##// END OF EJS Templates
Add notes about configuring a merge program
Add notes about configuring a merge program

File last commit:

r4315:bc6f5a1d default
r4386:1386a9cf default
Show More
test-help.out
308 lines | 13.5 KiB | text/plain | TextLexer
Thomas Arendsen Hein
Further help improvements:...
r849 Mercurial Distributed SCM
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 basic commands:
Thomas Arendsen Hein
Further help improvements:...
r849
add add the specified files on the next commit
annotate show changeset information per file line
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
Benoit Boissinot
make all commands be repo-wide by default...
r1568 diff diff repository (or selected files)
Thomas Arendsen Hein
Further help improvements:...
r849 export dump the header and diffs for one or more changesets
mpm@selenic.com
Fix tests for new init command
r908 init create a new repository in the given directory
Bryan O'Sullivan
Fix help output, and a few broken tests.
r1034 log show revision history of entire repository or files
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Matt Mackall
Elevate parents to a "common" command in help
r1475 parents show the parents of the working dir or revision
Thomas Arendsen Hein
Further help improvements:...
r849 pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
Vadim Gelfer
fix test-help output.
r2226 revert revert files or dirs to their states as of some revision
Thomas Arendsen Hein
Further help improvements:...
r849 serve export the repository via HTTP
status show changed files in the working directory
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg help" for the full list of commands or "hg -v" for details
Thomas Arendsen Hein
Further help improvements:...
r849 add add the specified files on the next commit
annotate show changeset information per file line
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
Benoit Boissinot
make all commands be repo-wide by default...
r1568 diff diff repository (or selected files)
Thomas Arendsen Hein
Further help improvements:...
r849 export dump the header and diffs for one or more changesets
mpm@selenic.com
Fix tests for new init command
r908 init create a new repository in the given directory
Bryan O'Sullivan
Fix help output, and a few broken tests.
r1034 log show revision history of entire repository or files
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Matt Mackall
Elevate parents to a "common" command in help
r1475 parents show the parents of the working dir or revision
Thomas Arendsen Hein
Further help improvements:...
r849 pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
Vadim Gelfer
fix test-help output.
r2226 revert revert files or dirs to their states as of some revision
Thomas Arendsen Hein
Further help improvements:...
r849 serve export the repository via HTTP
status show changed files in the working directory
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Thomas Arendsen Hein
Further help improvements:...
r849 Mercurial Distributed SCM
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 list of commands:
Thomas Arendsen Hein
Further help improvements:...
r849
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
backout reverse effect of earlier changeset
Matt Mackall
add branch and branches commands
r3502 branch set or show the current branch name
branches list repository named branches
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 bundle create a changegroup file
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 cat output the current or given revision of files
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
copy mark files as copied for the next commit
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
grep search for a pattern in specified files and revisions
heads show current repository heads
help show help for a command, extension, or list of commands
identify print information about the working copy
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
locate locate files matching specific patterns
log show revision history of entire repository or files
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 manifest output the current or given revision of the project manifest
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 outgoing show changesets not found in destination
parents show the parents of the working dir or revision
paths show definition of symbolic path names
pull pull changes from the specified source
push push changes to the specified destination
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
revert revert files or dirs to their states as of some revision
rollback roll back the last transaction in this repository
root print the root (top) of the current working dir
serve export the repository via HTTP
showconfig show combined config settings from all hgrc files
status show changed files in the working directory
Thomas Arendsen Hein
Adjust test-help output for the change in 3c82ab166eea.
r3919 tag add a tag for the current or given revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 tags list repository tags
tip show the tip revision
unbundle apply a changegroup file
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 verify verify the integrity of the repository
version output version and copyright information
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg -v help" to show aliases and global options
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
archive create unversioned archive of a repository revision
backout reverse effect of earlier changeset
Matt Mackall
add branch and branches commands
r3502 branch set or show the current branch name
branches list repository named branches
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 bundle create a changegroup file
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 cat output the current or given revision of files
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
copy mark files as copied for the next commit
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
grep search for a pattern in specified files and revisions
heads show current repository heads
help show help for a command, extension, or list of commands
identify print information about the working copy
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
locate locate files matching specific patterns
log show revision history of entire repository or files
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 manifest output the current or given revision of the project manifest
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 outgoing show changesets not found in destination
parents show the parents of the working dir or revision
paths show definition of symbolic path names
pull pull changes from the specified source
push push changes to the specified destination
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
revert revert files or dirs to their states as of some revision
rollback roll back the last transaction in this repository
root print the root (top) of the current working dir
serve export the repository via HTTP
showconfig show combined config settings from all hgrc files
status show changed files in the working directory
Thomas Arendsen Hein
Adjust test-help output for the change in 3c82ab166eea.
r3919 tag add a tag for the current or given revision
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 tags list repository tags
tip show the tip revision
unbundle apply a changegroup file
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Thomas Arendsen Hein
Un-debugify debugconfig to showconfig. (issue 317)
r3268 verify verify the integrity of the repository
version output version and copyright information
mpm@selenic.com
Fix up help test
r914 hg add [OPTION]... [FILE]...
Bryan O'Sullivan
Update tests to reflect walk changes.
r736
Thomas Arendsen Hein
Further help improvements:...
r849 add the specified files on the next commit
mpm@selenic.com
Add a simple testing framework...
r331
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 Schedule files to be version controlled and added to the repository.
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 The files will be added to the repository at the next commit. To
undo an add before that, see hg revert.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Benoit Boissinot
make all commands be repo-wide by default...
r1568 If no names are given, add all files in the repository.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Thomas Arendsen Hein
Further help improvements:...
r849 options:
Bryan O'Sullivan
Update tests to reflect walk changes.
r736
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 -I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
Vadim Gelfer
update test-help output after new options.
r2418 -n --dry-run do not perform actions, just print output
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg -v help add" to show global options
Thomas Arendsen Hein
Further help improvements:...
r849 hg add: option --skjdfks not recognized
mpm@selenic.com
Fix up help test
r914 hg add [OPTION]... [FILE]...
mpm@selenic.com
A bunch of parsing/help updates...
r596
add the specified files on the next commit
Thomas Arendsen Hein
Further help improvements:...
r849
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 Schedule files to be version controlled and added to the repository.
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 The files will be added to the repository at the next commit. To
undo an add before that, see hg revert.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Benoit Boissinot
make all commands be repo-wide by default...
r1568 If no names are given, add all files in the repository.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Thomas Arendsen Hein
Further help improvements:...
r849 options:
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 -I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
Vadim Gelfer
update test-help output after new options.
r2418 -n --dry-run do not perform actions, just print output
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg -v help add" to show global options
Thomas Arendsen Hein
Corrected synopsis for many commands....
r3885 hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...
mpm@selenic.com
Add a simple testing framework...
r331
Benoit Boissinot
make all commands be repo-wide by default...
r1568 diff repository (or selected files)
Thomas Arendsen Hein
Further help improvements:...
r849
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format.
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 NOTE: diff may generate unexpected results for merges, as it will
default to comparing against the working directory's first parent
changeset if no revisions are specified.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 When two revision arguments are given, then changes are shown
between those revisions. If only one revision is specified then
that revision is compared to the working directory, and, when no
revisions are specified, the working directory files are compared
to its parent.
Without the -a option, diff will avoid generating diffs of files
it detects as binary. With -a, diff will generate a diff anyway,
probably with undesirable results.
Thomas Arendsen Hein
Further help improvements:...
r849 options:
Haakon Riiser
diff: add -b/-B options
r2580 -r --rev revision
-a --text treat all files as text
-p --show-function show which function each change is in
Brendan Cully
Add diff --git option
r2907 -g --git use git extended diff format
Stephen Darnell
Remove single character equivalent of --nodates (was -D)
r3200 --nodates don't include dates in diff headers
Haakon Riiser
diff: add -b/-B options
r2580 -w --ignore-all-space ignore white space when comparing lines
-b --ignore-space-change ignore changes in the amount of white space
-B --ignore-blank-lines ignore changes whose lines are all blank
-I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg -v help diff" to show global options
mpm@selenic.com
Fix up help test
r914 hg status [OPTION]... [FILE]...
mpm@selenic.com
Add a simple testing framework...
r331
Thomas Arendsen Hein
Further help improvements:...
r849 show changed files in the working directory
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 Show status of files in the repository. If names are given, only
files that match are shown. Files that are clean or ignored, are
not listed unless -c (clean), -i (ignored) or -A is given.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 NOTE: status may appear to disagree with diff if permissions have
changed or a merge has occurred. The standard diff format does not
report permission changes and diff only reports changes relative
to one merge parent.
Alexis S. L. Carvalho
Update tests output
r3468 If one revision is given, it is used as the base revision.
If two revisions are given, the difference between them is shown.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 The codes used to show the status of files are:
Thomas Arendsen Hein
Further help improvements:...
r849 M = modified
A = added
R = removed
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 C = clean
Thomas Arendsen Hein
Adjusted all but one test output for the new behaviour of localrepo.changes()
r1620 ! = deleted, but still tracked
Thomas Arendsen Hein
Further help improvements:...
r849 ? = not tracked
Thomas Arendsen Hein
New option -i/--ignored for 'hg status' to show ignored files....
r2022 I = ignored (not shown by default)
Vadim Gelfer
fix tests.
r2640 = the previous added file was copied from here
Thomas Arendsen Hein
Further help improvements:...
r849
Matt Mackall
Fix up test-help, mark test-rename +x
r1515 aliases: st
Thomas Arendsen Hein
Further help improvements:...
r849 options:
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 -A --all show status of all files
Thomas Arendsen Hein
Adjusted test-help for change to hg status.
r1107 -m --modified show only modified files
-a --added show only added files
-r --removed show only removed files
Thomas Arendsen Hein
Adjusted all but one test output for the new behaviour of localrepo.changes()
r1620 -d --deleted show only deleted (but tracked) files
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 -c --clean show only files without changes
Thomas Arendsen Hein
Adjusted test-help for change to hg status.
r1107 -u --unknown show only unknown (not tracked) files
Thomas Arendsen Hein
Fix help text for hg status -i
r4156 -i --ignored show only ignored files
Thomas Arendsen Hein
Adjusted test-help for change to hg status.
r1107 -n --no-status hide status prefix
Vadim Gelfer
fix tests.
r2640 -C --copies show source of copied files
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 -0 --print0 end filenames with NUL, for use with xargs
Alexis S. L. Carvalho
Update tests output
r3468 --rev show difference from revision
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 -I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg -v help status" to show global options
mpm@selenic.com
Fix up help test
r914 hg status [OPTION]... [FILE]...
Thomas Arendsen Hein
Further help improvements:...
r849
show changed files in the working directory
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848 hg: unknown command 'foo'
Thomas Arendsen Hein
Further help improvements:...
r849 Mercurial Distributed SCM
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 basic commands:
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848
add add the specified files on the next commit
annotate show changeset information per file line
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
Benoit Boissinot
make all commands be repo-wide by default...
r1568 diff diff repository (or selected files)
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848 export dump the header and diffs for one or more changesets
mpm@selenic.com
Fix tests for new init command
r908 init create a new repository in the given directory
Bryan O'Sullivan
Fix help output, and a few broken tests.
r1034 log show revision history of entire repository or files
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Matt Mackall
Elevate parents to a "common" command in help
r1475 parents show the parents of the working dir or revision
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848 pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
Vadim Gelfer
fix test-help output.
r2226 revert revert files or dirs to their states as of some revision
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848 serve export the repository via HTTP
status show changed files in the working directory
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg help" for the full list of commands or "hg -v" for details
Thomas Arendsen Hein
Further help improvements:...
r849 hg: unknown command 'skjdfks'
Mercurial Distributed SCM
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 basic commands:
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848
add add the specified files on the next commit
annotate show changeset information per file line
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
Benoit Boissinot
make all commands be repo-wide by default...
r1568 diff diff repository (or selected files)
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848 export dump the header and diffs for one or more changesets
mpm@selenic.com
Fix tests for new init command
r908 init create a new repository in the given directory
Bryan O'Sullivan
Fix help output, and a few broken tests.
r1034 log show revision history of entire repository or files
Benoit Boissinot
various doc fixes...
r4014 merge merge working directory with another revision
Matt Mackall
Elevate parents to a "common" command in help
r1475 parents show the parents of the working dir or revision
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848 pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
Vadim Gelfer
fix test-help output.
r2226 revert revert files or dirs to their states as of some revision
Thomas Arendsen Hein
Always show short help when an unknown command is given.
r848 serve export the repository via HTTP
status show changed files in the working directory
Benoit Boissinot
various doc fixes...
r4014 update update working directory
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
use "hg help" for the full list of commands or "hg -v" for details