equal
deleted
inserted
replaced
118 3 b2 |
118 3 b2 |
119 2 0:17ab29e464c6 b1 |
119 2 0:17ab29e464c6 b1 |
120 1 r2 |
120 1 r2 |
121 0 r1 |
121 0 r1 |
122 |
122 |
123 |
123 test same-parent transplant with --log |
|
124 |
|
125 $ hg clone -r 1 ../t ../sameparent |
|
126 adding changesets |
|
127 adding manifests |
|
128 adding file changes |
|
129 added 2 changesets with 2 changes to 2 files |
|
130 updating to branch default |
|
131 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 $ cd ../sameparent |
|
133 $ hg transplant --log -s ../prune 5 |
|
134 searching for changes |
|
135 applying e234d668f844 |
|
136 e234d668f844 transplanted to e07aea8ecf9c |
|
137 $ hg log --template '{rev} {parents} {desc}\n' |
|
138 2 b1 |
|
139 (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170) |
|
140 1 r2 |
|
141 0 r1 |
124 remote transplant |
142 remote transplant |
125 |
143 |
126 $ hg clone -r 1 ../t ../remote |
144 $ hg clone -r 1 ../t ../remote |
127 adding changesets |
145 adding changesets |
128 adding manifests |
146 adding manifests |