Show More
@@ -55,6 +55,12 b' hg clone ../t ../pullback' | |||||
55 | cd ../pullback |
|
55 | cd ../pullback | |
56 | hg transplant -s ../remote -a -b tip |
|
56 | hg transplant -s ../remote -a -b tip | |
57 |
|
57 | |||
|
58 | echo '% remote transplant with pull' | |||
|
59 | hg clone -r 0 ../t ../rp | |||
|
60 | cd ../rp | |||
|
61 | hg transplant -s ../t 2 4 | |||
|
62 | hg log --template '{rev} {parents} {desc}\n' | |||
|
63 | ||||
58 | echo '% transplant --continue' |
|
64 | echo '% transplant --continue' | |
59 | hg init ../tc |
|
65 | hg init ../tc | |
60 | cd ../tc |
|
66 | cd ../tc |
@@ -75,6 +75,24 b' 4 files updated, 0 files merged, 0 files' | |||||
75 | searching for changes |
|
75 | searching for changes | |
76 | applying 4333daefcb15 |
|
76 | applying 4333daefcb15 | |
77 | 4333daefcb15 transplanted to 5f42c04e07cc |
|
77 | 4333daefcb15 transplanted to 5f42c04e07cc | |
|
78 | % remote transplant with pull | |||
|
79 | requesting all changes | |||
|
80 | adding changesets | |||
|
81 | adding manifests | |||
|
82 | adding file changes | |||
|
83 | added 1 changesets with 1 changes to 1 files | |||
|
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
85 | searching for changes | |||
|
86 | searching for changes | |||
|
87 | adding changesets | |||
|
88 | adding manifests | |||
|
89 | adding file changes | |||
|
90 | added 1 changesets with 1 changes to 1 files | |||
|
91 | applying a53251cdf717 | |||
|
92 | a53251cdf717 transplanted to 8d9279348abb | |||
|
93 | 2 b3 | |||
|
94 | 1 b1 | |||
|
95 | 0 r1 | |||
78 | % transplant --continue |
|
96 | % transplant --continue | |
79 | adding foo |
|
97 | adding foo | |
80 | adding toremove |
|
98 | adding toremove |
General Comments 0
You need to be logged in to leave comments.
Login now