Mercurial > evolve

comparison tests/test-evolve-issue5966.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 0095a5240db5
children
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
57 $ hg evolve -t :fail --rev 'first(orphan())' 57 $ hg evolve -t :fail --rev 'first(orphan())'
58 move:[2] banana 58 move:[2] banana
59 atop:[4] apricot 59 atop:[4] apricot
60 unresolved merge conflicts 60 unresolved merge conflicts
61 (see 'hg help evolve.interrupted') 61 (see 'hg help evolve.interrupted')
62 [240] 62 [1]
63 $ hg evolve --list 63 $ hg evolve --list
64 34a690fcf6ab: banana 64 34a690fcf6ab: banana
65 orphan: 7f59f18ca4a9 (obsolete parent) 65 orphan: 7f59f18ca4a9 (obsolete parent)
66 66
67 feb8c0bffa1f: coconut 67 feb8c0bffa1f: coconut
71 71
72 $ hg resolve --list 72 $ hg resolve --list
73 U a 73 U a
74 $ hg evolve --continue 74 $ hg evolve --continue
75 abort: unresolved merge conflicts (see 'hg help resolve') 75 abort: unresolved merge conflicts (see 'hg help resolve')
76 [20] 76 [255]
77 77
78 (even when ran twice) 78 (even when ran twice)
79 79
80 $ hg evolve --continue 80 $ hg evolve --continue
81 abort: unresolved merge conflicts (see 'hg help resolve') 81 abort: unresolved merge conflicts (see 'hg help resolve')
82 [20] 82 [255]
83 83
84 $ cat a 84 $ cat a
85 apricot 85 apricot
86 $ hg resolve --list 86 $ hg resolve --list
87 U a 87 U a