comparison tests/test-help.out @ 1437:ea51d296085f

import docstring from doc/hg.1.txt
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 24 Oct 2005 15:52:28 -0700
parents e6560042b7b8
children d791c335fb7b
comparison
equal deleted inserted replaced
1436:db6d7b4005ba 1437:ea51d296085f
122 version output version and copyright information 122 version output version and copyright information
123 hg add [OPTION]... [FILE]... 123 hg add [OPTION]... [FILE]...
124 124
125 add the specified files on the next commit 125 add the specified files on the next commit
126 126
127 options: 127 Schedule files to be version controlled and added to the repository.
128 128
129 -I --include include path in search 129 The files will be added to the repository at the next commit.
130 -X --exclude exclude path from search 130
131 If no names are given, add all files in the current directory and
132 its subdirectories.
133
134 options:
135
136 -I --include include names matching the given patterns
137 -X --exclude exclude names matching the given patterns
131 hg add: option --skjdfks not recognized 138 hg add: option --skjdfks not recognized
132 hg add [OPTION]... [FILE]... 139 hg add [OPTION]... [FILE]...
133 140
134 add the specified files on the next commit 141 add the specified files on the next commit
135 142
136 options: 143 Schedule files to be version controlled and added to the repository.
137 144
138 -I --include include path in search 145 The files will be added to the repository at the next commit.
139 -X --exclude exclude path from search 146
147 If no names are given, add all files in the current directory and
148 its subdirectories.
149
150 options:
151
152 -I --include include names matching the given patterns
153 -X --exclude exclude names matching the given patterns
140 hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]... 154 hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
141 155
142 diff working directory (or selected files) 156 diff working directory (or selected files)
157
158 Show differences between revisions for the specified files.
159
160 Differences between files are shown using the unified diff format.
161
162 When two revision arguments are given, then changes are shown
163 between those revisions. If only one revision is specified then
164 that revision is compared to the working directory, and, when no
165 revisions are specified, the working directory files are compared
166 to its parent.
167
168 Without the -a option, diff will avoid generating diffs of files
169 it detects as binary. With -a, diff will generate a diff anyway,
170 probably with undesirable results.
143 171
144 options: 172 options:
145 173
146 -r --rev revision 174 -r --rev revision
147 -a --text treat all files as text 175 -a --text treat all files as text
148 -I --include include path in search 176 -I --include include names matching the given patterns
149 -X --exclude exclude path from search 177 -X --exclude exclude names matching the given patterns
150 hg status [OPTION]... [FILE]... 178 hg status [OPTION]... [FILE]...
151 179
152 show changed files in the working directory 180 show changed files in the working directory
153 181
182 Show changed files in the working directory. If no names are
183 given, all files are shown. Otherwise, only files matching the
184 given names are shown.
185
186 The codes used to show the status of files are:
154 M = modified 187 M = modified
155 A = added 188 A = added
156 R = removed 189 R = removed
157 ? = not tracked 190 ? = not tracked
158 191
161 -m --modified show only modified files 194 -m --modified show only modified files
162 -a --added show only added files 195 -a --added show only added files
163 -r --removed show only removed files 196 -r --removed show only removed files
164 -u --unknown show only unknown (not tracked) files 197 -u --unknown show only unknown (not tracked) files
165 -n --no-status hide status prefix 198 -n --no-status hide status prefix
166 -0 --print0 end filenames with NUL 199 -0 --print0 end filenames with NUL, for use with xargs
167 -I --include include path in search 200 -I --include include names matching the given patterns
168 -X --exclude exclude path from search 201 -X --exclude exclude names matching the given patterns
169 hg status [OPTION]... [FILE]... 202 hg status [OPTION]... [FILE]...
170 203
171 show changed files in the working directory 204 show changed files in the working directory
172 hg: unknown command 'foo' 205 hg: unknown command 'foo'
173 Mercurial Distributed SCM 206 Mercurial Distributed SCM