Mercurial > hg

comparison tests/test-graft.t @ 21979:c2863cfe8a8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: allow regrafting ancestors with --force (issue3220)
author Siddharth Agarwal <sid0@fb.com>
date Fri, 25 Jul 2014 18:21:16 -0700
parents b081decd9062
children f4e5753745e9
comparison
equal deleted inserted replaced
21978:c21c1c8c2017 21979:c2863cfe8a8a
629 skipping revision 2 (already grafted to 22) 629 skipping revision 2 (already grafted to 22)
630 grafting revision 7 630 grafting revision 7
631 grafting revision 13 631 grafting revision 13
632 grafting revision 19 632 grafting revision 19
633 merging b 633 merging b
634
635 graft with --force (still doesn't graft merges)
636
637 $ hg graft 19 0 6
638 skipping ungraftable merge revision 6
639 skipping ancestor revision 0
640 skipping already grafted revision 19 (22 also has origin 2)
641 [255]
642 $ hg graft 19 0 6 --force
643 skipping ungraftable merge revision 6
644 grafting revision 19
645 merging b
646 grafting revision 0
647
648 graft --force after backout
649
650 $ echo abc > a
651 $ hg ci -m 28
652 $ hg backout 28
653 reverting a
654 changeset 29:484c03b8dfa4 backs out changeset 28:6c56f0f7f033
655 $ hg graft 28
656 skipping ancestor revision 28
657 [255]
658 $ hg graft 28 --force
659 grafting revision 28
660 merging a
661 $ cat a
662 abc
663