Mercurial > evolve
diff tests/test-evolve-stop-orphan.t @ 5747:8e4f6354b316 mercurial-5.6
tests: back out changeset b3d9e6c805d6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:48:36 +0800 |
| parents | 61d2f1cf90f0 |
| children | 98e87c181e0f fd039a7f0c3c |
line wrap: on
line diff
--- a/tests/test-evolve-stop-orphan.t Sat Jan 30 20:21:19 2021 +0800 +++ b/tests/test-evolve-stop-orphan.t Thu Jan 28 18:48:36 2021 +0800 @@ -92,7 +92,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve @@ -138,7 +138,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r cb6a2ab625bb d @@ -200,7 +200,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foo > d $ hg resolve -m (no more unresolved files) @@ -250,7 +250,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg status M c @@ -288,7 +288,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ echo foobar > c $ hg resolve -m @@ -363,7 +363,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve