Mercurial > hg > mercurial-crew
comparison tests/test-transplant.t @ 20020:6fb59247c7d5
transplant: use peer of source repository as "remote" for "repo.pull()"
Before this patch, transplant with "--merge" option fails with
traceback unexpectedly, if it causes pull from the source repository
on the local host.
"discovery.findcommonincoming()" invokes "capable()" method on the
object given from "localrepository.pull()", but it is
"localrepository" object in this case and doesn't have such method.
This patch uses peer object of source repository as "remote" argument
for "localrepository.pull()" invocation like other invocations of it
in transplant.py.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 16 Nov 2013 23:14:20 +0900 |
parents | 8ab0640c3090 |
children | 5a7aeb1e68b3 |
comparison
equal
deleted
inserted
replaced
20019:edbf7f1fd2a2 | 20020:6fb59247c7d5 |
---|---|
428 $ hg transplant -s ../t -b tip -a | 428 $ hg transplant -s ../t -b tip -a |
429 adding changesets | 429 adding changesets |
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 |
436 #if unix-permissions system-sh | 450 #if unix-permissions system-sh |
437 | 451 |