tests/test-evolve.t
branchstable
changeset 1106 6b0cf1b73693
parent 1105 836c4128c027
child 1110 875e671c3cd8
--- a/tests/test-evolve.t	Sat Aug 09 18:36:28 2014 -0400
+++ b/tests/test-evolve.t	Sat Aug 09 19:12:16 2014 -0400
@@ -270,9 +270,9 @@
   move:[4] another feature (child of 568a468b60fc)
   atop:[6] a nifty feature
   merging main-file-1
-  working directory is now at 5b410c3ae5af
+  working directory is now at 5c9c8d9c2e4e
   $ hg log
-  7	feature-B: another feature (child of 568a468b60fc) - test
+  7	feature-B: another feature (child of ba0ec09b1bab) - test
   6	feature-A: a nifty feature - test
   0	: base - test
 
@@ -301,7 +301,7 @@
   $ hg glog
   @  8	feature-B: another feature that rox - test
   |
-  | o  7	: another feature (child of 568a468b60fc) - test
+  | o  7	: another feature (child of ba0ec09b1bab) - test
   |/
   o  6	feature-A: a nifty feature - test
   |
@@ -309,14 +309,14 @@
   
   $ hg evolve --any --traceback
   recreate:[8] another feature that rox
-  atop:[7] another feature (child of 568a468b60fc)
+  atop:[7] another feature (child of ba0ec09b1bab)
   computing new diff
-  committed as 8234cfce9af9
-  working directory is now at 8234cfce9af9
+  committed as 476d0454d60e
+  working directory is now at 476d0454d60e
   $ hg glog
-  @  9	feature-B: bumped update to 5b410c3ae5af: - test
+  @  9	feature-B: bumped update to 5c9c8d9c2e4e: - test
   |
-  o  7	: another feature (child of 568a468b60fc) - test
+  o  7	: another feature (child of ba0ec09b1bab) - test
   |
   o  6	feature-A: a nifty feature - test
   |
@@ -371,7 +371,7 @@
   move:[11] dansk 3!
   atop:[14] dansk 2!
   merging main-file-1
-  working directory is now at e65e652e27bf
+  working directory is now at cfb5ebed336d
   $ hg glog
   @  15	: dansk 3! - test
   |
@@ -379,7 +379,7 @@
   |
   o  13	feature-B: dansk! - test
   |
-  o  7	: another feature (child of 568a468b60fc) - test
+  o  7	: another feature (child of ba0ec09b1bab) - test
   |
   o  6	feature-A: a nifty feature - test
   |
@@ -747,11 +747,11 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog
-  @  16:d0aee199f74c@default(draft) Folding with custom commit message
+  @  16:d6239ff09c9f@default(draft) Folding with custom commit message
   |
-  o  13:b0258f43f9d0@default(draft) dansk!
+  o  13:56ade053f46d@default(draft) dansk!
   |
-  o  7:5b410c3ae5af@default(public) another feature (child of 568a468b60fc)
+  o  7:5c9c8d9c2e4e@default(public) another feature (child of ba0ec09b1bab)
   |
   o  6:ba0ec09b1bab@default(public) a nifty feature
   |
@@ -766,8 +766,8 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qlog
-  17 - bf2fd466ccd4 A longer
+  17 - dba606655966 A longer
                     commit message (draft)
-  7 - 5b410c3ae5af another feature (child of 568a468b60fc) (public)
+  7 - 5c9c8d9c2e4e another feature (child of ba0ec09b1bab) (public)
   6 - ba0ec09b1bab a nifty feature (public)
   0 - e55e0562ee93 base (public)