diff tests/test-unrelated-pull.t @ 12279:28e2e3804f2e

combine tests

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-unrelated-pull.t	Tue Sep 14 12:20:51 2010 +0200
@@ -0,0 +1,43 @@
+  $ mkdir a
+  $ cd a
+  $ hg init
+  $ echo 123 > a
+  $ hg add a
+  $ hg commit -m "a" -u a
+
+  $ cd ..
+  $ mkdir b
+  $ cd b
+  $ hg init
+  $ 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
+
+  $ hg pull -f ../a
+  pulling from ../a
+  searching for changes
+  warning: repository is unrelated
+  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
+