Mercurial > evolve
diff tests/test-evolve-continue.t @ 4174:e07e764c0f48 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 12 Oct 2018 15:20:54 +0200 |
| parents | 537fd9a86c06 e268f7fd7839 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve-continue.t Fri Oct 12 15:15:09 2018 +0200 +++ b/tests/test-evolve-continue.t Fri Oct 12 15:20:54 2018 +0200 @@ -38,9 +38,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 @@ -55,7 +55,7 @@ $ hg evolve --all 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') fix conflicts and see `hg help evolve.interrupted` @@ -71,9 +71,9 @@ 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 @@ -88,20 +88,20 @@ $ hg ci -Aqm "added e" $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - [6] added d + [7] added d $ echo bar > e $ hg add e $ hg amend - 1 new orphan changesets + 1 new unstable changesets $ hg glog - @ 8:00a5c774cc37 added d + @ 10:00a5c774cc37 added d | () draft - | o 7:ad0a59d83efe added e + | o 8:ad0a59d83efe added e | | () draft - | x 6:2a4e03d422e2 added d + | x 7:2a4e03d422e2 added d |/ () draft - o 5:cb6a2ab625bb added c + o 6:cb6a2ab625bb added c | () draft o 2:b1661037fa25 added b | () draft @@ -111,8 +111,8 @@ () draft $ hg evolve - move:[7] added e - atop:[8] added d + move:[8] added e + atop:[10] added d merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') fix conflicts and see `hg help evolve.interrupted` @@ -125,13 +125,13 @@ $ hg diff $ hg evolve --continue - evolving 7:ad0a59d83efe "added e" - evolution of 7:ad0a59d83efe created no changes to commit + evolving 8:ad0a59d83efe "added e" + evolution of 8:ad0a59d83efe created no changes to commit $ hg glog - @ 8:00a5c774cc37 added d + @ 10:00a5c774cc37 added d | () draft - o 5:cb6a2ab625bb added c + o 6:cb6a2ab625bb added c | () draft o 2:b1661037fa25 added b | () draft @@ -147,11 +147,11 @@ $ echo bar > b $ hg add b $ hg amend - 3 new orphan changesets + 3 new unstable changesets $ hg evolve --all move:[2] added b - atop:[9] added a + atop:[12] added a merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') fix conflicts and see `hg help evolve.interrupted` @@ -163,19 +163,19 @@ continue: hg evolve --continue $ hg evolve --continue evolving 2:b1661037fa25 "added b" - move:[5] added c - atop:[10] added b - move:[8] added d + move:[6] added c + atop:[13] added b + move:[10] added d working directory is now at 6642d2c9176e $ hg glog - @ 12:6642d2c9176e added d + @ 15:6642d2c9176e added d | () draft - o 11:95665a2de664 added c + o 14:95665a2de664 added c | () draft - o 10:87f748868183 added b + o 13:87f748868183 added b | () draft - o 9:53b632d203d8 added a + o 12:53b632d203d8 added a | () draft o 0:8fa14d15e168 added hgignore () draft @@ -186,19 +186,19 @@ $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done; $ hg glog - @ 15:09becba8f97d added h + @ 18:09becba8f97d added h | () draft - o 14:5aa7b2bbd944 added g + o 17:5aa7b2bbd944 added g | () draft - o 13:be88f889b6dc added f + o 16:be88f889b6dc added f | () draft - o 12:6642d2c9176e added d + o 15:6642d2c9176e added d | () draft - o 11:95665a2de664 added c + o 14:95665a2de664 added c | () draft - o 10:87f748868183 added b + o 13:87f748868183 added b | () draft - o 9:53b632d203d8 added a + o 12:53b632d203d8 added a | () draft o 0:8fa14d15e168 added hgignore () draft @@ -210,32 +210,32 @@ $ echo bar > h $ hg add f h $ hg amend - 4 new orphan changesets + 4 new unstable changesets $ hg glog - @ 16:645135c5caa4 added c + @ 20:645135c5caa4 added c | () draft - | o 15:09becba8f97d added h + | o 18:09becba8f97d added h | | () draft - | o 14:5aa7b2bbd944 added g + | o 17:5aa7b2bbd944 added g | | () draft - | o 13:be88f889b6dc added f + | o 16:be88f889b6dc added f | | () draft - | o 12:6642d2c9176e added d + | o 15:6642d2c9176e added d | | () draft - | x 11:95665a2de664 added c + | x 14:95665a2de664 added c |/ () draft - o 10:87f748868183 added b + o 13:87f748868183 added b | () draft - o 9:53b632d203d8 added a + o 12:53b632d203d8 added a | () draft o 0:8fa14d15e168 added hgignore () draft $ hg evolve --all - move:[12] added d - atop:[16] added c - move:[13] added f + move:[15] added d + atop:[20] added c + move:[16] added f merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') fix conflicts and see `hg help evolve.interrupted` @@ -246,10 +246,10 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - evolving 13:be88f889b6dc "added f" - move:[14] added g - atop:[18] added f - move:[15] added h + evolving 16:be88f889b6dc "added f" + move:[17] added g + atop:[22] added f + move:[18] added h merging h warning: conflicts while merging h! (edit, then use 'hg resolve --mark') fix conflicts and see `hg help evolve.interrupted` @@ -260,25 +260,25 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - evolving 15:09becba8f97d "added h" + evolving 18:09becba8f97d "added h" working directory is now at 3ba9d3d1b089 Make sure, confirmopt is respected while continue $ hg glog - @ 20:3ba9d3d1b089 added h + @ 24:3ba9d3d1b089 added h | () draft - o 19:981e615b14ca added g + o 23:981e615b14ca added g | () draft - o 18:5794f1a3cbb2 added f + o 22:5794f1a3cbb2 added f | () draft - o 17:e47537da02b3 added d + o 21:e47537da02b3 added d | () draft - o 16:645135c5caa4 added c + o 20:645135c5caa4 added c | () draft - o 10:87f748868183 added b + o 13:87f748868183 added b | () draft - o 9:53b632d203d8 added a + o 12:53b632d203d8 added a | () draft o 0:8fa14d15e168 added hgignore () draft @@ -288,13 +288,13 @@ $ echo bar > g $ hg add g $ hg amend - 2 new orphan changesets + 2 new unstable changesets $ hg evolve --all --confirm<<EOF > y > EOF - move:[19] added g - atop:[21] added f + move:[23] added g + atop:[26] added f perform evolve? [Ny] y merging g warning: conflicts while merging g! (edit, then use 'hg resolve --mark') @@ -311,26 +311,26 @@ $ hg evolve --continue<<EOF > y > EOF - evolving 19:981e615b14ca "added g" - move:[20] added h - atop:[22] added g + evolving 23:981e615b14ca "added g" + move:[24] added h + atop:[27] added g perform evolve? [Ny] y working directory is now at af6bd002a48d $ hg glog - @ 23:af6bd002a48d added h + @ 28:af6bd002a48d added h | () draft - o 22:d2c94a8f44bd added g + o 27:d2c94a8f44bd added g | () draft - o 21:9849fa96c885 added f + o 26:9849fa96c885 added f | () draft - o 17:e47537da02b3 added d + o 21:e47537da02b3 added d | () draft - o 16:645135c5caa4 added c + o 20:645135c5caa4 added c | () draft - o 10:87f748868183 added b + o 13:87f748868183 added b | () draft - o 9:53b632d203d8 added a + o 12:53b632d203d8 added a | () draft o 0:8fa14d15e168 added hgignore () draft @@ -341,11 +341,11 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo foobar > g $ hg amend - 2 new orphan changesets + 2 new unstable changesets $ hg next --evolve - move:[22] added g - atop:[24] added f + move:[27] added g + atop:[30] added f merging g warning: conflicts while merging g! (edit, then use 'hg resolve --mark') fix conflicts and see `hg help evolve.interrupted` @@ -355,4 +355,4 @@ (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue - evolving 22:d2c94a8f44bd "added g" + evolving 27:d2c94a8f44bd "added g"