Mercurial > hg-stable
changeset 8834:6d36fc70754e
merge: rename -S/--show option to -P/--preview
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 19 Jun 2009 13:58:48 +0200 |
| parents | 14639c050251 |
| children | ec5483efc31f |
| files | mercurial/commands.py tests/test-debugcomplete.out tests/test-double-merge tests/test-merge-default tests/test-merge1 |
| diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Jun 19 13:58:22 2009 +0200 +++ b/mercurial/commands.py Fri Jun 19 13:58:48 2009 +0200 @@ -2108,7 +2108,7 @@ 'use "hg update" or merge with an explicit rev')) node = parent == bheads[0] and bheads[-1] or bheads[0] - if opts.get('show'): + if opts.get('preview'): p1 = repo['.'] p2 = repo[node] common = p1.ancestor(p2) @@ -3358,7 +3358,7 @@ (merge, [('f', 'force', None, _('force a merge with outstanding changes')), ('r', 'rev', '', _('revision to merge')), - ('S', 'show', None, + ('P', 'preview', None, _('review revisions to merge (no merge is performed)'))], _('[-f] [[-r] REV]')), "outgoing|out":
--- a/tests/test-debugcomplete.out Fri Jun 19 13:58:22 2009 +0200 +++ b/tests/test-debugcomplete.out Fri Jun 19 13:58:48 2009 +0200 @@ -169,7 +169,7 @@ export: output, switch-parent, text, git, nodates init: ssh, remotecmd log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude -merge: force, rev, show +merge: force, rev, preview parents: rev, style, template pull: update, force, rev, ssh, remotecmd push: force, rev, ssh, remotecmd
--- a/tests/test-double-merge Fri Jun 19 13:58:22 2009 +0200 +++ b/tests/test-double-merge Fri Jun 19 13:58:48 2009 +0200 @@ -20,7 +20,7 @@ hg ci -m 'change foo' -d "1000000 0" # we get conflicts that shouldn't be there -hg merge -S +hg merge -P hg merge --debug echo "-- foo --"