Jörg Sommer schrieb am Sat 22. Mar, 22:44 (+0100): > > Signed-off-by: Jörg Sommer <joerg@xxxxxxxxxxxx> > --- > 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.
Attachment:
signature.asc
Description: Digital signature http://en.wikipedia.org/wiki/OpenPGP
