#
#
# patch "cmd_ws_commit.cc"
#  from [0223b8cbd1d1be675d2d30a123f9d020590a7586]
#    to [54a57b74116c88f70874dfd7fa22cc74833679f7]
# 
# patch "work.cc"
#  from [09386e8dc6b242083cb2530775c543d8a68312ac]
#    to [a3c768dd6729d7019eeee493ab7c59fcfd65bf47]
#
============================================================
--- cmd_ws_commit.cc	0223b8cbd1d1be675d2d30a123f9d020590a7586
+++ cmd_ws_commit.cc	54a57b74116c88f70874dfd7fa22cc74833679f7
@@ -1283,7 +1283,7 @@ CMD_NO_WORKSPACE(import, "import", "", C
   options::opts::no_ignore | options::opts::exclude |
   options::opts::author | options::opts::date)
 {
-  revision_id ident;
+  revision_id ident; MM(ident);
   system_path dir;
 
   N(args.size() == 1,
@@ -1334,7 +1334,10 @@ CMD_NO_WORKSPACE(import, "import", "", C
 
   try
     {
-      app.work.set_work_state_unchanged(ident);
+      if (null_id(ident))
+        app.work.set_work_state_to_new_root();
+      else
+        app.work.set_work_state_unchanged(ident);
 
       // prepare stuff for 'add' and so on.
       app.found_workspace = true;       // Yup, this is cheating!
============================================================
--- work.cc	09386e8dc6b242083cb2530775c543d8a68312ac
+++ work.cc	a3c768dd6729d7019eeee493ab7c59fcfd65bf47
@@ -148,6 +148,7 @@ workspace::set_work_state_unchanged(revi
 void
 workspace::set_work_state_unchanged(revision_id const & rid)
 {
+  I(!null_id(rid));
   revision_t rev;
   make_revision_for_workspace(rid, cset(), rev);
   put_work_rev(rev);