equal
deleted
inserted
replaced
272 if c.parents: |
272 if c.parents: |
273 p1 = self.rev(c.parents[0].id.raw) |
273 p1 = self.rev(c.parents[0].id.raw) |
274 if len(c.parents) > 2: |
274 if len(c.parents) > 2: |
275 raise error.Abort(b'TODO octopus merge handling') |
275 raise error.Abort(b'TODO octopus merge handling') |
276 if len(c.parents) == 2: |
276 if len(c.parents) == 2: |
277 p2 = self.rev(c.parents[0].id.raw) |
277 p2 = self.rev(c.parents[1].id.raw) |
278 return p1, p2 |
278 return p1, p2 |
279 |
279 |
280 # Private method is used at least by the tags code. |
280 # Private method is used at least by the tags code. |
281 _uncheckedparentrevs = parentrevs |
281 _uncheckedparentrevs = parentrevs |
282 |
282 |