equal
deleted
inserted
replaced
249 for f in files: |
249 for f in files: |
250 repo.wvfs.unlinkpath(f) |
250 repo.wvfs.unlinkpath(f) |
251 |
251 |
252 def _writeaddedfiles(repo, pctx, files): |
252 def _writeaddedfiles(repo, pctx, files): |
253 actions = merge.emptyactions() |
253 actions = merge.emptyactions() |
254 addgaction = actions['g'].append |
254 addgaction = actions[merge.ACTION_GET].append |
255 mf = repo['.'].manifest() |
255 mf = repo['.'].manifest() |
256 for f in files: |
256 for f in files: |
257 if not repo.wvfs.exists(f): |
257 if not repo.wvfs.exists(f): |
258 addgaction((f, (mf.flags(f), False), "narrowspec updated")) |
258 addgaction((f, (mf.flags(f), False), "narrowspec updated")) |
259 merge.applyupdates(repo, actions, wctx=repo[None], |
259 merge.applyupdates(repo, actions, wctx=repo[None], |