changeset 42266 | b3fc78c028ef |
parent 42128 | 537a8aeb9977 |
child 42351 | 86f17fc31aa8 |
--- a/hgext/absorb.py Wed May 08 18:11:33 2019 -0400 +++ b/hgext/absorb.py Wed May 08 21:25:23 2019 -0700 @@ -914,7 +914,10 @@ """ if stack is None: limit = ui.configint('absorb', 'max-stack-size') - stack = getdraftstack(repo['.'], limit) + headctx = repo['.'] + if len(headctx.parents()) > 1: + raise error.Abort(_('cannot absorb into a merge')) + stack = getdraftstack(headctx, limit) if limit and len(stack) >= limit: ui.warn(_('absorb: only the recent %d changesets will ' 'be analysed\n')