Mercurial > hg

diff tests/test-rebase-collapse @ 10762:129e96f7a87a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix --collapse with --keepbranches (issue2100) This was broken in 38fe86fb16e3.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 23 Mar 2010 20:45:08 +0100
parents 49efeed49c94
children b345b1cc124f
line wrap: on
line diff
--- a/tests/test-rebase-collapse	Tue Mar 23 20:01:30 2010 +0100
+++ b/tests/test-rebase-collapse	Tue Mar 23 20:45:08 2010 +0100
@@ -43,7 +43,7 @@
 hg glog  --template '{rev}: {desc}\n'
 echo '% Rebasing B onto H'
 hg up -C 3
-hg rebase --collapse 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+hg rebase --collapse --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 hg glog  --template '{rev}: {desc}\n'
 echo "Expected A, B, C, D, F, H"
 hg manifest