--- a/tests/test-stabilize-order.t Tue Oct 15 16:20:17 2013 +0200
+++ b/tests/test-stabilize-order.t Wed Oct 16 00:37:29 2013 +0200
@@ -47,9 +47,9 @@
$ hg amend
1 new unstable changesets
$ glog
- @ 7:f5ff10856e5a@default(draft) adda
+ @ 7:005fe5914f78@default(draft) adda
|
- | o 5:ab8cbb6d87ff@default(draft) addb
+ | o 5:22619daeed78@default(draft) addb
| |
| | o 3:7a7552255fb5@default(draft) addc
| | |
@@ -65,14 +65,14 @@
$ hg evolve -v
move:[5] addb
atop:[7] adda
- hg rebase -r ab8cbb6d87ff -d f5ff10856e5a
+ hg rebase -r 22619daeed78 -d 005fe5914f78
resolving manifests
getting b
b
$ glog
- @ 8:6bf44048e43f@default(draft) addb
+ @ 8:bede829dd2d3@default(draft) addb
|
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
| o 3:7a7552255fb5@default(draft) addc
| |
@@ -91,7 +91,7 @@
$ hg evolve -v
move:[3] addc
atop:[8] addb
- hg rebase -r 7a7552255fb5 -d 6bf44048e43f
+ hg rebase -r 7a7552255fb5 -d bede829dd2d3
resolving manifests
getting b
resolving manifests
@@ -102,17 +102,20 @@
--- successors.old* (glob)
+++ successors.new* (glob)
@@ -3,3 +3,4 @@
- 93418d2c0979643ad446f621195e78720edb05b4 f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob)
- 3a4a591493f80708e46f2bf6d3b4debfad8ff91e 0 {'date': '* *', 'user': 'test'} (glob)
- ab8cbb6d87ff3ab5526735a051cba6b63f3d6775 6bf44048e43f830accbf7d2bd7bc252ad7a3b99c 0 {'date': '* *', 'user': 'test'} (glob)
- +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 5e819fbb0d278117c0a83b7f6f6486689732cfb2 0 {'date': '* *', 'user': 'test'} (glob)
+ 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 {'date': '* *', 'user': 'test'} (glob)
+ 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {'date': '* *', 'user': 'test'} (glob)
+ 22619daeed78036f80fbd326b6852519c4f0c25e bede829dd2d3b2ae9bf198c23432b250dc964458 0 {'date': '* *', 'user': 'test'} (glob)
+ +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 65095d7d0dd5e4f15503bb7b1f433a5fe9bac052 0 {'date': '* *', 'user': 'test'} (glob)
[1]
+
+
+
$ glog
- @ 9:5e819fbb0d27@default(draft) addc
+ @ 9:65095d7d0dd5@default(draft) addc
|
- o 8:6bf44048e43f@default(draft) addb
+ o 8:bede829dd2d3@default(draft) addb
|
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
@@ -128,13 +131,13 @@
$ hg amend
1 new unstable changesets
$ glog
- @ 11:4e7cec6b4afe@default(draft) addb
+ @ 11:036cf654e942@default(draft) addb
|
- | o 9:5e819fbb0d27@default(draft) addc
+ | o 9:65095d7d0dd5@default(draft) addc
| |
- | x 8:6bf44048e43f@default(draft) addb
+ | x 8:bede829dd2d3@default(draft) addb
|/
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
@@ -147,7 +150,7 @@
$ hg evolve --any -v
move:[9] addc
atop:[11] addb
- hg rebase -r 5e819fbb0d27 -d 4e7cec6b4afe
+ hg rebase -r 65095d7d0dd5 -d 036cf654e942
resolving manifests
removing c
getting b
@@ -155,11 +158,11 @@
getting c
c
$ glog
- @ 12:24f95816bb21@default(draft) addc
+ @ 12:e99ecf51c867@default(draft) addc
|
- o 11:4e7cec6b4afe@default(draft) addb
+ o 11:036cf654e942@default(draft) addb
|
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot