# 
# patch "ChangeLog"
#  from [14b789b0239c4006d5392dfb843c00826dc6d206]
#    to [24670bca71753156e7385d8c5faf47bc3b7809b5]
# 
# patch "revision.cc"
#  from [277c60b5acdedb97fe5cf8930b5f5452063abfd8]
#    to [dab8f8c33fc1b34f01958d267e98164a96e52738]
# 
# patch "tests/t_diff_currev.at"
#  from [a14fc00cd1a98b790f305ec3ea257c9c2406639b]
#    to [ee9a2d74b230a17a54292a4b2301f650330bf3ea]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,11 @@
 2005-06-21  Nathaniel Smith  <address@hidden>
 
+	* revision.cc (find_least_common_ancestor): Handle left == right
+	case.
+	* tests/t_diff_currev.at: Un-XFAIL.
+	
+2005-06-21  Nathaniel Smith  <address@hidden>
+
 	* netsync.cc (rebuild_merkle_trees): Fix FIXME comments to match
 	reality.
 	* tests/t_netsync_diffbranch.at: No longer a bug, remove
--- revision.cc
+++ revision.cc
@@ -555,6 +555,12 @@
   std::map< ctx, shared_bitmap >
     parents, ancestors;
 
+  if (left == right)
+    {
+      anc = left;
+      return true;
+    }
+
   ctx ln = intern.intern(left.inner()());
   ctx rn = intern.intern(right.inner()());
 
--- tests/t_diff_currev.at
+++ tests/t_diff_currev.at
@@ -1,9 +1,7 @@
 #  -*- Autoconf -*-
 
 AT_SETUP([diffing with explicit rev same as wc rev])
 
-AT_XFAIL_IF(true)
-
 MONOTONE_SETUP
 
 AT_DATA(foo1, [foo file 1