Mercurial > evolve

comparison tests/test-evolve.t @ 1799:b1809340478b mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with 5.6.0 no extra changes were needed form the mercurial-3.6 branch.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 01 Feb 2017 15:51:02 +0100
parents ad04f3c3b1a9 acfc610ec304
children 1554b30b18eb
comparison
equal deleted inserted replaced
1798:acfc610ec304 1799:b1809340478b
591 created new head 591 created new head
592 $ hg up -qC 6 592 $ hg up -qC 6
593 $ hg graft -O 7 593 $ hg graft -O 7
594 grafting 7:a5bfd90a2f29 "conflict" (tip) 594 grafting 7:a5bfd90a2f29 "conflict" (tip)
595 merging 1 595 merging 1
596 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') 596 warning: conflicts during merge.
597 merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
597 abort: unresolved conflicts, can't continue 598 abort: unresolved conflicts, can't continue
598 (use hg resolve and hg graft --continue) 599 (use hg resolve and hg graft --continue)
599 [255] 600 [255]
600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' 601 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
601 7:a5bfd90a2f29 602 7:a5bfd90a2f29
1440 move:[38] will be evolved safely 1441 move:[38] will be evolved safely
1441 atop:[41] amended 1442 atop:[41] amended
1442 move:[39] will cause conflict at evolve 1443 move:[39] will cause conflict at evolve
1443 atop:[42] will be evolved safely 1444 atop:[42] will be evolved safely
1444 merging newfile 1445 merging newfile
1445 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') 1446 warning: conflicts during merge.
1447 merging newfile incomplete! (edit conflicts, then use 'hg resolve --mark')
1446 evolve failed! 1448 evolve failed!
1447 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort 1449 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
1448 abort: unresolved merge conflicts (see hg help resolve) 1450 abort: unresolved merge conflicts (see hg help resolve)
1449 [255] 1451 [255]
1450 1452