Show More
@@ -22,28 +22,25 b" hg ci -Amb3 -d '2 0'" | |||||
22 |
|
22 | |||
23 | hg log --template '{rev} {parents} {desc}\n' |
|
23 | hg log --template '{rev} {parents} {desc}\n' | |
24 |
|
24 | |||
25 | cd .. |
|
25 | hg clone . ../rebase | |
26 | hg clone t rebase |
|
26 | cd ../rebase | |
27 | cd rebase |
|
|||
28 |
|
27 | |||
29 | hg up -C 1 |
|
28 | hg up -C 1 | |
30 | echo '% rebase b onto r1' |
|
29 | echo '% rebase b onto r1' | |
31 | hg transplant -a -b tip |
|
30 | hg transplant -a -b tip | |
32 | hg log --template '{rev} {parents} {desc}\n' |
|
31 | hg log --template '{rev} {parents} {desc}\n' | |
33 |
|
32 | |||
34 | cd .. |
|
33 | hg clone ../t ../prune | |
35 | hg clone t prune |
|
34 | cd ../prune | |
36 | cd prune |
|
|||
37 |
|
35 | |||
38 | hg up -C 1 |
|
36 | hg up -C 1 | |
39 | echo '% rebase b onto r1, skipping b2' |
|
37 | echo '% rebase b onto r1, skipping b2' | |
40 | hg transplant -a -b tip -p 3 |
|
38 | hg transplant -a -b tip -p 3 | |
41 | hg log --template '{rev} {parents} {desc}\n' |
|
39 | hg log --template '{rev} {parents} {desc}\n' | |
42 |
|
40 | |||
43 | cd .. |
|
|||
44 | echo '% remote transplant' |
|
41 | echo '% remote transplant' | |
45 | hg clone -r 1 t remote |
|
42 | hg clone -r 1 ../t ../remote | |
46 | cd remote |
|
43 | cd ../remote | |
47 | hg transplant --log -s ../t 2 4 |
|
44 | hg transplant --log -s ../t 2 4 | |
48 | hg log --template '{rev} {parents} {desc}\n' |
|
45 | hg log --template '{rev} {parents} {desc}\n' | |
49 |
|
46 | |||
@@ -54,9 +51,8 b" hg log --template '{rev} {parents} {desc" | |||||
54 | echo '% skip local changes transplanted to the source' |
|
51 | echo '% skip local changes transplanted to the source' | |
55 | echo b4 > b4 |
|
52 | echo b4 > b4 | |
56 | hg ci -Amb4 -d '3 0' |
|
53 | hg ci -Amb4 -d '3 0' | |
57 | cd .. |
|
54 | hg clone ../t ../pullback | |
58 | hg clone t pullback |
|
55 | cd ../pullback | |
59 | cd pullback |
|
|||
60 | hg transplant -s ../remote -a -b tip |
|
56 | hg transplant -s ../remote -a -b tip | |
61 |
|
57 | |||
62 | echo '% transplant --continue' |
|
58 | echo '% transplant --continue' |
General Comments 0
You need to be logged in to leave comments.
Login now