Mercurial > hg-stable

changeset 7453:9898427add1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: drop copy sources removed during qfold (see issue1405)
author Brendan Cully <brendan@kublai.com>
date Mon, 01 Dec 2008 20:09:10 -0800
parents 89c516430107
children 1d5ecaa47abb
files hgext/mq.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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