Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/FAQ.txt @ 718:7dae73778114

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typos in FAQ
author jdc@uwo.ca
date Sun, 17 Jul 2005 08:39:44 +0100
parents a287f6cd9c6b
children c6b912f8b5b2 8db4d406b3d3 d2422f10c136
comparison
equal deleted inserted replaced
717:a51e3ded642d 718:7dae73778114
63 joining points on two branches into one, usually at their current 63 joining points on two branches into one, usually at their current
64 heads. Use "hg heads" to find the heads in the current repository. 64 heads. Use "hg heads" to find the heads in the current repository.
65 65
66 The 'tip' is the most recently changed head, and also the highest 66 The 'tip' is the most recently changed head, and also the highest
67 numbered revision. If you have just made a commit, that commit will be 67 numbered revision. If you have just made a commit, that commit will be
68 the head. Alternately, if you have just pulled from another 68 the tip. Alternately, if you have just pulled from another
69 repository, the tip of that repository becomes the current tip. 69 repository, the tip of that repository becomes the current tip.
70 70
71 The 'tip' is the default revision for many commands such as update, 71 The 'tip' is the default revision for many commands such as update,
72 and also functions as a special symbolic tag. 72 and also functions as a special symbolic tag.
73 73
150 The incoming tree is best maintained as a pristine copy of the 150 The incoming tree is best maintained as a pristine copy of the
151 upstream repository. This works as a cache so that you don't have to 151 upstream repository. This works as a cache so that you don't have to
152 pull multiple copies over the network. No need to check files out here 152 pull multiple copies over the network. No need to check files out here
153 as you won't be changing them. 153 as you won't be changing them.
154 154
155 The outgoing tree contains all the changes you intend for merger into 155 The outgoing tree contains all the changes you intend for merge into
156 upsteam. Publish this tree with 'hg serve" or hgweb.cgi or use 'hg 156 upsteam. Publish this tree with 'hg serve" or hgweb.cgi or use 'hg
157 push" to push it to another publicly availabe repository. 157 push" to push it to another publicly availabe repository.
158 158
159 Then, for each feature you work on, create a new tree. Commit early 159 Then, for each feature you work on, create a new tree. Commit early
160 and commit often, merge with incoming regularly, and once you're 160 and commit often, merge with incoming regularly, and once you're
194 194
195 .Q. Can Mercurial do <x>? 195 .Q. Can Mercurial do <x>?
196 196
197 If you'd like to request a feature, send your request to 197 If you'd like to request a feature, send your request to
198 mercurial@selenic.com. As Mercurial is still very new, there are 198 mercurial@selenic.com. As Mercurial is still very new, there are
199 certainly features it is missing and you can give up feedback on how 199 certainly features it is missing and you can give us feedback on how
200 best to implement them. 200 best to implement them.
201 201
202 202
203 Section 3: Technical 203 Section 3: Technical
204 -------------------- 204 --------------------
254 .Q. How are manifests and changesets stored? 254 .Q. How are manifests and changesets stored?
255 255
256 A manifest is simply a list of all files in a given revision of a 256 A manifest is simply a list of all files in a given revision of a
257 project along with the nodeids of the corresponding file revisions. So 257 project along with the nodeids of the corresponding file revisions. So
258 grabbing a given version of the project means simply looking up its 258 grabbing a given version of the project means simply looking up its
259 manifest and reconstruction all the file revisions pointed to by it. 259 manifest and reconstructing all the file revisions pointed to by it.
260 260
261 A changeset is a list of all files changed in a check-in along with a 261 A changeset is a list of all files changed in a check-in along with a
262 change description and some metadata like user and date. It also 262 change description and some metadata like user and date. It also
263 contains a nodeid to the relevent revision of the manifest. 263 contains a nodeid to the relevent revision of the manifest.
264 264