From: Jörg Sommer <joerg@alea.gnuu.de>
Date: Sat, 22 Mar 2008 21:57:02 GMT
Subject: Re: [PATCH 3/3] Improve failure test for preserve merges
Message-ID: <20080322215702.GA29174@alea.gnuu.de>
In-Reply-To: <1206222266-29179-3-git-send-email-joerg@alea.gnuu.de>

Jörg Sommer schrieb am Sat 22. Mar, 22:44 (+0100):
> 
> Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
> ---
>  t/t3404-rebase-interactive.sh |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 014b036..eaa2fc0 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -213,11 +213,13 @@ test_expect_success 'preserve merges with -p' '
>  '
>  
>  test_expect_failure 'preserve merges with -p (case 2)' '

This test still fails, but I don't know how to fix it. The situation is
this:

o---P
 \   \
  A---M---B

A and B should get exchanged. So I would assume that telling rebase the
following should do it:

pick P
pick B
pick M
pick A

But what should be the new parent of B?

Is it allowed to permute lines with preserve merges? I've got the
impression it's not.

Bye, Jörg.
-- 
[dpkg] We are the apt. Resistance is futile. You will be packaged.