# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1436391829 18000
# Node ID 648323f41a89619d9eeeb7287213378c340866c8
# Parent  ff11c1565c04fbb178dd014336bef0b444fd9da4# Parent  501c51d607922692bd6654cb3c24d9f1e31d7450
merge with stable

diff -r ff11c1565c04 -r 648323f41a89 hgext/convert/p4.py
--- 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: