tests/test-transplant.t
changeset 20020 6fb59247c7d5
parent 18138 8ab0640c3090
child 20267 5a7aeb1e68b3
--- a/tests/test-transplant.t	Fri Nov 15 22:57:11 2013 -0500
+++ b/tests/test-transplant.t	Sat Nov 16 23:14:20 2013 +0900
@@ -430,6 +430,20 @@
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 4 files
+
+test "--merge" causing pull from source repository on local host
+
+  $ hg --config extensions.mq= -q strip 2
+  $ hg transplant -s ../t --merge tip
+  searching for changes
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files
+  applying a53251cdf717
+  4:a53251cdf717 merged at 4831f4dc831a
+
   $ cd ..