changeset 7453 | 9898427add1c |
parent 7421 | 4c4324476be6 |
child 7454 | 1d5ecaa47abb |
--- 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