# 
# 
# patch "ChangeLog"
#  from [e369c0222f33a719d1119e0587d279ee57a33bbf]
#    to [22f7eef4db2323cac5b9312203c06ed47189f04b]
# 
# patch "diff_patch.cc"
#  from [8aa66b18efb3414899dc18893b4f2417ef124558]
#    to [632da9f7f6aa996c1d5d9ef05881255f258a4c74]
# 
# patch "tests/merge_conflict_with_no_lca/__driver__.lua"
#  from [6e54e4eca1aa844a5ef1c7273f1227c62bcf82ca]
#    to [b87439d545d28f8c33101c43c2397189c38bc758]
# 
============================================================
--- ChangeLog	e369c0222f33a719d1119e0587d279ee57a33bbf
+++ ChangeLog	22f7eef4db2323cac5b9312203c06ed47189f04b
@@ -1,5 +1,10 @@
 2006-07-05  Timothy Brownawell  <address@hidden>
 
+	* diff-patch.cc: Apply njs's patch to fix crash.
+	* tests/merge_conflict_with_no_lca/__driver__.lua: Remove xfail.
+
+2006-07-05  Timothy Brownawell  <address@hidden>
+
 	* tests/merge_conflict_with_no_lca: We don't want to crash when
 	a merge has a content conflict but no lca.
 
============================================================
--- diff_patch.cc	8aa66b18efb3414899dc18893b4f2417ef124558
+++ diff_patch.cc	632da9f7f6aa996c1d5d9ef05881255f258a4c74
@@ -547,7 +547,7 @@
 
   // If this roster doesn't contain the file, replace it with
   // the file's birth roster.
-  if (!anc->has_node(nid))
+  if (!anc || !anc->has_node(nid))
     {
       marking_map::const_iterator j = mm.find(nid);
       I(j != mm.end());
============================================================
--- tests/merge_conflict_with_no_lca/__driver__.lua	6e54e4eca1aa844a5ef1c7273f1227c62bcf82ca
+++ tests/merge_conflict_with_no_lca/__driver__.lua	b87439d545d28f8c33101c43c2397189c38bc758
@@ -29,4 +29,4 @@
 netsync.sync("*branch")
 
 -- should be a conflict
+check(mtn("merge"), 1, false, false)
-xfail_if(true, mtn("merge"), 1, false, false)