Show More
@@ -1,292 +1,292 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | adding b |
|
2 | adding b | |
3 | updating to branch default |
|
3 | updating to branch default | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | pulling from ../b |
|
5 | pulling from ../b | |
6 | searching for changes |
|
6 | searching for changes | |
7 | warning: repository is unrelated |
|
7 | warning: repository is unrelated | |
8 | adding changesets |
|
8 | adding changesets | |
9 | adding manifests |
|
9 | adding manifests | |
10 | adding file changes |
|
10 | adding file changes | |
11 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
11 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
12 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
12 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | (branch merge, don't forget to commit) |
|
14 | (branch merge, don't forget to commit) | |
15 | %% -R/--repository |
|
15 | %% -R/--repository | |
16 | changeset: 0:8580ff50825a |
|
16 | changeset: 0:8580ff50825a | |
17 | tag: tip |
|
17 | tag: tip | |
18 | user: test |
|
18 | user: test | |
19 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
19 | date: Thu Jan 01 00:00:01 1970 +0000 | |
20 | summary: a |
|
20 | summary: a | |
21 |
|
21 | |||
22 | changeset: 0:b6c483daf290 |
|
22 | changeset: 0:b6c483daf290 | |
23 | tag: tip |
|
23 | tag: tip | |
24 | user: test |
|
24 | user: test | |
25 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
25 | date: Thu Jan 01 00:00:01 1970 +0000 | |
26 | summary: b |
|
26 | summary: b | |
27 |
|
27 | |||
28 | %% implicit -R |
|
28 | %% implicit -R | |
29 | 0: a |
|
29 | 0: a | |
30 | 0: a |
|
30 | 0: a | |
31 | abort: There is no Mercurial repository here (.hg not found)! |
|
31 | abort: There is no Mercurial repository here (.hg not found)! | |
32 | abort: a/a not under root |
|
32 | abort: a/a not under root | |
33 | abort: There is no Mercurial repository here (.hg not found)! |
|
33 | abort: There is no Mercurial repository here (.hg not found)! | |
34 | %% abbrev of long option |
|
34 | %% abbrev of long option | |
35 | changeset: 1:b6c483daf290 |
|
35 | changeset: 1:b6c483daf290 | |
36 | tag: tip |
|
36 | tag: tip | |
37 | parent: -1:000000000000 |
|
37 | parent: -1:000000000000 | |
38 | user: test |
|
38 | user: test | |
39 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
39 | date: Thu Jan 01 00:00:01 1970 +0000 | |
40 | summary: b |
|
40 | summary: b | |
41 |
|
41 | |||
42 | %% earlygetopt with duplicate options (36d23de02da1) |
|
42 | %% earlygetopt with duplicate options (36d23de02da1) | |
43 | changeset: 1:b6c483daf290 |
|
43 | changeset: 1:b6c483daf290 | |
44 | tag: tip |
|
44 | tag: tip | |
45 | parent: -1:000000000000 |
|
45 | parent: -1:000000000000 | |
46 | user: test |
|
46 | user: test | |
47 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
47 | date: Thu Jan 01 00:00:01 1970 +0000 | |
48 | summary: b |
|
48 | summary: b | |
49 |
|
49 | |||
50 | changeset: 0:8580ff50825a |
|
50 | changeset: 0:8580ff50825a | |
51 | tag: tip |
|
51 | tag: tip | |
52 | user: test |
|
52 | user: test | |
53 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
53 | date: Thu Jan 01 00:00:01 1970 +0000 | |
54 | summary: a |
|
54 | summary: a | |
55 |
|
55 | |||
56 | %% earlygetopt short option without following space |
|
56 | %% earlygetopt short option without following space | |
57 | 0:b6c483daf290 |
|
57 | 0:b6c483daf290 | |
58 | %% earlygetopt with illegal abbreviations |
|
58 | %% earlygetopt with illegal abbreviations | |
59 | abort: Option --config may not be abbreviated! |
|
59 | abort: Option --config may not be abbreviated! | |
60 | abort: Option --cwd may not be abbreviated! |
|
60 | abort: Option --cwd may not be abbreviated! | |
61 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
61 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
62 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
62 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
63 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
63 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
64 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
64 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
65 | %% --cwd |
|
65 | %% --cwd | |
66 | changeset: 0:8580ff50825a |
|
66 | changeset: 0:8580ff50825a | |
67 | tag: tip |
|
67 | tag: tip | |
68 | user: test |
|
68 | user: test | |
69 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
69 | date: Thu Jan 01 00:00:01 1970 +0000 | |
70 | summary: a |
|
70 | summary: a | |
71 |
|
71 | |||
72 | %% -y/--noninteractive - just be sure it is parsed |
|
72 | %% -y/--noninteractive - just be sure it is parsed | |
73 | 0:8580ff50825a |
|
73 | 0:8580ff50825a | |
74 | 0:8580ff50825a |
|
74 | 0:8580ff50825a | |
75 | %% -q/--quiet |
|
75 | %% -q/--quiet | |
76 | 0:8580ff50825a |
|
76 | 0:8580ff50825a | |
77 | 0:b6c483daf290 |
|
77 | 0:b6c483daf290 | |
78 | 0:8580ff50825a |
|
78 | 0:8580ff50825a | |
79 | 1:b6c483daf290 |
|
79 | 1:b6c483daf290 | |
80 | %% -v/--verbose |
|
80 | %% -v/--verbose | |
81 | changeset: 1:b6c483daf290 |
|
81 | changeset: 1:b6c483daf290 | |
82 | tag: tip |
|
82 | tag: tip | |
83 | parent: -1:000000000000 |
|
83 | parent: -1:000000000000 | |
84 | user: test |
|
84 | user: test | |
85 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
85 | date: Thu Jan 01 00:00:01 1970 +0000 | |
86 | files: b |
|
86 | files: b | |
87 | description: |
|
87 | description: | |
88 | b |
|
88 | b | |
89 |
|
89 | |||
90 |
|
90 | |||
91 | changeset: 0:8580ff50825a |
|
91 | changeset: 0:8580ff50825a | |
92 | user: test |
|
92 | user: test | |
93 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
93 | date: Thu Jan 01 00:00:01 1970 +0000 | |
94 | files: a |
|
94 | files: a | |
95 | description: |
|
95 | description: | |
96 | a |
|
96 | a | |
97 |
|
97 | |||
98 |
|
98 | |||
99 | changeset: 0:b6c483daf290 |
|
99 | changeset: 0:b6c483daf290 | |
100 | tag: tip |
|
100 | tag: tip | |
101 | user: test |
|
101 | user: test | |
102 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
102 | date: Thu Jan 01 00:00:01 1970 +0000 | |
103 | files: b |
|
103 | files: b | |
104 | description: |
|
104 | description: | |
105 | b |
|
105 | b | |
106 |
|
106 | |||
107 |
|
107 | |||
108 | %% --config |
|
108 | %% --config | |
109 | quuxfoo |
|
109 | quuxfoo | |
110 | abort: malformed --config option: '' (use --config section.name=value) |
|
110 | abort: malformed --config option: '' (use --config section.name=value) | |
111 | abort: malformed --config option: 'a.b' (use --config section.name=value) |
|
111 | abort: malformed --config option: 'a.b' (use --config section.name=value) | |
112 | abort: malformed --config option: 'a' (use --config section.name=value) |
|
112 | abort: malformed --config option: 'a' (use --config section.name=value) | |
113 | abort: malformed --config option: 'a.=' (use --config section.name=value) |
|
113 | abort: malformed --config option: 'a.=' (use --config section.name=value) | |
114 | abort: malformed --config option: '.b=' (use --config section.name=value) |
|
114 | abort: malformed --config option: '.b=' (use --config section.name=value) | |
115 | %% --debug |
|
115 | %% --debug | |
116 | changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a |
|
116 | changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a | |
117 | tag: tip |
|
117 | tag: tip | |
118 | parent: -1:0000000000000000000000000000000000000000 |
|
118 | parent: -1:0000000000000000000000000000000000000000 | |
119 | parent: -1:0000000000000000000000000000000000000000 |
|
119 | parent: -1:0000000000000000000000000000000000000000 | |
120 | manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 |
|
120 | manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 | |
121 | user: test |
|
121 | user: test | |
122 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
122 | date: Thu Jan 01 00:00:01 1970 +0000 | |
123 | files+: b |
|
123 | files+: b | |
124 | extra: branch=default |
|
124 | extra: branch=default | |
125 | description: |
|
125 | description: | |
126 | b |
|
126 | b | |
127 |
|
127 | |||
128 |
|
128 | |||
129 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
129 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab | |
130 | parent: -1:0000000000000000000000000000000000000000 |
|
130 | parent: -1:0000000000000000000000000000000000000000 | |
131 | parent: -1:0000000000000000000000000000000000000000 |
|
131 | parent: -1:0000000000000000000000000000000000000000 | |
132 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
132 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
133 | user: test |
|
133 | user: test | |
134 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
134 | date: Thu Jan 01 00:00:01 1970 +0000 | |
135 | files+: a |
|
135 | files+: a | |
136 | extra: branch=default |
|
136 | extra: branch=default | |
137 | description: |
|
137 | description: | |
138 | a |
|
138 | a | |
139 |
|
139 | |||
140 |
|
140 | |||
141 | %% --traceback |
|
141 | %% --traceback | |
142 | Traceback (most recent call last): |
|
142 | Traceback (most recent call last): | |
143 | %% --time |
|
143 | %% --time | |
144 | Time: real x.x secs (user x.x+x.x sys x.x+x.x) |
|
144 | Time: real x.x secs (user x.x+x.x sys x.x+x.x) | |
145 | %% --version |
|
145 | %% --version | |
146 | Mercurial Distributed SCM (version xxx) |
|
146 | Mercurial Distributed SCM (version xxx) | |
147 | %% -h/--help |
|
147 | %% -h/--help | |
148 | Mercurial Distributed SCM |
|
148 | Mercurial Distributed SCM | |
149 |
|
149 | |||
150 | list of commands: |
|
150 | list of commands: | |
151 |
|
151 | |||
152 | add add the specified files on the next commit |
|
152 | add add the specified files on the next commit | |
153 | addremove add all new files, delete all missing files |
|
153 | addremove add all new files, delete all missing files | |
154 | annotate show changeset information by line for each file |
|
154 | annotate show changeset information by line for each file | |
155 | archive create an unversioned archive of a repository revision |
|
155 | archive create an unversioned archive of a repository revision | |
156 | backout reverse effect of earlier changeset |
|
156 | backout reverse effect of earlier changeset | |
157 | bisect subdivision search of changesets |
|
157 | bisect subdivision search of changesets | |
158 | branch set or show the current branch name |
|
158 | branch set or show the current branch name | |
159 | branches list repository named branches |
|
159 | branches list repository named branches | |
160 | bundle create a changegroup file |
|
160 | bundle create a changegroup file | |
161 | cat output the current or given revision of files |
|
161 | cat output the current or given revision of files | |
162 | clone make a copy of an existing repository |
|
162 | clone make a copy of an existing repository | |
163 | commit commit the specified files or all outstanding changes |
|
163 | commit commit the specified files or all outstanding changes | |
164 | copy mark files as copied for the next commit |
|
164 | copy mark files as copied for the next commit | |
165 | diff diff repository (or selected files) |
|
165 | diff diff repository (or selected files) | |
166 | export dump the header and diffs for one or more changesets |
|
166 | export dump the header and diffs for one or more changesets | |
167 | forget forget the specified files on the next commit |
|
167 | forget forget the specified files on the next commit | |
168 | grep search for a pattern in specified files and revisions |
|
168 | grep search for a pattern in specified files and revisions | |
169 | heads show current repository heads or show branch heads |
|
169 | heads show current repository heads or show branch heads | |
170 | help show help for a given topic or a help overview |
|
170 | help show help for a given topic or a help overview | |
171 | identify identify the working copy or specified revision |
|
171 | identify identify the working copy or specified revision | |
172 | import import an ordered set of patches |
|
172 | import import an ordered set of patches | |
173 | incoming show new changesets found in source |
|
173 | incoming show new changesets found in source | |
174 | init create a new repository in the given directory |
|
174 | init create a new repository in the given directory | |
175 | locate locate files matching specific patterns |
|
175 | locate locate files matching specific patterns | |
176 | log show revision history of entire repository or files |
|
176 | log show revision history of entire repository or files | |
177 | manifest output the current or given revision of the project manifest |
|
177 | manifest output the current or given revision of the project manifest | |
178 | merge merge working directory with another revision |
|
178 | merge merge working directory with another revision | |
179 | outgoing show changesets not found in the destination |
|
179 | outgoing show changesets not found in the destination | |
180 | parents show the parents of the working directory or revision |
|
180 | parents show the parents of the working directory or revision | |
181 | paths show aliases for remote repositories |
|
181 | paths show aliases for remote repositories | |
182 | pull pull changes from the specified source |
|
182 | pull pull changes from the specified source | |
183 | push push changes to the specified destination |
|
183 | push push changes to the specified destination | |
184 | recover roll back an interrupted transaction |
|
184 | recover roll back an interrupted transaction | |
185 | remove remove the specified files on the next commit |
|
185 | remove remove the specified files on the next commit | |
186 | rename rename files; equivalent of copy + remove |
|
186 | rename rename files; equivalent of copy + remove | |
187 | resolve various operations to help finish a merge |
|
187 | resolve redo merges or set/view the merge status of files | |
188 | revert restore individual files or directories to an earlier state |
|
188 | revert restore individual files or directories to an earlier state | |
189 | rollback roll back the last transaction (dangerous) |
|
189 | rollback roll back the last transaction (dangerous) | |
190 | root print the root (top) of the current working directory |
|
190 | root print the root (top) of the current working directory | |
191 | serve start stand-alone webserver |
|
191 | serve start stand-alone webserver | |
192 | showconfig show combined config settings from all hgrc files |
|
192 | showconfig show combined config settings from all hgrc files | |
193 | status show changed files in the working directory |
|
193 | status show changed files in the working directory | |
194 | summary summarize working directory state |
|
194 | summary summarize working directory state | |
195 | tag add one or more tags for the current or given revision |
|
195 | tag add one or more tags for the current or given revision | |
196 | tags list repository tags |
|
196 | tags list repository tags | |
197 | tip show the tip revision |
|
197 | tip show the tip revision | |
198 | unbundle apply one or more changegroup files |
|
198 | unbundle apply one or more changegroup files | |
199 | update update working directory (or switch revisions) |
|
199 | update update working directory (or switch revisions) | |
200 | verify verify the integrity of the repository |
|
200 | verify verify the integrity of the repository | |
201 | version output version and copyright information |
|
201 | version output version and copyright information | |
202 |
|
202 | |||
203 | additional help topics: |
|
203 | additional help topics: | |
204 |
|
204 | |||
205 | config Configuration Files |
|
205 | config Configuration Files | |
206 | dates Date Formats |
|
206 | dates Date Formats | |
207 | patterns File Name Patterns |
|
207 | patterns File Name Patterns | |
208 | environment Environment Variables |
|
208 | environment Environment Variables | |
209 | revisions Specifying Single Revisions |
|
209 | revisions Specifying Single Revisions | |
210 | multirevs Specifying Multiple Revisions |
|
210 | multirevs Specifying Multiple Revisions | |
211 | revsets Specifying Revision Sets |
|
211 | revsets Specifying Revision Sets | |
212 | diffs Diff Formats |
|
212 | diffs Diff Formats | |
213 | templating Template Usage |
|
213 | templating Template Usage | |
214 | urls URL Paths |
|
214 | urls URL Paths | |
215 | extensions Using additional features |
|
215 | extensions Using additional features | |
216 | hgweb Configuring hgweb |
|
216 | hgweb Configuring hgweb | |
217 | glossary Glossary |
|
217 | glossary Glossary | |
218 |
|
218 | |||
219 | use "hg -v help" to show aliases and global options |
|
219 | use "hg -v help" to show aliases and global options | |
220 | Mercurial Distributed SCM |
|
220 | Mercurial Distributed SCM | |
221 |
|
221 | |||
222 | list of commands: |
|
222 | list of commands: | |
223 |
|
223 | |||
224 | add add the specified files on the next commit |
|
224 | add add the specified files on the next commit | |
225 | addremove add all new files, delete all missing files |
|
225 | addremove add all new files, delete all missing files | |
226 | annotate show changeset information by line for each file |
|
226 | annotate show changeset information by line for each file | |
227 | archive create an unversioned archive of a repository revision |
|
227 | archive create an unversioned archive of a repository revision | |
228 | backout reverse effect of earlier changeset |
|
228 | backout reverse effect of earlier changeset | |
229 | bisect subdivision search of changesets |
|
229 | bisect subdivision search of changesets | |
230 | branch set or show the current branch name |
|
230 | branch set or show the current branch name | |
231 | branches list repository named branches |
|
231 | branches list repository named branches | |
232 | bundle create a changegroup file |
|
232 | bundle create a changegroup file | |
233 | cat output the current or given revision of files |
|
233 | cat output the current or given revision of files | |
234 | clone make a copy of an existing repository |
|
234 | clone make a copy of an existing repository | |
235 | commit commit the specified files or all outstanding changes |
|
235 | commit commit the specified files or all outstanding changes | |
236 | copy mark files as copied for the next commit |
|
236 | copy mark files as copied for the next commit | |
237 | diff diff repository (or selected files) |
|
237 | diff diff repository (or selected files) | |
238 | export dump the header and diffs for one or more changesets |
|
238 | export dump the header and diffs for one or more changesets | |
239 | forget forget the specified files on the next commit |
|
239 | forget forget the specified files on the next commit | |
240 | grep search for a pattern in specified files and revisions |
|
240 | grep search for a pattern in specified files and revisions | |
241 | heads show current repository heads or show branch heads |
|
241 | heads show current repository heads or show branch heads | |
242 | help show help for a given topic or a help overview |
|
242 | help show help for a given topic or a help overview | |
243 | identify identify the working copy or specified revision |
|
243 | identify identify the working copy or specified revision | |
244 | import import an ordered set of patches |
|
244 | import import an ordered set of patches | |
245 | incoming show new changesets found in source |
|
245 | incoming show new changesets found in source | |
246 | init create a new repository in the given directory |
|
246 | init create a new repository in the given directory | |
247 | locate locate files matching specific patterns |
|
247 | locate locate files matching specific patterns | |
248 | log show revision history of entire repository or files |
|
248 | log show revision history of entire repository or files | |
249 | manifest output the current or given revision of the project manifest |
|
249 | manifest output the current or given revision of the project manifest | |
250 | merge merge working directory with another revision |
|
250 | merge merge working directory with another revision | |
251 | outgoing show changesets not found in the destination |
|
251 | outgoing show changesets not found in the destination | |
252 | parents show the parents of the working directory or revision |
|
252 | parents show the parents of the working directory or revision | |
253 | paths show aliases for remote repositories |
|
253 | paths show aliases for remote repositories | |
254 | pull pull changes from the specified source |
|
254 | pull pull changes from the specified source | |
255 | push push changes to the specified destination |
|
255 | push push changes to the specified destination | |
256 | recover roll back an interrupted transaction |
|
256 | recover roll back an interrupted transaction | |
257 | remove remove the specified files on the next commit |
|
257 | remove remove the specified files on the next commit | |
258 | rename rename files; equivalent of copy + remove |
|
258 | rename rename files; equivalent of copy + remove | |
259 | resolve various operations to help finish a merge |
|
259 | resolve redo merges or set/view the merge status of files | |
260 | revert restore individual files or directories to an earlier state |
|
260 | revert restore individual files or directories to an earlier state | |
261 | rollback roll back the last transaction (dangerous) |
|
261 | rollback roll back the last transaction (dangerous) | |
262 | root print the root (top) of the current working directory |
|
262 | root print the root (top) of the current working directory | |
263 | serve start stand-alone webserver |
|
263 | serve start stand-alone webserver | |
264 | showconfig show combined config settings from all hgrc files |
|
264 | showconfig show combined config settings from all hgrc files | |
265 | status show changed files in the working directory |
|
265 | status show changed files in the working directory | |
266 | summary summarize working directory state |
|
266 | summary summarize working directory state | |
267 | tag add one or more tags for the current or given revision |
|
267 | tag add one or more tags for the current or given revision | |
268 | tags list repository tags |
|
268 | tags list repository tags | |
269 | tip show the tip revision |
|
269 | tip show the tip revision | |
270 | unbundle apply one or more changegroup files |
|
270 | unbundle apply one or more changegroup files | |
271 | update update working directory (or switch revisions) |
|
271 | update update working directory (or switch revisions) | |
272 | verify verify the integrity of the repository |
|
272 | verify verify the integrity of the repository | |
273 | version output version and copyright information |
|
273 | version output version and copyright information | |
274 |
|
274 | |||
275 | additional help topics: |
|
275 | additional help topics: | |
276 |
|
276 | |||
277 | config Configuration Files |
|
277 | config Configuration Files | |
278 | dates Date Formats |
|
278 | dates Date Formats | |
279 | patterns File Name Patterns |
|
279 | patterns File Name Patterns | |
280 | environment Environment Variables |
|
280 | environment Environment Variables | |
281 | revisions Specifying Single Revisions |
|
281 | revisions Specifying Single Revisions | |
282 | multirevs Specifying Multiple Revisions |
|
282 | multirevs Specifying Multiple Revisions | |
283 | revsets Specifying Revision Sets |
|
283 | revsets Specifying Revision Sets | |
284 | diffs Diff Formats |
|
284 | diffs Diff Formats | |
285 | templating Template Usage |
|
285 | templating Template Usage | |
286 | urls URL Paths |
|
286 | urls URL Paths | |
287 | extensions Using additional features |
|
287 | extensions Using additional features | |
288 | hgweb Configuring hgweb |
|
288 | hgweb Configuring hgweb | |
289 | glossary Glossary |
|
289 | glossary Glossary | |
290 |
|
290 | |||
291 | use "hg -v help" to show aliases and global options |
|
291 | use "hg -v help" to show aliases and global options | |
292 | %% not tested: --debugger |
|
292 | %% not tested: --debugger |
@@ -1,678 +1,678 b'' | |||||
1 | Mercurial Distributed SCM |
|
1 | Mercurial Distributed SCM | |
2 |
|
2 | |||
3 | basic commands: |
|
3 | basic commands: | |
4 |
|
4 | |||
5 | add add the specified files on the next commit |
|
5 | add add the specified files on the next commit | |
6 | annotate show changeset information by line for each file |
|
6 | annotate show changeset information by line for each file | |
7 | clone make a copy of an existing repository |
|
7 | clone make a copy of an existing repository | |
8 | commit commit the specified files or all outstanding changes |
|
8 | commit commit the specified files or all outstanding changes | |
9 | diff diff repository (or selected files) |
|
9 | diff diff repository (or selected files) | |
10 | export dump the header and diffs for one or more changesets |
|
10 | export dump the header and diffs for one or more changesets | |
11 | forget forget the specified files on the next commit |
|
11 | forget forget the specified files on the next commit | |
12 | init create a new repository in the given directory |
|
12 | init create a new repository in the given directory | |
13 | log show revision history of entire repository or files |
|
13 | log show revision history of entire repository or files | |
14 | merge merge working directory with another revision |
|
14 | merge merge working directory with another revision | |
15 | pull pull changes from the specified source |
|
15 | pull pull changes from the specified source | |
16 | push push changes to the specified destination |
|
16 | push push changes to the specified destination | |
17 | remove remove the specified files on the next commit |
|
17 | remove remove the specified files on the next commit | |
18 | serve start stand-alone webserver |
|
18 | serve start stand-alone webserver | |
19 | status show changed files in the working directory |
|
19 | status show changed files in the working directory | |
20 | summary summarize working directory state |
|
20 | summary summarize working directory state | |
21 | update update working directory (or switch revisions) |
|
21 | update update working directory (or switch revisions) | |
22 |
|
22 | |||
23 | use "hg help" for the full list of commands or "hg -v" for details |
|
23 | use "hg help" for the full list of commands or "hg -v" for details | |
24 | add add the specified files on the next commit |
|
24 | add add the specified files on the next commit | |
25 | annotate show changeset information by line for each file |
|
25 | annotate show changeset information by line for each file | |
26 | clone make a copy of an existing repository |
|
26 | clone make a copy of an existing repository | |
27 | commit commit the specified files or all outstanding changes |
|
27 | commit commit the specified files or all outstanding changes | |
28 | diff diff repository (or selected files) |
|
28 | diff diff repository (or selected files) | |
29 | export dump the header and diffs for one or more changesets |
|
29 | export dump the header and diffs for one or more changesets | |
30 | forget forget the specified files on the next commit |
|
30 | forget forget the specified files on the next commit | |
31 | init create a new repository in the given directory |
|
31 | init create a new repository in the given directory | |
32 | log show revision history of entire repository or files |
|
32 | log show revision history of entire repository or files | |
33 | merge merge working directory with another revision |
|
33 | merge merge working directory with another revision | |
34 | pull pull changes from the specified source |
|
34 | pull pull changes from the specified source | |
35 | push push changes to the specified destination |
|
35 | push push changes to the specified destination | |
36 | remove remove the specified files on the next commit |
|
36 | remove remove the specified files on the next commit | |
37 | serve start stand-alone webserver |
|
37 | serve start stand-alone webserver | |
38 | status show changed files in the working directory |
|
38 | status show changed files in the working directory | |
39 | summary summarize working directory state |
|
39 | summary summarize working directory state | |
40 | update update working directory (or switch revisions) |
|
40 | update update working directory (or switch revisions) | |
41 | Mercurial Distributed SCM |
|
41 | Mercurial Distributed SCM | |
42 |
|
42 | |||
43 | list of commands: |
|
43 | list of commands: | |
44 |
|
44 | |||
45 | add add the specified files on the next commit |
|
45 | add add the specified files on the next commit | |
46 | addremove add all new files, delete all missing files |
|
46 | addremove add all new files, delete all missing files | |
47 | annotate show changeset information by line for each file |
|
47 | annotate show changeset information by line for each file | |
48 | archive create an unversioned archive of a repository revision |
|
48 | archive create an unversioned archive of a repository revision | |
49 | backout reverse effect of earlier changeset |
|
49 | backout reverse effect of earlier changeset | |
50 | bisect subdivision search of changesets |
|
50 | bisect subdivision search of changesets | |
51 | branch set or show the current branch name |
|
51 | branch set or show the current branch name | |
52 | branches list repository named branches |
|
52 | branches list repository named branches | |
53 | bundle create a changegroup file |
|
53 | bundle create a changegroup file | |
54 | cat output the current or given revision of files |
|
54 | cat output the current or given revision of files | |
55 | clone make a copy of an existing repository |
|
55 | clone make a copy of an existing repository | |
56 | commit commit the specified files or all outstanding changes |
|
56 | commit commit the specified files or all outstanding changes | |
57 | copy mark files as copied for the next commit |
|
57 | copy mark files as copied for the next commit | |
58 | diff diff repository (or selected files) |
|
58 | diff diff repository (or selected files) | |
59 | export dump the header and diffs for one or more changesets |
|
59 | export dump the header and diffs for one or more changesets | |
60 | forget forget the specified files on the next commit |
|
60 | forget forget the specified files on the next commit | |
61 | grep search for a pattern in specified files and revisions |
|
61 | grep search for a pattern in specified files and revisions | |
62 | heads show current repository heads or show branch heads |
|
62 | heads show current repository heads or show branch heads | |
63 | help show help for a given topic or a help overview |
|
63 | help show help for a given topic or a help overview | |
64 | identify identify the working copy or specified revision |
|
64 | identify identify the working copy or specified revision | |
65 | import import an ordered set of patches |
|
65 | import import an ordered set of patches | |
66 | incoming show new changesets found in source |
|
66 | incoming show new changesets found in source | |
67 | init create a new repository in the given directory |
|
67 | init create a new repository in the given directory | |
68 | locate locate files matching specific patterns |
|
68 | locate locate files matching specific patterns | |
69 | log show revision history of entire repository or files |
|
69 | log show revision history of entire repository or files | |
70 | manifest output the current or given revision of the project manifest |
|
70 | manifest output the current or given revision of the project manifest | |
71 | merge merge working directory with another revision |
|
71 | merge merge working directory with another revision | |
72 | outgoing show changesets not found in the destination |
|
72 | outgoing show changesets not found in the destination | |
73 | parents show the parents of the working directory or revision |
|
73 | parents show the parents of the working directory or revision | |
74 | paths show aliases for remote repositories |
|
74 | paths show aliases for remote repositories | |
75 | pull pull changes from the specified source |
|
75 | pull pull changes from the specified source | |
76 | push push changes to the specified destination |
|
76 | push push changes to the specified destination | |
77 | recover roll back an interrupted transaction |
|
77 | recover roll back an interrupted transaction | |
78 | remove remove the specified files on the next commit |
|
78 | remove remove the specified files on the next commit | |
79 | rename rename files; equivalent of copy + remove |
|
79 | rename rename files; equivalent of copy + remove | |
80 | resolve various operations to help finish a merge |
|
80 | resolve redo merges or set/view the merge status of files | |
81 | revert restore individual files or directories to an earlier state |
|
81 | revert restore individual files or directories to an earlier state | |
82 | rollback roll back the last transaction (dangerous) |
|
82 | rollback roll back the last transaction (dangerous) | |
83 | root print the root (top) of the current working directory |
|
83 | root print the root (top) of the current working directory | |
84 | serve start stand-alone webserver |
|
84 | serve start stand-alone webserver | |
85 | showconfig show combined config settings from all hgrc files |
|
85 | showconfig show combined config settings from all hgrc files | |
86 | status show changed files in the working directory |
|
86 | status show changed files in the working directory | |
87 | summary summarize working directory state |
|
87 | summary summarize working directory state | |
88 | tag add one or more tags for the current or given revision |
|
88 | tag add one or more tags for the current or given revision | |
89 | tags list repository tags |
|
89 | tags list repository tags | |
90 | tip show the tip revision |
|
90 | tip show the tip revision | |
91 | unbundle apply one or more changegroup files |
|
91 | unbundle apply one or more changegroup files | |
92 | update update working directory (or switch revisions) |
|
92 | update update working directory (or switch revisions) | |
93 | verify verify the integrity of the repository |
|
93 | verify verify the integrity of the repository | |
94 | version output version and copyright information |
|
94 | version output version and copyright information | |
95 |
|
95 | |||
96 | additional help topics: |
|
96 | additional help topics: | |
97 |
|
97 | |||
98 | config Configuration Files |
|
98 | config Configuration Files | |
99 | dates Date Formats |
|
99 | dates Date Formats | |
100 | patterns File Name Patterns |
|
100 | patterns File Name Patterns | |
101 | environment Environment Variables |
|
101 | environment Environment Variables | |
102 | revisions Specifying Single Revisions |
|
102 | revisions Specifying Single Revisions | |
103 | multirevs Specifying Multiple Revisions |
|
103 | multirevs Specifying Multiple Revisions | |
104 | revsets Specifying Revision Sets |
|
104 | revsets Specifying Revision Sets | |
105 | diffs Diff Formats |
|
105 | diffs Diff Formats | |
106 | templating Template Usage |
|
106 | templating Template Usage | |
107 | urls URL Paths |
|
107 | urls URL Paths | |
108 | extensions Using additional features |
|
108 | extensions Using additional features | |
109 | hgweb Configuring hgweb |
|
109 | hgweb Configuring hgweb | |
110 | glossary Glossary |
|
110 | glossary Glossary | |
111 |
|
111 | |||
112 | use "hg -v help" to show aliases and global options |
|
112 | use "hg -v help" to show aliases and global options | |
113 | add add the specified files on the next commit |
|
113 | add add the specified files on the next commit | |
114 | addremove add all new files, delete all missing files |
|
114 | addremove add all new files, delete all missing files | |
115 | annotate show changeset information by line for each file |
|
115 | annotate show changeset information by line for each file | |
116 | archive create an unversioned archive of a repository revision |
|
116 | archive create an unversioned archive of a repository revision | |
117 | backout reverse effect of earlier changeset |
|
117 | backout reverse effect of earlier changeset | |
118 | bisect subdivision search of changesets |
|
118 | bisect subdivision search of changesets | |
119 | branch set or show the current branch name |
|
119 | branch set or show the current branch name | |
120 | branches list repository named branches |
|
120 | branches list repository named branches | |
121 | bundle create a changegroup file |
|
121 | bundle create a changegroup file | |
122 | cat output the current or given revision of files |
|
122 | cat output the current or given revision of files | |
123 | clone make a copy of an existing repository |
|
123 | clone make a copy of an existing repository | |
124 | commit commit the specified files or all outstanding changes |
|
124 | commit commit the specified files or all outstanding changes | |
125 | copy mark files as copied for the next commit |
|
125 | copy mark files as copied for the next commit | |
126 | diff diff repository (or selected files) |
|
126 | diff diff repository (or selected files) | |
127 | export dump the header and diffs for one or more changesets |
|
127 | export dump the header and diffs for one or more changesets | |
128 | forget forget the specified files on the next commit |
|
128 | forget forget the specified files on the next commit | |
129 | grep search for a pattern in specified files and revisions |
|
129 | grep search for a pattern in specified files and revisions | |
130 | heads show current repository heads or show branch heads |
|
130 | heads show current repository heads or show branch heads | |
131 | help show help for a given topic or a help overview |
|
131 | help show help for a given topic or a help overview | |
132 | identify identify the working copy or specified revision |
|
132 | identify identify the working copy or specified revision | |
133 | import import an ordered set of patches |
|
133 | import import an ordered set of patches | |
134 | incoming show new changesets found in source |
|
134 | incoming show new changesets found in source | |
135 | init create a new repository in the given directory |
|
135 | init create a new repository in the given directory | |
136 | locate locate files matching specific patterns |
|
136 | locate locate files matching specific patterns | |
137 | log show revision history of entire repository or files |
|
137 | log show revision history of entire repository or files | |
138 | manifest output the current or given revision of the project manifest |
|
138 | manifest output the current or given revision of the project manifest | |
139 | merge merge working directory with another revision |
|
139 | merge merge working directory with another revision | |
140 | outgoing show changesets not found in the destination |
|
140 | outgoing show changesets not found in the destination | |
141 | parents show the parents of the working directory or revision |
|
141 | parents show the parents of the working directory or revision | |
142 | paths show aliases for remote repositories |
|
142 | paths show aliases for remote repositories | |
143 | pull pull changes from the specified source |
|
143 | pull pull changes from the specified source | |
144 | push push changes to the specified destination |
|
144 | push push changes to the specified destination | |
145 | recover roll back an interrupted transaction |
|
145 | recover roll back an interrupted transaction | |
146 | remove remove the specified files on the next commit |
|
146 | remove remove the specified files on the next commit | |
147 | rename rename files; equivalent of copy + remove |
|
147 | rename rename files; equivalent of copy + remove | |
148 | resolve various operations to help finish a merge |
|
148 | resolve redo merges or set/view the merge status of files | |
149 | revert restore individual files or directories to an earlier state |
|
149 | revert restore individual files or directories to an earlier state | |
150 | rollback roll back the last transaction (dangerous) |
|
150 | rollback roll back the last transaction (dangerous) | |
151 | root print the root (top) of the current working directory |
|
151 | root print the root (top) of the current working directory | |
152 | serve start stand-alone webserver |
|
152 | serve start stand-alone webserver | |
153 | showconfig show combined config settings from all hgrc files |
|
153 | showconfig show combined config settings from all hgrc files | |
154 | status show changed files in the working directory |
|
154 | status show changed files in the working directory | |
155 | summary summarize working directory state |
|
155 | summary summarize working directory state | |
156 | tag add one or more tags for the current or given revision |
|
156 | tag add one or more tags for the current or given revision | |
157 | tags list repository tags |
|
157 | tags list repository tags | |
158 | tip show the tip revision |
|
158 | tip show the tip revision | |
159 | unbundle apply one or more changegroup files |
|
159 | unbundle apply one or more changegroup files | |
160 | update update working directory (or switch revisions) |
|
160 | update update working directory (or switch revisions) | |
161 | verify verify the integrity of the repository |
|
161 | verify verify the integrity of the repository | |
162 | version output version and copyright information |
|
162 | version output version and copyright information | |
163 |
|
163 | |||
164 | additional help topics: |
|
164 | additional help topics: | |
165 |
|
165 | |||
166 | config Configuration Files |
|
166 | config Configuration Files | |
167 | dates Date Formats |
|
167 | dates Date Formats | |
168 | patterns File Name Patterns |
|
168 | patterns File Name Patterns | |
169 | environment Environment Variables |
|
169 | environment Environment Variables | |
170 | revisions Specifying Single Revisions |
|
170 | revisions Specifying Single Revisions | |
171 | multirevs Specifying Multiple Revisions |
|
171 | multirevs Specifying Multiple Revisions | |
172 | revsets Specifying Revision Sets |
|
172 | revsets Specifying Revision Sets | |
173 | diffs Diff Formats |
|
173 | diffs Diff Formats | |
174 | templating Template Usage |
|
174 | templating Template Usage | |
175 | urls URL Paths |
|
175 | urls URL Paths | |
176 | extensions Using additional features |
|
176 | extensions Using additional features | |
177 | hgweb Configuring hgweb |
|
177 | hgweb Configuring hgweb | |
178 | glossary Glossary |
|
178 | glossary Glossary | |
179 | %% test short command list with verbose option |
|
179 | %% test short command list with verbose option | |
180 | Mercurial Distributed SCM (version xxx) |
|
180 | Mercurial Distributed SCM (version xxx) | |
181 |
|
181 | |||
182 | Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others |
|
182 | Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others | |
183 | This is free software; see the source for copying conditions. There is NO |
|
183 | This is free software; see the source for copying conditions. There is NO | |
184 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
|
184 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
185 |
|
185 | |||
186 | basic commands: |
|
186 | basic commands: | |
187 |
|
187 | |||
188 | add: |
|
188 | add: | |
189 | add the specified files on the next commit |
|
189 | add the specified files on the next commit | |
190 | annotate, blame: |
|
190 | annotate, blame: | |
191 | show changeset information by line for each file |
|
191 | show changeset information by line for each file | |
192 | clone: |
|
192 | clone: | |
193 | make a copy of an existing repository |
|
193 | make a copy of an existing repository | |
194 | commit, ci: |
|
194 | commit, ci: | |
195 | commit the specified files or all outstanding changes |
|
195 | commit the specified files or all outstanding changes | |
196 | diff: |
|
196 | diff: | |
197 | diff repository (or selected files) |
|
197 | diff repository (or selected files) | |
198 | export: |
|
198 | export: | |
199 | dump the header and diffs for one or more changesets |
|
199 | dump the header and diffs for one or more changesets | |
200 | forget: |
|
200 | forget: | |
201 | forget the specified files on the next commit |
|
201 | forget the specified files on the next commit | |
202 | init: |
|
202 | init: | |
203 | create a new repository in the given directory |
|
203 | create a new repository in the given directory | |
204 | log, history: |
|
204 | log, history: | |
205 | show revision history of entire repository or files |
|
205 | show revision history of entire repository or files | |
206 | merge: |
|
206 | merge: | |
207 | merge working directory with another revision |
|
207 | merge working directory with another revision | |
208 | pull: |
|
208 | pull: | |
209 | pull changes from the specified source |
|
209 | pull changes from the specified source | |
210 | push: |
|
210 | push: | |
211 | push changes to the specified destination |
|
211 | push changes to the specified destination | |
212 | remove, rm: |
|
212 | remove, rm: | |
213 | remove the specified files on the next commit |
|
213 | remove the specified files on the next commit | |
214 | serve: |
|
214 | serve: | |
215 | start stand-alone webserver |
|
215 | start stand-alone webserver | |
216 | status, st: |
|
216 | status, st: | |
217 | show changed files in the working directory |
|
217 | show changed files in the working directory | |
218 | summary, sum: |
|
218 | summary, sum: | |
219 | summarize working directory state |
|
219 | summarize working directory state | |
220 | update, up, checkout, co: |
|
220 | update, up, checkout, co: | |
221 | update working directory (or switch revisions) |
|
221 | update working directory (or switch revisions) | |
222 |
|
222 | |||
223 | global options: |
|
223 | global options: | |
224 | -R --repository REPO repository root directory or name of overlay bundle |
|
224 | -R --repository REPO repository root directory or name of overlay bundle | |
225 | file |
|
225 | file | |
226 | --cwd DIR change working directory |
|
226 | --cwd DIR change working directory | |
227 | -y --noninteractive do not prompt, assume 'yes' for any required answers |
|
227 | -y --noninteractive do not prompt, assume 'yes' for any required answers | |
228 | -q --quiet suppress output |
|
228 | -q --quiet suppress output | |
229 | -v --verbose enable additional output |
|
229 | -v --verbose enable additional output | |
230 | --config CONFIG [+] set/override config option (use 'section.name=value') |
|
230 | --config CONFIG [+] set/override config option (use 'section.name=value') | |
231 | --debug enable debugging output |
|
231 | --debug enable debugging output | |
232 | --debugger start debugger |
|
232 | --debugger start debugger | |
233 | --encoding ENCODE set the charset encoding (default: ascii) |
|
233 | --encoding ENCODE set the charset encoding (default: ascii) | |
234 | --encodingmode MODE set the charset encoding mode (default: strict) |
|
234 | --encodingmode MODE set the charset encoding mode (default: strict) | |
235 | --traceback always print a traceback on exception |
|
235 | --traceback always print a traceback on exception | |
236 | --time time how long the command takes |
|
236 | --time time how long the command takes | |
237 | --profile print command execution profile |
|
237 | --profile print command execution profile | |
238 | --version output version information and exit |
|
238 | --version output version information and exit | |
239 | -h --help display help and exit |
|
239 | -h --help display help and exit | |
240 |
|
240 | |||
241 | [+] marked option can be specified multiple times |
|
241 | [+] marked option can be specified multiple times | |
242 |
|
242 | |||
243 | use "hg help" for the full list of commands |
|
243 | use "hg help" for the full list of commands | |
244 | hg add [OPTION]... [FILE]... |
|
244 | hg add [OPTION]... [FILE]... | |
245 |
|
245 | |||
246 | add the specified files on the next commit |
|
246 | add the specified files on the next commit | |
247 |
|
247 | |||
248 | Schedule files to be version controlled and added to the repository. |
|
248 | Schedule files to be version controlled and added to the repository. | |
249 |
|
249 | |||
250 | The files will be added to the repository at the next commit. To undo an |
|
250 | The files will be added to the repository at the next commit. To undo an | |
251 | add before that, see "hg forget". |
|
251 | add before that, see "hg forget". | |
252 |
|
252 | |||
253 | If no names are given, add all files to the repository. |
|
253 | If no names are given, add all files to the repository. | |
254 |
|
254 | |||
255 | Returns 0 if all files are successfully added. |
|
255 | Returns 0 if all files are successfully added. | |
256 |
|
256 | |||
257 | use "hg -v help add" to show verbose help |
|
257 | use "hg -v help add" to show verbose help | |
258 |
|
258 | |||
259 | options: |
|
259 | options: | |
260 |
|
260 | |||
261 | -I --include PATTERN [+] include names matching the given patterns |
|
261 | -I --include PATTERN [+] include names matching the given patterns | |
262 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
262 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
263 | -n --dry-run do not perform actions, just print output |
|
263 | -n --dry-run do not perform actions, just print output | |
264 |
|
264 | |||
265 | [+] marked option can be specified multiple times |
|
265 | [+] marked option can be specified multiple times | |
266 |
|
266 | |||
267 | use "hg -v help add" to show global options |
|
267 | use "hg -v help add" to show global options | |
268 | %% verbose help for add |
|
268 | %% verbose help for add | |
269 | hg add [OPTION]... [FILE]... |
|
269 | hg add [OPTION]... [FILE]... | |
270 |
|
270 | |||
271 | add the specified files on the next commit |
|
271 | add the specified files on the next commit | |
272 |
|
272 | |||
273 | Schedule files to be version controlled and added to the repository. |
|
273 | Schedule files to be version controlled and added to the repository. | |
274 |
|
274 | |||
275 | The files will be added to the repository at the next commit. To undo an |
|
275 | The files will be added to the repository at the next commit. To undo an | |
276 | add before that, see "hg forget". |
|
276 | add before that, see "hg forget". | |
277 |
|
277 | |||
278 | If no names are given, add all files to the repository. |
|
278 | If no names are given, add all files to the repository. | |
279 |
|
279 | |||
280 | An example showing how new (unknown) files are added automatically by "hg |
|
280 | An example showing how new (unknown) files are added automatically by "hg | |
281 | add": |
|
281 | add": | |
282 |
|
282 | |||
283 | $ ls |
|
283 | $ ls | |
284 | foo.c |
|
284 | foo.c | |
285 | $ hg status |
|
285 | $ hg status | |
286 | ? foo.c |
|
286 | ? foo.c | |
287 | $ hg add |
|
287 | $ hg add | |
288 | adding foo.c |
|
288 | adding foo.c | |
289 | $ hg status |
|
289 | $ hg status | |
290 | A foo.c |
|
290 | A foo.c | |
291 |
|
291 | |||
292 | Returns 0 if all files are successfully added. |
|
292 | Returns 0 if all files are successfully added. | |
293 |
|
293 | |||
294 | options: |
|
294 | options: | |
295 |
|
295 | |||
296 | -I --include PATTERN [+] include names matching the given patterns |
|
296 | -I --include PATTERN [+] include names matching the given patterns | |
297 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
297 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
298 | -n --dry-run do not perform actions, just print output |
|
298 | -n --dry-run do not perform actions, just print output | |
299 |
|
299 | |||
300 | global options: |
|
300 | global options: | |
301 | -R --repository REPO repository root directory or name of overlay bundle |
|
301 | -R --repository REPO repository root directory or name of overlay bundle | |
302 | file |
|
302 | file | |
303 | --cwd DIR change working directory |
|
303 | --cwd DIR change working directory | |
304 | -y --noninteractive do not prompt, assume 'yes' for any required |
|
304 | -y --noninteractive do not prompt, assume 'yes' for any required | |
305 | answers |
|
305 | answers | |
306 | -q --quiet suppress output |
|
306 | -q --quiet suppress output | |
307 | -v --verbose enable additional output |
|
307 | -v --verbose enable additional output | |
308 | --config CONFIG [+] set/override config option (use |
|
308 | --config CONFIG [+] set/override config option (use | |
309 | 'section.name=value') |
|
309 | 'section.name=value') | |
310 | --debug enable debugging output |
|
310 | --debug enable debugging output | |
311 | --debugger start debugger |
|
311 | --debugger start debugger | |
312 | --encoding ENCODE set the charset encoding (default: ascii) |
|
312 | --encoding ENCODE set the charset encoding (default: ascii) | |
313 | --encodingmode MODE set the charset encoding mode (default: strict) |
|
313 | --encodingmode MODE set the charset encoding mode (default: strict) | |
314 | --traceback always print a traceback on exception |
|
314 | --traceback always print a traceback on exception | |
315 | --time time how long the command takes |
|
315 | --time time how long the command takes | |
316 | --profile print command execution profile |
|
316 | --profile print command execution profile | |
317 | --version output version information and exit |
|
317 | --version output version information and exit | |
318 | -h --help display help and exit |
|
318 | -h --help display help and exit | |
319 |
|
319 | |||
320 | [+] marked option can be specified multiple times |
|
320 | [+] marked option can be specified multiple times | |
321 | %% test help option with version option |
|
321 | %% test help option with version option | |
322 | Mercurial Distributed SCM (version xxx) |
|
322 | Mercurial Distributed SCM (version xxx) | |
323 |
|
323 | |||
324 | Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others |
|
324 | Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others | |
325 | This is free software; see the source for copying conditions. There is NO |
|
325 | This is free software; see the source for copying conditions. There is NO | |
326 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
|
326 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
327 |
|
327 | |||
328 | hg add [OPTION]... [FILE]... |
|
328 | hg add [OPTION]... [FILE]... | |
329 |
|
329 | |||
330 | add the specified files on the next commit |
|
330 | add the specified files on the next commit | |
331 |
|
331 | |||
332 | Schedule files to be version controlled and added to the repository. |
|
332 | Schedule files to be version controlled and added to the repository. | |
333 |
|
333 | |||
334 | The files will be added to the repository at the next commit. To undo an |
|
334 | The files will be added to the repository at the next commit. To undo an | |
335 | add before that, see "hg forget". |
|
335 | add before that, see "hg forget". | |
336 |
|
336 | |||
337 | If no names are given, add all files to the repository. |
|
337 | If no names are given, add all files to the repository. | |
338 |
|
338 | |||
339 | Returns 0 if all files are successfully added. |
|
339 | Returns 0 if all files are successfully added. | |
340 |
|
340 | |||
341 | use "hg -v help add" to show verbose help |
|
341 | use "hg -v help add" to show verbose help | |
342 |
|
342 | |||
343 | options: |
|
343 | options: | |
344 |
|
344 | |||
345 | -I --include PATTERN [+] include names matching the given patterns |
|
345 | -I --include PATTERN [+] include names matching the given patterns | |
346 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
346 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
347 | -n --dry-run do not perform actions, just print output |
|
347 | -n --dry-run do not perform actions, just print output | |
348 |
|
348 | |||
349 | [+] marked option can be specified multiple times |
|
349 | [+] marked option can be specified multiple times | |
350 |
|
350 | |||
351 | use "hg -v help add" to show global options |
|
351 | use "hg -v help add" to show global options | |
352 | hg add: option --skjdfks not recognized |
|
352 | hg add: option --skjdfks not recognized | |
353 | hg add [OPTION]... [FILE]... |
|
353 | hg add [OPTION]... [FILE]... | |
354 |
|
354 | |||
355 | add the specified files on the next commit |
|
355 | add the specified files on the next commit | |
356 |
|
356 | |||
357 | Schedule files to be version controlled and added to the repository. |
|
357 | Schedule files to be version controlled and added to the repository. | |
358 |
|
358 | |||
359 | The files will be added to the repository at the next commit. To undo an |
|
359 | The files will be added to the repository at the next commit. To undo an | |
360 | add before that, see "hg forget". |
|
360 | add before that, see "hg forget". | |
361 |
|
361 | |||
362 | If no names are given, add all files to the repository. |
|
362 | If no names are given, add all files to the repository. | |
363 |
|
363 | |||
364 | Returns 0 if all files are successfully added. |
|
364 | Returns 0 if all files are successfully added. | |
365 |
|
365 | |||
366 | use "hg -v help add" to show verbose help |
|
366 | use "hg -v help add" to show verbose help | |
367 |
|
367 | |||
368 | options: |
|
368 | options: | |
369 |
|
369 | |||
370 | -I --include PATTERN [+] include names matching the given patterns |
|
370 | -I --include PATTERN [+] include names matching the given patterns | |
371 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
371 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
372 | -n --dry-run do not perform actions, just print output |
|
372 | -n --dry-run do not perform actions, just print output | |
373 |
|
373 | |||
374 | [+] marked option can be specified multiple times |
|
374 | [+] marked option can be specified multiple times | |
375 |
|
375 | |||
376 | use "hg -v help add" to show global options |
|
376 | use "hg -v help add" to show global options | |
377 | %% test ambiguous command help |
|
377 | %% test ambiguous command help | |
378 | list of commands: |
|
378 | list of commands: | |
379 |
|
379 | |||
380 | add add the specified files on the next commit |
|
380 | add add the specified files on the next commit | |
381 | addremove add all new files, delete all missing files |
|
381 | addremove add all new files, delete all missing files | |
382 |
|
382 | |||
383 | use "hg -v help ad" to show aliases and global options |
|
383 | use "hg -v help ad" to show aliases and global options | |
384 | %% test command without options |
|
384 | %% test command without options | |
385 | hg verify |
|
385 | hg verify | |
386 |
|
386 | |||
387 | verify the integrity of the repository |
|
387 | verify the integrity of the repository | |
388 |
|
388 | |||
389 | Verify the integrity of the current repository. |
|
389 | Verify the integrity of the current repository. | |
390 |
|
390 | |||
391 | This will perform an extensive check of the repository's integrity, |
|
391 | This will perform an extensive check of the repository's integrity, | |
392 | validating the hashes and checksums of each entry in the changelog, |
|
392 | validating the hashes and checksums of each entry in the changelog, | |
393 | manifest, and tracked files, as well as the integrity of their crosslinks |
|
393 | manifest, and tracked files, as well as the integrity of their crosslinks | |
394 | and indices. |
|
394 | and indices. | |
395 |
|
395 | |||
396 | Returns 0 on success, 1 if errors are encountered. |
|
396 | Returns 0 on success, 1 if errors are encountered. | |
397 |
|
397 | |||
398 | use "hg -v help verify" to show global options |
|
398 | use "hg -v help verify" to show global options | |
399 | hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]... |
|
399 | hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]... | |
400 |
|
400 | |||
401 | diff repository (or selected files) |
|
401 | diff repository (or selected files) | |
402 |
|
402 | |||
403 | Show differences between revisions for the specified files. |
|
403 | Show differences between revisions for the specified files. | |
404 |
|
404 | |||
405 | Differences between files are shown using the unified diff format. |
|
405 | Differences between files are shown using the unified diff format. | |
406 |
|
406 | |||
407 | NOTE: diff may generate unexpected results for merges, as it will default |
|
407 | NOTE: diff may generate unexpected results for merges, as it will default | |
408 | to comparing against the working directory's first parent changeset if no |
|
408 | to comparing against the working directory's first parent changeset if no | |
409 | revisions are specified. |
|
409 | revisions are specified. | |
410 |
|
410 | |||
411 | When two revision arguments are given, then changes are shown between |
|
411 | When two revision arguments are given, then changes are shown between | |
412 | those revisions. If only one revision is specified then that revision is |
|
412 | those revisions. If only one revision is specified then that revision is | |
413 | compared to the working directory, and, when no revisions are specified, |
|
413 | compared to the working directory, and, when no revisions are specified, | |
414 | the working directory files are compared to its parent. |
|
414 | the working directory files are compared to its parent. | |
415 |
|
415 | |||
416 | Alternatively you can specify -c/--change with a revision to see the |
|
416 | Alternatively you can specify -c/--change with a revision to see the | |
417 | changes in that changeset relative to its first parent. |
|
417 | changes in that changeset relative to its first parent. | |
418 |
|
418 | |||
419 | Without the -a/--text option, diff will avoid generating diffs of files it |
|
419 | Without the -a/--text option, diff will avoid generating diffs of files it | |
420 | detects as binary. With -a, diff will generate a diff anyway, probably |
|
420 | detects as binary. With -a, diff will generate a diff anyway, probably | |
421 | with undesirable results. |
|
421 | with undesirable results. | |
422 |
|
422 | |||
423 | Use the -g/--git option to generate diffs in the git extended diff format. |
|
423 | Use the -g/--git option to generate diffs in the git extended diff format. | |
424 | For more information, read "hg help diffs". |
|
424 | For more information, read "hg help diffs". | |
425 |
|
425 | |||
426 | Returns 0 on success. |
|
426 | Returns 0 on success. | |
427 |
|
427 | |||
428 | options: |
|
428 | options: | |
429 |
|
429 | |||
430 | -r --rev REV [+] revision |
|
430 | -r --rev REV [+] revision | |
431 | -c --change REV change made by revision |
|
431 | -c --change REV change made by revision | |
432 | -a --text treat all files as text |
|
432 | -a --text treat all files as text | |
433 | -g --git use git extended diff format |
|
433 | -g --git use git extended diff format | |
434 | --nodates omit dates from diff headers |
|
434 | --nodates omit dates from diff headers | |
435 | -p --show-function show which function each change is in |
|
435 | -p --show-function show which function each change is in | |
436 | --reverse produce a diff that undoes the changes |
|
436 | --reverse produce a diff that undoes the changes | |
437 | -w --ignore-all-space ignore white space when comparing lines |
|
437 | -w --ignore-all-space ignore white space when comparing lines | |
438 | -b --ignore-space-change ignore changes in the amount of white space |
|
438 | -b --ignore-space-change ignore changes in the amount of white space | |
439 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
439 | -B --ignore-blank-lines ignore changes whose lines are all blank | |
440 | -U --unified NUM number of lines of context to show |
|
440 | -U --unified NUM number of lines of context to show | |
441 | --stat output diffstat-style summary of changes |
|
441 | --stat output diffstat-style summary of changes | |
442 | -I --include PATTERN [+] include names matching the given patterns |
|
442 | -I --include PATTERN [+] include names matching the given patterns | |
443 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
443 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
444 |
|
444 | |||
445 | [+] marked option can be specified multiple times |
|
445 | [+] marked option can be specified multiple times | |
446 |
|
446 | |||
447 | use "hg -v help diff" to show global options |
|
447 | use "hg -v help diff" to show global options | |
448 | hg status [OPTION]... [FILE]... |
|
448 | hg status [OPTION]... [FILE]... | |
449 |
|
449 | |||
450 | aliases: st |
|
450 | aliases: st | |
451 |
|
451 | |||
452 | show changed files in the working directory |
|
452 | show changed files in the working directory | |
453 |
|
453 | |||
454 | Show status of files in the repository. If names are given, only files |
|
454 | Show status of files in the repository. If names are given, only files | |
455 | that match are shown. Files that are clean or ignored or the source of a |
|
455 | that match are shown. Files that are clean or ignored or the source of a | |
456 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, |
|
456 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, | |
457 | -C/--copies or -A/--all are given. Unless options described with "show |
|
457 | -C/--copies or -A/--all are given. Unless options described with "show | |
458 | only ..." are given, the options -mardu are used. |
|
458 | only ..." are given, the options -mardu are used. | |
459 |
|
459 | |||
460 | Option -q/--quiet hides untracked (unknown and ignored) files unless |
|
460 | Option -q/--quiet hides untracked (unknown and ignored) files unless | |
461 | explicitly requested with -u/--unknown or -i/--ignored. |
|
461 | explicitly requested with -u/--unknown or -i/--ignored. | |
462 |
|
462 | |||
463 | NOTE: status may appear to disagree with diff if permissions have changed |
|
463 | NOTE: status may appear to disagree with diff if permissions have changed | |
464 | or a merge has occurred. The standard diff format does not report |
|
464 | or a merge has occurred. The standard diff format does not report | |
465 | permission changes and diff only reports changes relative to one merge |
|
465 | permission changes and diff only reports changes relative to one merge | |
466 | parent. |
|
466 | parent. | |
467 |
|
467 | |||
468 | If one revision is given, it is used as the base revision. If two |
|
468 | If one revision is given, it is used as the base revision. If two | |
469 | revisions are given, the differences between them are shown. The --change |
|
469 | revisions are given, the differences between them are shown. The --change | |
470 | option can also be used as a shortcut to list the changed files of a |
|
470 | option can also be used as a shortcut to list the changed files of a | |
471 | revision from its first parent. |
|
471 | revision from its first parent. | |
472 |
|
472 | |||
473 | The codes used to show the status of files are: |
|
473 | The codes used to show the status of files are: | |
474 |
|
474 | |||
475 | M = modified |
|
475 | M = modified | |
476 | A = added |
|
476 | A = added | |
477 | R = removed |
|
477 | R = removed | |
478 | C = clean |
|
478 | C = clean | |
479 | ! = missing (deleted by non-hg command, but still tracked) |
|
479 | ! = missing (deleted by non-hg command, but still tracked) | |
480 | ? = not tracked |
|
480 | ? = not tracked | |
481 | I = ignored |
|
481 | I = ignored | |
482 | = origin of the previous file listed as A (added) |
|
482 | = origin of the previous file listed as A (added) | |
483 |
|
483 | |||
484 | Returns 0 on success. |
|
484 | Returns 0 on success. | |
485 |
|
485 | |||
486 | options: |
|
486 | options: | |
487 |
|
487 | |||
488 | -A --all show status of all files |
|
488 | -A --all show status of all files | |
489 | -m --modified show only modified files |
|
489 | -m --modified show only modified files | |
490 | -a --added show only added files |
|
490 | -a --added show only added files | |
491 | -r --removed show only removed files |
|
491 | -r --removed show only removed files | |
492 | -d --deleted show only deleted (but tracked) files |
|
492 | -d --deleted show only deleted (but tracked) files | |
493 | -c --clean show only files without changes |
|
493 | -c --clean show only files without changes | |
494 | -u --unknown show only unknown (not tracked) files |
|
494 | -u --unknown show only unknown (not tracked) files | |
495 | -i --ignored show only ignored files |
|
495 | -i --ignored show only ignored files | |
496 | -n --no-status hide status prefix |
|
496 | -n --no-status hide status prefix | |
497 | -C --copies show source of copied files |
|
497 | -C --copies show source of copied files | |
498 | -0 --print0 end filenames with NUL, for use with xargs |
|
498 | -0 --print0 end filenames with NUL, for use with xargs | |
499 | --rev REV [+] show difference from revision |
|
499 | --rev REV [+] show difference from revision | |
500 | --change REV list the changed files of a revision |
|
500 | --change REV list the changed files of a revision | |
501 | -I --include PATTERN [+] include names matching the given patterns |
|
501 | -I --include PATTERN [+] include names matching the given patterns | |
502 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
502 | -X --exclude PATTERN [+] exclude names matching the given patterns | |
503 |
|
503 | |||
504 | [+] marked option can be specified multiple times |
|
504 | [+] marked option can be specified multiple times | |
505 |
|
505 | |||
506 | use "hg -v help status" to show global options |
|
506 | use "hg -v help status" to show global options | |
507 | hg status [OPTION]... [FILE]... |
|
507 | hg status [OPTION]... [FILE]... | |
508 |
|
508 | |||
509 | show changed files in the working directory |
|
509 | show changed files in the working directory | |
510 | hg: unknown command 'foo' |
|
510 | hg: unknown command 'foo' | |
511 | Mercurial Distributed SCM |
|
511 | Mercurial Distributed SCM | |
512 |
|
512 | |||
513 | basic commands: |
|
513 | basic commands: | |
514 |
|
514 | |||
515 | add add the specified files on the next commit |
|
515 | add add the specified files on the next commit | |
516 | annotate show changeset information by line for each file |
|
516 | annotate show changeset information by line for each file | |
517 | clone make a copy of an existing repository |
|
517 | clone make a copy of an existing repository | |
518 | commit commit the specified files or all outstanding changes |
|
518 | commit commit the specified files or all outstanding changes | |
519 | diff diff repository (or selected files) |
|
519 | diff diff repository (or selected files) | |
520 | export dump the header and diffs for one or more changesets |
|
520 | export dump the header and diffs for one or more changesets | |
521 | forget forget the specified files on the next commit |
|
521 | forget forget the specified files on the next commit | |
522 | init create a new repository in the given directory |
|
522 | init create a new repository in the given directory | |
523 | log show revision history of entire repository or files |
|
523 | log show revision history of entire repository or files | |
524 | merge merge working directory with another revision |
|
524 | merge merge working directory with another revision | |
525 | pull pull changes from the specified source |
|
525 | pull pull changes from the specified source | |
526 | push push changes to the specified destination |
|
526 | push push changes to the specified destination | |
527 | remove remove the specified files on the next commit |
|
527 | remove remove the specified files on the next commit | |
528 | serve start stand-alone webserver |
|
528 | serve start stand-alone webserver | |
529 | status show changed files in the working directory |
|
529 | status show changed files in the working directory | |
530 | summary summarize working directory state |
|
530 | summary summarize working directory state | |
531 | update update working directory (or switch revisions) |
|
531 | update update working directory (or switch revisions) | |
532 |
|
532 | |||
533 | use "hg help" for the full list of commands or "hg -v" for details |
|
533 | use "hg help" for the full list of commands or "hg -v" for details | |
534 | hg: unknown command 'skjdfks' |
|
534 | hg: unknown command 'skjdfks' | |
535 | Mercurial Distributed SCM |
|
535 | Mercurial Distributed SCM | |
536 |
|
536 | |||
537 | basic commands: |
|
537 | basic commands: | |
538 |
|
538 | |||
539 | add add the specified files on the next commit |
|
539 | add add the specified files on the next commit | |
540 | annotate show changeset information by line for each file |
|
540 | annotate show changeset information by line for each file | |
541 | clone make a copy of an existing repository |
|
541 | clone make a copy of an existing repository | |
542 | commit commit the specified files or all outstanding changes |
|
542 | commit commit the specified files or all outstanding changes | |
543 | diff diff repository (or selected files) |
|
543 | diff diff repository (or selected files) | |
544 | export dump the header and diffs for one or more changesets |
|
544 | export dump the header and diffs for one or more changesets | |
545 | forget forget the specified files on the next commit |
|
545 | forget forget the specified files on the next commit | |
546 | init create a new repository in the given directory |
|
546 | init create a new repository in the given directory | |
547 | log show revision history of entire repository or files |
|
547 | log show revision history of entire repository or files | |
548 | merge merge working directory with another revision |
|
548 | merge merge working directory with another revision | |
549 | pull pull changes from the specified source |
|
549 | pull pull changes from the specified source | |
550 | push push changes to the specified destination |
|
550 | push push changes to the specified destination | |
551 | remove remove the specified files on the next commit |
|
551 | remove remove the specified files on the next commit | |
552 | serve start stand-alone webserver |
|
552 | serve start stand-alone webserver | |
553 | status show changed files in the working directory |
|
553 | status show changed files in the working directory | |
554 | summary summarize working directory state |
|
554 | summary summarize working directory state | |
555 | update update working directory (or switch revisions) |
|
555 | update update working directory (or switch revisions) | |
556 |
|
556 | |||
557 | use "hg help" for the full list of commands or "hg -v" for details |
|
557 | use "hg help" for the full list of commands or "hg -v" for details | |
558 | %% test command with no help text |
|
558 | %% test command with no help text | |
559 | hg nohelp |
|
559 | hg nohelp | |
560 |
|
560 | |||
561 | (no help text available) |
|
561 | (no help text available) | |
562 |
|
562 | |||
563 | use "hg -v help nohelp" to show global options |
|
563 | use "hg -v help nohelp" to show global options | |
564 | %% test that default list of commands omits extension commands |
|
564 | %% test that default list of commands omits extension commands | |
565 | Mercurial Distributed SCM |
|
565 | Mercurial Distributed SCM | |
566 |
|
566 | |||
567 | list of commands: |
|
567 | list of commands: | |
568 |
|
568 | |||
569 | add add the specified files on the next commit |
|
569 | add add the specified files on the next commit | |
570 | addremove add all new files, delete all missing files |
|
570 | addremove add all new files, delete all missing files | |
571 | annotate show changeset information by line for each file |
|
571 | annotate show changeset information by line for each file | |
572 | archive create an unversioned archive of a repository revision |
|
572 | archive create an unversioned archive of a repository revision | |
573 | backout reverse effect of earlier changeset |
|
573 | backout reverse effect of earlier changeset | |
574 | bisect subdivision search of changesets |
|
574 | bisect subdivision search of changesets | |
575 | branch set or show the current branch name |
|
575 | branch set or show the current branch name | |
576 | branches list repository named branches |
|
576 | branches list repository named branches | |
577 | bundle create a changegroup file |
|
577 | bundle create a changegroup file | |
578 | cat output the current or given revision of files |
|
578 | cat output the current or given revision of files | |
579 | clone make a copy of an existing repository |
|
579 | clone make a copy of an existing repository | |
580 | commit commit the specified files or all outstanding changes |
|
580 | commit commit the specified files or all outstanding changes | |
581 | copy mark files as copied for the next commit |
|
581 | copy mark files as copied for the next commit | |
582 | diff diff repository (or selected files) |
|
582 | diff diff repository (or selected files) | |
583 | export dump the header and diffs for one or more changesets |
|
583 | export dump the header and diffs for one or more changesets | |
584 | forget forget the specified files on the next commit |
|
584 | forget forget the specified files on the next commit | |
585 | grep search for a pattern in specified files and revisions |
|
585 | grep search for a pattern in specified files and revisions | |
586 | heads show current repository heads or show branch heads |
|
586 | heads show current repository heads or show branch heads | |
587 | help show help for a given topic or a help overview |
|
587 | help show help for a given topic or a help overview | |
588 | identify identify the working copy or specified revision |
|
588 | identify identify the working copy or specified revision | |
589 | import import an ordered set of patches |
|
589 | import import an ordered set of patches | |
590 | incoming show new changesets found in source |
|
590 | incoming show new changesets found in source | |
591 | init create a new repository in the given directory |
|
591 | init create a new repository in the given directory | |
592 | locate locate files matching specific patterns |
|
592 | locate locate files matching specific patterns | |
593 | log show revision history of entire repository or files |
|
593 | log show revision history of entire repository or files | |
594 | manifest output the current or given revision of the project manifest |
|
594 | manifest output the current or given revision of the project manifest | |
595 | merge merge working directory with another revision |
|
595 | merge merge working directory with another revision | |
596 | outgoing show changesets not found in the destination |
|
596 | outgoing show changesets not found in the destination | |
597 | parents show the parents of the working directory or revision |
|
597 | parents show the parents of the working directory or revision | |
598 | paths show aliases for remote repositories |
|
598 | paths show aliases for remote repositories | |
599 | pull pull changes from the specified source |
|
599 | pull pull changes from the specified source | |
600 | push push changes to the specified destination |
|
600 | push push changes to the specified destination | |
601 | recover roll back an interrupted transaction |
|
601 | recover roll back an interrupted transaction | |
602 | remove remove the specified files on the next commit |
|
602 | remove remove the specified files on the next commit | |
603 | rename rename files; equivalent of copy + remove |
|
603 | rename rename files; equivalent of copy + remove | |
604 | resolve various operations to help finish a merge |
|
604 | resolve redo merges or set/view the merge status of files | |
605 | revert restore individual files or directories to an earlier state |
|
605 | revert restore individual files or directories to an earlier state | |
606 | rollback roll back the last transaction (dangerous) |
|
606 | rollback roll back the last transaction (dangerous) | |
607 | root print the root (top) of the current working directory |
|
607 | root print the root (top) of the current working directory | |
608 | serve start stand-alone webserver |
|
608 | serve start stand-alone webserver | |
609 | showconfig show combined config settings from all hgrc files |
|
609 | showconfig show combined config settings from all hgrc files | |
610 | status show changed files in the working directory |
|
610 | status show changed files in the working directory | |
611 | summary summarize working directory state |
|
611 | summary summarize working directory state | |
612 | tag add one or more tags for the current or given revision |
|
612 | tag add one or more tags for the current or given revision | |
613 | tags list repository tags |
|
613 | tags list repository tags | |
614 | tip show the tip revision |
|
614 | tip show the tip revision | |
615 | unbundle apply one or more changegroup files |
|
615 | unbundle apply one or more changegroup files | |
616 | update update working directory (or switch revisions) |
|
616 | update update working directory (or switch revisions) | |
617 | verify verify the integrity of the repository |
|
617 | verify verify the integrity of the repository | |
618 | version output version and copyright information |
|
618 | version output version and copyright information | |
619 |
|
619 | |||
620 | enabled extensions: |
|
620 | enabled extensions: | |
621 |
|
621 | |||
622 | helpext (no help text available) |
|
622 | helpext (no help text available) | |
623 |
|
623 | |||
624 | additional help topics: |
|
624 | additional help topics: | |
625 |
|
625 | |||
626 | config Configuration Files |
|
626 | config Configuration Files | |
627 | dates Date Formats |
|
627 | dates Date Formats | |
628 | patterns File Name Patterns |
|
628 | patterns File Name Patterns | |
629 | environment Environment Variables |
|
629 | environment Environment Variables | |
630 | revisions Specifying Single Revisions |
|
630 | revisions Specifying Single Revisions | |
631 | multirevs Specifying Multiple Revisions |
|
631 | multirevs Specifying Multiple Revisions | |
632 | revsets Specifying Revision Sets |
|
632 | revsets Specifying Revision Sets | |
633 | diffs Diff Formats |
|
633 | diffs Diff Formats | |
634 | templating Template Usage |
|
634 | templating Template Usage | |
635 | urls URL Paths |
|
635 | urls URL Paths | |
636 | extensions Using additional features |
|
636 | extensions Using additional features | |
637 | hgweb Configuring hgweb |
|
637 | hgweb Configuring hgweb | |
638 | glossary Glossary |
|
638 | glossary Glossary | |
639 |
|
639 | |||
640 | use "hg -v help" to show aliases and global options |
|
640 | use "hg -v help" to show aliases and global options | |
641 | %% test list of commands with command with no help text |
|
641 | %% test list of commands with command with no help text | |
642 | helpext extension - no help text available |
|
642 | helpext extension - no help text available | |
643 |
|
643 | |||
644 | list of commands: |
|
644 | list of commands: | |
645 |
|
645 | |||
646 | nohelp (no help text available) |
|
646 | nohelp (no help text available) | |
647 |
|
647 | |||
648 | use "hg -v help helpext" to show aliases and global options |
|
648 | use "hg -v help helpext" to show aliases and global options | |
649 | %% test a help topic |
|
649 | %% test a help topic | |
650 | Specifying Single Revisions |
|
650 | Specifying Single Revisions | |
651 |
|
651 | |||
652 | Mercurial supports several ways to specify individual revisions. |
|
652 | Mercurial supports several ways to specify individual revisions. | |
653 |
|
653 | |||
654 | A plain integer is treated as a revision number. Negative integers are |
|
654 | A plain integer is treated as a revision number. Negative integers are | |
655 | treated as sequential offsets from the tip, with -1 denoting the tip, -2 |
|
655 | treated as sequential offsets from the tip, with -1 denoting the tip, -2 | |
656 | denoting the revision prior to the tip, and so forth. |
|
656 | denoting the revision prior to the tip, and so forth. | |
657 |
|
657 | |||
658 | A 40-digit hexadecimal string is treated as a unique revision identifier. |
|
658 | A 40-digit hexadecimal string is treated as a unique revision identifier. | |
659 |
|
659 | |||
660 | A hexadecimal string less than 40 characters long is treated as a unique |
|
660 | A hexadecimal string less than 40 characters long is treated as a unique | |
661 | revision identifier and is referred to as a short-form identifier. A |
|
661 | revision identifier and is referred to as a short-form identifier. A | |
662 | short-form identifier is only valid if it is the prefix of exactly one |
|
662 | short-form identifier is only valid if it is the prefix of exactly one | |
663 | full-length identifier. |
|
663 | full-length identifier. | |
664 |
|
664 | |||
665 | Any other string is treated as a tag or branch name. A tag name is a |
|
665 | Any other string is treated as a tag or branch name. A tag name is a | |
666 | symbolic name associated with a revision identifier. A branch name denotes |
|
666 | symbolic name associated with a revision identifier. A branch name denotes | |
667 | the tipmost revision of that branch. Tag and branch names must not contain |
|
667 | the tipmost revision of that branch. Tag and branch names must not contain | |
668 | the ":" character. |
|
668 | the ":" character. | |
669 |
|
669 | |||
670 | The reserved name "tip" is a special tag that always identifies the most |
|
670 | The reserved name "tip" is a special tag that always identifies the most | |
671 | recent revision. |
|
671 | recent revision. | |
672 |
|
672 | |||
673 | The reserved name "null" indicates the null revision. This is the revision |
|
673 | The reserved name "null" indicates the null revision. This is the revision | |
674 | of an empty repository, and the parent of revision 0. |
|
674 | of an empty repository, and the parent of revision 0. | |
675 |
|
675 | |||
676 | The reserved name "." indicates the working directory parent. If no |
|
676 | The reserved name "." indicates the working directory parent. If no | |
677 | working directory is checked out, it is equivalent to null. If an |
|
677 | working directory is checked out, it is equivalent to null. If an | |
678 | uncommitted merge is in progress, "." is the revision of the first parent. |
|
678 | uncommitted merge is in progress, "." is the revision of the first parent. |
General Comments 0
You need to be logged in to leave comments.
Login now