Mercurial > hg
changeset 23400:3bd577a3283e stable
merge: be precise about what merged into what in short desc
| author | anatoly techtonik <techtonik@gmail.com> |
|---|---|
| date | Wed, 26 Nov 2014 17:22:09 +0300 |
| parents | 7f8d27e1f862 |
| children | fd1bab28a8cc |
| files | mercurial/commands.py tests/test-alias.t tests/test-commandserver.t tests/test-globalopts.t tests/test-help.t tests/test-strict.t |
| diffstat | 6 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Nov 25 18:37:28 2014 +0900 +++ b/mercurial/commands.py Wed Nov 26 17:22:09 2014 +0300 @@ -4535,7 +4535,7 @@ ] + mergetoolopts, _('[-P] [-f] [[-r] REV]')) def merge(ui, repo, node=None, **opts): - """merge working directory with another revision + """merge another revision into working directory The current working directory is updated with all changes made in the requested revision since the last common predecessor revision.
--- a/tests/test-alias.t Tue Nov 25 18:37:28 2014 +0900 +++ b/tests/test-alias.t Wed Nov 26 17:22:09 2014 +0300 @@ -443,7 +443,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -469,7 +469,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -495,7 +495,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit
--- a/tests/test-commandserver.t Tue Nov 25 18:37:28 2014 +0900 +++ b/tests/test-commandserver.t Wed Nov 26 17:22:09 2014 +0300 @@ -68,7 +68,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit
--- a/tests/test-globalopts.t Tue Nov 25 18:37:28 2014 +0900 +++ b/tests/test-globalopts.t Wed Nov 26 17:22:09 2014 +0300 @@ -315,7 +315,7 @@ init create a new repository in the given directory 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 another revision into working directory outgoing show changesets not found in the destination paths show aliases for remote repositories phase set or show the current phase name @@ -396,7 +396,7 @@ init create a new repository in the given directory 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 another revision into working directory outgoing show changesets not found in the destination paths show aliases for remote repositories phase set or show the current phase name
--- a/tests/test-help.t Tue Nov 25 18:37:28 2014 +0900 +++ b/tests/test-help.t Wed Nov 26 17:22:09 2014 +0300 @@ -14,7 +14,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -35,7 +35,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -78,7 +78,7 @@ init create a new repository in the given directory 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 another revision into working directory outgoing show changesets not found in the destination paths show aliases for remote repositories phase set or show the current phase name @@ -153,7 +153,7 @@ init create a new repository in the given directory 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 another revision into working directory outgoing show changesets not found in the destination paths show aliases for remote repositories phase set or show the current phase name @@ -293,7 +293,7 @@ forget forget the specified files on the next commit init create a new repository in the given directory log, history show revision history of entire repository or files - merge merge working directory with another revision + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove, rm remove the specified files on the next commit @@ -599,7 +599,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -694,7 +694,7 @@ init create a new repository in the given directory 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 another revision into working directory outgoing show changesets not found in the destination paths show aliases for remote repositories phase set or show the current phase name @@ -1362,7 +1362,7 @@ merge </a> </td><td> - merge working directory with another revision + merge another revision into working directory </td></tr> <tr><td> <a href="/help/pull">
--- a/tests/test-strict.t Tue Nov 25 18:37:28 2014 +0900 +++ b/tests/test-strict.t Wed Nov 26 17:22:09 2014 +0300 @@ -28,7 +28,7 @@ forget forget the specified files on the next commit 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 + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit