Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 08 Jul 2015 16:43:49 -0500
changeset 25760 648323f41a89
parent 25759 ff11c1565c04 (current diff)
parent 25745 501c51d60792 (diff)
child 25761 0d37b9b21467
merge with stable
hgext/convert/p4.py file | annotate | diff | comparison | revisions 
--- a/hgext/convert/p4.py	Wed Jul 08 17:07:45 2015 +0900
+++ b/hgext/convert/p4.py	Wed Jul 08 16:43:49 2015 -0500
@@ -210,7 +210,8 @@
                 raise IOError(d["generic"], data)
 
             elif code == "stat":
-                if d.get("action") == "purge":
+                action = d.get("action")
+                if action in ["purge", "delete", "move/delete"]:
                     return None, None
                 p4type = self.re_type.match(d["type"])
                 if p4type:
hg-stable