doc/hg.1.txt
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 22 Jul 2005 19:45:48 -0800
changeset 766 b444a7e053f1
parent 761 0fb498458905
child 810 790a0ff306f2
child 814 0902ffece4b4
permissions -rw-r--r--
Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     1
HG(1)
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     2
=====
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     3
Matt Mackall <mpm@selenic.com>
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     4
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     5
NAME
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     6
----
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
     7
hg - Mercurial source code management system
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     8
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
     9
SYNOPSIS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    10
--------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    11
'hg' [-v -d -q -y] <command> [command options] [files]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    12
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    13
DESCRIPTION
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    14
-----------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    15
The hg(1) command provides a command line interface to the Mercurial system.
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    16
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    17
OPTIONS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    18
-------
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    19
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    20
--debug, -d::
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    21
    enable debugging output
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    22
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    23
--quiet, -q::
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    24
    suppress output
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    25
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    26
--verbose, -v::
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    27
    enable additional output
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    28
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    29
--noninteractive, -y::
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    30
    do not prompt, assume 'yes' for any required answers
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    31
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    32
COMMAND ELEMENTS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    33
----------------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    34
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    35
files ...::
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
    36
    indicates one or more filename or relative path filenames; see
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
    37
    "FILE NAME PATTERNS" for information on pattern matching
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    38
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    39
path::
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    40
    indicates a path on the local machine
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    41
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
    42
revision::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    43
    indicates a changeset which can be specified as a changeset revision
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    44
    number, a tag, or a unique substring of the changeset hash value
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    45
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    46
repository path::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
    47
    either the pathname of a local repository or the URI of a remote
181
038e4d8602bd updated for .hgpaths and http/old-http protocol name change
jake@edge2.net
parents: 177
diff changeset
    48
    repository.  There are two available URI protocols, http:// which is
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
    49
    fast and the old-http:// protocol which is much slower but does not
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    50
    require a special server on the web host.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    51
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    52
COMMANDS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    53
--------
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    54
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
    55
add [options] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    56
    Schedule files to be version controlled and added to the repository.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    57
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
    58
    The files will be added to the repository at the next commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    59
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
    60
    If no names are given, add all files in the current directory and
728
f6588fd14272 Fix typo.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
    61
    its subdirectories.
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
    62
766
b444a7e053f1 Get addremove to use new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 761
diff changeset
    63
