equal
deleted
inserted
replaced
595 | o 1:73d38bb17fd7@default(draft) add 1 |
595 | o 1:73d38bb17fd7@default(draft) add 1 |
596 |/ |
596 |/ |
597 o 0:8685c6d34325@default(draft) add 0 |
597 o 0:8685c6d34325@default(draft) add 0 |
598 |
598 |
599 $ hg grab -r3 |
599 $ hg grab -r3 |
600 grabbing 3:0e84df4912da "add 3" |
600 picking 3:0e84df4912da "add 3" |
601 $ hg graft -r1 |
601 $ hg graft -r1 |
602 grafting 1:73d38bb17fd7 "add 1" |
602 grafting 1:73d38bb17fd7 "add 1" |
603 $ hg prune -r2 --succ . |
603 $ hg prune -r2 --succ . |
604 1 changesets pruned |
604 1 changesets pruned |
605 $ glog --hidden |
605 $ glog --hidden |
627 $ echo 2 > 1 |
627 $ echo 2 > 1 |
628 $ hg ci -Am conflict 1 |
628 $ hg ci -Am conflict 1 |
629 created new head |
629 created new head |
630 $ hg up -qC 6 |
630 $ hg up -qC 6 |
631 $ hg grab -r 7 |
631 $ hg grab -r 7 |
632 grabbing 7:a5bfd90a2f29 "conflict" |
632 picking 7:a5bfd90a2f29 "conflict" |
633 merging 1 |
633 merging 1 |
634 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
634 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
635 unresolved merge conflicts (see hg help resolve) |
635 unresolved merge conflicts (see hg help resolve) |
636 [1] |
636 [1] |
637 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
637 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |