From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Tue, 27 Feb 2007 14:25:57 GMT
Subject: Re: [PATCH] Add a testcase for the safety of pull-policy='pull'.
Message-ID: <b0943d9e0702270625o5a9ef8b4xd0fa5df68e2b805a@mail.gmail.com>
In-Reply-To: <20070225220853.31361.7201.stgit@gandelf.nowhere.earth>

On 25/02/07, Yann Dirson <ydirson@altern.org> wrote:
> This testcase demonstrates a long-standing problem with the handling
> of conflicts on a rewinding branch, when "stg pull" calls git-pull.
[...]
> diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh
[...]
> +test_expect_failure \
> +    'Rewind/rewrite upstream commit and pull it from clone, without --merged' \
> +    '
> +    (cd upstream && echo b >> file2 && stg refresh) &&
> +    (cd clone && stg pull)
> +    '

This fails (with git 1.5), as expected, but probably not for the same
reason. See below.

> +test_expect_success \
> +    'Undo the conflicted pull' \
> +    '(cd clone && stg push --undo)'

This actually fails in my tests because the git-pull failed previously
(and not the patch pushing) and there is no patch on the stack to
undo. BTW, push --undo now requires a status --reset beforehand.

I can merge the patch as it is and you can send me another one for this issue.

Thanks.

-- 
Catalin