hgext/convert/hg.py
changeset 26078 5ca587348875
parent 26037 a75d24539aba
child 26154 242853e14804
--- a/hgext/convert/hg.py	Mon Aug 24 22:16:01 2015 -0700
+++ b/hgext/convert/hg.py	Tue Aug 25 15:54:33 2015 -0700
@@ -223,7 +223,12 @@
         def getfilectx(repo, memctx, f):
             if p2ctx and f in p2files and f not in copies:
                 self.ui.debug('reusing %s from p2\n' % f)
-                return p2ctx[f]
+                try:
+                    return p2ctx[f]
+                except error.ManifestLookupError:
+                    # If the file doesn't exist in p2, then we're syncing a
+                    # delete, so just return None.
+                    return None
             try:
                 v = files[f]
             except KeyError: