# 
# 
# patch "tests/import/__driver__.lua"
#  from [5d260317de7f59c7cf7e03c7d872af83ee2cb806]
#    to [ba6fabc54dd88545944bdd5f2ee06243bfdf1270]
# 
============================================================
--- tests/import/__driver__.lua	5d260317de7f59c7cf7e03c7d872af83ee2cb806
+++ tests/import/__driver__.lua	ba6fabc54dd88545944bdd5f2ee06243bfdf1270
@@ -131,7 +131,22 @@ check(mtn("import", "importdir",
 -- This attempt is expected to FAIL, because we gave it a non-existing key.
 -- However, we want to check that such an error didn't leave a _MTN behind.
 check(mtn("import", "importdir",
-	  "--message", "Import seven, trying to import a workspace",
+	  "--message", "Import nine, trying to import a workspace",
 	  "--branch", "importbranch",
 	  "--key", "address@hidden"), 1, false, false)
 check(not exists("importdir/_MTN"))
+
+------------------------------------------------------------------------------
+-- Tenth attempt, importing with an added subdirectory
+mkdir("importdir/subdir")
+writefile("importdir/subdir/importmesubdir", "version 0 of subdir file\n")
+
+check(mtn("import", "importdir",
+	  "--message", "Import ten, trying to import a workspace",
+	  "--branch", "importbranch"), 0, false, false)
+
+check(mtn("checkout", "exportdir10", "--branch", "importbranch"),
+      0, false, false)
+
+xfail(samefile("importdir/subdir/importmesubdir",
+	       "exportdir10/subdir/importmesubdir"))