Mercurial > evolve
diff tests/test-evolve-stop-orphan.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 | 9b1bdd68d545 c0921b5277a0 |
line wrap: on
line diff
--- a/tests/test-evolve-stop-orphan.t Sat Apr 24 19:54:14 2021 +0800 +++ b/tests/test-evolve-stop-orphan.t Sat Apr 24 20:01:39 2021 +0800 @@ -102,7 +102,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 @@ -150,7 +150,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 @@ -213,7 +213,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) @@ -265,7 +265,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 @@ -305,7 +305,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 @@ -382,7 +382,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