equal
deleted
inserted
replaced
598 | | |
598 | | |
599 | o 1:73d38bb17fd7@default(draft) add 1 |
599 | o 1:73d38bb17fd7@default(draft) add 1 |
600 |/ |
600 |/ |
601 o 0:8685c6d34325@default(draft) add 0 |
601 o 0:8685c6d34325@default(draft) add 0 |
602 |
602 |
603 $ hg grab -r3 |
603 $ hg pick -r3 |
604 grabbing 3:0e84df4912da "add 3" |
604 picking 3:0e84df4912da "add 3" |
605 $ hg graft -r1 |
605 $ hg graft -r1 |
606 grafting 1:73d38bb17fd7 "add 1" |
606 grafting 1:73d38bb17fd7 "add 1" |
607 $ hg prune -r2 --succ . |
607 $ hg prune -r2 --succ . |
608 1 changesets pruned |
608 1 changesets pruned |
609 $ glog --hidden |
609 $ glog --hidden |
630 $ hg up -qC 0 |
630 $ hg up -qC 0 |
631 $ echo 2 > 1 |
631 $ echo 2 > 1 |
632 $ hg ci -Am conflict 1 |
632 $ hg ci -Am conflict 1 |
633 created new head |
633 created new head |
634 $ hg up -qC 6 |
634 $ hg up -qC 6 |
635 $ hg grab -r 7 |
635 $ hg pick -r 7 |
636 grabbing 7:a5bfd90a2f29 "conflict" |
636 picking 7:a5bfd90a2f29 "conflict" |
637 merging 1 |
637 merging 1 |
638 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
638 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
639 unresolved merge conflicts (see hg help resolve) |
639 unresolved merge conflicts (see hg help resolve) |
640 [1] |
640 [1] |
641 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
641 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
642 7:a5bfd90a2f29 |
642 7:a5bfd90a2f29 |
643 $ echo 3 > 1 |
643 $ echo 3 > 1 |
644 $ hg resolve -m 1 |
644 $ hg resolve -m 1 |
645 (no more unresolved files) |
645 (no more unresolved files) |
646 continue: hg grab --continue |
646 continue: hg pick --continue |
647 $ hg grab --continue |
647 $ hg pick --continue |
648 $ glog --hidden |
648 $ glog --hidden |
649 @ 8:fb2c0f0a0c54@default(draft) conflict |
649 @ 8:fb2c0f0a0c54@default(draft) conflict |
650 | |
650 | |
651 | x 7:a5bfd90a2f29@default(draft) conflict |
651 | x 7:a5bfd90a2f29@default(draft) conflict |
652 | | |
652 | | |