# 
# 
# patch "ChangeLog"
#  from [949ae4e24460622ec5c161f345aacae7428b81c0]
#    to [757232ae36f4e16a5fc6ddf3aa26b2e2110d8826]
# 
# patch "cmd_ws_commit.cc"
#  from [56b8da305737799f6573c70b590c95fd48c0bff9]
#    to [2241b489caafa25dbf52884999a52488c54b6eb9]
# 
============================================================
--- ChangeLog	949ae4e24460622ec5c161f345aacae7428b81c0
+++ ChangeLog	757232ae36f4e16a5fc6ddf3aa26b2e2110d8826
@@ -1,5 +1,11 @@ 2006-12-01  Richard Levitte  <address@hidden
 2006-12-01  Richard Levitte  <address@hidden>
 
+	* cmd_ws_commit.cc (CMD_NO_WORKSPACE(import)): Make sure some
+	global variables, like found_workspace, are properly initialised
+	after the temporary bookkeeping directory is created.
+
+2006-12-01  Richard Levitte  <address@hidden>
+
 	* tests/import/__driver__.lua: Test using --message-file.
 
 2006-12-01  Richard Levitte  <address@hidden>
============================================================
--- cmd_ws_commit.cc	56b8da305737799f6573c70b590c95fd48c0bff9
+++ cmd_ws_commit.cc	2241b489caafa25dbf52884999a52488c54b6eb9
@@ -1017,6 +1017,9 @@ CMD_NO_WORKSPACE(import, N_("tree"), N_(
   make_revision_for_workspace(ident, cset(), rev);
   app.work.put_work_rev(rev);
 
+  // prepare stuff for 'add' and so on.
+  app.allow_workspace();
+
   vector<utf8> empty_args;
   options save_opts;
   // add --unknown