changeset 45003 | 1b757f385549 |
parent 44470 | 9d2b2df2c2ba |
child 45004 | bfef35bb4ecb |
--- a/hgext/absorb.py Mon Jun 22 15:19:35 2020 +0530 +++ b/hgext/absorb.py Mon Jun 01 10:33:00 2020 +0200 @@ -887,6 +887,8 @@ if len(parents) != 1: return False pctx = parents[0] + if ctx.branch() != pctx.branch(): + return False # ctx changes more files (not a subset of memworkingcopy) if not set(ctx.files()).issubset(set(memworkingcopy)): return False