equal
deleted
inserted
replaced
1574 newer = obsolete.successorssets(ctx._repo, base.node()) |
1574 newer = obsolete.successorssets(ctx._repo, base.node()) |
1575 # drop filter and solution including the original ctx |
1575 # drop filter and solution including the original ctx |
1576 newer = [n for n in newer if n and ctx.node() not in n] |
1576 newer = [n for n in newer if n and ctx.node() not in n] |
1577 if newer: |
1577 if newer: |
1578 return base, tuple(ctx._repo[o] for o in newer[0]) |
1578 return base, tuple(ctx._repo[o] for o in newer[0]) |
1579 raise util.Abort('base of divergent changeset not found', |
1579 raise util.Abort("base of divergent changeset %s not found" % ctx, |
1580 hint='this case is not yet handled') |
1580 hint='this case is not yet handled') |
1581 |
1581 |
1582 |
1582 |
1583 |
1583 |
1584 shorttemplate = '[{rev}] {desc|firstline}\n' |
1584 shorttemplate = '[{rev}] {desc|firstline}\n' |