51 4 - fbb94e3a0ecf add e (draft) |
51 4 - fbb94e3a0ecf add e (draft) |
52 3 - 47d2a3944de8 add d (draft) |
52 3 - 47d2a3944de8 add d (draft) |
53 2 - 4538525df7e2 add c (draft) |
53 2 - 4538525df7e2 add c (draft) |
54 1 - 7c3bad9141dc add b (public) |
54 1 - 7c3bad9141dc add b (public) |
55 0 - 1f0dee641bb7 add a (public) |
55 0 - 1f0dee641bb7 add a (public) |
|
56 |
|
57 test kill and immutable changeset |
|
58 |
|
59 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
|
60 1 public stable |
|
61 $ hg kill 1 |
|
62 cannot kill immutable changeset 7c3bad9141dc |
|
63 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
|
64 1 public stable |
56 |
65 |
57 test simple kill |
66 test simple kill |
58 |
67 |
59 $ hg id -n |
68 $ hg id -n |
60 5 |
69 5 |
354 adding file changes |
363 adding file changes |
355 added 1 changesets with 1 changes to 1 files |
364 added 1 changesets with 1 changes to 1 files |
356 (run 'hg update' to get a working copy) |
365 (run 'hg update' to get a working copy) |
357 $ hg up |
366 $ hg up |
358 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
367 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
368 |
359 $ cd .. |
369 $ cd .. |
360 |
370 |
361 Test graft --obsolete/--old-obsolete |
371 Test graft --obsolete/--old-obsolete |
362 |
372 |
363 $ hg init test-graft |
373 $ hg init test-graft |
400 o 0:8685c6d34325@default(draft) add 0 |
410 o 0:8685c6d34325@default(draft) add 0 |
401 |
411 |
402 $ hg debugsuccessors |
412 $ hg debugsuccessors |
403 0e84df4912da 0b9e50c35132 |
413 0e84df4912da 0b9e50c35132 |
404 db038628b9e5 acb28cd497b7 |
414 db038628b9e5 acb28cd497b7 |
405 $ cd .. |
415 |
406 |
416 Test graft --continue |
|
417 |
|
418 $ hg up -qC 0 |
|
419 $ echo 2 > 1 |
|
420 $ hg ci -Am conflict 1 |
|
421 created new head |
|
422 $ hg up -qC 6 |
|
423 $ hg graft -O 7 |
|
424 grafting revision 7 |
|
425 merging 1 |
|
426 warning: conflicts during merge. |
|
427 merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
428 abort: unresolved conflicts, can't continue |
|
429 (use hg resolve and hg graft --continue) |
|
430 [255] |
|
431 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
|
432 7:a5bfd90a2f29 stable |
|
433 $ echo 3 > 1 |
|
434 $ hg resolve -m 1 |
|
435 $ hg graft --continue -O |
|
436 grafting revision 7 |
|
437 $ glog --hidden |
|
438 @ 8:920e58bb443b@default(draft) conflict |
|
439 | |
|
440 | x 7:a5bfd90a2f29@default(draft) conflict |
|
441 | | |
|
442 o | 6:acb28cd497b7@default(draft) add 1 |
|
443 | | |
|
444 o | 5:0b9e50c35132@default(draft) add 3 |
|
445 | | |
|
446 o | 4:ce341209337f@default(draft) add 4 |
|
447 |/ |
|
448 | x 3:0e84df4912da@default(draft) add 3 |
|
449 | | |
|
450 | x 2:db038628b9e5@default(draft) add 2 |
|
451 | | |
|
452 | o 1:73d38bb17fd7@default(draft) add 1 |
|
453 |/ |
|
454 o 0:8685c6d34325@default(draft) add 0 |
|
455 |
|
456 $ hg debugsuccessors |
|
457 0e84df4912da 0b9e50c35132 |
|
458 a5bfd90a2f29 920e58bb443b |
|
459 db038628b9e5 acb28cd497b7 |
|
460 |
|
461 $ cd .. |
|
462 |