# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2006-09-18 03:59:33
# Node ID 02b22fefc01feac0efd6261a672fbcbccc0ec7cc
# Parent  4d021b91cb26e7d8360ed621469ae041197177f8

changectx: add ancestor function

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -67,6 +67,13 @@ class changectx(object):
         for f in m:
             yield self.filectx(f, fileid=mf[f])
 
+    def ancestor(self, c2):
+        """
+        return the ancestor context of self and c2
+        """
+        n = self._repo.changelog.ancestor(self._node, c2._node)
+        return changectx(self._repo, n)
+
 class filectx(object):
     """A filecontext object makes access to data related to a particular
        filerevision convenient."""