Show More
@@ -2363,8 +2363,17 b' def resolve(ui, repo, *pats, **opts):' | |||||
2363 | else: |
|
2363 | else: | |
2364 | wctx = repo[None] |
|
2364 | wctx = repo[None] | |
2365 | mctx = wctx.parents()[-1] |
|
2365 | mctx = wctx.parents()[-1] | |
|
2366 | ||||
|
2367 | # backup pre-resolve (merge uses .orig for its own purposes) | |||
|
2368 | a = repo.wjoin(f) | |||
|
2369 | util.copyfile(a, a + ".resolve") | |||
|
2370 | ||||
|
2371 | # resolve file | |||
2366 | ms.resolve(f, wctx, mctx) |
|
2372 | ms.resolve(f, wctx, mctx) | |
2367 |
|
2373 | |||
|
2374 | # replace filemerge's .orig file with our resolve file | |||
|
2375 | util.rename(a + ".resolve", a + ".orig") | |||
|
2376 | ||||
2368 | def revert(ui, repo, *pats, **opts): |
|
2377 | def revert(ui, repo, *pats, **opts): | |
2369 | """restore individual files or dirs to an earlier state |
|
2378 | """restore individual files or dirs to an earlier state | |
2370 |
|
2379 |
General Comments 0
You need to be logged in to leave comments.
Login now