comparison tests/test-globalopts.t @ 23048:ee5f834077be stable

merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents 55dcc7fb731c
children 3bd577a3283e
comparison
equal deleted inserted replaced
22843:b6531d806de8 23048:ee5f834077be
232 Testing --debug: 232 Testing --debug:
233 233
234 $ hg --cwd c log --debug 234 $ hg --cwd c log --debug
235 changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a 235 changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
236 tag: tip 236 tag: tip
237 phase: public
237 parent: -1:0000000000000000000000000000000000000000 238 parent: -1:0000000000000000000000000000000000000000
238 parent: -1:0000000000000000000000000000000000000000 239 parent: -1:0000000000000000000000000000000000000000
239 manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 240 manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49
240 user: test 241 user: test
241 date: Thu Jan 01 00:00:01 1970 +0000 242 date: Thu Jan 01 00:00:01 1970 +0000
244 description: 245 description:
245 b 246 b
246 247
247 248
248 changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab 249 changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab
250 phase: public
249 parent: -1:0000000000000000000000000000000000000000 251 parent: -1:0000000000000000000000000000000000000000
250 parent: -1:0000000000000000000000000000000000000000 252 parent: -1:0000000000000000000000000000000000000000
251 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 253 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
252 user: test 254 user: test
253 date: Thu Jan 01 00:00:01 1970 +0000 255 date: Thu Jan 01 00:00:01 1970 +0000
299 commit commit the specified files or all outstanding changes 301 commit commit the specified files or all outstanding changes
300 config show combined config settings from all hgrc files 302 config show combined config settings from all hgrc files
301 copy mark files as copied for the next commit 303 copy mark files as copied for the next commit
302 diff diff repository (or selected files) 304 diff diff repository (or selected files)
303 export dump the header and diffs for one or more changesets 305 export dump the header and diffs for one or more changesets
306 files list tracked files
304 forget forget the specified files on the next commit 307 forget forget the specified files on the next commit
305 graft copy changes from other branches onto the current branch 308 graft copy changes from other branches onto the current branch
306 grep search for a pattern in specified files and revisions 309 grep search for a pattern in specified files and revisions
307 heads show branch heads 310 heads show branch heads
308 help show help for a given topic or a help overview 311 help show help for a given topic or a help overview
309 identify identify the working copy or specified revision 312 identify identify the working copy or specified revision
310 import import an ordered set of patches 313 import import an ordered set of patches
311 incoming show new changesets found in source 314 incoming show new changesets found in source
312 init create a new repository in the given directory 315 init create a new repository in the given directory
313 locate locate files matching specific patterns
314 log show revision history of entire repository or files 316 log show revision history of entire repository or files
315 manifest output the current or given revision of the project manifest 317 manifest output the current or given revision of the project manifest
316 merge merge working directory with another revision 318 merge merge working directory with another revision
317 outgoing show changesets not found in the destination 319 outgoing show changesets not found in the destination
318 parents show the parents of the working directory or revision
319 paths show aliases for remote repositories 320 paths show aliases for remote repositories
320 phase set or show the current phase name 321 phase set or show the current phase name
321 pull pull changes from the specified source 322 pull pull changes from the specified source
322 push push changes to the specified destination 323 push push changes to the specified destination
323 recover roll back an interrupted transaction 324 recover roll back an interrupted transaction
355 revsets Specifying Revision Sets 356 revsets Specifying Revision Sets
356 subrepos Subrepositories 357 subrepos Subrepositories
357 templating Template Usage 358 templating Template Usage
358 urls URL Paths 359 urls URL Paths
359 360
360 use "hg -v help" to show builtin aliases and global options 361 (use "hg help -v" to show built-in aliases and global options)
361 362
362 363
363 364
364 $ hg --help 365 $ hg --help
365 Mercurial Distributed SCM 366 Mercurial Distributed SCM
381 commit commit the specified files or all outstanding changes 382 commit commit the specified files or all outstanding changes
382 config show combined config settings from all hgrc files 383 config show combined config settings from all hgrc files
383 copy mark files as copied for the next commit 384 copy mark files as copied for the next commit
384 diff diff repository (or selected files) 385 diff diff repository (or selected files)
385 export dump the header and diffs for one or more changesets 386 export dump the header and diffs for one or more changesets
387 files list tracked files
386 forget forget the specified files on the next commit 388 forget forget the specified files on the next commit
387 graft copy changes from other branches onto the current branch 389 graft copy changes from other branches onto the current branch
388 grep search for a pattern in specified files and revisions 390 grep search for a pattern in specified files and revisions
389 heads show branch heads 391 heads show branch heads
390 help show help for a given topic or a help overview 392 help show help for a given topic or a help overview
391 identify identify the working copy or specified revision 393 identify identify the working copy or specified revision
392 import import an ordered set of patches 394 import import an ordered set of patches
393 incoming show new changesets found in source 395 incoming show new changesets found in source
394 init create a new repository in the given directory 396 init create a new repository in the given directory
395 locate locate files matching specific patterns
396 log show revision history of entire repository or files 397 log show revision history of entire repository or files
397 manifest output the current or given revision of the project manifest 398 manifest output the current or given revision of the project manifest
398 merge merge working directory with another revision 399 merge merge working directory with another revision
399 outgoing show changesets not found in the destination 400 outgoing show changesets not found in the destination
400 parents show the parents of the working directory or revision
401 paths show aliases for remote repositories 401 paths show aliases for remote repositories
402 phase set or show the current phase name 402 phase set or show the current phase name
403 pull pull changes from the specified source 403 pull pull changes from the specified source
404 push push changes to the specified destination 404 push push changes to the specified destination
405 recover roll back an interrupted transaction 405 recover roll back an interrupted transaction
437 revsets Specifying Revision Sets 437 revsets Specifying Revision Sets
438 subrepos Subrepositories 438 subrepos Subrepositories
439 templating Template Usage 439 templating Template Usage
440 urls URL Paths 440 urls URL Paths
441 441
442 use "hg -v help" to show builtin aliases and global options 442 (use "hg help -v" to show built-in aliases and global options)
443 443
444 Not tested: --debugger 444 Not tested: --debugger
445 445