equal
deleted
inserted
replaced
382 actions.append((f, "g", (m2.flags(f),), "prompt recreating")) |
382 actions.append((f, "g", (m2.flags(f),), "prompt recreating")) |
383 else: assert False, m |
383 else: assert False, m |
384 return actions |
384 return actions |
385 |
385 |
386 def actionkey(a): |
386 def actionkey(a): |
387 return a[1] == "r" and -1 or 0, a |
387 return a[1] in "rf" and -1 or 0, a |
388 |
388 |
389 def getremove(repo, mctx, overwrite, args): |
389 def getremove(repo, mctx, overwrite, args): |
390 """apply usually-non-interactive updates to the working directory |
390 """apply usually-non-interactive updates to the working directory |
391 |
391 |
392 mctx is the context to be merged into the working copy |
392 mctx is the context to be merged into the working copy |