Mercurial > evolve

comparison tests/test-unstability-resolution-result.t @ 5892:34cd08a46b6d mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 20:01:39 +0800
parents fd039a7f0c3c
children 43c4db536990
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
88 atop:[5] changea 88 atop:[5] changea
89 merging a 89 merging a
90 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 90 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
91 unresolved merge conflicts 91 unresolved merge conflicts
92 (see 'hg help evolve.interrupted') 92 (see 'hg help evolve.interrupted')
93 [240] 93 [1]
94 $ hg revert -r "orphan()" a 94 $ hg revert -r "orphan()" a
95 $ hg diff 95 $ hg diff
96 diff -r 66719795a494 a 96 diff -r 66719795a494 a
97 --- a/a Thu Jan 01 00:00:00 1970 +0000 97 --- a/a Thu Jan 01 00:00:00 1970 +0000
98 +++ b/a Thu Jan 01 00:00:00 1970 +0000 98 +++ b/a Thu Jan 01 00:00:00 1970 +0000
100 a 100 a
101 +a 101 +a
102 +newer a 102 +newer a
103 $ hg evolve --continue 103 $ hg evolve --continue
104 abort: unresolved merge conflicts (see 'hg help resolve') 104 abort: unresolved merge conflicts (see 'hg help resolve')
105 [20] 105 [255]
106 $ hg resolve -m a 106 $ hg resolve -m a
107 (no more unresolved files) 107 (no more unresolved files)
108 continue: hg evolve --continue 108 continue: hg evolve --continue
109 $ hg evolve --continue 109 $ hg evolve --continue
110 evolving 4:3655f0f50885 "newer a" 110 evolving 4:3655f0f50885 "newer a"