Show More
@@ -797,19 +797,12 b' All copies of a cset' | |||
|
797 | 797 | summary: 2 |
|
798 | 798 | |
|
799 | 799 | |
|
800 | graft works on complex revset | |
|
800 | graft skips ancestors | |
|
801 | 801 | |
|
802 | $ hg graft 'origin(13) or destination(origin(13))' | |
|
802 | $ hg graft 21 3 | |
|
803 | 803 | skipping ancestor revision 21:7e61b508e709 |
|
804 | skipping ancestor revision 22:3a4e92d81b97 | |
|
805 | skipping revision 2:5c095ad7e90f (already grafted to 22:3a4e92d81b97) | |
|
806 | grafting 7:ef0ef43d49e7 "2" | |
|
807 | warning: can't find ancestor for 'b' copied from 'a'! | |
|
808 | grafting 13:7a4785234d87 "2" | |
|
809 | warning: can't find ancestor for 'b' copied from 'a'! | |
|
810 | grafting 19:9627f653b421 "2" | |
|
811 | merging b | |
|
812 | warning: can't find ancestor for 'b' copied from 'a'! | |
|
804 | grafting 3:4c60f11aa304 "3" | |
|
805 | merging b and c to c | |
|
813 | 806 | |
|
814 | 807 |
graft |
|
815 | 808 | |
@@ -828,15 +821,15 b" graft with --force (still doesn't graft " | |||
|
828 | 821 | graft --force after backout |
|
829 | 822 | |
|
830 | 823 | $ echo abc > a |
|
831 |
$ hg ci -m 2 |
|
|
832 |
$ hg backout 2 |
|
|
824 | $ hg ci -m 26 | |
|
825 | $ hg backout 26 | |
|
833 | 826 | reverting a |
|
834 |
changeset 2 |
|
|
835 |
$ hg graft 2 |
|
|
836 |
skipping ancestor revision 2 |
|
|
827 | changeset 27:e25e17192dc4 backs out changeset 26:44f862488a35 | |
|
828 | $ hg graft 26 | |
|
829 | skipping ancestor revision 26:44f862488a35 | |
|
837 | 830 | [255] |
|
838 |
$ hg graft 2 |
|
|
839 |
grafting 2 |
|
|
831 | $ hg graft 26 --force | |
|
832 | grafting 26:44f862488a35 "26" | |
|
840 | 833 | merging a |
|
841 | 834 | $ cat a |
|
842 | 835 | abc |
@@ -844,9 +837,9 b' graft --force after backout' | |||
|
844 | 837 | graft --continue after --force |
|
845 | 838 | |
|
846 | 839 | $ echo def > a |
|
847 |
$ hg ci -m |
|
|
848 |
$ hg graft 2 |
|
|
849 |
grafting 2 |
|
|
840 | $ hg ci -m 29 | |
|
841 | $ hg graft 26 --force --tool internal:fail | |
|
842 | grafting 26:44f862488a35 "26" | |
|
850 | 843 |
|
|
851 | 844 |
(use 'hg |
|
852 | 845 | [255] |
@@ -859,7 +852,7 b' graft --continue after --force' | |||
|
859 | 852 | (no more unresolved files) |
|
860 | 853 | continue: hg graft --continue |
|
861 | 854 | $ hg graft -c |
|
862 |
grafting 2 |
|
|
855 | grafting 26:44f862488a35 "26" | |
|
863 | 856 | $ cat a |
|
864 | 857 | abc |
|
865 | 858 | |
@@ -876,12 +869,12 b' but do some destructive editing of the r' | |||
|
876 | 869 | |
|
877 | 870 | Empty graft |
|
878 | 871 | |
|
879 |
$ hg up -qr 2 |
|
|
872 | $ hg up -qr 24 | |
|
880 | 873 | $ hg tag -f something |
|
881 |
$ hg graft -qr 2 |
|
|
882 |
$ hg graft -f 2 |
|
|
883 |
grafting 2 |
|
|
884 |
note: graft of 2 |
|
|
874 | $ hg graft -qr 25 | |
|
875 | $ hg graft -f 25 | |
|
876 | grafting 25:bd0c98709948 "26" | |
|
877 | note: graft of 25:bd0c98709948 created no changes to commit | |
|
885 | 878 | |
|
886 | 879 | $ cd .. |
|
887 | 880 |
General Comments 0
You need to be logged in to leave comments.
Login now