Show More
@@ -1255,7 +1255,12 def dirstatecopy(ui, repo, wctx, src, ds | |||||
1255 | wctx.copy(origsrc, dst) |
|
1255 | wctx.copy(origsrc, dst) | |
1256 |
|
1256 | |||
1257 | def movedirstate(repo, newctx, match=None): |
|
1257 | def movedirstate(repo, newctx, match=None): | |
1258 |
"""Move the dirstate to newctx and adjust it as necessary. |
|
1258 | """Move the dirstate to newctx and adjust it as necessary. | |
|
1259 | ||||
|
1260 | A matcher can be provided as an optimization. It is probably a bug to pass | |||
|
1261 | a matcher that doesn't match all the differences between the parent of the | |||
|
1262 | working copy and newctx. | |||
|
1263 | """ | |||
1259 | oldctx = repo['.'] |
|
1264 | oldctx = repo['.'] | |
1260 | ds = repo.dirstate |
|
1265 | ds = repo.dirstate | |
1261 | ds.setparents(newctx.node(), nullid) |
|
1266 | ds.setparents(newctx.node(), nullid) |
General Comments 0
You need to be logged in to leave comments.
Login now