Mercurial > evolve

comparison tests/test-stabilize-conflict.t @ 1516:c4f8a2916e43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: run test with 3.6 and apply test change Tested with 3.4, 3.5 and 3.6. Some minor test update had to be done.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 30 Oct 2015 15:48:13 +0000
parents 362e2c8c5677
children 13701c3fed9c 0d8973818980
comparison
equal deleted inserted replaced
1515:9729fdcc1fab 1516:c4f8a2916e43
125 1 new unstable changesets 125 1 new unstable changesets
126 $ hg evolve 126 $ hg evolve
127 move:[5] babar count up to fifteen 127 move:[5] babar count up to fifteen
128 atop:[7] babar count up to ten 128 atop:[7] babar count up to ten
129 merging babar 129 merging babar
130 warning: conflicts during merge. 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
131 merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
132 evolve failed! 131 evolve failed!
133 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort 132 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
134 abort: unresolved merge conflicts (see hg help resolve) 133 abort: unresolved merge conflicts (see hg help resolve)
135 [255] 134 [255]
136 $ hg resolve -l 135 $ hg resolve -l