Show More
@@ -1,452 +1,458 b'' | |||||
1 | $ hg init a |
|
1 | $ hg init a | |
2 | $ cd a |
|
2 | $ cd a | |
3 | $ echo a > a |
|
3 | $ echo a > a | |
4 | $ hg ci -A -d'1 0' -m a |
|
4 | $ hg ci -A -d'1 0' -m a | |
5 | adding a |
|
5 | adding a | |
6 |
|
6 | |||
7 | $ cd .. |
|
7 | $ cd .. | |
8 |
|
8 | |||
9 | $ hg init b |
|
9 | $ hg init b | |
10 | $ cd b |
|
10 | $ cd b | |
11 | $ echo b > b |
|
11 | $ echo b > b | |
12 | $ hg ci -A -d'1 0' -m b |
|
12 | $ hg ci -A -d'1 0' -m b | |
13 | adding b |
|
13 | adding b | |
14 |
|
14 | |||
15 | $ cd .. |
|
15 | $ cd .. | |
16 |
|
16 | |||
17 | $ hg clone a c |
|
17 | $ hg clone a c | |
18 | updating to branch default |
|
18 | updating to branch default | |
19 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
20 | $ cd c |
|
20 | $ cd c | |
21 | $ cat >> .hg/hgrc <<EOF |
|
21 | $ cat >> .hg/hgrc <<EOF | |
22 | > [paths] |
|
22 | > [paths] | |
23 | > relative = ../a |
|
23 | > relative = ../a | |
24 | > EOF |
|
24 | > EOF | |
25 | $ hg pull -f ../b |
|
25 | $ hg pull -f ../b | |
26 | pulling from ../b |
|
26 | pulling from ../b | |
27 | searching for changes |
|
27 | searching for changes | |
28 | warning: repository is unrelated |
|
28 | warning: repository is unrelated | |
29 | requesting all changes |
|
29 | requesting all changes | |
30 | adding changesets |
|
30 | adding changesets | |
31 | adding manifests |
|
31 | adding manifests | |
32 | adding file changes |
|
32 | adding file changes | |
33 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
33 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
34 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
34 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
35 | $ hg merge |
|
35 | $ hg merge | |
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
37 | (branch merge, don't forget to commit) |
|
37 | (branch merge, don't forget to commit) | |
38 |
|
38 | |||
39 | $ cd .. |
|
39 | $ cd .. | |
40 |
|
40 | |||
41 | Testing -R/--repository: |
|
41 | Testing -R/--repository: | |
42 |
|
42 | |||
43 | $ hg -R a tip |
|
43 | $ hg -R a tip | |
44 | changeset: 0:8580ff50825a |
|
44 | changeset: 0:8580ff50825a | |
45 | tag: tip |
|
45 | tag: tip | |
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: a |
|
48 | summary: a | |
49 |
|
49 | |||
50 | $ hg --repository b tip |
|
50 | $ hg --repository b tip | |
51 | changeset: 0:b6c483daf290 |
|
51 | changeset: 0:b6c483daf290 | |
52 | tag: tip |
|
52 | tag: tip | |
53 | user: test |
|
53 | user: test | |
54 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
54 | date: Thu Jan 01 00:00:01 1970 +0000 | |
55 | summary: b |
|
55 | summary: b | |
56 |
|
56 | |||
57 |
|
57 | |||
58 | -R with a URL: |
|
58 | -R with a URL: | |
59 |
|
59 | |||
60 | $ hg -R file:a identify |
|
60 | $ hg -R file:a identify | |
61 | 8580ff50825a tip |
|
61 | 8580ff50825a tip | |
62 | $ hg -R file://localhost/`pwd`/a/ identify |
|
62 | $ hg -R file://localhost/`pwd`/a/ identify | |
63 | 8580ff50825a tip |
|
63 | 8580ff50825a tip | |
64 |
|
64 | |||
65 | -R with path aliases: |
|
65 | -R with path aliases: | |
66 |
|
66 | |||
67 | $ cd c |
|
67 | $ cd c | |
68 | $ hg -R default identify |
|
68 | $ hg -R default identify | |
69 | 8580ff50825a tip |
|
69 | 8580ff50825a tip | |
70 | $ hg -R relative identify |
|
70 | $ hg -R relative identify | |
71 | 8580ff50825a tip |
|
71 | 8580ff50825a tip | |
72 | $ echo '[paths]' >> $HGRCPATH |
|
72 | $ echo '[paths]' >> $HGRCPATH | |
73 | $ echo 'relativetohome = a' >> $HGRCPATH |
|
73 | $ echo 'relativetohome = a' >> $HGRCPATH | |
74 | $ HOME=`pwd`/../ hg -R relativetohome identify |
|
74 | $ HOME=`pwd`/../ hg -R relativetohome identify | |
75 | 8580ff50825a tip |
|
75 | 8580ff50825a tip | |
76 | $ cd .. |
|
76 | $ cd .. | |
77 |
|
77 | |||
78 | #if no-outer-repo |
|
78 | #if no-outer-repo | |
79 |
|
79 | |||
80 | Implicit -R: |
|
80 | Implicit -R: | |
81 |
|
81 | |||
82 | $ hg ann a/a |
|
82 | $ hg ann a/a | |
83 | 0: a |
|
83 | 0: a | |
84 | $ hg ann a/a a/a |
|
84 | $ hg ann a/a a/a | |
85 | 0: a |
|
85 | 0: a | |
86 | $ hg ann a/a b/b |
|
86 | $ hg ann a/a b/b | |
87 | abort: no repository found in '$TESTTMP' (.hg not found)! |
|
87 | abort: no repository found in '$TESTTMP' (.hg not found)! | |
88 | [255] |
|
88 | [255] | |
89 | $ hg -R b ann a/a |
|
89 | $ hg -R b ann a/a | |
90 | abort: a/a not under root '$TESTTMP/b' (glob) |
|
90 | abort: a/a not under root '$TESTTMP/b' (glob) | |
91 | (consider using '--cwd b') |
|
91 | (consider using '--cwd b') | |
92 | [255] |
|
92 | [255] | |
93 | $ hg log |
|
93 | $ hg log | |
94 | abort: no repository found in '$TESTTMP' (.hg not found)! |
|
94 | abort: no repository found in '$TESTTMP' (.hg not found)! | |
95 | [255] |
|
95 | [255] | |
96 |
|
96 | |||
97 | #endif |
|
97 | #endif | |
98 |
|
98 | |||
99 | Abbreviation of long option: |
|
99 | Abbreviation of long option: | |
100 |
|
100 | |||
101 | $ hg --repo c tip |
|
101 | $ hg --repo c tip | |
102 | changeset: 1:b6c483daf290 |
|
102 | changeset: 1:b6c483daf290 | |
103 | tag: tip |
|
103 | tag: tip | |
104 | parent: -1:000000000000 |
|
104 | parent: -1:000000000000 | |
105 | user: test |
|
105 | user: test | |
106 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
106 | date: Thu Jan 01 00:00:01 1970 +0000 | |
107 | summary: b |
|
107 | summary: b | |
108 |
|
108 | |||
109 |
|
109 | |||
110 | earlygetopt with duplicate options (36d23de02da1): |
|
110 | earlygetopt with duplicate options (36d23de02da1): | |
111 |
|
111 | |||
112 | $ hg --cwd a --cwd b --cwd c tip |
|
112 | $ hg --cwd a --cwd b --cwd c tip | |
113 | changeset: 1:b6c483daf290 |
|
113 | changeset: 1:b6c483daf290 | |
114 | tag: tip |
|
114 | tag: tip | |
115 | parent: -1:000000000000 |
|
115 | parent: -1:000000000000 | |
116 | user: test |
|
116 | user: test | |
117 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
117 | date: Thu Jan 01 00:00:01 1970 +0000 | |
118 | summary: b |
|
118 | summary: b | |
119 |
|
119 | |||
120 | $ hg --repo c --repository b -R a tip |
|
120 | $ hg --repo c --repository b -R a tip | |
121 | changeset: 0:8580ff50825a |
|
121 | changeset: 0:8580ff50825a | |
122 | tag: tip |
|
122 | tag: tip | |
123 | user: test |
|
123 | user: test | |
124 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
124 | date: Thu Jan 01 00:00:01 1970 +0000 | |
125 | summary: a |
|
125 | summary: a | |
126 |
|
126 | |||
127 |
|
127 | |||
128 | earlygetopt short option without following space: |
|
128 | earlygetopt short option without following space: | |
129 |
|
129 | |||
130 | $ hg -q -Rb tip |
|
130 | $ hg -q -Rb tip | |
131 | 0:b6c483daf290 |
|
131 | 0:b6c483daf290 | |
132 |
|
132 | |||
133 | earlygetopt with illegal abbreviations: |
|
133 | earlygetopt with illegal abbreviations: | |
134 |
|
134 | |||
135 | $ hg --confi "foo.bar=baz" |
|
135 | $ hg --confi "foo.bar=baz" | |
136 | abort: option --config may not be abbreviated! |
|
136 | abort: option --config may not be abbreviated! | |
137 | [255] |
|
137 | [255] | |
138 | $ hg --cw a tip |
|
138 | $ hg --cw a tip | |
139 | abort: option --cwd may not be abbreviated! |
|
139 | abort: option --cwd may not be abbreviated! | |
140 | [255] |
|
140 | [255] | |
141 | $ hg --rep a tip |
|
141 | $ hg --rep a tip | |
142 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
142 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
143 | [255] |
|
143 | [255] | |
144 | $ hg --repositor a tip |
|
144 | $ hg --repositor a tip | |
145 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
145 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
146 | [255] |
|
146 | [255] | |
147 | $ hg -qR a tip |
|
147 | $ hg -qR a tip | |
148 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
148 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
149 | [255] |
|
149 | [255] | |
150 | $ hg -qRa tip |
|
150 | $ hg -qRa tip | |
151 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
151 | abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
152 | [255] |
|
152 | [255] | |
153 |
|
153 | |||
154 | Testing --cwd: |
|
154 | Testing --cwd: | |
155 |
|
155 | |||
156 | $ hg --cwd a parents |
|
156 | $ hg --cwd a parents | |
157 | changeset: 0:8580ff50825a |
|
157 | changeset: 0:8580ff50825a | |
158 | tag: tip |
|
158 | tag: tip | |
159 | user: test |
|
159 | user: test | |
160 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
160 | date: Thu Jan 01 00:00:01 1970 +0000 | |
161 | summary: a |
|
161 | summary: a | |
162 |
|
162 | |||
163 |
|
163 | |||
164 | Testing -y/--noninteractive - just be sure it is parsed: |
|
164 | Testing -y/--noninteractive - just be sure it is parsed: | |
165 |
|
165 | |||
166 | $ hg --cwd a tip -q --noninteractive |
|
166 | $ hg --cwd a tip -q --noninteractive | |
167 | 0:8580ff50825a |
|
167 | 0:8580ff50825a | |
168 | $ hg --cwd a tip -q -y |
|
168 | $ hg --cwd a tip -q -y | |
169 | 0:8580ff50825a |
|
169 | 0:8580ff50825a | |
170 |
|
170 | |||
171 | Testing -q/--quiet: |
|
171 | Testing -q/--quiet: | |
172 |
|
172 | |||
173 | $ hg -R a -q tip |
|
173 | $ hg -R a -q tip | |
174 | 0:8580ff50825a |
|
174 | 0:8580ff50825a | |
175 | $ hg -R b -q tip |
|
175 | $ hg -R b -q tip | |
176 | 0:b6c483daf290 |
|
176 | 0:b6c483daf290 | |
177 | $ hg -R c --quiet parents |
|
177 | $ hg -R c --quiet parents | |
178 | 0:8580ff50825a |
|
178 | 0:8580ff50825a | |
179 | 1:b6c483daf290 |
|
179 | 1:b6c483daf290 | |
180 |
|
180 | |||
181 | Testing -v/--verbose: |
|
181 | Testing -v/--verbose: | |
182 |
|
182 | |||
183 | $ hg --cwd c head -v |
|
183 | $ hg --cwd c head -v | |
184 | changeset: 1:b6c483daf290 |
|
184 | changeset: 1:b6c483daf290 | |
185 | tag: tip |
|
185 | tag: tip | |
186 | parent: -1:000000000000 |
|
186 | parent: -1:000000000000 | |
187 | user: test |
|
187 | user: test | |
188 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
188 | date: Thu Jan 01 00:00:01 1970 +0000 | |
189 | files: b |
|
189 | files: b | |
190 | description: |
|
190 | description: | |
191 | b |
|
191 | b | |
192 |
|
192 | |||
193 |
|
193 | |||
194 | changeset: 0:8580ff50825a |
|
194 | changeset: 0:8580ff50825a | |
195 | user: test |
|
195 | user: test | |
196 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
196 | date: Thu Jan 01 00:00:01 1970 +0000 | |
197 | files: a |
|
197 | files: a | |
198 | description: |
|
198 | description: | |
199 | a |
|
199 | a | |
200 |
|
200 | |||
201 |
|
201 | |||
202 | $ hg --cwd b tip --verbose |
|
202 | $ hg --cwd b tip --verbose | |
203 | changeset: 0:b6c483daf290 |
|
203 | changeset: 0:b6c483daf290 | |
204 | tag: tip |
|
204 | tag: tip | |
205 | user: test |
|
205 | user: test | |
206 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
206 | date: Thu Jan 01 00:00:01 1970 +0000 | |
207 | files: b |
|
207 | files: b | |
208 | description: |
|
208 | description: | |
209 | b |
|
209 | b | |
210 |
|
210 | |||
211 |
|
211 | |||
212 |
|
212 | |||
213 | Testing --config: |
|
213 | Testing --config: | |
214 |
|
214 | |||
215 | $ hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo |
|
215 | $ hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo | |
216 | quuxfoo |
|
216 | quuxfoo | |
217 | $ hg --cwd c --config '' tip -q |
|
217 | $ hg --cwd c --config '' tip -q | |
218 | abort: malformed --config option: '' (use --config section.name=value) |
|
218 | abort: malformed --config option: '' (use --config section.name=value) | |
219 | [255] |
|
219 | [255] | |
220 | $ hg --cwd c --config a.b tip -q |
|
220 | $ hg --cwd c --config a.b tip -q | |
221 | abort: malformed --config option: 'a.b' (use --config section.name=value) |
|
221 | abort: malformed --config option: 'a.b' (use --config section.name=value) | |
222 | [255] |
|
222 | [255] | |
223 | $ hg --cwd c --config a tip -q |
|
223 | $ hg --cwd c --config a tip -q | |
224 | abort: malformed --config option: 'a' (use --config section.name=value) |
|
224 | abort: malformed --config option: 'a' (use --config section.name=value) | |
225 | [255] |
|
225 | [255] | |
226 | $ hg --cwd c --config a.= tip -q |
|
226 | $ hg --cwd c --config a.= tip -q | |
227 | abort: malformed --config option: 'a.=' (use --config section.name=value) |
|
227 | abort: malformed --config option: 'a.=' (use --config section.name=value) | |
228 | [255] |
|
228 | [255] | |
229 | $ hg --cwd c --config .b= tip -q |
|
229 | $ hg --cwd c --config .b= tip -q | |
230 | abort: malformed --config option: '.b=' (use --config section.name=value) |
|
230 | abort: malformed --config option: '.b=' (use --config section.name=value) | |
231 | [255] |
|
231 | [255] | |
232 |
|
232 | |||
233 | Testing --debug: |
|
233 | Testing --debug: | |
234 |
|
234 | |||
235 | $ hg --cwd c log --debug |
|
235 | $ hg --cwd c log --debug | |
236 | changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a |
|
236 | changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a | |
237 | tag: tip |
|
237 | tag: tip | |
238 | phase: public |
|
238 | phase: public | |
239 | parent: -1:0000000000000000000000000000000000000000 |
|
239 | parent: -1:0000000000000000000000000000000000000000 | |
240 | parent: -1:0000000000000000000000000000000000000000 |
|
240 | parent: -1:0000000000000000000000000000000000000000 | |
241 | manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 |
|
241 | manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 | |
242 | user: test |
|
242 | user: test | |
243 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
243 | date: Thu Jan 01 00:00:01 1970 +0000 | |
244 | files+: b |
|
244 | files+: b | |
245 | extra: branch=default |
|
245 | extra: branch=default | |
246 | description: |
|
246 | description: | |
247 | b |
|
247 | b | |
248 |
|
248 | |||
249 |
|
249 | |||
250 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
250 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab | |
251 | phase: public |
|
251 | phase: public | |
252 | parent: -1:0000000000000000000000000000000000000000 |
|
252 | parent: -1:0000000000000000000000000000000000000000 | |
253 | parent: -1:0000000000000000000000000000000000000000 |
|
253 | parent: -1:0000000000000000000000000000000000000000 | |
254 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
254 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
255 | user: test |
|
255 | user: test | |
256 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
256 | date: Thu Jan 01 00:00:01 1970 +0000 | |
257 | files+: a |
|
257 | files+: a | |
258 | extra: branch=default |
|
258 | extra: branch=default | |
259 | description: |
|
259 | description: | |
260 | a |
|
260 | a | |
261 |
|
261 | |||
262 |
|
262 | |||
263 |
|
263 | |||
264 | Testing --traceback: |
|
264 | Testing --traceback: | |
265 |
|
265 | |||
|
266 | #if no-chg | |||
266 | $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback' |
|
267 | $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback' | |
267 | Traceback (most recent call last): |
|
268 | Traceback (most recent call last): | |
|
269 | #else | |||
|
270 | Traceback for '--config' errors not supported with chg. | |||
|
271 | $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback' | |||
|
272 | [1] | |||
|
273 | #endif | |||
268 |
|
274 | |||
269 | Testing --time: |
|
275 | Testing --time: | |
270 |
|
276 | |||
271 | $ hg --cwd a --time id |
|
277 | $ hg --cwd a --time id | |
272 | 8580ff50825a tip |
|
278 | 8580ff50825a tip | |
273 | time: real * (glob) |
|
279 | time: real * (glob) | |
274 |
|
280 | |||
275 | Testing --version: |
|
281 | Testing --version: | |
276 |
|
282 | |||
277 | $ hg --version -q |
|
283 | $ hg --version -q | |
278 | Mercurial Distributed SCM * (glob) |
|
284 | Mercurial Distributed SCM * (glob) | |
279 |
|
285 | |||
280 | hide outer repo |
|
286 | hide outer repo | |
281 | $ hg init |
|
287 | $ hg init | |
282 |
|
288 | |||
283 | Testing -h/--help: |
|
289 | Testing -h/--help: | |
284 |
|
290 | |||
285 | $ hg -h |
|
291 | $ hg -h | |
286 | Mercurial Distributed SCM |
|
292 | Mercurial Distributed SCM | |
287 |
|
293 | |||
288 | list of commands: |
|
294 | list of commands: | |
289 |
|
295 | |||
290 | add add the specified files on the next commit |
|
296 | add add the specified files on the next commit | |
291 | addremove add all new files, delete all missing files |
|
297 | addremove add all new files, delete all missing files | |
292 | annotate show changeset information by line for each file |
|
298 | annotate show changeset information by line for each file | |
293 | archive create an unversioned archive of a repository revision |
|
299 | archive create an unversioned archive of a repository revision | |
294 | backout reverse effect of earlier changeset |
|
300 | backout reverse effect of earlier changeset | |
295 | bisect subdivision search of changesets |
|
301 | bisect subdivision search of changesets | |
296 | bookmarks create a new bookmark or list existing bookmarks |
|
302 | bookmarks create a new bookmark or list existing bookmarks | |
297 | branch set or show the current branch name |
|
303 | branch set or show the current branch name | |
298 | branches list repository named branches |
|
304 | branches list repository named branches | |
299 | bundle create a bundle file |
|
305 | bundle create a bundle file | |
300 | cat output the current or given revision of files |
|
306 | cat output the current or given revision of files | |
301 | clone make a copy of an existing repository |
|
307 | clone make a copy of an existing repository | |
302 | commit commit the specified files or all outstanding changes |
|
308 | commit commit the specified files or all outstanding changes | |
303 | config show combined config settings from all hgrc files |
|
309 | config show combined config settings from all hgrc files | |
304 | copy mark files as copied for the next commit |
|
310 | copy mark files as copied for the next commit | |
305 | diff diff repository (or selected files) |
|
311 | diff diff repository (or selected files) | |
306 | export dump the header and diffs for one or more changesets |
|
312 | export dump the header and diffs for one or more changesets | |
307 | files list tracked files |
|
313 | files list tracked files | |
308 | forget forget the specified files on the next commit |
|
314 | forget forget the specified files on the next commit | |
309 | graft copy changes from other branches onto the current branch |
|
315 | graft copy changes from other branches onto the current branch | |
310 | grep search revision history for a pattern in specified files |
|
316 | grep search revision history for a pattern in specified files | |
311 | heads show branch heads |
|
317 | heads show branch heads | |
312 | help show help for a given topic or a help overview |
|
318 | help show help for a given topic or a help overview | |
313 | identify identify the working directory or specified revision |
|
319 | identify identify the working directory or specified revision | |
314 | import import an ordered set of patches |
|
320 | import import an ordered set of patches | |
315 | incoming show new changesets found in source |
|
321 | incoming show new changesets found in source | |
316 | init create a new repository in the given directory |
|
322 | init create a new repository in the given directory | |
317 | log show revision history of entire repository or files |
|
323 | log show revision history of entire repository or files | |
318 | manifest output the current or given revision of the project manifest |
|
324 | manifest output the current or given revision of the project manifest | |
319 | merge merge another revision into working directory |
|
325 | merge merge another revision into working directory | |
320 | outgoing show changesets not found in the destination |
|
326 | outgoing show changesets not found in the destination | |
321 | paths show aliases for remote repositories |
|
327 | paths show aliases for remote repositories | |
322 | phase set or show the current phase name |
|
328 | phase set or show the current phase name | |
323 | pull pull changes from the specified source |
|
329 | pull pull changes from the specified source | |
324 | push push changes to the specified destination |
|
330 | push push changes to the specified destination | |
325 | recover roll back an interrupted transaction |
|
331 | recover roll back an interrupted transaction | |
326 | remove remove the specified files on the next commit |
|
332 | remove remove the specified files on the next commit | |
327 | rename rename files; equivalent of copy + remove |
|
333 | rename rename files; equivalent of copy + remove | |
328 | resolve redo merges or set/view the merge status of files |
|
334 | resolve redo merges or set/view the merge status of files | |
329 | revert restore files to their checkout state |
|
335 | revert restore files to their checkout state | |
330 | root print the root (top) of the current working directory |
|
336 | root print the root (top) of the current working directory | |
331 | serve start stand-alone webserver |
|
337 | serve start stand-alone webserver | |
332 | status show changed files in the working directory |
|
338 | status show changed files in the working directory | |
333 | summary summarize working directory state |
|
339 | summary summarize working directory state | |
334 | tag add one or more tags for the current or given revision |
|
340 | tag add one or more tags for the current or given revision | |
335 | tags list repository tags |
|
341 | tags list repository tags | |
336 | unbundle apply one or more bundle files |
|
342 | unbundle apply one or more bundle files | |
337 | update update working directory (or switch revisions) |
|
343 | update update working directory (or switch revisions) | |
338 | verify verify the integrity of the repository |
|
344 | verify verify the integrity of the repository | |
339 | version output version and copyright information |
|
345 | version output version and copyright information | |
340 |
|
346 | |||
341 | additional help topics: |
|
347 | additional help topics: | |
342 |
|
348 | |||
343 | bundlespec Bundle File Formats |
|
349 | bundlespec Bundle File Formats | |
344 | color Colorizing Outputs |
|
350 | color Colorizing Outputs | |
345 | config Configuration Files |
|
351 | config Configuration Files | |
346 | dates Date Formats |
|
352 | dates Date Formats | |
347 | diffs Diff Formats |
|
353 | diffs Diff Formats | |
348 | environment Environment Variables |
|
354 | environment Environment Variables | |
349 | extensions Using Additional Features |
|
355 | extensions Using Additional Features | |
350 | filesets Specifying File Sets |
|
356 | filesets Specifying File Sets | |
351 | glossary Glossary |
|
357 | glossary Glossary | |
352 | hgignore Syntax for Mercurial Ignore Files |
|
358 | hgignore Syntax for Mercurial Ignore Files | |
353 | hgweb Configuring hgweb |
|
359 | hgweb Configuring hgweb | |
354 | internals Technical implementation topics |
|
360 | internals Technical implementation topics | |
355 | merge-tools Merge Tools |
|
361 | merge-tools Merge Tools | |
356 | pager Pager Support |
|
362 | pager Pager Support | |
357 | patterns File Name Patterns |
|
363 | patterns File Name Patterns | |
358 | phases Working with Phases |
|
364 | phases Working with Phases | |
359 | revisions Specifying Revisions |
|
365 | revisions Specifying Revisions | |
360 | scripting Using Mercurial from scripts and automation |
|
366 | scripting Using Mercurial from scripts and automation | |
361 | subrepos Subrepositories |
|
367 | subrepos Subrepositories | |
362 | templating Template Usage |
|
368 | templating Template Usage | |
363 | urls URL Paths |
|
369 | urls URL Paths | |
364 |
|
370 | |||
365 | (use 'hg help -v' to show built-in aliases and global options) |
|
371 | (use 'hg help -v' to show built-in aliases and global options) | |
366 |
|
372 | |||
367 |
|
373 | |||
368 |
|
374 | |||
369 | $ hg --help |
|
375 | $ hg --help | |
370 | Mercurial Distributed SCM |
|
376 | Mercurial Distributed SCM | |
371 |
|
377 | |||
372 | list of commands: |
|
378 | list of commands: | |
373 |
|
379 | |||
374 | add add the specified files on the next commit |
|
380 | add add the specified files on the next commit | |
375 | addremove add all new files, delete all missing files |
|
381 | addremove add all new files, delete all missing files | |
376 | annotate show changeset information by line for each file |
|
382 | annotate show changeset information by line for each file | |
377 | archive create an unversioned archive of a repository revision |
|
383 | archive create an unversioned archive of a repository revision | |
378 | backout reverse effect of earlier changeset |
|
384 | backout reverse effect of earlier changeset | |
379 | bisect subdivision search of changesets |
|
385 | bisect subdivision search of changesets | |
380 | bookmarks create a new bookmark or list existing bookmarks |
|
386 | bookmarks create a new bookmark or list existing bookmarks | |
381 | branch set or show the current branch name |
|
387 | branch set or show the current branch name | |
382 | branches list repository named branches |
|
388 | branches list repository named branches | |
383 | bundle create a bundle file |
|
389 | bundle create a bundle file | |
384 | cat output the current or given revision of files |
|
390 | cat output the current or given revision of files | |
385 | clone make a copy of an existing repository |
|
391 | clone make a copy of an existing repository | |
386 | commit commit the specified files or all outstanding changes |
|
392 | commit commit the specified files or all outstanding changes | |
387 | config show combined config settings from all hgrc files |
|
393 | config show combined config settings from all hgrc files | |
388 | copy mark files as copied for the next commit |
|
394 | copy mark files as copied for the next commit | |
389 | diff diff repository (or selected files) |
|
395 | diff diff repository (or selected files) | |
390 | export dump the header and diffs for one or more changesets |
|
396 | export dump the header and diffs for one or more changesets | |
391 | files list tracked files |
|
397 | files list tracked files | |
392 | forget forget the specified files on the next commit |
|
398 | forget forget the specified files on the next commit | |
393 | graft copy changes from other branches onto the current branch |
|
399 | graft copy changes from other branches onto the current branch | |
394 | grep search revision history for a pattern in specified files |
|
400 | grep search revision history for a pattern in specified files | |
395 | heads show branch heads |
|
401 | heads show branch heads | |
396 | help show help for a given topic or a help overview |
|
402 | help show help for a given topic or a help overview | |
397 | identify identify the working directory or specified revision |
|
403 | identify identify the working directory or specified revision | |
398 | import import an ordered set of patches |
|
404 | import import an ordered set of patches | |
399 | incoming show new changesets found in source |
|
405 | incoming show new changesets found in source | |
400 | init create a new repository in the given directory |
|
406 | init create a new repository in the given directory | |
401 | log show revision history of entire repository or files |
|
407 | log show revision history of entire repository or files | |
402 | manifest output the current or given revision of the project manifest |
|
408 | manifest output the current or given revision of the project manifest | |
403 | merge merge another revision into working directory |
|
409 | merge merge another revision into working directory | |
404 | outgoing show changesets not found in the destination |
|
410 | outgoing show changesets not found in the destination | |
405 | paths show aliases for remote repositories |
|
411 | paths show aliases for remote repositories | |
406 | phase set or show the current phase name |
|
412 | phase set or show the current phase name | |
407 | pull pull changes from the specified source |
|
413 | pull pull changes from the specified source | |
408 | push push changes to the specified destination |
|
414 | push push changes to the specified destination | |
409 | recover roll back an interrupted transaction |
|
415 | recover roll back an interrupted transaction | |
410 | remove remove the specified files on the next commit |
|
416 | remove remove the specified files on the next commit | |
411 | rename rename files; equivalent of copy + remove |
|
417 | rename rename files; equivalent of copy + remove | |
412 | resolve redo merges or set/view the merge status of files |
|
418 | resolve redo merges or set/view the merge status of files | |
413 | revert restore files to their checkout state |
|
419 | revert restore files to their checkout state | |
414 | root print the root (top) of the current working directory |
|
420 | root print the root (top) of the current working directory | |
415 | serve start stand-alone webserver |
|
421 | serve start stand-alone webserver | |
416 | status show changed files in the working directory |
|
422 | status show changed files in the working directory | |
417 | summary summarize working directory state |
|
423 | summary summarize working directory state | |
418 | tag add one or more tags for the current or given revision |
|
424 | tag add one or more tags for the current or given revision | |
419 | tags list repository tags |
|
425 | tags list repository tags | |
420 | unbundle apply one or more bundle files |
|
426 | unbundle apply one or more bundle files | |
421 | update update working directory (or switch revisions) |
|
427 | update update working directory (or switch revisions) | |
422 | verify verify the integrity of the repository |
|
428 | verify verify the integrity of the repository | |
423 | version output version and copyright information |
|
429 | version output version and copyright information | |
424 |
|
430 | |||
425 | additional help topics: |
|
431 | additional help topics: | |
426 |
|
432 | |||
427 | bundlespec Bundle File Formats |
|
433 | bundlespec Bundle File Formats | |
428 | color Colorizing Outputs |
|
434 | color Colorizing Outputs | |
429 | config Configuration Files |
|
435 | config Configuration Files | |
430 | dates Date Formats |
|
436 | dates Date Formats | |
431 | diffs Diff Formats |
|
437 | diffs Diff Formats | |
432 | environment Environment Variables |
|
438 | environment Environment Variables | |
433 | extensions Using Additional Features |
|
439 | extensions Using Additional Features | |
434 | filesets Specifying File Sets |
|
440 | filesets Specifying File Sets | |
435 | glossary Glossary |
|
441 | glossary Glossary | |
436 | hgignore Syntax for Mercurial Ignore Files |
|
442 | hgignore Syntax for Mercurial Ignore Files | |
437 | hgweb Configuring hgweb |
|
443 | hgweb Configuring hgweb | |
438 | internals Technical implementation topics |
|
444 | internals Technical implementation topics | |
439 | merge-tools Merge Tools |
|
445 | merge-tools Merge Tools | |
440 | pager Pager Support |
|
446 | pager Pager Support | |
441 | patterns File Name Patterns |
|
447 | patterns File Name Patterns | |
442 | phases Working with Phases |
|
448 | phases Working with Phases | |
443 | revisions Specifying Revisions |
|
449 | revisions Specifying Revisions | |
444 | scripting Using Mercurial from scripts and automation |
|
450 | scripting Using Mercurial from scripts and automation | |
445 | subrepos Subrepositories |
|
451 | subrepos Subrepositories | |
446 | templating Template Usage |
|
452 | templating Template Usage | |
447 | urls URL Paths |
|
453 | urls URL Paths | |
448 |
|
454 | |||
449 | (use 'hg help -v' to show built-in aliases and global options) |
|
455 | (use 'hg help -v' to show built-in aliases and global options) | |
450 |
|
456 | |||
451 | Not tested: --debugger |
|
457 | Not tested: --debugger | |
452 |
|
458 |
General Comments 0
You need to be logged in to leave comments.
Login now