# HG changeset patch # User Brendan Cully # Date 1228190950 28800 # Node ID 9898427add1c83e100c1b79a6a470ac4842fae94 # Parent 89c516430107e38352953e4c3bd4c8f282aaf169 mq: drop copy sources removed during qfold (see issue1405) diff -r 89c516430107 -r 9898427add1c hgext/mq.py --- a/hgext/mq.py Mon Dec 01 14:06:02 2008 -0800 +++ b/hgext/mq.py Mon Dec 01 20:09:10 2008 -0800 @@ -1193,7 +1193,9 @@ copies = {} for dst in a: src = repo.dirstate.copied(dst) - if src is not None: + # during qfold, the source file for copies may + # be removed. Treat this as a simple add. + if src is not None and src in repo.dirstate: copies.setdefault(src, []).append(dst) repo.dirstate.add(dst) # remember the copies between patchparent and tip