Show More
@@ -2445,7 +2445,7 b' def rename(ui, repo, *pats, **opts):' | |||||
2445 | def resolve(ui, repo, *pats, **opts): |
|
2445 | def resolve(ui, repo, *pats, **opts): | |
2446 | """retry file merges from a merge or update |
|
2446 | """retry file merges from a merge or update | |
2447 |
|
2447 | |||
2448 |
This command |
|
2448 | This command can cleanly retry unresolved file merges using file | |
2449 | revisions preserved from the last update or merge. To attempt to |
|
2449 | revisions preserved from the last update or merge. To attempt to | |
2450 | resolve all unresolved files, use the -a/--all switch. |
|
2450 | resolve all unresolved files, use the -a/--all switch. | |
2451 |
|
2451 | |||
@@ -2463,7 +2463,8 b' def resolve(ui, repo, *pats, **opts):' | |||||
2463 | R = resolved |
|
2463 | R = resolved | |
2464 | """ |
|
2464 | """ | |
2465 |
|
2465 | |||
2466 | all, mark, unmark, show = [opts.get(o) for o in 'all mark unmark list'.split()] |
|
2466 | all, mark, unmark, show, nostatus = \ | |
|
2467 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] | |||
2467 |
|
2468 | |||
2468 | if (show and (mark or unmark)) or (mark and unmark): |
|
2469 | if (show and (mark or unmark)) or (mark and unmark): | |
2469 | raise util.Abort(_("too many options specified")) |
|
2470 | raise util.Abort(_("too many options specified")) | |
@@ -2479,6 +2480,9 b' def resolve(ui, repo, *pats, **opts):' | |||||
2479 | for f in ms: |
|
2480 | for f in ms: | |
2480 | if m(f): |
|
2481 | if m(f): | |
2481 | if show: |
|
2482 | if show: | |
|
2483 | if nostatus: | |||
|
2484 | ui.write("%s\n" % f) | |||
|
2485 | else: | |||
2482 | ui.write("%s %s\n" % (ms[f].upper(), f)) |
|
2486 | ui.write("%s %s\n" % (ms[f].upper(), f)) | |
2483 | elif mark: |
|
2487 | elif mark: | |
2484 | ms.mark(f, "r") |
|
2488 | ms.mark(f, "r") | |
@@ -3586,7 +3590,8 b' table = {' | |||||
3586 | [('a', 'all', None, _('remerge all unresolved files')), |
|
3590 | [('a', 'all', None, _('remerge all unresolved files')), | |
3587 | ('l', 'list', None, _('list state of files needing merge')), |
|
3591 | ('l', 'list', None, _('list state of files needing merge')), | |
3588 | ('m', 'mark', None, _('mark files as resolved')), |
|
3592 | ('m', 'mark', None, _('mark files as resolved')), | |
3589 |
('u', 'unmark', None, _('unmark files as resolved')) |
|
3593 | ('u', 'unmark', None, _('unmark files as resolved')), | |
|
3594 | ('n', 'no-status', None, _('hide status prefix'))] | |||
3590 | + walkopts, |
|
3595 | + walkopts, | |
3591 | _('[OPTION]... [FILE]...')), |
|
3596 | _('[OPTION]... [FILE]...')), | |
3592 | "revert": |
|
3597 | "revert": |
@@ -218,7 +218,7 b' parents: rev, style, template' | |||||
218 | paths: |
|
218 | paths: | |
219 | recover: |
|
219 | recover: | |
220 | rename: after, force, include, exclude, dry-run |
|
220 | rename: after, force, include, exclude, dry-run | |
221 | resolve: all, list, mark, unmark, include, exclude |
|
221 | resolve: all, list, mark, unmark, no-status, include, exclude | |
222 | revert: all, date, rev, no-backup, include, exclude, dry-run |
|
222 | revert: all, date, rev, no-backup, include, exclude, dry-run | |
223 | rollback: |
|
223 | rollback: | |
224 | root: |
|
224 | root: |
General Comments 0
You need to be logged in to leave comments.
Login now