tests/test-simplemerge.py.out
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sat, 16 Nov 2013 23:14:20 +0900
changeset 20020 6fb59247c7d5
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
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.

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK