Mercurial > evolve
diff tests/test-evolve-content-divergent-interrupted.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 | a119432bafc1 |
| children | 03410b04cf10 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t Sat Jan 30 20:21:19 2021 +0800 +++ b/tests/test-evolve-content-divergent-interrupted.t Thu Jan 28 18:48:36 2021 +0800 @@ -90,7 +90,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg status -v M d @@ -204,7 +204,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --abort 2 new orphan changesets @@ -314,7 +314,7 @@ 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --abort evolve aborted @@ -368,7 +368,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --abort evolve aborted @@ -460,7 +460,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve @@ -513,7 +513,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg evolve --stop stopped the interrupted evolve @@ -568,7 +568,7 @@ 0 files updated, 0 files merged, 0 files removed, 2 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [240] + [1] $ hg diff diff -r 517d4375cb72 c