Mercurial > evolve

comparison tests/test-stabilize-result.t @ 2836:feaa52680682

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: bumped was renamed into phasedivergent Bumped was renamed into phasedivergent, update tests. Match 9c27a2891b75 mercurial changeset.
author Boris Feld <boris.feld@octobus.net>
date Thu, 10 Aug 2017 19:31:55 +0200
parents 20c2499ce8bc
children 2b8b960a04ee
comparison
equal deleted inserted replaced
2835:20c2499ce8bc 2836:feaa52680682
154 o 0:07f494440405@default(public) bk:[] adda 154 o 0:07f494440405@default(public) bk:[] adda
155 155
156 156
157 Stabilize! 157 Stabilize!
158 158
159 $ hg evolve --any --dry-run --bumped 159 $ hg evolve --any --dry-run --phasedivergent
160 recreate:[12] newer a 160 recreate:[12] newer a
161 atop:[8] newer a 161 atop:[8] newer a
162 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) 162 hg rebase --rev d5c7ef82d003 --dest 66719795a494;
163 hg update 1cf0aacfd363; 163 hg update 1cf0aacfd363;
164 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) 164 hg revert --all --rev d5c7ef82d003;
165 hg commit --msg "bumped update to %s" (no-eol) 165 hg commit --msg "bumped update to %s" (no-eol)
166 $ hg evolve --any --confirm --bumped 166 $ hg evolve --any --confirm --phasedivergent
167 recreate:[12] newer a 167 recreate:[12] newer a
168 atop:[8] newer a 168 atop:[8] newer a
169 perform evolve? [Ny] n 169 perform evolve? [Ny] n
170 abort: evolve aborted by user 170 abort: evolve aborted by user
171 [255] 171 [255]
172 $ echo y | hg evolve --any --confirm --config ui.interactive=True --bumped 172 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent
173 recreate:[12] newer a 173 recreate:[12] newer a
174 atop:[8] newer a 174 atop:[8] newer a
175 perform evolve? [Ny] y 175 perform evolve? [Ny] y
176 rebasing to destination parent: 66719795a494 176 rebasing to destination parent: 66719795a494
177 computing new diff 177 computing new diff