Mercurial > evolve

comparison tests/test-evolve.t @ 1600:0d8973818980 mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: register expected difference for Mercurial 3.5
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 04 Feb 2016 11:07:44 +0000
parents dcf145d0ce21
children c2739551ea4e
comparison
equal deleted inserted replaced
1599:dcf145d0ce21 1600:0d8973818980
590 created new head 590 created new head
591 $ hg up -qC 6 591 $ hg up -qC 6
592 $ hg graft -O 7 592 $ hg graft -O 7
593 grafting 7:a5bfd90a2f29 "conflict" (tip) 593 grafting 7:a5bfd90a2f29 "conflict" (tip)
594 merging 1 594 merging 1
595 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') 595 warning: conflicts during merge.
596 merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
596 abort: unresolved conflicts, can't continue 597 abort: unresolved conflicts, can't continue
597 (use hg resolve and hg graft --continue) 598 (use hg resolve and hg graft --continue)
598 [255] 599 [255]
599 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' 600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
600 7:a5bfd90a2f29 stable 601 7:a5bfd90a2f29 stable