# 
# 
# patch "ChangeLog"
#  from [b63607663621f1b002ed4552069d4c81bff1d3d1]
#    to [1ff2e063ea0ef4d895fcb15ac47434d8a1262b97]
# 
# patch "app_state.cc"
#  from [da53d196b9e952d489a1deda59bb26a9798bb612]
#    to [065def7a145f069635bcbf6270a4ec5e2038d096]
# 
# patch "automate.cc"
#  from [c471763d3649db89ba59bfcf99705ac18b68d9b2]
#    to [5e1910efbdc8a8356902e3cee539e9ac2895f51b]
# 
# patch "paths.cc"
#  from [c3e1e8e12a3ce2661f4d2587457d18b15aca40f8]
#    to [79caf3a6b352ffa2268b1ed6b545b174a8ad104e]
# 
============================================================
--- ChangeLog	b63607663621f1b002ed4552069d4c81bff1d3d1
+++ ChangeLog	1ff2e063ea0ef4d895fcb15ac47434d8a1262b97
@@ -1,5 +1,14 @@
 2006-03-28  Nathaniel Smith  <address@hidden>
 
+	* paths.cc (file_path): Use in_bookkeeping_dir when joining paths,
+	instead of being clever.  It should be just about as fast, and
+	means that there's only one code path that has to know how to
+	detect bookkeeping dirs.
+	* app_state.cc, automate.cc: Oops, forgot to hit save before.
+	s/MT/_MTN/.
+
+2006-03-28  Nathaniel Smith  <address@hidden>
+
 	* paths.cc (in_bookkeeping_dir): Argh.  Really correct now!
 	Really!
 	(test_split_join): Another cut-and-paste error.
============================================================
--- app_state.cc	da53d196b9e952d489a1deda59bb26a9798bb612
+++ app_state.cc	065def7a145f069635bcbf6270a4ec5e2038d096
@@ -80,8 +80,8 @@
           get_local_dump_path(dump_path);
           L(FL("setting dump path to %s\n") % dump_path);
           // the 'true' means that, e.g., if we're running checkout, then it's
-          // okay for dumps to go into our starting working dir's MT rather
-          // than the new workspace dir's MT.
+          // okay for dumps to go into our starting working dir's _MTN rather
+          // than the new workspace dir's _MTN.
           global_sanity.filename = system_path(dump_path, false);
         }
     }
@@ -94,14 +94,14 @@
   if (found_workspace) {
     if (!options[database_option]().empty())
       {
-	system_path dbname = system_path(options[database_option]);
-	db.set_filename(dbname);
+        system_path dbname = system_path(options[database_option]);
+        db.set_filename(dbname);
       }
 
     if (!options[keydir_option]().empty())
       {
-	system_path keydir = system_path(options[keydir_option]);
-	set_key_dir(keydir);
+        system_path keydir = system_path(options[keydir_option]);
+        set_key_dir(keydir);
       }
 
     if (branch_name().empty())
@@ -492,7 +492,7 @@
 }
 
 // rc files are loaded after we've changed to the workspace so that
-// MT/monotonerc can be loaded between ~/.monotone/monotonerc and other
+// _MTN/monotonerc can be loaded between ~/.monotone/monotonerc and other
 // rcfiles
 
 void
@@ -504,7 +504,7 @@
     lua.add_std_hooks();
 
   // ~/.monotone/monotonerc overrides that, and
-  // MT/monotonerc overrides *that*
+  // _MTN/monotonerc overrides *that*
 
   if (rcfiles)
     {
============================================================
--- automate.cc	c471763d3649db89ba59bfcf99705ac18b68d9b2
+++ automate.cc	5e1910efbdc8a8356902e3cee539e9ac2895f51b
@@ -524,7 +524,7 @@
 // post-state corresponds to the "to" side of renames and additions
 // node-state corresponds to the state of the node with the given name
 //
-// pre/post state are related to the path rearrangement in MT/work
+// pre/post state are related to the path rearrangement in _MTN/work
 // node state is related to the details of the resulting path
 
 struct inventory_item
@@ -666,7 +666,7 @@
 //   includes the rest of the line. Directory paths are identified as ending with
 //   the "/" character, file paths do not end in this character.
 //
-// Error conditions: If no workspace book keeping MT directory is found,
+// Error conditions: If no workspace book keeping _MTN directory is found,
 //   prints an error message to stderr, and exits with status 1.
 
 static void
============================================================
--- paths.cc	c3e1e8e12a3ce2661f4d2587457d18b15aca40f8
+++ paths.cc	79caf3a6b352ffa2268b1ed6b545b174a8ad104e
@@ -280,11 +280,9 @@
         tmp += "/";
       tmp += (*i)();
       if (start)
-        {
-          I(tmp != bookkeeping_root.as_internal());
-          start = false;
-        }
+        start = false;
     }
+  I(!in_bookkeeping_dir(tmp));
   data = tmp;
 }