Comments
Patch
@@ -550,10 +550,20 @@ class changectx(basectx):
n2 = c2._node
if n2 is None:
n2 = c2._parents[0]._node
return n2, self._repo.changelog.commonancestorsheads(self._node, n2)
+ def commonancestors(self, c2):
+ """return all ancestor contexts of self and c202c8af058d
+
+ Commonly called the "bid merge" this method returns the common
+ ancestors.
+
+ """
+ n2, cahs = self._commonancestors(c2)
+ return [changectx(self._repo, anc) for anc in cahs]
+
def ancestor(self, c2, warn=False):
"""return the "best" ancestor context of self and c2
If there are multiple candidates, it will show a message and check
merge.preferancestor configuration before falling back to the