--- a/tests/test-merge6 Wed Oct 20 23:39:48 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-cat <<EOF > merge
-import sys, os
-print "merging for", os.path.basename(sys.argv[1])
-EOF
-HGMERGE="python ../merge"; export HGMERGE
-
-mkdir A1
-cd A1
-hg init
-echo This is file foo1 > foo
-echo This is file bar1 > bar
-hg add foo bar
-hg commit -m "commit text" -d "1000000 0"
-
-cd ..
-hg clone A1 B1
-
-cd A1
-rm bar
-hg remove bar
-hg commit -m "commit test" -d "1000000 0"
-
-cd ../B1
-echo This is file foo22 > foo
-hg commit -m "commit test" -d "1000000 0"
-
-cd ..
-hg clone A1 A2
-hg clone B1 B2
-
-cd A1
-hg pull ../B1
-hg merge
-hg commit -m "commit test" -d "1000000 0"
-echo bar should remain deleted.
-hg manifest --debug
-
-cd ../B2
-hg pull ../A2
-hg merge
-hg commit -m "commit test" -d "1000000 0"
-echo bar should remain deleted.
-hg manifest --debug