--- a/tests/test-fetch Mon Mar 03 21:48:43 2008 +0100
+++ b/tests/test-fetch Wed Mar 05 09:10:45 2008 -0800
@@ -24,6 +24,7 @@
hg clone c d
hg clone c e
+echo % should merge c into a
hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
ls c
@@ -37,3 +38,15 @@
echo '% fetch over http with auth (should be hidden in desc)'
hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/
hg --cwd e tip --template '{desc}\n'
+
+hg clone a f
+hg clone a g
+
+echo f > f/f
+hg --cwd f ci -d '6 0' -Amf
+
+echo g > g/g
+hg --cwd g ci -d '6 0' -Amg
+
+echo % should merge f into g
+hg --cwd g fetch --switch ../f