Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/hg.1 @ 196:48827121af7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add export, recover, and undo to the man page add export to hg help
author jake@edge2.net
date Mon, 30 May 2005 09:53:48 -0700
parents 089594a5bbde
children
comparison
equal deleted inserted replaced
195:b98bcf66dd9d 196:48827121af7e
108 .TP 108 .TP
109 dumpmanifest [revision] 109 dumpmanifest [revision]
110 print the indicated revision of the manifest (list of version controlled files) 110 print the indicated revision of the manifest (list of version controlled files)
111 111
112 .TP 112 .TP
113 export [revision]
114 print the changeset header (author, changeset hash, parent, and commit comment) and the diffs for a particular revision\&.
115
116 .TP
113 history 117 history
114 print the revision history of the repository 118 print the revision history of the repository
115 119
116 .TP 120 .TP
117 init 121 init
124 .TP 128 .TP
125 merge <repository path> 129 merge <repository path>
126 pull any changes from the specified repository to the repository in the current directory\&. Use the value of the HGMERGE environment variable as a program to resolve any merge conflicts between the two repositories\&. An implicit commit is done at the end of this process if there were any merge conflicts\&. Note that merge does not yet merge with changed files in the working dir\&. 130 pull any changes from the specified repository to the repository in the current directory\&. Use the value of the HGMERGE environment variable as a program to resolve any merge conflicts between the two repositories\&. An implicit commit is done at the end of this process if there were any merge conflicts\&. Note that merge does not yet merge with changed files in the working dir\&.
127 131
128 .TP 132 .TP
133 recover
134 rollback an interrupted transaction
135
136 .TP
129 remove [files ...] 137 remove [files ...]
130 schedule the indicated files for removal from the repository at the next commit 138 schedule the indicated files for removal from the repository at the next commit
131 139
132 .TP 140 .TP
133 serve [\-a addr \-n name \-p port \-t templatedir] 141 serve [\-a addr \-n name \-p port \-t templatedir]
139 147
140 .TP 148 .TP
141 tags 149 tags
142 list the current tags 150 list the current tags
143 151
152 .TP
153 undo
154 undo the last transaction
155
144 .SH "ENVIRONMENT VARIABLES" 156 .SH "ENVIRONMENT VARIABLES"
145 157
146 .TP 158 .TP
147 HGMERGE 159 HGMERGE
148 points to an executable to use for resolving merge conflicts, the program will be executed with four arguments: local file, remote file, ancestor file, and original filename\&. 160 points to an executable to use for resolving merge conflicts, the program will be executed with four arguments: local file, remote file, ancestor file, and original filename\&.