# 
# 
# patch "ChangeLog"
#  from [96cad349867917452d34e585b31982e9777c9ea6]
#    to [b63607663621f1b002ed4552069d4c81bff1d3d1]
# 
# patch "paths.cc"
#  from [7b43846e2f4cc0e3ccdcff9a108f1b25d2d0a8bd]
#    to [c3e1e8e12a3ce2661f4d2587457d18b15aca40f8]
# 
============================================================
--- ChangeLog	96cad349867917452d34e585b31982e9777c9ea6
+++ ChangeLog	b63607663621f1b002ed4552069d4c81bff1d3d1
@@ -1,5 +1,11 @@
 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.
+
+2006-03-28  Nathaniel Smith  <address@hidden>
+
 	* paths.cc (test_split_join): Whoops, be more careful
 	copy-and-pasting within a single scope...
 	(in_bookkeeping_dir): Was totally wrong, make all the constants
============================================================
--- paths.cc	7b43846e2f4cc0e3ccdcff9a108f1b25d2d0a8bd
+++ paths.cc	c3e1e8e12a3ce2661f4d2587457d18b15aca40f8
@@ -168,11 +168,11 @@
 {
   if (path.size() == 0 || (path[0] != '_'))
     return false;
-  if (path.size() == 1 || (path[1] != 'M' && path[0] != 'm'))
+  if (path.size() == 1 || (path[1] != 'M' && path[1] != 'm'))
     return false;
-  if (path.size() == 2 || (path[2] != 'T' && path[1] != 't'))
+  if (path.size() == 2 || (path[2] != 'T' && path[2] != 't'))
     return false;
-  if (path.size() == 3 || (path[3] != 'N' && path[2] != 'n'))
+  if (path.size() == 3 || (path[3] != 'N' && path[3] != 'n'))
     return false;
   // if we've gotten here, the first three letters are _, M, T, and N, in
   // either upper or lower case.  So if that is the whole path, or else if it
@@ -939,7 +939,6 @@
     split_path split_mt1, split_mt2;
     file_path_internal("foo/_mTn").split(split_mt1);
     BOOST_CHECK(split_mt1.size() == 3);
-    I(split_mt1[2] == bookkeeping_root_component);
     split_mt2.push_back(the_null_component);
     split_mt2.push_back(split_mt1[2]);
     // split_mt2 now contains the component "_mTn"