tests/test-rebase-collapse.t
changeset 17005 50f434510da6
parent 16714 0a176990243c
child 17013 c8eda7bbdcab
--- a/tests/test-rebase-collapse.t	Wed Jun 20 17:40:19 2012 +0400
+++ b/tests/test-rebase-collapse.t	Wed Jun 20 20:08:57 2012 +0200
@@ -230,7 +230,7 @@
 
 Rebase and collapse - E onto H:
 
-  $ hg rebase -s 4 --collapse
+  $ hg rebase -s 4 --collapse # root (4) is not a merge
   saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
@@ -250,7 +250,6 @@
   
   $ hg manifest
   A
-  B
   C
   D
   E
@@ -340,7 +339,7 @@
   $ hg clone -q -u . c c1
   $ cd c1
 
-  $ hg rebase -s 4 --collapse
+  $ hg rebase -s 4 --collapse # root (4) is not a merge
   merging E
   saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob)
 
@@ -362,7 +361,6 @@
   
   $ hg manifest
   A
-  B
   C
   D
   E