--- a/tests/test-586 Wed Oct 20 23:39:48 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#!/bin/sh
-# a test for issue586
-
-hg init a
-cd a
-echo a > a
-hg ci -Ama
-
-hg init ../b
-cd ../b
-echo b > b
-hg ci -Amb
-
-hg pull -f ../a
-hg merge
-hg rm -f a
-hg ci -Amc
-
-hg st -A
-cd ..
-
-# a test for issue 1433, related to issue586
-echo % create test repos
-hg init repoa
-touch repoa/a
-hg -R repoa ci -Am adda
-
-hg init repob
-touch repob/b
-hg -R repob ci -Am addb
-
-hg init repoc
-cd repoc
-hg pull ../repoa
-hg update
-mkdir tst
-hg mv * tst
-hg ci -m "import a in tst"
-hg pull -f ../repob
-echo % merge both repos
-hg merge
-mkdir src
-echo % move b content
-hg mv b src
-hg ci -m "import b in src"
-hg manifest
-
-
-