equal
deleted
inserted
replaced
211 created new head |
211 created new head |
212 $ hg prev |
212 $ hg prev |
213 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
213 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
214 [3] added b (2) |
214 [3] added b (2) |
215 $ hg next <<EOF |
215 $ hg next <<EOF |
216 > 1 |
216 > 2 |
217 > EOF |
217 > EOF |
218 ambiguous next changeset, choose one to update: |
218 ambiguous next changeset, choose one to update: |
219 0: [e3b6d5df389b] added c |
219 1: [e3b6d5df389b] added c |
220 1: [9df671ccd2c7] added d |
220 2: [9df671ccd2c7] added d |
221 q: quit the prompt |
221 q: quit the prompt |
222 enter the index of the revision you want to select: 1 |
222 enter the index of the revision you want to select: 2 |
223 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
223 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
224 [5] added d |
224 [5] added d |
225 |
225 |
226 $ hg prev |
226 $ hg prev |
227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
234 $ hg next --no-evolve |
234 $ hg next --no-evolve |
235 no children |
235 no children |
236 (2 unstable changesets to be evolved here, do you want --evolve?) |
236 (2 unstable changesets to be evolved here, do you want --evolve?) |
237 [1] |
237 [1] |
238 $ hg next --evolve <<EOF |
238 $ hg next --evolve <<EOF |
239 > 0 |
239 > 1 |
240 > EOF |
240 > EOF |
241 ambiguous next (unstable) changeset, choose one to evolve and update: |
241 ambiguous next (unstable) changeset, choose one to evolve and update: |
242 0: [e3b6d5df389b] added c |
242 1: [e3b6d5df389b] added c |
243 1: [9df671ccd2c7] added d |
243 2: [9df671ccd2c7] added d |
244 q: quit the prompt |
244 q: quit the prompt |
245 enter the index of the revision you want to select: 0 |
245 enter the index of the revision you want to select: 1 |
246 move:[4] added c |
246 move:[4] added c |
247 atop:[6] added b (3) |
247 atop:[6] added b (3) |
248 working directory now at 5ce67c2407b0 |
248 working directory now at 5ce67c2407b0 |
249 |
249 |
250 $ hg log -GT "{rev}:{node|short} {desc}\n" |
250 $ hg log -GT "{rev}:{node|short} {desc}\n" |
282 |
282 |
283 $ hg prev <<EOF |
283 $ hg prev <<EOF |
284 > q |
284 > q |
285 > EOF |
285 > EOF |
286 multiple parents, choose one to update: |
286 multiple parents, choose one to update: |
287 0: [47ea25be8aea] added d |
287 1: [47ea25be8aea] added d |
288 1: [5ce67c2407b0] added c |
288 2: [5ce67c2407b0] added c |
289 q: quit the prompt |
289 q: quit the prompt |
290 enter the index of the revision you want to select: q |
290 enter the index of the revision you want to select: q |
291 [8] added d |
291 [8] added d |
292 [7] added c |
292 [7] added c |
293 multiple parents, explicitly update to one |
293 multiple parents, explicitly update to one |
298 [7] added c |
298 [7] added c |
299 multiple parents, explicitly update to one |
299 multiple parents, explicitly update to one |
300 [1] |
300 [1] |
301 |
301 |
302 $ hg prev <<EOF |
302 $ hg prev <<EOF |
303 > 1 |
303 > 2 |
304 > EOF |
304 > EOF |
305 multiple parents, choose one to update: |
305 multiple parents, choose one to update: |
306 0: [47ea25be8aea] added d |
306 1: [47ea25be8aea] added d |
307 1: [5ce67c2407b0] added c |
307 2: [5ce67c2407b0] added c |
308 q: quit the prompt |
308 q: quit the prompt |
309 enter the index of the revision you want to select: 1 |
309 enter the index of the revision you want to select: 2 |
310 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
310 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
311 [7] added c |
311 [7] added c |
312 |
312 |
313 $ hg log -GT "{rev}:{node|short} {desc}\n" |
313 $ hg log -GT "{rev}:{node|short} {desc}\n" |
314 o 9:a4b8c25a87d3 merge commit |
314 o 9:a4b8c25a87d3 merge commit |
337 |
337 |
338 $ hg amend --edit & |
338 $ hg amend --edit & |
339 $ sleep 1 |
339 $ sleep 1 |
340 $ hg prev |
340 $ hg prev |
341 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
341 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
342 got lock after [4-6] seconds (re) |
342 got lock after (\d+) seconds (re) |
343 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
343 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
344 [0] one |
344 [0] one |
345 $ wait |
345 $ wait |
346 |
346 |
347 $ hg amend --edit & |
347 $ hg amend --edit & |
348 $ sleep 1 |
348 $ sleep 1 |
349 $ hg next --evolve |
349 $ hg next --evolve |
350 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
350 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
351 1 new orphan changesets |
351 1 new orphan changesets |
352 got lock after [4-6] seconds (re) |
352 got lock after (\d+) seconds (re) |
353 move:[2] two |
353 move:[2] two |
354 atop:[3] one |
354 atop:[3] one |
355 working directory now at a7d885c75614 |
355 working directory now at a7d885c75614 |
356 $ wait |
356 $ wait |
357 |
357 |
441 (do you want --merge?) |
441 (do you want --merge?) |
442 [255] |
442 [255] |
443 |
443 |
444 Test that --merge still works fine with commands.update.check set |
444 Test that --merge still works fine with commands.update.check set |
445 |
445 |
446 XXX: yes we want --merge and we passed that! |
446 $ hg config commands.update.check |
|
447 noconflict |
447 $ echo hi > bar |
448 $ echo hi > bar |
448 $ echo bar >> bar |
449 $ echo bar >> bar |
|
450 $ hg next |
|
451 abort: conflicting changes |
|
452 (do you want --merge?) |
|
453 [255] |
449 $ hg next --merge |
454 $ hg next --merge |
450 merging bar |
455 merging bar |
451 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
456 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
452 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
457 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
453 use 'hg resolve' to retry unresolved file merges |
458 use 'hg resolve' to retry unresolved file merges |
457 $ hg resolve -m |
462 $ hg resolve -m |
458 (no more unresolved files) |
463 (no more unresolved files) |
459 |
464 |
460 Testing --merge works with other values of commands.update.check also |
465 Testing --merge works with other values of commands.update.check also |
461 |
466 |
462 XXX: things are broken! |
467 $ hg prev --config commands.update.check=abort |
|
468 abort: uncommitted changes |
|
469 (do you want --merge?) |
|
470 [255] |
463 $ hg prev --merge --config commands.update.check=abort |
471 $ hg prev --merge --config commands.update.check=abort |
464 local [working copy] changed bar which other [destination] deleted |
472 local [working copy] changed bar which other [destination] deleted |
465 use (c)hanged version, (d)elete, or leave (u)nresolved? |
473 use (c)hanged version, (d)elete, or leave (u)nresolved? |
466 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
474 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
467 use 'hg resolve' to retry unresolved file merges |
475 use 'hg resolve' to retry unresolved file merges |
474 (no more unresolved files) |
482 (no more unresolved files) |
475 |
483 |
476 $ echo bar > bar |
484 $ echo bar > bar |
477 $ hg add bar |
485 $ hg add bar |
478 |
486 |
|
487 $ hg next --config commands.update.check=abort |
|
488 abort: uncommitted changes |
|
489 (do you want --merge?) |
|
490 [255] |
479 $ hg next --merge --config commands.update.check=abort |
491 $ hg next --merge --config commands.update.check=abort |
480 merging bar |
492 merging bar |
481 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
493 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
482 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
494 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
483 use 'hg resolve' to retry unresolved file merges |
495 use 'hg resolve' to retry unresolved file merges |