diff -r d5adce52cef4 -r 98941c28f3e2 tests/test-evolve-stop.t --- a/tests/test-evolve-stop.t Wed Mar 21 16:06:17 2018 +0100 +++ b/tests/test-evolve-stop.t Wed Mar 21 16:18:31 2018 +0100 @@ -68,9 +68,9 @@ $ echo bar > d $ hg add d $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg glog - @ 5:cb6a2ab625bb added c + @ 6:cb6a2ab625bb added c | () draft | o 4:c41c793e0ef1 added d | | () draft @@ -85,7 +85,7 @@ $ hg evolve move:[4] added d - atop:[5] added c + atop:[6] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! @@ -115,7 +115,7 @@ Checking graph $ hg glog - @ 5:cb6a2ab625bb added c + @ 6:cb6a2ab625bb added c | () draft | o 4:c41c793e0ef1 added d | | () draft @@ -133,7 +133,7 @@ $ hg next --evolve move:[4] added d - atop:[5] added c + atop:[6] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! @@ -157,7 +157,7 @@ working directory is now at cb6a2ab625bb $ hg glog - @ 5:cb6a2ab625bb added c + @ 6:cb6a2ab625bb added c | () draft | o 4:c41c793e0ef1 added d | | () draft @@ -182,7 +182,7 @@ $ hg evolve move:[4] added d - atop:[5] added c + atop:[6] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! @@ -197,9 +197,9 @@ evolving 4:c41c793e0ef1 "added d" working directory is now at 2a4e03d422e2 $ hg glog - @ 6:2a4e03d422e2 added d + @ 7:2a4e03d422e2 added d | () draft - o 5:cb6a2ab625bb added c + o 6:cb6a2ab625bb added c | () draft o 2:b1661037fa25 added b | () draft @@ -213,14 +213,14 @@ $ echo bar > c $ hg add c $ hg amend - 4 new orphan changesets + 4 new unstable changesets $ hg glog - @ 7:21817cd42526 added hgignore + @ 9:21817cd42526 added hgignore () draft - o 6:2a4e03d422e2 added d + o 7:2a4e03d422e2 added d | () draft - o 5:cb6a2ab625bb added c + o 6:cb6a2ab625bb added c | () draft o 2:b1661037fa25 added b | () draft @@ -231,11 +231,11 @@ $ hg evolve --all move:[1] added a - atop:[7] added hgignore + atop:[9] added hgignore move:[2] added b - atop:[8] added a - move:[5] added c - atop:[9] added b + atop:[10] added a + move:[6] added c + atop:[11] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! @@ -253,15 +253,15 @@ Only changeset which has a successor now are obsoleted $ hg glog - @ 9:aec285328e90 added b + @ 11:aec285328e90 added b | () draft - o 8:fd00db71edca added a + o 10:fd00db71edca added a | () draft - o 7:21817cd42526 added hgignore + o 9:21817cd42526 added hgignore () draft - o 6:2a4e03d422e2 added d + o 7:2a4e03d422e2 added d | () draft - o 5:cb6a2ab625bb added c + o 6:cb6a2ab625bb added c | () draft x 2:b1661037fa25 added b | () draft @@ -273,8 +273,8 @@ Making sure doing evolve again resumes from right place and does the right thing $ hg evolve --all - move:[5] added c - atop:[9] added b + move:[6] added c + atop:[11] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! @@ -287,20 +287,20 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - evolving 5:cb6a2ab625bb "added c" - move:[6] added d - atop:[10] added c + evolving 6:cb6a2ab625bb "added c" + move:[7] added d + atop:[12] added c working directory is now at cd0909a30222 $ hg glog - @ 11:cd0909a30222 added d + @ 13:cd0909a30222 added d | () draft - o 10:cb1dd1086ef6 added c + o 12:cb1dd1086ef6 added c | () draft - o 9:aec285328e90 added b + o 11:aec285328e90 added b | () draft - o 8:fd00db71edca added a + o 10:fd00db71edca added a | () draft - o 7:21817cd42526 added hgignore + o 9:21817cd42526 added hgignore () draft Bookmarks should only be moved of the changesets which have been evolved, @@ -316,43 +316,43 @@ $ hg bookmark b2 $ hg glog - o 11:cd0909a30222 added d + o 13:cd0909a30222 added d | () draft - o 10:cb1dd1086ef6 added c + o 12:cb1dd1086ef6 added c | (b1) draft - @ 9:aec285328e90 added b + @ 11:aec285328e90 added b | (b2) draft - o 8:fd00db71edca added a + o 10:fd00db71edca added a | () draft - o 7:21817cd42526 added hgignore + o 9:21817cd42526 added hgignore () draft $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - [8] added a + [10] added a $ echo tom > c $ hg amend - 3 new orphan changesets + 3 new unstable changesets $ hg glog - @ 12:a3cc2042492f added a + @ 15:a3cc2042492f added a | () draft - | o 11:cd0909a30222 added d + | o 13:cd0909a30222 added d | | () draft - | o 10:cb1dd1086ef6 added c + | o 12:cb1dd1086ef6 added c | | (b1) draft - | o 9:aec285328e90 added b + | o 11:aec285328e90 added b | | (b2) draft - | x 8:fd00db71edca added a + | x 10:fd00db71edca added a |/ () draft - o 7:21817cd42526 added hgignore + o 9:21817cd42526 added hgignore () draft $ hg evolve --all - move:[9] added b - atop:[12] added a - move:[10] added c - atop:[13] added b + move:[11] added b + atop:[15] added a + move:[12] added c + atop:[16] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! @@ -366,17 +366,17 @@ Bookmarks of only the changeset which are evolved is moved $ hg glog - @ 13:a3f4b95da934 added b + @ 16:a3f4b95da934 added b | (b2) draft - o 12:a3cc2042492f added a + o 15:a3cc2042492f added a | () draft - | o 11:cd0909a30222 added d + | o 13:cd0909a30222 added d | | () draft - | o 10:cb1dd1086ef6 added c + | o 12:cb1dd1086ef6 added c | | (b1) draft - | x 9:aec285328e90 added b + | x 11:aec285328e90 added b | | () draft - | x 8:fd00db71edca added a + | x 10:fd00db71edca added a |/ () draft - o 7:21817cd42526 added hgignore + o 9:21817cd42526 added hgignore () draft