diff tests/test-rebase-collapse.t @ 19924:c23c62209cc4

tests: prepare rebase test for wc parent preservation

In the way to solving issue3813 we'll preserve the working directory parent
after the rebase. Multiple rebases test expect the working directory parent to
be tip after rebase. We patches them before the actual change to prevent
confusion.

--- a/tests/test-rebase-collapse.t	Fri Oct 18 18:56:52 2013 +0200
+++ b/tests/test-rebase-collapse.t	Mon Oct 14 16:49:54 2013 +0200
@@ -71,7 +71,7 @@
   |/
   o  0:draft 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   B
   C
@@ -107,7 +107,7 @@
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   E
   F
@@ -142,7 +142,7 @@
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   E
   F
@@ -249,7 +249,7 @@
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -399,7 +399,7 @@
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -407,6 +407,7 @@
   G
   I
 
+  $ hg up tip -q
   $ cat E
   F
 
@@ -481,7 +482,7 @@
   |
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   B
   C
@@ -611,12 +612,13 @@
   merging f and c to c
   saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob)
   $ hg st
-  $ hg st --copies --change .
+  $ hg st --copies --change tip
   A d
     a
   A g
     b
   R b
+  $ hg up tip -q
   $ cat c
   c
   c
@@ -648,7 +650,7 @@
 
   $ hg rebase --collapse -b . -d 0
   saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob)
-  $ hg st --change . --copies
+  $ hg st --change tip --copies
   M a
   M c
   A d
@@ -656,6 +658,7 @@
   A g
     b
   R b
+  $ hg up tip -q
   $ cat a
   a
   a
@@ -741,7 +744,7 @@
   |
   o  0: 'base'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   b
   base