# 
# patch "ChangeLog"
#  from [4da55323c6f152dfe2c5f92498c70d02902769bc]
#    to [38ba832803f530f4b665ac67bd921dbc5bdc6894]
# 
# patch "commands.cc"
#  from [889b85e8285c01cbd3cfecfecc5b2d687f9cdcd3]
#    to [6368c2bb3e6de393e4ffdaa9a65a6f3b541b1f85]
# 
========================================================================
--- ChangeLog	4da55323c6f152dfe2c5f92498c70d02902769bc
+++ ChangeLog	38ba832803f530f4b665ac67bd921dbc5bdc6894
@@ -1,3 +1,7 @@
+2005-10-02  Marcel van der Boom  <address@hidden>
+
+	* commands.cc (CMD(checkout)): Check for non-existant checkout dir earlier, so we can fail earlier 
+
 2005-09-30  Nathaniel Smith  <address@hidden>
 
 	* Makefile.am (AM_CFLAGS, AM_CXXFLAGS): Add
========================================================================
--- commands.cc	889b85e8285c01cbd3cfecfecc5b2d687f9cdcd3
+++ commands.cc	6368c2bb3e6de393e4ffdaa9a65a6f3b541b1f85
@@ -1366,6 +1366,11 @@
         checkout_dot = true;
     }
 
+  if (!checkout_dot)
+    require_path_is_nonexistent(dir,
+                                F("checkout directory '%s' already exists")
+                                % dir);
+
   if (app.revision_selectors.size() == 0)
     {
       // use branch head revision
@@ -1403,10 +1408,6 @@
         % ident % app.branch_name);
     }
 
-  if (!checkout_dot)
-    require_path_is_nonexistent(dir,
-                                F("checkout directory '%s' already exists")
-                                % dir);
   app.create_working_copy(dir);
 
   transaction_guard guard(app.db);