Mercurial > evolve

comparison tests/test-evolve-issue5966.t @ 4577:bcd52ce0916d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: don't update after instability resolution by default (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 15:59:02 +0200
parents 8aa28e68ac44
children e6d7d261ca4a
comparison
equal deleted inserted replaced
4576:96ce1030d2fb 4577:bcd52ce0916d
89 continue: hg evolve --continue 89 continue: hg evolve --continue
90 $ hg resolve --list 90 $ hg resolve --list
91 R a 91 R a
92 $ hg evolve --continue 92 $ hg evolve --continue
93 evolving 2:34a690fcf6ab "banana" 93 evolving 2:34a690fcf6ab "banana"
94 working directory is now at e4207a610ed0 94 working directory is now at 581a2bb4704c
95 $ hg resolve --list 95 $ hg resolve --list
96 96
97 evolve the rest of the stack 97 evolve the rest of the stack
98 98
99 $ hg evolve 99 $ hg evolve
100 move:[3] coconut 100 move:[3] coconut
101 atop:[5] banana 101 atop:[5] banana
102 merging a 102 merging a
103 working directory is now at d77b4639fe26
104 103
105 All commit evolved 104 All commit evolved
106 105
107 $ hg glog 106 $ hg glog
108 @ 6: coconut 107 o 6: coconut
109 | 108 |
110 o 5: banana 109 o 5: banana
111 | 110 |
112 o 4: apricot 111 @ 4: apricot
113 | 112 |
114 o 0: empty 113 o 0: empty
115 114