addremove [options] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    64
    Add all new files and remove all missing files from the repository.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    65
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    66
    New files are ignored if they match any of the patterns in .hgignore. As
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
    67
    with add, these changes take effect at the next commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    68
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    69
annotate [-r <rev> -u -n -c] [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    70
    List changes in files, showing the revision id responsible for each line
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    71
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    72
    This command is useful to discover who did a change or when a change took
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    73
    place.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    74
    
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    75
    options:
734
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
    76
    -I, --include <pat>  include directories matching the given patterns
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
    77
    -X, --exclude <pat>  exclude directories matching the given patterns
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    78
    -r, --revision <rev>  annotate the specified revision
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    79
    -u, --user            list the author
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    80
    -c, --changeset       list the changeset
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    81
    -n, --number          list the revision number (default)
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    82
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
    83
cat <file> [revision]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    84
    Output to stdout the given revision for the specified file.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    85
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
    86
    If no revision is given then the tip is used.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
    87
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 484
diff changeset
    88
clone [-U] <source> [dest]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    89
    Create a copy of an existing repository in a new directory.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    90
523
003df62ae39f [PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents: 509
diff changeset
    91
    If no destination directory name is specified, it defaults to the
003df62ae39f [PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents: 509
diff changeset
    92
    basename of the source.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    93
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
    94
    The source is added to the new repository's .hg/hgrc file to be used in
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    95
    future pulls.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    96
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
    97
    For efficiency, hardlinks are used for cloning whenever the
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
    98
    source and destination are on the same filesystem.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
    99
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   100
    options:
505
dc1f735dfaac [PATCH] Fix "no-update" option to clone
mpm@selenic.com
parents: 498
diff changeset
   101
    -U, --noupdate   do not update the new working directory
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   102
745
9246ae925d57 Add -m for commit and deprecate -t
mpm@selenic.com
parents: 740
diff changeset
   103
commit [-A -t -l <file> -m <text> -u <user> -d <datecode>] [files...]::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   104
    Commit changes to the given files into the repository.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   105
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   106
    If a list of files is omitted, all changes reported by "hg status"
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   107
    will be commited.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   108
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   109
    The HGEDITOR or EDITOR environment variables are used to start an
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   110
    editor to add a commit comment.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   111
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   112
    Options:
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   113
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   114
    -A, --addremove       run addremove during commit
761
0fb498458905 Change all references to -t --text commit message to -m and --message.
Andrew Thompson <andrewkt@aktzero.com>
parents: 750
diff changeset
   115
    -m, --message <text>  use <text> as commit message
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   116
    -l, --logfile <file>  show the commit message for the given file
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   117
    -d, --date <datecode> record datecode as commit date
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   118
    -u, --user <user>     record user as commiter
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   119
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   120
    aliases: ci
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   121
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   122
copy <source> <dest>::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   123
    Mark <dest> file as a copy or rename of a <source> one
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   124
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   125
    This command takes effect for the next commit.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   126
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   127
diff [-r revision] [-r revision] [files ...]::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   128
    Show differences between revisions for the specified files.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   129
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   130
    Differences between files are shown using the unified diff format.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   131
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   132
    When two revision arguments are given, then changes are shown
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   133
    between those revisions. If only one revision is specified then
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   134
    that revision is compared to the working directory, and, when no
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   135
    revisions are specified, the working directory files are compared
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   136
    to its parent.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   137
734
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
   138
    options:
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
   139
    -I, --include <pat>  include directories matching the given patterns
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
   140
    -X, --exclude <pat>  exclude directories matching the given patterns
d4e161d60f61 Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 731
diff changeset
   141
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   142
export [-o filespec] [revision] ...::
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   143
    Print the changeset header and diffs for one or more revisions.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   144
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   145
    The information shown in the changeset header is: author,
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   146
    changeset hash, parent and commit comment.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   147
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   148
    Output may be to a file, in which case the name of the file is
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   149
    given using a format string.  The formatting rules are as follows:
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   150
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   151
    %%   literal "%" character
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   152
    %H   changeset hash (40 bytes of hexadecimal)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   153
    %N   number of patches being generated
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   154
    %R   changeset revision number
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   155
    %b   basename of the exporting repository
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   156
    %h   short-form changeset hash (12 bytes of hexadecimal)
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   157
    %n   zero-padded sequence number, starting at 1
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   158
    %r   zero-padded changeset revision number
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   159
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   160
    Options:
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   161
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   162
    -o, --output <filespec>   print output to file with formatted named
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   163
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   164
forget [files]::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   165
    Undo an 'hg add' scheduled for the next commit.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   166
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   167
heads::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   168
    Show all repository head changesets.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   169
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   170
    Repository "heads" are changesets that don't have children
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   171
    changesets. They are where development generally takes place and
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   172
    are the usual targets for update and merge operations.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   173
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   174
identify::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   175
    Print a short summary of the current state of the repo.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   176
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   177
    This summary identifies the repository state using one or two parent
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   178
    hash identifiers, followed by a "+" if there are uncommitted changes
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   179
    in the working directory, followed by a list of tags for this revision.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   180
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   181
    aliases: id
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   182
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   183
import [-p <n> -b <base> -q] <patches>::
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   184
    Import a list of patches and commit them individually.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   185
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   186
    options:
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   187
    -p, --strip <n>   directory strip option for patch. This has the same
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   188
                      meaning as the correnponding patch option
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   189
    -b <path>         base directory to read patches from
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   190
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   191
    aliases: patch
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   192
496
6ce95a04999d [PATCH] simplify init
mpm@selenic.com
parents: 495
diff changeset
   193
init::
6ce95a04999d [PATCH] simplify init
mpm@selenic.com
parents: 495
diff changeset
   194
    Initialize a new repository in the current directory.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   195
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   196
locate [options] [files]::
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   197
    Print all files under Mercurial control whose names match the
629
2fdf3b1659b9 Clarify man page entry for locate a little.
Bryan O'Sullivan <bos@serpentine.com>
parents: 627
diff changeset
   198
    given patterns.
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   199
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   200
    This command searches the current directory and its
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   201
    subdirectories.  To search an entire repository, move to the root
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   202
    of the repository.
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   203
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   204
    If no patterns are given to match, this command prints all file
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   205
    names.
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   206
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   207
    If you want to feed the output of this command into the "xargs"
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   208
    command, use the "-0" option to both this command and "xargs".
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   209
    This will avoid the problem of "xargs" treating single filenames
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   210
    that contain white space as multiple file names.
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   211
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   212
    options:
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   213
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   214
    -0, --print0         end filenames with NUL, for use with xargs
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   215
    -f, --fullpath       print complete paths from the filesystem root
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   216
    -I, --include <pat>  include directories matching the given patterns
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   217
    -r, --rev <rev>      search the repository as it stood at rev
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   218
    -X, --exclude <pat>  exclude directories matching the given patterns
627
b6c42714d900 Add locate command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 612
diff changeset
   219
612
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   220
log [-r revision ...] [-p] [file]::
509
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
   221
    Print the revision history of the specified file or the entire project.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   222
509
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
   223
    By default this command outputs: changeset id and hash, tags,
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
   224
    parents, user, date and time, and a summary for each commit. The
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
   225
    -v switch adds some more detail, such as changed files, manifest
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
   226
    hashes or message signatures.
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
   227
612
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   228
    options:
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   229
    -r, --rev <A>, ...  When a revision argument is given, only this file or
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   230
                        changelog revision is displayed. With two revision
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   231
                        arguments all revisions in this range are listed.
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   232
                        Additional revision arguments may be given repeating
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   233
                        the above cycle.
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents: 608
diff changeset
   234
    -p, --patch         show patch
552
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 523
diff changeset
   235
509
98a2935c3d6c [PATCH] replace history with log
mpm@selenic.com
parents: 505
diff changeset
   236
    aliases: history
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   237
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   238
manifest [revision]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   239
    Print a list of version controlled files for the given revision.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   240
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   241
    The manifest is the list of files being version controlled. If no revision
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   242
    is given then the tip is used.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   243
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   244
parents::
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   245
    Print the working directory's parent revisions.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   246
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   247
pull <repository path>::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   248
    Pull changes from a remote repository to a local one.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   249
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   250
    This finds all changes from the repository at the specified path
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   251
    or URL and adds them to the local repository. By default, this
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   252
    does not update the copy of the project in the working directory.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   253
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   254
    options:
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   255
    -u, --update   update the working directory to tip after pull
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   256
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   257
push <destination>::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   258
    Push changes from the local repository to the given destination.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   259
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   260
    This is the symmetrical operation for pull. It helps to move
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   261
    changes from the current repository to a different one. If the
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   262
    destination is local this is identical to a pull in that directory
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   263
    from the current one.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   264
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   265
    The other currently available push method is SSH. This requires an
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   266
    accessible shell account on the destination machine and a copy of
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   267
    hg in the remote path. Destinations are specified in the following
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   268
    form:
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   269
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   270
      ssh://[user@]host[:port]/path
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   271
747
c3ce3976ae75 Add -m for rawcommit
mpm@selenic.com
parents: 746
diff changeset
   272
rawcommit [-p -d -u -F -m -l]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   273
    Lowlevel commit, for use in helper scripts.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   274
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   275
    This command is not intended to be used by normal users, as it is
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   276
    primarily useful for importing from other SCMs.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   277
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
   278
recover::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   279
    Recover from an interrupted commit or pull.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   280
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   281
    This command tries to fix the repository status after an interrupted
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   282
    operation. It should only be necessary when Mercurial suggests it.
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
   283
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   284
remove [files ...]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   285
    Schedule the indicated files for removal from the repository.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   286
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   287
    This command shedules the files to be removed at the next commit.
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   288
    This only removes files from the current branch, not from the
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   289
    entire project history.
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   290
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   291
    aliases: rm
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   292
588
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   293
revert [names ...]::
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   294
    Revert any uncommitted modifications made to the named files or
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   295
    directories.  This restores the contents of the affected files to
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   296
    an unmodified state.
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   297
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   298
    If a file has been deleted, it is recreated.  If the executable
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   299
    mode of a file was changed, it is reset.
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   300
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   301
    If a directory is given, all files in that directory and its
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   302
    subdirectories are reverted.
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   303
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   304
    If no arguments are given, all files in the current directory and
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   305
    its subdirectories are reverted.
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   306
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   307
    options:
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   308
    -r, --rev <rev>       revision to revert to
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   309
    -n, --nonrecursive    do not recurse into subdirectories
0c3bae18403b [PATCH] hg revert
mpm@selenic.com
parents: 580
diff changeset
   310
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   311
root::
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   312
    Print the root directory of the current repository.
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   313
606
ea4526f9b1a5 [PATCH] Fix thinko in "serve" man page entry.
mpm@selenic.com
parents: 605
diff changeset
   314
serve [options]::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   315
    Start a local HTTP repository browser and pull server.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   316
605
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   317
    By default, the server logs accesses to stdout and errors to
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   318
    stderr.  Use the "-A" and "-E" options to log to files.
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   319
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   320
    options:
605
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   321
    -A, --accesslog <file>   name of access log file to write to
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   322
    -E, --errorlog <file>    name of error log file to write to
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   323
    -a, --address <addr>     address to use
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   324
    -p, --port <n>           port to use (default: 8000)
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents: 595
diff changeset
   325
    -n, --name <name>        name to show in web pages (default: working dir)
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   326
    -t, --templatedir <path> web templates to use
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   327
731
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   328
status [options] [files]::
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   329
    Show changed files in the working directory.  If no names are
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   330
    given, all files are shown.  Otherwise, only files matching the
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   331
    given names are shown.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   332
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   333
    The codes used to show the status of files are:
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   334
    
746
9095e3456ea7 Change C to M in status
mpm@selenic.com
parents: 745
diff changeset
   335
    M = changed
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   336
    A = added
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   337
    R = removed
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   338
    ? = not tracked
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   339
731
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   340
    options:
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   341
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   342
    -I, --include <pat>  include directories matching the given patterns
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   343
    -X, --exclude <pat>  exclude directories matching the given patterns
91ca3afab8e8 Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 728
diff changeset
   344
750
25986be9a1aa Add tag -t, deprecate tag -m
mpm@selenic.com
parents: 747
diff changeset
   345
tag [-l -m <text> -d <datecode> -u <user>] <name> [revision]::
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   346
    Name a particular revision using <name>.
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   347
    
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   348
    Tags are used to name particular revisions of the repository and are
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   349
    very useful to compare different revision, to go back to significant
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   350
    earlier versions or to mark branch points as releases, etc.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   351
    
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   352
    If no revision is given, the tip is used.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   353
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   354
    To facilitate version control, distribution, and merging of tags,
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   355
    they are stored as a file named ".hgtags" which is managed
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   356
    similarly to other project files and can be hand-edited if
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   357
    necessary.
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   358
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   359
    options:
631
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
   360
    -l, --local           make the tag local
761
0fb498458905 Change all references to -t --text commit message to -m and --message.
Andrew Thompson <andrewkt@aktzero.com>
parents: 750
diff changeset
   361
    -m, --message <text>  message for tag commit log entry
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   362
    -d, --date <datecode> datecode for commit
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   363
    -u, --user <user>     user for commit
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   364
631
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
   365
    Note: Local tags are not version-controlled or distributed and are
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
   366
    stored in the .hg/localtags file. If there exists a local tag and
a287f6cd9c6b Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents: 629
diff changeset
   367
    a public tag with the same name, local tag is used.
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   368
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   369
tags::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   370
    List the repository tags.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   371
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   372
    This lists both regular and local tags.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   373
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   374
tip::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   375
    Show the tip revision.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   376
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
   377
undo::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   378
    Undo the last commit or pull transaction.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   379
595
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   380
    Roll back the last pull or commit transaction on the
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   381
    repository, restoring the project to its earlier state.
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   382
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   383
    This command should be used with care. There is only one level of
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   384
    undo and there is no redo.
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   385
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   386
    This command is not intended for use on public repositories. Once
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   387
    a change is visible for pull by other users, undoing it locally is
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   388
    ineffective.
c2c2c6d617bd Expand undo docs
mpm@selenic.com
parents: 588
diff changeset
   389
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   390
update [-m -C] [revision]::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   391
    Update the working directory to the specified revision.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   392
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   393
    By default, update will refuse to run if doing so would require
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   394
    merging or discarding local changes.
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   395
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   396
    With the -m option, a merge will be performed.
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   397
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   398
    With the -C option, local changes will be lost.
497
2dcced388cab [PATCH] doc cleanups
mpm@selenic.com
parents: 496
diff changeset
   399
    
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   400
    options:
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   401
    -m, --merge       allow merging of branches
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   402
    -C, --clean       overwrite locally modified files
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   403
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   404
    aliases: up checkout co
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   405
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   406
verify::
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   407
    Verify the integrity of the current repository.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   408
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   409
    This will perform an extensive check of the repository's
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   410
    integrity, validating the hashes and checksums of each entry in
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   411
    the changelog, manifest, and tracked files, as well as the
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   412
    integrity of their crosslinks and indices.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   413
724
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   414
FILE NAME PATTERNS
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   415
------------------
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   416
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   417
    Mercurial accepts several notations for identifying one or more
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   418
    file at a time.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   419
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   420
    By default, Mercurial treats file names as shell-style extended
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   421
    glob patterns.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   422
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   423
    Alternate pattern notations must be specified explicitly.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   424
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   425
    To use a plain path name without any pattern matching, start a
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   426
    name with "path:".  These path names must match completely, from
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   427
    the root of the current repository.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   428
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   429
    To use an extended glob, start a name with "glob:".  Globs are
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   430
    rooted at the current directory; a glob such as "*.c" will match
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   431
    files ending in ".c" in the current directory only.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   432
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   433
    The supported glob syntax extensions are "**" to match any string
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   434
    across path separators, and "{a,b}" to mean "a or b".
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   435
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   436
    To use a Perl/Python regular expression, start a name with "re:".
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   437
    Regexp pattern matching is anchored at the root of the repository.
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   438
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   439
    Plain examples:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   440
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   441
    path:foo/bar   a name bar in a directory named foo in the root of
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   442
                   the repository
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   443
    path:path:name a file or directory named "path:name"
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   444
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   445
    Glob examples:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   446
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   447
    glob:*.c       any name ending in ".c" in the current directory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   448
    *.c            any name ending in ".c" in the current directory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   449
    **.c           any name ending in ".c" in the current directory, or
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   450
                   any subdirectory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   451
    foo/*.c        any name ending in ".c" in the directory foo
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   452
    foo/**.c       any name ending in ".c" in the directory foo, or any
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   453
                   subdirectory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   454
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   455
    Regexp examples:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   456
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   457
    re:.*\.c$      any name ending in ".c", anywhere in the repsitory
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   458
1c0c413cccdd Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 671
diff changeset
   459
580
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   460
SPECIFYING SINGLE REVISIONS
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   461
---------------------------
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   462
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   463
    Mercurial accepts several notations for identifying individual
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   464
    revisions.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   465
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   466
    A plain integer is treated as a revision number.  Negative
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   467
    integers are treated as offsets from the tip, with -1 denoting the
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   468
    tip.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   469
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   470
    A 40-digit hexadecimal string is treated as a unique revision
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   471
    identifier.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   472
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   473
    A hexadecimal string less than 40 characters long is treated as a
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   474
    unique revision identifier, and referred to as a short-form
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   475
    identifier.  A short-form identifier is only valid if it is the
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   476
    prefix of one full-length identifier.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   477
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   478
    Any other string is treated as a tag name, which is a symbolic
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   479
    name associated with a revision identifier.  Tag names may not
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   480
    contain the ":" character.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   481
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   482
    The reserved name "tip" is a special tag that always identifies
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   483
    the most recent revision.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   484
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   485
SPECIFYING MULTIPLE REVISIONS
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   486
-----------------------------
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   487
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   488
    When Mercurial accepts more than one revision, they may be
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   489
    specified individually, or provided as a continuous range,
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   490
    separated by the ":" character.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   491
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   492
    The syntax of range notation is [BEGIN]:[END], where BEGIN and END
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   493
    are revision identifiers.  Both BEGIN and END are optional.  If
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   494
    BEGIN is not specified, it defaults to revision number 0.  If END
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   495
    is not specified, it defaults to the tip.  The range ":" thus
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   496
    means "all revisions".
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   497
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   498
    If BEGIN is greater than END, revisions are treated in reverse
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   499
    order.
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   500
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   501
    A range acts as an open interval.  This means that a range of 3:5
353a2ce50423 [PATCH] New export patch
mpm@selenic.com
parents: 553
diff changeset
   502
    gives 3, 4 and 5.  Similarly, a range of 4:2 gives 4, 3, and 2.
196
48827121af7e add export, recover, and undo to the man page
jake@edge2.net
parents: 182
diff changeset
   503
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   504
ENVIRONMENT VARIABLES
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   505
---------------------
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   506
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   507
HGEDITOR::
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   508
    This is the name of the editor to use when committing. Defaults to the
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
   509
    value of EDITOR. 
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
   510
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
   511
    (deprecated, use .hgrc)
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   512
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   513
HGMERGE::
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   514
    An executable to use for resolving merge conflicts. The program
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   515
    will be executed with three arguments: local file, remote file,
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   516
    ancestor file.
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   517
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   518
    The default program is "hgmerge", which is a shell script provided
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   519
    by Mercurial with some sensible defaults.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   520
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
   521
    (deprecated, use .hgrc)
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
   522
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   523
HGUSER::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   524
    This is the string used for the author of a commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   525
608
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
   526
    (deprecated, use .hgrc)
d2994b5298fb Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents: 606
diff changeset
   527
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   528
EMAIL::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   529
    If HGUSER is not set, this will be used as the author for a commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   530
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   531
LOGNAME::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   532
    If neither HGUSER nor EMAIL is set, LOGNAME will be used (with
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   533
    '@hostname' appended) as the author value for a commit.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   534
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   535
EDITOR::
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   536
    This is the name of the editor used in the hgmerge script. It will be
498
8cf3999b3d03 Various doc clean-ups and spelling fixes
mpm@selenic.com
parents: 497
diff changeset
   537
    used for commit messages if HGEDITOR isn't set. Defaults to 'vi'.
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   538
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   539
PYTHONPATH::
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   540
    This is used by Python to find imported modules and may need to be set
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   541
    appropriately if Mercurial is not installed system-wide.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   542
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   543
FILES
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   544
-----
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   545
 .hgignore::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   546
    This file contains regular expressions (one per line) that describe file
478
f1804f2e7f35 Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents: 438
diff changeset
   547
    names that should be ignored by hg.
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   548
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   549
 .hgtags::
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   550
    This file contains changeset hash values and text tag names (one of each
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   551
    seperated by spaces) that correspond to tagged versions of the repository
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   552
    contents.
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   553
438
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   554
 $HOME/.hgrc, .hg/hgrc::
b38deaf7873e Update docs
mpm@selenic.com
parents: 330
diff changeset
   555
    This file contains defaults and configuration. Values in .hg/hgrc
671
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   556
    override those in .hgrc.  See hgrc(5) for details of the contents
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   557
    and format of these files.
321
73b8a8a059ec Transparent proxy support
mpm@selenic.com
parents: 196
diff changeset
   558
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   559
BUGS
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   560
----
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   561
Probably lots, please post them to the mailing list (See Resources below)
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   562
when you find them.
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   563
671
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   564
SEE ALSO
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   565
--------
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   566
hgrc(5)
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   567
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   568
AUTHOR
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   569
------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   570
Written by Matt Mackall <mpm@selenic.com>
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   571
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   572
RESOURCES
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   573
---------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   574
http://selenic.com/mercurial[Main Web Site]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   575
671
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   576
http://www.serpentine.com/mercurial[Wiki site]
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents: 631
diff changeset
   577
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   578
http://selenic.com/hg[Source code repository]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   579
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   580
http://selenic.com/mailman/listinfo/mercurial[Mailing list]
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   581
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   582
COPYING
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   583
-------
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   584
Copyright (C) 2005 Matt Mackall.
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   585
Free use of this software is granted under the terms of the GNU General
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
   586
Public License (GPL).