# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1381762194 -7200
# Node ID c23c62209cc4ce88e8dd7d4f8cb8e59ea3334566
# Parent  52bc80d0769fcc4db3c414266c84cce257580f5b
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.

diff -r 52bc80d0769f -r c23c62209cc4 tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t	Fri Oct 18 18:56:52 2013 +0200
+++ b/tests/test-histedit-obsolete.t	Mon Oct 14 16:49:54 2013 +0200
@@ -148,6 +148,7 @@
 stabilise
 
   $ hg rebase  -r 'unstable()' -d .
+  $ hg up tip -q
 
 Test dropping of changeset on the top of the stack
 -------------------------------------------------------
diff -r 52bc80d0769f -r c23c62209cc4 tests/test-rebase-collapse.t
--- 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
 
diff -r 52bc80d0769f -r c23c62209cc4 tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t	Fri Oct 18 18:56:52 2013 +0200
+++ b/tests/test-rebase-detach.t	Mon Oct 14 16:49:54 2013 +0200
@@ -68,7 +68,7 @@
   |/
   o  0:draft 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   D
   F
@@ -119,7 +119,7 @@
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -171,7 +171,7 @@
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   B
   C
@@ -224,7 +224,7 @@
   |/
   o  0:draft 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -350,7 +350,7 @@
   o  0: 'A'
   
 
-  $ hg parents
+  $ hg log --rev tip
   changeset:   8:9472f4b1d736
   tag:         tip
   user:        test
diff -r 52bc80d0769f -r c23c62209cc4 tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t	Fri Oct 18 18:56:52 2013 +0200
+++ b/tests/test-rebase-obsolete.t	Mon Oct 14 16:49:54 2013 +0200
@@ -283,7 +283,7 @@
   |/
   o  0:cd010b8cd998 A
   
-  $ hg id --debug
+  $ hg id --debug -r tip
   4dc2197e807bae9817f09905b50ab288be2dbbcf tip
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob)