Mercurial > evolve
comparison tests/test-stabilize-result.t @ 4311:8aa28e68ac44 stable
evolve: detect unresolved conflict during evolve --continue (issue5966)
Evolve --continue was ignoring unresolved conflict, proceeding with its
operation without any check. This is now fixed.
This test case was built and formalized by Matt Harbison and Anton Shestakov.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 21 Dec 2018 13:14:59 +0800 |
| parents | ecbf61d90807 |
| children | 4a740f9eee49 f530850c8184 d02a7c8cdee5 |
comparison
equal
deleted
inserted
replaced
| 4304:604732387e33 | 4311:8aa28e68ac44 |
|---|---|
| 91 @@ -1,1 +1,3 @@ | 91 @@ -1,1 +1,3 @@ |
| 92 a | 92 a |
| 93 +a | 93 +a |
| 94 +newer a | 94 +newer a |
| 95 $ hg evolve --continue | 95 $ hg evolve --continue |
| 96 evolving 4:3655f0f50885 "newer a" | |
| 97 abort: unresolved merge conflicts (see 'hg help resolve') | 96 abort: unresolved merge conflicts (see 'hg help resolve') |
| 98 [255] | 97 [255] |
| 99 $ hg resolve -m a | 98 $ hg resolve -m a |
| 100 (no more unresolved files) | 99 (no more unresolved files) |
| 101 continue: hg evolve --continue | 100 continue: hg evolve --continue |