summaryrefslogtreecommitdiff
path: root/tests/test-unrelated-pull.t
diff options
context:
space:
mode:
authorLorry <lorry@roadtrain.codethink.co.uk>2012-08-22 14:49:51 +0100
committerLorry <lorry@roadtrain.codethink.co.uk>2012-08-22 14:49:51 +0100
commita498da43c7fdb9f24b73680c02a4a3588cc62d9a (patch)
treedaf8119dae1749b5165b68033a1b23a7375ce9ce /tests/test-unrelated-pull.t
downloadmercurial-tarball-a498da43c7fdb9f24b73680c02a4a3588cc62d9a.tar.gz
Tarball conversion
Diffstat (limited to 'tests/test-unrelated-pull.t')
-rw-r--r--tests/test-unrelated-pull.t45
1 files changed, 45 insertions, 0 deletions
diff --git a/tests/test-unrelated-pull.t b/tests/test-unrelated-pull.t
new file mode 100644
index 0000000..5779905
--- /dev/null
+++ b/tests/test-unrelated-pull.t
@@ -0,0 +1,45 @@
+ $ hg init a
+ $ cd a
+ $ echo 123 > a
+ $ hg add a
+ $ hg commit -m "a" -u a
+
+ $ cd ..
+ $ hg init b
+ $ cd b
+ $ echo 321 > b
+ $ hg add b
+ $ hg commit -m "b" -u b
+
+ $ hg pull ../a
+ pulling from ../a
+ searching for changes
+ abort: repository is unrelated
+ [255]
+
+ $ hg pull -f ../a
+ pulling from ../a
+ searching for changes
+ warning: repository is unrelated
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+ (run 'hg heads' to see heads, 'hg merge' to merge)
+
+ $ hg heads
+ changeset: 1:9a79c33a9db3
+ tag: tip
+ parent: -1:000000000000
+ user: a
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: a
+
+ changeset: 0:01f8062b2de5
+ user: b
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: b
+
+
+ $ cd ..