# 
# 
# patch "ChangeLog"
#  from [22f7eef4db2323cac5b9312203c06ed47189f04b]
#    to [30fc6a3dc8a136e76c6cd8184de530310e02fcd4]
# 
# patch "diff_patch.cc"
#  from [632da9f7f6aa996c1d5d9ef05881255f258a4c74]
#    to [f6e49ea0bc62a2243092315f0fb9541cbf946cf3]
# 
# patch "testsuite.lua"
#  from [ace2e8cf29a362a716f553babc7a6a1a1cd21149]
#    to [124e9b129be94555e7697d500d062074182114c1]
# 
============================================================
--- ChangeLog	22f7eef4db2323cac5b9312203c06ed47189f04b
+++ ChangeLog	30fc6a3dc8a136e76c6cd8184de530310e02fcd4
@@ -1,3 +1,8 @@
+2006-07-05  Nathaniel Smith  <address@hidden>
+
+	* diff_patch.cc (get_ancestral_roster): Update comment and add an
+	invariant.
+
 2006-07-05  Timothy Brownawell  <address@hidden>
 
 	* diff-patch.cc: Apply njs's patch to fix crash.
============================================================
--- diff_patch.cc	632da9f7f6aa996c1d5d9ef05881255f258a4c74
+++ diff_patch.cc	f6e49ea0bc62a2243092315f0fb9541cbf946cf3
@@ -545,14 +545,15 @@
   if (!lca.inner()().empty())
     load_and_cache_roster(lca, rosters, anc, app);
 
-  // If this roster doesn't contain the file, replace it with
-  // the file's birth roster.
+  // If there is no LCA, or the LCA's roster doesn't contain the file,
+  // then use the file's birth roster.
   if (!anc || !anc->has_node(nid))
     {
       marking_map::const_iterator j = mm.find(nid);
       I(j != mm.end());
       load_and_cache_roster(j->second.birth_revision, rosters, anc, app);
     }
+  I(anc);
 }
 
 void
============================================================
--- testsuite.lua	ace2e8cf29a362a716f553babc7a6a1a1cd21149
+++ testsuite.lua	124e9b129be94555e7697d500d062074182114c1
@@ -48,20 +48,20 @@
 
 -- NLS nuisances.
 for _,name in pairs({  "LANG",
-		       "LANGUAGE",
-		       "LC_ADDRESS",
-		       "LC_ALL",
-		       "LC_COLLATE",
-		       "LC_CTYPE",
-		       "LC_IDENTIFICATION",
-		       "LC_MEASUREMENT",
-		       "LC_MESSAGES",
-		       "LC_MONETARY",
-		       "LC_NAME",
-		       "LC_NUMERIC",
-		       "LC_PAPER",
-		       "LC_TELEPHONE",
-		       "LC_TIME"  }) do
+                       "LANGUAGE",
+                       "LC_ADDRESS",
+                       "LC_ALL",
+                       "LC_COLLATE",
+                       "LC_CTYPE",
+                       "LC_IDENTIFICATION",
+                       "LC_MEASUREMENT",
+                       "LC_MESSAGES",
+                       "LC_MONETARY",
+                       "LC_NAME",
+                       "LC_NUMERIC",
+                       "LC_PAPER",
+                       "LC_TELEPHONE",
+                       "LC_TIME"  }) do
    set_env(name,"C")
 end