diff -r 19ec729f3ca2 -r a77fb9669e99 tests/test-stabilize-order.t --- a/tests/test-stabilize-order.t Mon Apr 23 12:11:10 2018 +0200 +++ b/tests/test-stabilize-order.t Mon Apr 23 12:23:00 2018 +0200 @@ -38,18 +38,18 @@ [2] addb $ echo b >> b $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg gdown gdown have been deprecated in favor of previous 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [1] adda $ echo a >> a $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ glog - @ 5:005fe5914f78@default(draft) adda + @ 7:005fe5914f78@default(draft) adda | - | o 4:22619daeed78@default(draft) addb + | o 5:22619daeed78@default(draft) addb | | | | o 3:7a7552255fb5@default(draft) addc | | | @@ -63,8 +63,8 @@ Test stabilizing a predecessor child $ hg evolve -v - move:[4] addb - atop:[5] adda + move:[5] addb + atop:[7] adda hg rebase -r 22619daeed78 -d 005fe5914f78 resolving manifests getting b @@ -74,9 +74,9 @@ committing changelog working directory is now at 81b8bbcd5892 $ glog - @ 6:81b8bbcd5892@default(draft) addb + @ 8:81b8bbcd5892@default(draft) addb | - o 5:005fe5914f78@default(draft) adda + o 7:005fe5914f78@default(draft) adda | | o 3:7a7552255fb5@default(draft) addc | | @@ -89,12 +89,12 @@ Test stabilizing a descendant predecessor's child - $ hg up -r 005fe5914f78 + $ hg up 7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg debugobsolete > successors.old $ hg evolve -v move:[3] addc - atop:[6] addb + atop:[8] addb hg rebase -r 7a7552255fb5 -d 81b8bbcd5892 resolving manifests getting b @@ -109,21 +109,21 @@ $ diff -u successors.old successors.new --- successors.old* (glob) +++ successors.new* (glob) - @@ -1,3 +1,4 @@ - ef23d6ef94d68dea65d20587dfecc8b33d165617 22619daeed78036f80fbd326b6852519c4f0c25e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} - 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} - 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} - +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} + @@ -3,3 +3,4 @@ + 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob) + 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob) + 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} + +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} [1] $ glog - @ 7:0f691739f917@default(draft) addc + @ 9:0f691739f917@default(draft) addc | - o 6:81b8bbcd5892@default(draft) addb + o 8:81b8bbcd5892@default(draft) addb | - o 5:005fe5914f78@default(draft) adda + o 7:005fe5914f78@default(draft) adda | o 0:c471ef929e6a@default(draft) addroot @@ -132,31 +132,32 @@ Test behavior with --any - $ hg up 81b8bbcd5892 + $ hg up 8 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo b >> b $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ glog - @ 8:7a68bc4596ea@default(draft) addb + @ 11:7a68bc4596ea@default(draft) addb | - | o 7:0f691739f917@default(draft) addc + | o 9:0f691739f917@default(draft) addc | | - | x 6:81b8bbcd5892@default(draft) addb + | x 8:81b8bbcd5892@default(draft) addb |/ - o 5:005fe5914f78@default(draft) adda + o 7:005fe5914f78@default(draft) adda | o 0:c471ef929e6a@default(draft) addroot - $ hg up 0f691739f917 +| | + $ hg up 9 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg evolve -v nothing to evolve on current working copy parent (1 other orphan in the repository, do you want --any or --rev) [2] $ hg evolve --any -v - move:[7] addc - atop:[8] addb + move:[9] addc + atop:[11] addb hg rebase -r 0f691739f917 -d 7a68bc4596ea resolving manifests removing c @@ -169,11 +170,11 @@ committing changelog working directory is now at 2256dae6521f $ glog - @ 9:2256dae6521f@default(draft) addc + @ 12:2256dae6521f@default(draft) addc | - o 8:7a68bc4596ea@default(draft) addb + o 11:7a68bc4596ea@default(draft) addb | - o 5:005fe5914f78@default(draft) adda + o 7:005fe5914f78@default(draft) adda | o 0:c471ef929e6a@default(draft) addroot @@ -194,41 +195,41 @@ $ hg up .^ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg commit --amend -m "newmessage" - 2 new orphan changesets + 2 new unstable changesets $ hg log -G - @ changeset: 12:f83a0bce03e4 + @ changeset: 15:f83a0bce03e4 | tag: tip - | parent: 8:7a68bc4596ea + | parent: 11:7a68bc4596ea | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: newmessage | - | o changeset: 11:fa68011f392e - | | parent: 9:2256dae6521f + | o changeset: 14:fa68011f392e + | | parent: 12:2256dae6521f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: secondambiguous | | - | | o changeset: 10:bdc003b6eec2 + | | o changeset: 13:bdc003b6eec2 | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: firstambiguous | | - | x changeset: 9:2256dae6521f + | x changeset: 12:2256dae6521f |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded using amend as 12:f83a0bce03e4 + | obsolete: reworded as f83a0bce03e4 | summary: addc | - o changeset: 8:7a68bc4596ea - | parent: 5:005fe5914f78 + o changeset: 11:7a68bc4596ea + | parent: 7:005fe5914f78 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: addb | - o changeset: 5:005fe5914f78 + o changeset: 7:005fe5914f78 | parent: 0:c471ef929e6a | user: test | date: Thu Jan 01 00:00:00 1970 +0000