Show More
@@ -1,276 +1,278 b'' | |||
|
1 | 1 | adding a |
|
2 | 2 | adding b |
|
3 | 3 | updating working directory |
|
4 | 4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 5 | pulling from ../b |
|
6 | 6 | searching for changes |
|
7 | 7 | warning: repository is unrelated |
|
8 | 8 | adding changesets |
|
9 | 9 | adding manifests |
|
10 | 10 | adding file changes |
|
11 | 11 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
12 | 12 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
13 | 13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 14 | (branch merge, don't forget to commit) |
|
15 | 15 | %% -R/--repository |
|
16 | 16 | changeset: 0:8580ff50825a |
|
17 | 17 | tag: tip |
|
18 | 18 | user: test |
|
19 | 19 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
20 | 20 | summary: a |
|
21 | 21 | |
|
22 | 22 | changeset: 0:b6c483daf290 |
|
23 | 23 | tag: tip |
|
24 | 24 | user: test |
|
25 | 25 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
26 | 26 | summary: b |
|
27 | 27 | |
|
28 | 28 | %% implicit -R |
|
29 | 29 | 0: a |
|
30 | 30 | 0: a |
|
31 | 31 | abort: There is no Mercurial repository here (.hg not found)! |
|
32 | 32 | abort: a/a not under root |
|
33 | 33 | abort: There is no Mercurial repository here (.hg not found)! |
|
34 | 34 | %% abbrev of long option |
|
35 | 35 | changeset: 1:b6c483daf290 |
|
36 | 36 | tag: tip |
|
37 | 37 | parent: -1:000000000000 |
|
38 | 38 | user: test |
|
39 | 39 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
40 | 40 | summary: b |
|
41 | 41 | |
|
42 | 42 | %% earlygetopt with duplicate options (36d23de02da1) |
|
43 | 43 | changeset: 1:b6c483daf290 |
|
44 | 44 | tag: tip |
|
45 | 45 | parent: -1:000000000000 |
|
46 | 46 | user: test |
|
47 | 47 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
48 | 48 | summary: b |
|
49 | 49 | |
|
50 | 50 | changeset: 0:8580ff50825a |
|
51 | 51 | tag: tip |
|
52 | 52 | user: test |
|
53 | 53 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
54 | 54 | summary: a |
|
55 | 55 | |
|
56 | 56 | %% earlygetopt short option without following space |
|
57 | 57 | 0:b6c483daf290 |
|
58 | 58 | %% earlygetopt with illegal abbreviations |
|
59 | 59 | abort: Option --config may not be abbreviated! |
|
60 | 60 | abort: Option --cwd may not be abbreviated! |
|
61 | 61 | abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo! |
|
62 | 62 | abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo! |
|
63 | 63 | abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo! |
|
64 | 64 | abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo! |
|
65 | 65 | %% --cwd |
|
66 | 66 | changeset: 0:8580ff50825a |
|
67 | 67 | tag: tip |
|
68 | 68 | user: test |
|
69 | 69 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
70 | 70 | summary: a |
|
71 | 71 | |
|
72 | 72 | %% -y/--noninteractive - just be sure it is parsed |
|
73 | 73 | 0:8580ff50825a |
|
74 | 74 | 0:8580ff50825a |
|
75 | 75 | %% -q/--quiet |
|
76 | 76 | 0:8580ff50825a |
|
77 | 77 | 0:b6c483daf290 |
|
78 | 78 | 0:8580ff50825a |
|
79 | 79 | 1:b6c483daf290 |
|
80 | 80 | %% -v/--verbose |
|
81 | 81 | changeset: 1:b6c483daf290 |
|
82 | 82 | tag: tip |
|
83 | 83 | parent: -1:000000000000 |
|
84 | 84 | user: test |
|
85 | 85 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
86 | 86 | files: b |
|
87 | 87 | description: |
|
88 | 88 | b |
|
89 | 89 | |
|
90 | 90 | |
|
91 | 91 | changeset: 0:8580ff50825a |
|
92 | 92 | user: test |
|
93 | 93 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
94 | 94 | files: a |
|
95 | 95 | description: |
|
96 | 96 | a |
|
97 | 97 | |
|
98 | 98 | |
|
99 | 99 | changeset: 0:b6c483daf290 |
|
100 | 100 | tag: tip |
|
101 | 101 | user: test |
|
102 | 102 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
103 | 103 | files: b |
|
104 | 104 | description: |
|
105 | 105 | b |
|
106 | 106 | |
|
107 | 107 | |
|
108 | 108 | %% --config |
|
109 | 109 | quuxfoo |
|
110 | 110 | abort: malformed --config option: |
|
111 | 111 | abort: malformed --config option: a.b |
|
112 | 112 | abort: malformed --config option: a |
|
113 | 113 | abort: malformed --config option: a.= |
|
114 | 114 | abort: malformed --config option: .b= |
|
115 | 115 | %% --debug |
|
116 | 116 | changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a |
|
117 | 117 | tag: tip |
|
118 | 118 | parent: -1:0000000000000000000000000000000000000000 |
|
119 | 119 | parent: -1:0000000000000000000000000000000000000000 |
|
120 | 120 | manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 |
|
121 | 121 | user: test |
|
122 | 122 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
123 | 123 | files+: b |
|
124 | 124 | extra: branch=default |
|
125 | 125 | description: |
|
126 | 126 | b |
|
127 | 127 | |
|
128 | 128 | |
|
129 | 129 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
130 | 130 | parent: -1:0000000000000000000000000000000000000000 |
|
131 | 131 | parent: -1:0000000000000000000000000000000000000000 |
|
132 | 132 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
133 | 133 | user: test |
|
134 | 134 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
135 | 135 | files+: a |
|
136 | 136 | extra: branch=default |
|
137 | 137 | description: |
|
138 | 138 | a |
|
139 | 139 | |
|
140 | 140 | |
|
141 | 141 | %% --traceback |
|
142 | 142 | Traceback (most recent call last): |
|
143 | 143 | %% --time |
|
144 | 144 | Time: real x.x secs (user x.x+x.x sys x.x+x.x) |
|
145 | 145 | %% --version |
|
146 | 146 | Mercurial Distributed SCM (version xxx) |
|
147 | 147 | %% -h/--help |
|
148 | 148 | Mercurial Distributed SCM |
|
149 | 149 | |
|
150 | 150 | list of commands: |
|
151 | 151 | |
|
152 | 152 | add add the specified files on the next commit |
|
153 | 153 | addremove add all new files, delete all missing files |
|
154 | 154 | annotate show changeset information per file line |
|
155 | 155 | archive create unversioned archive of a repository revision |
|
156 | 156 | backout reverse effect of earlier changeset |
|
157 | 157 | bisect subdivision search of changesets |
|
158 | 158 | branch set or show the current branch name |
|
159 | 159 | branches list repository named branches |
|
160 | 160 | bundle create a changegroup file |
|
161 | 161 | cat output the current or given revision of files |
|
162 | 162 | clone make a copy of an existing repository |
|
163 | 163 | commit commit the specified files or all outstanding changes |
|
164 | 164 | copy mark files as copied for the next commit |
|
165 | 165 | diff diff repository (or selected files) |
|
166 | 166 | export dump the header and diffs for one or more changesets |
|
167 | 167 | grep search for a pattern in specified files and revisions |
|
168 | 168 | heads show current repository heads or show branch heads |
|
169 | 169 | help show help for a given topic or a help overview |
|
170 | 170 | identify identify the working copy or specified revision |
|
171 | 171 | import import an ordered set of patches |
|
172 | 172 | incoming show new changesets found in source |
|
173 | 173 | init create a new repository in the given directory |
|
174 | 174 | locate locate files matching specific patterns |
|
175 | 175 | log show revision history of entire repository or files |
|
176 | 176 | manifest output the current or given revision of the project manifest |
|
177 | 177 | merge merge working directory with another revision |
|
178 | 178 | outgoing show changesets not found in destination |
|
179 | 179 | parents show the parents of the working dir or revision |
|
180 | paths show definition of symbolic path names | |
|
180 | paths show aliases for remote repositories | |
|
181 | 181 | pull pull changes from the specified source |
|
182 | 182 | push push changes to the specified destination |
|
183 | 183 | recover roll back an interrupted transaction |
|
184 | 184 | remove remove the specified files on the next commit |
|
185 | 185 | rename rename files; equivalent of copy + remove |
|
186 | 186 | resolve retry file merges from a merge or update |
|
187 | 187 | revert restore individual files or dirs to an earlier state |
|
188 | 188 | rollback roll back the last transaction |
|
189 | 189 | root print the root (top) of the current working dir |
|
190 | 190 | serve export the repository via HTTP |
|
191 | 191 | showconfig show combined config settings from all hgrc files |
|
192 | 192 | status show changed files in the working directory |
|
193 | 193 | tag add one or more tags for the current or given revision |
|
194 | 194 | tags list repository tags |
|
195 | 195 | tip show the tip revision |
|
196 | 196 | unbundle apply one or more changegroup files |
|
197 | 197 | update update working directory |
|
198 | 198 | verify verify the integrity of the repository |
|
199 | 199 | version output version and copyright information |
|
200 | 200 | |
|
201 | 201 | additional help topics: |
|
202 | 202 | |
|
203 | 203 | dates Date Formats |
|
204 | 204 | patterns File Name Patterns |
|
205 | 205 | environment Environment Variables |
|
206 | 206 | revisions Specifying Single Revisions |
|
207 | 207 | multirevs Specifying Multiple Revisions |
|
208 | 208 | diffs Diff Formats |
|
209 | 209 | templating Template Usage |
|
210 | urls Url Paths | |
|
210 | 211 | |
|
211 | 212 | use "hg -v help" to show aliases and global options |
|
212 | 213 | Mercurial Distributed SCM |
|
213 | 214 | |
|
214 | 215 | list of commands: |
|
215 | 216 | |
|
216 | 217 | add add the specified files on the next commit |
|
217 | 218 | addremove add all new files, delete all missing files |
|
218 | 219 | annotate show changeset information per file line |
|
219 | 220 | archive create unversioned archive of a repository revision |
|
220 | 221 | backout reverse effect of earlier changeset |
|
221 | 222 | bisect subdivision search of changesets |
|
222 | 223 | branch set or show the current branch name |
|
223 | 224 | branches list repository named branches |
|
224 | 225 | bundle create a changegroup file |
|
225 | 226 | cat output the current or given revision of files |
|
226 | 227 | clone make a copy of an existing repository |
|
227 | 228 | commit commit the specified files or all outstanding changes |
|
228 | 229 | copy mark files as copied for the next commit |
|
229 | 230 | diff diff repository (or selected files) |
|
230 | 231 | export dump the header and diffs for one or more changesets |
|
231 | 232 | grep search for a pattern in specified files and revisions |
|
232 | 233 | heads show current repository heads or show branch heads |
|
233 | 234 | help show help for a given topic or a help overview |
|
234 | 235 | identify identify the working copy or specified revision |
|
235 | 236 | import import an ordered set of patches |
|
236 | 237 | incoming show new changesets found in source |
|
237 | 238 | init create a new repository in the given directory |
|
238 | 239 | locate locate files matching specific patterns |
|
239 | 240 | log show revision history of entire repository or files |
|
240 | 241 | manifest output the current or given revision of the project manifest |
|
241 | 242 | merge merge working directory with another revision |
|
242 | 243 | outgoing show changesets not found in destination |
|
243 | 244 | parents show the parents of the working dir or revision |
|
244 | paths show definition of symbolic path names | |
|
245 | paths show aliases for remote repositories | |
|
245 | 246 | pull pull changes from the specified source |
|
246 | 247 | push push changes to the specified destination |
|
247 | 248 | recover roll back an interrupted transaction |
|
248 | 249 | remove remove the specified files on the next commit |
|
249 | 250 | rename rename files; equivalent of copy + remove |
|
250 | 251 | resolve retry file merges from a merge or update |
|
251 | 252 | revert restore individual files or dirs to an earlier state |
|
252 | 253 | rollback roll back the last transaction |
|
253 | 254 | root print the root (top) of the current working dir |
|
254 | 255 | serve export the repository via HTTP |
|
255 | 256 | showconfig show combined config settings from all hgrc files |
|
256 | 257 | status show changed files in the working directory |
|
257 | 258 | tag add one or more tags for the current or given revision |
|
258 | 259 | tags list repository tags |
|
259 | 260 | tip show the tip revision |
|
260 | 261 | unbundle apply one or more changegroup files |
|
261 | 262 | update update working directory |
|
262 | 263 | verify verify the integrity of the repository |
|
263 | 264 | version output version and copyright information |
|
264 | 265 | |
|
265 | 266 | additional help topics: |
|
266 | 267 | |
|
267 | 268 | dates Date Formats |
|
268 | 269 | patterns File Name Patterns |
|
269 | 270 | environment Environment Variables |
|
270 | 271 | revisions Specifying Single Revisions |
|
271 | 272 | multirevs Specifying Multiple Revisions |
|
272 | 273 | diffs Diff Formats |
|
273 | 274 | templating Template Usage |
|
275 | urls Url Paths | |
|
274 | 276 | |
|
275 | 277 | use "hg -v help" to show aliases and global options |
|
276 | 278 | %% not tested: --debugger |
@@ -1,338 +1,340 b'' | |||
|
1 | 1 | Mercurial Distributed SCM |
|
2 | 2 | |
|
3 | 3 | basic commands: |
|
4 | 4 | |
|
5 | 5 | add add the specified files on the next commit |
|
6 | 6 | annotate show changeset information per file line |
|
7 | 7 | clone make a copy of an existing repository |
|
8 | 8 | commit commit the specified files or all outstanding changes |
|
9 | 9 | diff diff repository (or selected files) |
|
10 | 10 | export dump the header and diffs for one or more changesets |
|
11 | 11 | init create a new repository in the given directory |
|
12 | 12 | log show revision history of entire repository or files |
|
13 | 13 | merge merge working directory with another revision |
|
14 | 14 | parents show the parents of the working dir or revision |
|
15 | 15 | pull pull changes from the specified source |
|
16 | 16 | push push changes to the specified destination |
|
17 | 17 | remove remove the specified files on the next commit |
|
18 | 18 | serve export the repository via HTTP |
|
19 | 19 | status show changed files in the working directory |
|
20 | 20 | update update working directory |
|
21 | 21 | |
|
22 | 22 | use "hg help" for the full list of commands or "hg -v" for details |
|
23 | 23 | add add the specified files on the next commit |
|
24 | 24 | annotate show changeset information per file line |
|
25 | 25 | clone make a copy of an existing repository |
|
26 | 26 | commit commit the specified files or all outstanding changes |
|
27 | 27 | diff diff repository (or selected files) |
|
28 | 28 | export dump the header and diffs for one or more changesets |
|
29 | 29 | init create a new repository in the given directory |
|
30 | 30 | log show revision history of entire repository or files |
|
31 | 31 | merge merge working directory with another revision |
|
32 | 32 | parents show the parents of the working dir or revision |
|
33 | 33 | pull pull changes from the specified source |
|
34 | 34 | push push changes to the specified destination |
|
35 | 35 | remove remove the specified files on the next commit |
|
36 | 36 | serve export the repository via HTTP |
|
37 | 37 | status show changed files in the working directory |
|
38 | 38 | update update working directory |
|
39 | 39 | Mercurial Distributed SCM |
|
40 | 40 | |
|
41 | 41 | list of commands: |
|
42 | 42 | |
|
43 | 43 | add add the specified files on the next commit |
|
44 | 44 | addremove add all new files, delete all missing files |
|
45 | 45 | annotate show changeset information per file line |
|
46 | 46 | archive create unversioned archive of a repository revision |
|
47 | 47 | backout reverse effect of earlier changeset |
|
48 | 48 | bisect subdivision search of changesets |
|
49 | 49 | branch set or show the current branch name |
|
50 | 50 | branches list repository named branches |
|
51 | 51 | bundle create a changegroup file |
|
52 | 52 | cat output the current or given revision of files |
|
53 | 53 | clone make a copy of an existing repository |
|
54 | 54 | commit commit the specified files or all outstanding changes |
|
55 | 55 | copy mark files as copied for the next commit |
|
56 | 56 | diff diff repository (or selected files) |
|
57 | 57 | export dump the header and diffs for one or more changesets |
|
58 | 58 | grep search for a pattern in specified files and revisions |
|
59 | 59 | heads show current repository heads or show branch heads |
|
60 | 60 | help show help for a given topic or a help overview |
|
61 | 61 | identify identify the working copy or specified revision |
|
62 | 62 | import import an ordered set of patches |
|
63 | 63 | incoming show new changesets found in source |
|
64 | 64 | init create a new repository in the given directory |
|
65 | 65 | locate locate files matching specific patterns |
|
66 | 66 | log show revision history of entire repository or files |
|
67 | 67 | manifest output the current or given revision of the project manifest |
|
68 | 68 | merge merge working directory with another revision |
|
69 | 69 | outgoing show changesets not found in destination |
|
70 | 70 | parents show the parents of the working dir or revision |
|
71 | paths show definition of symbolic path names | |
|
71 | paths show aliases for remote repositories | |
|
72 | 72 | pull pull changes from the specified source |
|
73 | 73 | push push changes to the specified destination |
|
74 | 74 | recover roll back an interrupted transaction |
|
75 | 75 | remove remove the specified files on the next commit |
|
76 | 76 | rename rename files; equivalent of copy + remove |
|
77 | 77 | resolve retry file merges from a merge or update |
|
78 | 78 | revert restore individual files or dirs to an earlier state |
|
79 | 79 | rollback roll back the last transaction |
|
80 | 80 | root print the root (top) of the current working dir |
|
81 | 81 | serve export the repository via HTTP |
|
82 | 82 | showconfig show combined config settings from all hgrc files |
|
83 | 83 | status show changed files in the working directory |
|
84 | 84 | tag add one or more tags for the current or given revision |
|
85 | 85 | tags list repository tags |
|
86 | 86 | tip show the tip revision |
|
87 | 87 | unbundle apply one or more changegroup files |
|
88 | 88 | update update working directory |
|
89 | 89 | verify verify the integrity of the repository |
|
90 | 90 | version output version and copyright information |
|
91 | 91 | |
|
92 | 92 | additional help topics: |
|
93 | 93 | |
|
94 | 94 | dates Date Formats |
|
95 | 95 | patterns File Name Patterns |
|
96 | 96 | environment Environment Variables |
|
97 | 97 | revisions Specifying Single Revisions |
|
98 | 98 | multirevs Specifying Multiple Revisions |
|
99 | 99 | diffs Diff Formats |
|
100 | 100 | templating Template Usage |
|
101 | urls Url Paths | |
|
101 | 102 | |
|
102 | 103 | use "hg -v help" to show aliases and global options |
|
103 | 104 | add add the specified files on the next commit |
|
104 | 105 | addremove add all new files, delete all missing files |
|
105 | 106 | annotate show changeset information per file line |
|
106 | 107 | archive create unversioned archive of a repository revision |
|
107 | 108 | backout reverse effect of earlier changeset |
|
108 | 109 | bisect subdivision search of changesets |
|
109 | 110 | branch set or show the current branch name |
|
110 | 111 | branches list repository named branches |
|
111 | 112 | bundle create a changegroup file |
|
112 | 113 | cat output the current or given revision of files |
|
113 | 114 | clone make a copy of an existing repository |
|
114 | 115 | commit commit the specified files or all outstanding changes |
|
115 | 116 | copy mark files as copied for the next commit |
|
116 | 117 | diff diff repository (or selected files) |
|
117 | 118 | export dump the header and diffs for one or more changesets |
|
118 | 119 | grep search for a pattern in specified files and revisions |
|
119 | 120 | heads show current repository heads or show branch heads |
|
120 | 121 | help show help for a given topic or a help overview |
|
121 | 122 | identify identify the working copy or specified revision |
|
122 | 123 | import import an ordered set of patches |
|
123 | 124 | incoming show new changesets found in source |
|
124 | 125 | init create a new repository in the given directory |
|
125 | 126 | locate locate files matching specific patterns |
|
126 | 127 | log show revision history of entire repository or files |
|
127 | 128 | manifest output the current or given revision of the project manifest |
|
128 | 129 | merge merge working directory with another revision |
|
129 | 130 | outgoing show changesets not found in destination |
|
130 | 131 | parents show the parents of the working dir or revision |
|
131 | paths show definition of symbolic path names | |
|
132 | paths show aliases for remote repositories | |
|
132 | 133 | pull pull changes from the specified source |
|
133 | 134 | push push changes to the specified destination |
|
134 | 135 | recover roll back an interrupted transaction |
|
135 | 136 | remove remove the specified files on the next commit |
|
136 | 137 | rename rename files; equivalent of copy + remove |
|
137 | 138 | resolve retry file merges from a merge or update |
|
138 | 139 | revert restore individual files or dirs to an earlier state |
|
139 | 140 | rollback roll back the last transaction |
|
140 | 141 | root print the root (top) of the current working dir |
|
141 | 142 | serve export the repository via HTTP |
|
142 | 143 | showconfig show combined config settings from all hgrc files |
|
143 | 144 | status show changed files in the working directory |
|
144 | 145 | tag add one or more tags for the current or given revision |
|
145 | 146 | tags list repository tags |
|
146 | 147 | tip show the tip revision |
|
147 | 148 | unbundle apply one or more changegroup files |
|
148 | 149 | update update working directory |
|
149 | 150 | verify verify the integrity of the repository |
|
150 | 151 | version output version and copyright information |
|
151 | 152 | |
|
152 | 153 | additional help topics: |
|
153 | 154 | |
|
154 | 155 | dates Date Formats |
|
155 | 156 | patterns File Name Patterns |
|
156 | 157 | environment Environment Variables |
|
157 | 158 | revisions Specifying Single Revisions |
|
158 | 159 | multirevs Specifying Multiple Revisions |
|
159 | 160 | diffs Diff Formats |
|
160 | 161 | templating Template Usage |
|
162 | urls Url Paths | |
|
161 | 163 | hg add [OPTION]... [FILE]... |
|
162 | 164 | |
|
163 | 165 | add the specified files on the next commit |
|
164 | 166 | |
|
165 | 167 | Schedule files to be version controlled and added to the repository. |
|
166 | 168 | |
|
167 | 169 | The files will be added to the repository at the next commit. To |
|
168 | 170 | undo an add before that, see hg revert. |
|
169 | 171 | |
|
170 | 172 | If no names are given, add all files in the repository. |
|
171 | 173 | |
|
172 | 174 | options: |
|
173 | 175 | |
|
174 | 176 | -I --include include names matching the given patterns |
|
175 | 177 | -X --exclude exclude names matching the given patterns |
|
176 | 178 | -n --dry-run do not perform actions, just print output |
|
177 | 179 | |
|
178 | 180 | use "hg -v help add" to show global options |
|
179 | 181 | hg add: option --skjdfks not recognized |
|
180 | 182 | hg add [OPTION]... [FILE]... |
|
181 | 183 | |
|
182 | 184 | add the specified files on the next commit |
|
183 | 185 | |
|
184 | 186 | Schedule files to be version controlled and added to the repository. |
|
185 | 187 | |
|
186 | 188 | The files will be added to the repository at the next commit. To |
|
187 | 189 | undo an add before that, see hg revert. |
|
188 | 190 | |
|
189 | 191 | If no names are given, add all files in the repository. |
|
190 | 192 | |
|
191 | 193 | options: |
|
192 | 194 | |
|
193 | 195 | -I --include include names matching the given patterns |
|
194 | 196 | -X --exclude exclude names matching the given patterns |
|
195 | 197 | -n --dry-run do not perform actions, just print output |
|
196 | 198 | |
|
197 | 199 | use "hg -v help add" to show global options |
|
198 | 200 | hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]... |
|
199 | 201 | |
|
200 | 202 | diff repository (or selected files) |
|
201 | 203 | |
|
202 | 204 | Show differences between revisions for the specified files. |
|
203 | 205 | |
|
204 | 206 | Differences between files are shown using the unified diff format. |
|
205 | 207 | |
|
206 | 208 | NOTE: diff may generate unexpected results for merges, as it will |
|
207 | 209 | default to comparing against the working directory's first parent |
|
208 | 210 | changeset if no revisions are specified. |
|
209 | 211 | |
|
210 | 212 | When two revision arguments are given, then changes are shown |
|
211 | 213 | between those revisions. If only one revision is specified then |
|
212 | 214 | that revision is compared to the working directory, and, when no |
|
213 | 215 | revisions are specified, the working directory files are compared |
|
214 | 216 | to its parent. |
|
215 | 217 | |
|
216 | 218 | Without the -a option, diff will avoid generating diffs of files |
|
217 | 219 | it detects as binary. With -a, diff will generate a diff anyway, |
|
218 | 220 | probably with undesirable results. |
|
219 | 221 | |
|
220 | 222 | Use the --git option to generate diffs in the git extended diff |
|
221 | 223 | format. Read the diffs help topic for more information. |
|
222 | 224 | |
|
223 | 225 | options: |
|
224 | 226 | |
|
225 | 227 | -r --rev revision |
|
226 | 228 | -c --change change made by revision |
|
227 | 229 | -a --text treat all files as text |
|
228 | 230 | -g --git use git extended diff format |
|
229 | 231 | --nodates don't include dates in diff headers |
|
230 | 232 | -p --show-function show which function each change is in |
|
231 | 233 | -w --ignore-all-space ignore white space when comparing lines |
|
232 | 234 | -b --ignore-space-change ignore changes in the amount of white space |
|
233 | 235 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
234 | 236 | -U --unified number of lines of context to show |
|
235 | 237 | -I --include include names matching the given patterns |
|
236 | 238 | -X --exclude exclude names matching the given patterns |
|
237 | 239 | |
|
238 | 240 | use "hg -v help diff" to show global options |
|
239 | 241 | hg status [OPTION]... [FILE]... |
|
240 | 242 | |
|
241 | 243 | aliases: st |
|
242 | 244 | |
|
243 | 245 | show changed files in the working directory |
|
244 | 246 | |
|
245 | 247 | Show status of files in the repository. If names are given, only |
|
246 | 248 | files that match are shown. Files that are clean or ignored or |
|
247 | 249 | source of a copy/move operation, are not listed unless -c (clean), |
|
248 | 250 | -i (ignored), -C (copies) or -A is given. Unless options described |
|
249 | 251 | with "show only ..." are given, the options -mardu are used. |
|
250 | 252 | |
|
251 | 253 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
252 | 254 | unless explicitly requested with -u/--unknown or -i/-ignored. |
|
253 | 255 | |
|
254 | 256 | NOTE: status may appear to disagree with diff if permissions have |
|
255 | 257 | changed or a merge has occurred. The standard diff format does not |
|
256 | 258 | report permission changes and diff only reports changes relative |
|
257 | 259 | to one merge parent. |
|
258 | 260 | |
|
259 | 261 | If one revision is given, it is used as the base revision. |
|
260 | 262 | If two revisions are given, the difference between them is shown. |
|
261 | 263 | |
|
262 | 264 | The codes used to show the status of files are: |
|
263 | 265 | M = modified |
|
264 | 266 | A = added |
|
265 | 267 | R = removed |
|
266 | 268 | C = clean |
|
267 | 269 | ! = deleted, but still tracked |
|
268 | 270 | ? = not tracked |
|
269 | 271 | I = ignored |
|
270 | 272 | = the previous added file was copied from here |
|
271 | 273 | |
|
272 | 274 | options: |
|
273 | 275 | |
|
274 | 276 | -A --all show status of all files |
|
275 | 277 | -m --modified show only modified files |
|
276 | 278 | -a --added show only added files |
|
277 | 279 | -r --removed show only removed files |
|
278 | 280 | -d --deleted show only deleted (but tracked) files |
|
279 | 281 | -c --clean show only files without changes |
|
280 | 282 | -u --unknown show only unknown (not tracked) files |
|
281 | 283 | -i --ignored show only ignored files |
|
282 | 284 | -n --no-status hide status prefix |
|
283 | 285 | -C --copies show source of copied files |
|
284 | 286 | -0 --print0 end filenames with NUL, for use with xargs |
|
285 | 287 | --rev show difference from revision |
|
286 | 288 | -I --include include names matching the given patterns |
|
287 | 289 | -X --exclude exclude names matching the given patterns |
|
288 | 290 | |
|
289 | 291 | use "hg -v help status" to show global options |
|
290 | 292 | hg status [OPTION]... [FILE]... |
|
291 | 293 | |
|
292 | 294 | show changed files in the working directory |
|
293 | 295 | hg: unknown command 'foo' |
|
294 | 296 | Mercurial Distributed SCM |
|
295 | 297 | |
|
296 | 298 | basic commands: |
|
297 | 299 | |
|
298 | 300 | add add the specified files on the next commit |
|
299 | 301 | annotate show changeset information per file line |
|
300 | 302 | clone make a copy of an existing repository |
|
301 | 303 | commit commit the specified files or all outstanding changes |
|
302 | 304 | diff diff repository (or selected files) |
|
303 | 305 | export dump the header and diffs for one or more changesets |
|
304 | 306 | init create a new repository in the given directory |
|
305 | 307 | log show revision history of entire repository or files |
|
306 | 308 | merge merge working directory with another revision |
|
307 | 309 | parents show the parents of the working dir or revision |
|
308 | 310 | pull pull changes from the specified source |
|
309 | 311 | push push changes to the specified destination |
|
310 | 312 | remove remove the specified files on the next commit |
|
311 | 313 | serve export the repository via HTTP |
|
312 | 314 | status show changed files in the working directory |
|
313 | 315 | update update working directory |
|
314 | 316 | |
|
315 | 317 | use "hg help" for the full list of commands or "hg -v" for details |
|
316 | 318 | hg: unknown command 'skjdfks' |
|
317 | 319 | Mercurial Distributed SCM |
|
318 | 320 | |
|
319 | 321 | basic commands: |
|
320 | 322 | |
|
321 | 323 | add add the specified files on the next commit |
|
322 | 324 | annotate show changeset information per file line |
|
323 | 325 | clone make a copy of an existing repository |
|
324 | 326 | commit commit the specified files or all outstanding changes |
|
325 | 327 | diff diff repository (or selected files) |
|
326 | 328 | export dump the header and diffs for one or more changesets |
|
327 | 329 | init create a new repository in the given directory |
|
328 | 330 | log show revision history of entire repository or files |
|
329 | 331 | merge merge working directory with another revision |
|
330 | 332 | parents show the parents of the working dir or revision |
|
331 | 333 | pull pull changes from the specified source |
|
332 | 334 | push push changes to the specified destination |
|
333 | 335 | remove remove the specified files on the next commit |
|
334 | 336 | serve export the repository via HTTP |
|
335 | 337 | status show changed files in the working directory |
|
336 | 338 | update update working directory |
|
337 | 339 | |
|
338 | 340 | use "hg help" for the full list of commands or "hg -v" for details |
General Comments 0
You need to be logged in to leave comments.
Login now