# HG changeset patch # User Benoit Boissinot # Date 2006-12-29 05:37:43 # Node ID 509342f9556481a322ad5234167e9ff05a7ac812 # Parent 54fa628b8c788e5ae916cdac5d9b2bc336b5286d various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1773,7 +1773,7 @@ def manifest(ui, repo, rev=None): ui.write("%s\n" % f) def merge(ui, repo, node=None, force=None, branch=None): - """Merge working directory with another revision + """merge working directory with another revision Merge the contents of the current working directory and the requested revision. Files that changed between either parent are @@ -2489,7 +2489,7 @@ def unbundle(ui, repo, fname, **opts): return postincoming(ui, repo, modheads, opts['update']) def update(ui, repo, node=None, clean=False, branch=None, date=None): - """update or merge working directory + """update working directory Update the working directory to the specified revision. @@ -2501,7 +2501,7 @@ def update(ui, repo, node=None, clean=Fa merge command. By default, update will refuse to run if doing so would require - merging or discarding local changes. + discarding local changes. """ if date: if node: @@ -2807,7 +2807,7 @@ table = { ] + walkopts, _('hg log [OPTION]... [FILE]')), "manifest": (manifest, [], _('hg manifest [REV]')), - "merge": + "^merge": (merge, [('b', 'branch', '', _('merge with head of a specific branch (DEPRECATED)')), ('f', 'force', None, _('force a merge with outstanding changes'))], diff --git a/tests/test-globalopts.out b/tests/test-globalopts.out --- a/tests/test-globalopts.out +++ b/tests/test-globalopts.out @@ -141,7 +141,7 @@ list of commands (use "hg help -v" to sh locate locate files matching specific patterns log show revision history of entire repository or files manifest output the current or given revision of the project manifest - merge Merge working directory with another revision + merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names @@ -160,7 +160,7 @@ list of commands (use "hg help -v" to sh tags list repository tags tip show the tip revision unbundle apply a changegroup file - update update or merge working directory + update update working directory verify verify the integrity of the repository version output version and copyright information Mercurial Distributed SCM @@ -191,7 +191,7 @@ list of commands (use "hg help -v" to sh locate locate files matching specific patterns log show revision history of entire repository or files manifest output the current or given revision of the project manifest - merge Merge working directory with another revision + merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names @@ -210,7 +210,7 @@ list of commands (use "hg help -v" to sh tags list repository tags tip show the tip revision unbundle apply a changegroup file - update update or merge working directory + update update working directory verify verify the integrity of the repository version output version and copyright information %% not tested: --debugger diff --git a/tests/test-help.out b/tests/test-help.out --- a/tests/test-help.out +++ b/tests/test-help.out @@ -10,6 +10,7 @@ basic commands (use "hg help" for the fu export dump the header and diffs for one or more changesets init create a new repository in the given directory log show revision history of entire repository or files + merge merge working directory with another revision parents show the parents of the working dir or revision pull pull changes from the specified source push push changes to the specified destination @@ -17,7 +18,7 @@ basic commands (use "hg help" for the fu revert revert files or dirs to their states as of some revision serve export the repository via HTTP status show changed files in the working directory - update update or merge working directory + update update working directory add add the specified files on the next commit annotate show changeset information per file line clone make a copy of an existing repository @@ -26,6 +27,7 @@ basic commands (use "hg help" for the fu export dump the header and diffs for one or more changesets init create a new repository in the given directory log show revision history of entire repository or files + merge merge working directory with another revision parents show the parents of the working dir or revision pull pull changes from the specified source push push changes to the specified destination @@ -33,7 +35,7 @@ basic commands (use "hg help" for the fu revert revert files or dirs to their states as of some revision serve export the repository via HTTP status show changed files in the working directory - update update or merge working directory + update update working directory Mercurial Distributed SCM list of commands (use "hg help -v" to show aliases and global options): @@ -62,7 +64,7 @@ list of commands (use "hg help -v" to sh locate locate files matching specific patterns log show revision history of entire repository or files manifest output the current or given revision of the project manifest - merge Merge working directory with another revision + merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names @@ -81,7 +83,7 @@ list of commands (use "hg help -v" to sh tags list repository tags tip show the tip revision unbundle apply a changegroup file - update update or merge working directory + update update working directory verify verify the integrity of the repository version output version and copyright information add add the specified files on the next commit @@ -108,7 +110,7 @@ list of commands (use "hg help -v" to sh locate locate files matching specific patterns log show revision history of entire repository or files manifest output the current or given revision of the project manifest - merge Merge working directory with another revision + merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names @@ -127,7 +129,7 @@ list of commands (use "hg help -v" to sh tags list repository tags tip show the tip revision unbundle apply a changegroup file - update update or merge working directory + update update working directory verify verify the integrity of the repository version output version and copyright information hg add [OPTION]... [FILE]... @@ -257,6 +259,7 @@ basic commands (use "hg help" for the fu export dump the header and diffs for one or more changesets init create a new repository in the given directory log show revision history of entire repository or files + merge merge working directory with another revision parents show the parents of the working dir or revision pull pull changes from the specified source push push changes to the specified destination @@ -264,7 +267,7 @@ basic commands (use "hg help" for the fu revert revert files or dirs to their states as of some revision serve export the repository via HTTP status show changed files in the working directory - update update or merge working directory + update update working directory hg: unknown command 'skjdfks' Mercurial Distributed SCM @@ -278,6 +281,7 @@ basic commands (use "hg help" for the fu export dump the header and diffs for one or more changesets init create a new repository in the given directory log show revision history of entire repository or files + merge merge working directory with another revision parents show the parents of the working dir or revision pull pull changes from the specified source push push changes to the specified destination @@ -285,4 +289,4 @@ basic commands (use "hg help" for the fu revert revert files or dirs to their states as of some revision serve export the repository via HTTP status show changed files in the working directory - update update or merge working directory + update update working directory diff --git a/tests/test-strict.out b/tests/test-strict.out --- a/tests/test-strict.out +++ b/tests/test-strict.out @@ -13,6 +13,7 @@ basic commands (use "hg help" for the fu export dump the header and diffs for one or more changesets init create a new repository in the given directory log show revision history of entire repository or files + merge merge working directory with another revision parents show the parents of the working dir or revision pull pull changes from the specified source push push changes to the specified destination @@ -20,7 +21,7 @@ basic commands (use "hg help" for the fu revert revert files or dirs to their states as of some revision serve export the repository via HTTP status show changed files in the working directory - update update or merge working directory + update update working directory 0: a % should succeed - up is an alias, not an abbreviation 0 files updated, 0 files merged, 0 files removed, 0 files unresolved