##// END OF EJS Templates
merge: fix changectx.ancestor(workingctx) (issue1327)
Matt Mackall -
r9843:d1043c2f default
parent child Browse files
Show More
@@ -164,7 +164,11 b' class changectx(object):'
164 """
164 """
165 return the ancestor context of self and c2
165 return the ancestor context of self and c2
166 """
166 """
167 n = self._repo.changelog.ancestor(self._node, c2._node)
167 # deal with workingctxs
168 n2 = c2._node
169 if n2 == None:
170 n2 = c2._parents[0]._node
171 n = self._repo.changelog.ancestor(self._node, n2)
168 return changectx(self._repo, n)
172 return changectx(self._repo, n)
169
173
170 def walk(self, match):
174 def walk(self, match):
General Comments 0
You need to be logged in to leave comments. Login now