Mercurial > evolve

comparison tests/test-stabilize-result.t @ 1450:5f6e78aea094 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable Test are updated to run with current mercurial stable (3.4.1)
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 25 Jun 2015 16:55:27 -0700
parents 6c122c975125
children 8ca31deb8db7
comparison
equal deleted inserted replaced
1438:3295353b1363 1450:5f6e78aea094
156 o 0:07f494440405@default(public) bk:[] adda 156 o 0:07f494440405@default(public) bk:[] adda
157 157
158 158
159 Stabilize! 159 Stabilize!
160 160
161 $ hg evolve --any --dry-run 161 $ hg evolve --any --dry-run --bumped
162 recreate:[12] newer a 162 recreate:[12] newer a
163 atop:[8] newer a 163 atop:[8] newer a
164 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) 164 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re)
165 hg update 1cf0aacfd363; 165 hg update 1cf0aacfd363;
166 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) 166 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
167 hg commit --msg "bumped update to %s" (no-eol) 167 hg commit --msg "bumped update to %s" (no-eol)
168 $ hg evolve --any --confirm 168 $ hg evolve --any --confirm --bumped
169 recreate:[12] newer a 169 recreate:[12] newer a
170 atop:[8] newer a 170 atop:[8] newer a
171 perform evolve? [Ny] n 171 perform evolve? [Ny] n
172 abort: evolve aborted by user 172 abort: evolve aborted by user
173 [255] 173 [255]
174 $ echo y | hg evolve --any --confirm --config ui.interactive=True 174 $ echo y | hg evolve --any --confirm --config ui.interactive=True --bumped
175 recreate:[12] newer a 175 recreate:[12] newer a
176 atop:[8] newer a 176 atop:[8] newer a
177 perform evolve? [Ny] y 177 perform evolve? [Ny] y
178 rebasing to destination parent: 66719795a494 178 rebasing to destination parent: 66719795a494
179 computing new diff 179 computing new diff
222 $ echo 'babar' >> a 222 $ echo 'babar' >> a
223 $ hg amend 223 $ hg amend
224 $ hg up --hidden 15 224 $ hg up --hidden 15
225 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 225 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
226 working directory parent is obsolete! 226 working directory parent is obsolete!
227 (use "hg evolve" to update to its successor)
227 $ mv a a.old 228 $ mv a a.old
228 $ echo 'jungle' > a 229 $ echo 'jungle' > a
229 $ cat a.old >> a 230 $ cat a.old >> a
230 $ rm a.old 231 $ rm a.old
231 $ hg amend 232 $ hg amend
246 o 0:07f494440405@default(public) bk:[] adda 247 o 0:07f494440405@default(public) bk:[] adda
247 248
248 249
249 Stabilize it 250 Stabilize it
250 251
251 $ hg evolve -qn --confirm 252 $ hg evolve -qn --confirm --divergent
252 merge:[19] More addition 253 merge:[19] More addition
253 with: [17] More addition 254 with: [17] More addition
254 base: [15] More addition 255 base: [15] More addition
255 perform evolve? [Ny] n 256 perform evolve? [Ny] n
256 abort: evolve aborted by user 257 abort: evolve aborted by user
257 [255] 258 [255]
258 $ echo y | hg evolve -qn --confirm --config ui.interactive=True 259 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --divergent
259 merge:[19] More addition 260 merge:[19] More addition
260 with: [17] More addition 261 with: [17] More addition
261 base: [15] More addition 262 base: [15] More addition
262 perform evolve? [Ny] y 263 perform evolve? [Ny] y
263 hg update -c eacc9c8240fe && 264 hg update -c eacc9c8240fe &&
264 hg merge d2f173e25686 && 265 hg merge d2f173e25686 &&
265 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& 266 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&&
266 hg up -C 3932c176bbaa && 267 hg up -C 3932c176bbaa &&
267 hg revert --all --rev tip && 268 hg revert --all --rev tip &&
268 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; 269 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
269 $ hg evolve -v 270 $ hg evolve -v --divergent
270 merge:[19] More addition 271 merge:[19] More addition
271 with: [17] More addition 272 with: [17] More addition
272 base: [15] More addition 273 base: [15] More addition
273 merging divergent changeset 274 merging divergent changeset
274 resolving manifests 275 resolving manifests
333 ------------------------------------------------- 334 -------------------------------------------------
334 335
335 $ hg up --hidden 15 336 $ hg up --hidden 15
336 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
337 working directory parent is obsolete! 338 working directory parent is obsolete!
339 (use "hg evolve" to update to its successor)
338 $ echo 'gotta break' >> a 340 $ echo 'gotta break' >> a
339 $ hg amend 341 $ hg amend
340 2 new divergent changesets 342 2 new divergent changesets
341 # reamend so that the case is not the first precursor. 343 # reamend so that the case is not the first precursor.
342 $ hg amend -m "More addition (2)" 344 $ hg amend -m "More addition (2)"
343 $ hg phase 'divergent()' 345 $ hg phase 'divergent()'
344 21: draft 346 21: draft
345 24: draft 347 24: draft
346 $ hg evolve -qn 348 $ hg evolve -qn --divergent
347 hg update -c 0b336205a5d0 && 349 hg update -c 0b336205a5d0 &&
348 hg merge f344982e63c4 && 350 hg merge f344982e63c4 &&
349 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& 351 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&&
350 hg up -C 3932c176bbaa && 352 hg up -C 3932c176bbaa &&
351 hg revert --all --rev tip && 353 hg revert --all --rev tip &&
352 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; 354 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
353 $ hg evolve 355 $ hg evolve --divergent
354 merge:[24] More addition (2) 356 merge:[24] More addition (2)
355 with: [21] More addition 357 with: [21] More addition
356 base: [15] More addition 358 base: [15] More addition
357 merging a 359 merging a
358 warning: conflicts during merge. 360 warning: conflicts during merge.