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