Mercurial > evolve

comparison tests/test-evolve-orphan-merge.t @ 3914:96945ea908df stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
217 $ hg evolve --all 217 $ hg evolve --all
218 move:[10] foobar to c 218 move:[10] foobar to c
219 atop:[11] foo to c 219 atop:[11] foo to c
220 merging c 220 merging c
221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 221 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
222 evolve failed! 222 fix conflicts and see `hg help evolve.interrupted`
223 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 223 [1]
224 abort: unresolved merge conflicts (see hg help resolve)
225 [255]
226 224
227 $ echo FOObar > c 225 $ echo FOObar > c
228 $ hg resolve -m 226 $ hg resolve -m
229 (no more unresolved files) 227 (no more unresolved files)
230 continue: hg evolve --continue 228 continue: hg evolve --continue
274 $ hg evolve --all 272 $ hg evolve --all
275 move:[12] foobar to c 273 move:[12] foobar to c
276 atop:[13] foo to c 274 atop:[13] foo to c
277 merging c 275 merging c
278 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 276 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
279 evolve failed! 277 fix conflicts and see `hg help evolve.interrupted`
280 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort 278 [1]
281 abort: unresolved merge conflicts (see hg help resolve)
282 [255]
283 279
284 $ echo foobar > c 280 $ echo foobar > c
285 $ hg resolve -m 281 $ hg resolve -m
286 (no more unresolved files) 282 (no more unresolved files)
287 continue: hg evolve --continue 283 continue: hg evolve --continue