Mercurial > evolve
diff tests/test-evolve-abort-phasediv.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | fd039a7f0c3c |
| children | 67fc03f42d92 43c4db536990 |
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t Sat Apr 24 19:54:14 2021 +0800 +++ b/tests/test-evolve-abort-phasediv.t Sat Apr 24 20:01:39 2021 +0800 @@ -105,7 +105,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] testing that interrupted evolve shows up in morestatus $ hg status -v @@ -224,7 +224,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg abort 1 new phase-divergent changesets @@ -294,7 +294,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo watwat > c $ hg resolve -m @@ -310,7 +310,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg abort 1 new phase-divergent changesets