# 
# 
# patch "ChangeLog"
#  from [368ef654e3d2b25df0446a0d9900d07276e3ba61]
#    to [d02c1935a516c2f27d9a4d3791bc53c8643db436]
# 
# patch "tests/import/__driver__.lua"
#  from [138fe4a4f128d8765e5835d77f9472268b4cde6c]
#    to [262c68206019fac25d075dfa23e29572cff0d20a]
# 
============================================================
--- ChangeLog	368ef654e3d2b25df0446a0d9900d07276e3ba61
+++ ChangeLog	d02c1935a516c2f27d9a4d3791bc53c8643db436
@@ -1,5 +1,10 @@ 2006-11-30  Richard Levitte  <address@hidden
 2006-11-30  Richard Levitte  <address@hidden>
 
+	* tests/import/__driver__.lua: Add a test to show that it really
+	doesn't import a workspace.
+
+2006-11-30  Richard Levitte  <address@hidden>
+
 	* cmd_ws_commit.cc (CMD_NO_WORKSPACE(import)): Add import command.
 	It's quite simplistic, it basically creates a _MTN bookkeeping
 	directory filled with information derived from a given branch or
============================================================
--- tests/import/__driver__.lua	138fe4a4f128d8765e5835d77f9472268b4cde6c
+++ tests/import/__driver__.lua	262c68206019fac25d075dfa23e29572cff0d20a
@@ -100,3 +100,11 @@ check(samefile("importdir/importmethird"
 check(not exists("exportdir6/importmefirst"))
 check(not exists("exportdir6/importmesecond"))
 check(samefile("importdir/importmethird", "exportdir6/importmethird"))
+
+------------------------------------------------------------------------------
+-- Seventh attempt, importing from one of the export checkouts.
+-- This attempt is expected to FAIL, because import should refuse to
+-- import from a workspace.
+check(mtn("import", "exportdir2",
+	  "--message", "Import seven, trying to import a workspace",
+	  "--branch", "importbranch"), 1, false, false)