Mercurial > evolve
diff tests/test-evolve-orphan-merge.t @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:52:06 +0200 |
| parents | 629558d09898 |
| children | d00f0c369bc7 4eb3877540f1 |
line wrap: on
line diff
--- a/tests/test-evolve-orphan-merge.t Wed Jul 25 15:30:37 2018 -0700 +++ b/tests/test-evolve-orphan-merge.t Tue Jul 31 12:52:06 2018 +0200 @@ -219,10 +219,8 @@ atop:[11] foo to c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort - abort: unresolved merge conflicts (see hg help resolve) - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ echo FOObar > c $ hg resolve -m @@ -276,10 +274,8 @@ atop:[13] foo to c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort - abort: unresolved merge conflicts (see hg help resolve) - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ echo foobar > c $ hg resolve -m