--- a/tests/test-subrepo-recursion.t	Mon Oct 17 16:45:19 2011 +0200
+++ b/tests/test-subrepo-recursion.t	Mon Oct 17 18:01:38 2011 +0200
@@ -349,6 +349,18 @@
 
   $ mv $HGRCPATH.no-progress $HGRCPATH
 
+Test archiving when there is a directory in the way for a subrepo
+created by archive:
+
+  $ hg clone -U . ../almost-empty
+  $ cd ../almost-empty
+  $ mkdir foo
+  $ echo f > foo/f
+  $ hg archive --subrepos -r tip archive
+  cloning subrepo foo from $TESTTMP/empty/foo
+  abort: destination '$TESTTMP/almost-empty/foo' is not empty
+  [255]
+
 Clone and test outgoing:
 
   $ cd ..