equal
deleted
inserted
replaced
244 dstfiles.append(f) |
244 dstfiles.append(f) |
245 |
245 |
246 def getfilectx(repo, memctx, f): |
246 def getfilectx(repo, memctx, f): |
247 if lfutil.isstandin(f): |
247 if lfutil.isstandin(f): |
248 # if the file isn't in the manifest then it was removed |
248 # if the file isn't in the manifest then it was removed |
249 # or renamed, raise IOError to indicate this |
249 # or renamed, return None to indicate this |
250 srcfname = lfutil.splitstandin(f) |
250 srcfname = lfutil.splitstandin(f) |
251 try: |
251 try: |
252 fctx = ctx.filectx(srcfname) |
252 fctx = ctx.filectx(srcfname) |
253 except error.LookupError: |
253 except error.LookupError: |
254 return None |
254 return None |