From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Thu, 04 Aug 2011 09:22:33 GMT
Subject: Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
Message-ID: <CALkWK0nvfV=JXm6g5W4K899MN+Qbbq72xRn-YsJtn_ceUexp+g@mail.gmail.com>
In-Reply-To: <201108040657.24610.chriscool@tuxfamily.org>

Hi Christian,

Christian Couder writes:
> On Monday 01 August 2011 20:07:04 Ramkumar Ramachandra wrote:
>> +test_expect_success '--continue complains when there are unresolved
>> conflicts' '
>> +     pristine_detach initial &&
>> +     test_must_fail git cherry-pick base..picked &&
>> +     test_must_fail git cherry-pick --continue
>> +'
>
> When I try to manually run the above test I get:
>
> -----------------------------------
>
> $ pristine_detach initial
> Warning: you are leaving 1 commit behind, not connected to
> any of your branches:
>
>  30b20f1 unrelatedpick
>
> HEAD is now at df2a63d... initial
> $
> $ git cherry-pick base..picked
> [detached HEAD 30b20f1] unrelatedpick
>  Author: A U Thor <author@example.com>
>  1 files changed, 1 insertions(+), 1 deletions(-)
> Auto-merging foo
> CONFLICT (content): Merge conflict in foo
> error: could not apply fdc0b12... picked
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'
> $
> $ git cherry-pick --continue
> fatal: No cherry-pick in progress

Good catch.  It should be "base..anotherpick".  Fixed now.

-- Ram