Show More
@@ -2529,26 +2529,31 b' def rename(ui, repo, *pats, **opts):' | |||
|
2529 | 2529 | wlock.release() |
|
2530 | 2530 | |
|
2531 | 2531 | def resolve(ui, repo, *pats, **opts): |
|
2532 | """retry file merges from a merge or update | |
|
2533 | ||
|
2534 | This command can cleanly retry unresolved file merges using file | |
|
2535 | revisions preserved from the last update or merge. | |
|
2536 | ||
|
2537 | If a conflict is resolved manually, please note that the changes | |
|
2538 | will be overwritten if the merge is retried with resolve. The | |
|
2539 | -m/--mark switch should be used to mark the file as resolved. | |
|
2540 | ||
|
2541 | You can specify a set of files to operate on, or use the -a/--all | |
|
2542 | switch to select all unresolved files. | |
|
2543 | ||
|
2544 | This command also allows listing resolved files and manually | |
|
2545 | indicating whether or not files are resolved. All files must be | |
|
2546 | marked as resolved before a commit is permitted. | |
|
2547 | ||
|
2548 | The codes used to show the status of files are:: | |
|
2549 | ||
|
2550 | U = unresolved | |
|
2551 | R = resolved | |
|
2532 | """various operations to help finish a merge | |
|
2533 | ||
|
2534 | This command includes several actions that are often useful while | |
|
2535 | performing a merge, after running ``merge`` but before running | |
|
2536 | ``commit``. (It is only meaningful if your working directory has | |
|
2537 | two parents.) It is most relevant for merges with unresolved | |
|
2538 | conflicts, which are typically a result of non-interactive merging with | |
|
2539 | ``internal:merge`` or a command-line merge tool like ``diff3``. | |
|
2540 | ||
|
2541 | The available actions are: | |
|
2542 | ||
|
2543 | 1) list files that were merged with conflicts (U, for unresolved) | |
|
2544 | and without conflicts (R, for resolved): ``hg resolve -l`` | |
|
2545 | (this is like ``status`` for merges) | |
|
2546 | 2) record that you have resolved conflicts in certain files: | |
|
2547 | ``hg resolve -m [file ...]`` (default: mark all unresolved files) | |
|
2548 | 3) forget that you have resolved conflicts in certain files: | |
|
2549 | ``hg resolve -u [file ...]`` (default: unmark all resolved files) | |
|
2550 | 4) discard your current attempt(s) at resolving conflicts and | |
|
2551 | restart the merge from scratch: ``hg resolve file...`` | |
|
2552 | (or ``-a`` for all unresolved files) | |
|
2553 | ||
|
2554 | Note that Mercurial will not let you commit files with unresolved merge | |
|
2555 | conflicts. You must use ``hg resolve -m ...`` before you can commit | |
|
2556 | after a conflicting merge. | |
|
2552 | 2557 | """ |
|
2553 | 2558 | |
|
2554 | 2559 | all, mark, unmark, show, nostatus = \ |
General Comments 0
You need to be logged in to leave comments.
Login now