Show More
@@ -154,7 +154,7 b' class transplanter(object):' | |||||
154 | # transplants before them fail. |
|
154 | # transplants before them fail. | |
155 | domerge = True |
|
155 | domerge = True | |
156 | if not hasnode(repo, node): |
|
156 | if not hasnode(repo, node): | |
157 | repo.pull(source, heads=[node]) |
|
157 | repo.pull(source.peer(), heads=[node]) | |
158 |
|
158 | |||
159 | skipmerge = False |
|
159 | skipmerge = False | |
160 | if parents[1] != revlog.nullid: |
|
160 | if parents[1] != revlog.nullid: |
@@ -430,6 +430,20 b' test transplant into empty repository' | |||||
430 | adding manifests |
|
430 | adding manifests | |
431 | adding file changes |
|
431 | adding file changes | |
432 | added 4 changesets with 4 changes to 4 files |
|
432 | added 4 changesets with 4 changes to 4 files | |
|
433 | ||||
|
434 | test "--merge" causing pull from source repository on local host | |||
|
435 | ||||
|
436 | $ hg --config extensions.mq= -q strip 2 | |||
|
437 | $ hg transplant -s ../t --merge tip | |||
|
438 | searching for changes | |||
|
439 | searching for changes | |||
|
440 | adding changesets | |||
|
441 | adding manifests | |||
|
442 | adding file changes | |||
|
443 | added 2 changesets with 2 changes to 2 files | |||
|
444 | applying a53251cdf717 | |||
|
445 | 4:a53251cdf717 merged at 4831f4dc831a | |||
|
446 | ||||
433 | $ cd .. |
|
447 | $ cd .. | |
434 |
|
448 | |||
435 |
|
449 |
General Comments 0
You need to be logged in to leave comments.
Login now