comparison tests/test-help.out @ 2019:ced2d3620f95

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents 9bbc7b304c34
children a59da8cc35e4
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
57 incoming show new changesets found in source 57 incoming show new changesets found in source
58 init create a new repository in the given directory 58 init create a new repository in the given directory
59 locate locate files matching specific patterns 59 locate locate files matching specific patterns
60 log show revision history of entire repository or files 60 log show revision history of entire repository or files
61 manifest output the latest or given revision of the project manifest 61 manifest output the latest or given revision of the project manifest
62 merge Merge working directory with another revision
62 outgoing show changesets not found in destination 63 outgoing show changesets not found in destination
63 parents show the parents of the working dir or revision 64 parents show the parents of the working dir or revision
64 paths show definition of symbolic path names 65 paths show definition of symbolic path names
65 pull pull changes from the specified source 66 pull pull changes from the specified source
66 push push changes to the specified destination 67 push push changes to the specified destination
98 incoming show new changesets found in source 99 incoming show new changesets found in source
99 init create a new repository in the given directory 100 init create a new repository in the given directory
100 locate locate files matching specific patterns 101 locate locate files matching specific patterns
101 log show revision history of entire repository or files 102 log show revision history of entire repository or files
102 manifest output the latest or given revision of the project manifest 103 manifest output the latest or given revision of the project manifest
104 merge Merge working directory with another revision
103 outgoing show changesets not found in destination 105 outgoing show changesets not found in destination
104 parents show the parents of the working dir or revision 106 parents show the parents of the working dir or revision
105 paths show definition of symbolic path names 107 paths show definition of symbolic path names
106 pull pull changes from the specified source 108 pull pull changes from the specified source
107 push push changes to the specified destination 109 push push changes to the specified destination