# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1258049019 21600
# Node ID d1043c2ffe6cb7c5669b7af8539bac726c6607f7
# Parent  d3dbdca92458a522f41c0ccdc0c8d46865ee79c8
merge: fix changectx.ancestor(workingctx) (issue1327)

diff -r d3dbdca92458 -r d1043c2ffe6c mercurial/context.py
--- a/mercurial/context.py	Thu Nov 12 16:39:11 2009 +0100
+++ b/mercurial/context.py	Thu Nov 12 12:03:39 2009 -0600
@@ -164,7 +164,11 @@
         """
         return the ancestor context of self and c2
         """
-        n = self._repo.changelog.ancestor(self._node, c2._node)
+        # deal with workingctxs
+        n2 = c2._node
+        if n2 == None:
+            n2 = c2._parents[0]._node
+        n = self._repo.changelog.ancestor(self._node, n2)
         return changectx(self._repo, n)
 
     def walk(self, match):