Mercurial > evolve
comparison tests/test-evolve-phase.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 fb8e44c70798 |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 84 $ hg evolve | 84 $ hg evolve |
| 85 move:[2] c | 85 move:[2] c |
| 86 atop:[3] b | 86 atop:[3] b |
| 87 merging a | 87 merging a |
| 88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 88 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 89 evolve failed! | 89 fix conflicts and see `hg help evolve.interrupted` |
| 90 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 90 [1] |
| 91 abort: unresolved merge conflicts (see hg help resolve) | |
| 92 [255] | |
| 93 | 91 |
| 94 $ hg diff | 92 $ hg diff |
| 95 diff -r 87495ea7c9ec a | 93 diff -r 87495ea7c9ec a |
| 96 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 94 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
| 97 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 95 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |