Differences between revisions 13 and 14
Revision 13 as of 2008-11-19 03:01:04
Size: 2077
Comment: Fixed a typing mistake.
Revision 14 as of 2008-12-30 03:17:44
Size: 2068
Editor: ibn
Comment:
Deletions are marked like this. Additions are marked like this.
Line 41: Line 41:
Question by AiBin: Do you know which is the one HG takes itself? Question: Do you know which is the one HG takes itself?

Mercurial working practices

This page documents some ways to use Mercurial. Because the software is flexible, there's no "right way", but some methods are more scalable than others.

First, [:Merge:merge] often! This makes merging easier for everyone and you find out about conflicts (which are often rooted in incompatible design decisions) earlier.

Second, don't hesitate to use multiple trees locally. Mercurial makes this fast and light-weight. Typical usage is to have an incoming tree, an outgoing tree, and a separate tree for each area being worked on.

The incoming tree is best maintained as a pristine copy of the upstream [:Repository:repository]. This works as a cache so that you don't have to [:Pull:pull] multiple copies over the network. No need to check files out here as you won't be changing them.

The outgoing tree contains all the changes you intend for merge into upstream. Publish this tree with hg serve or hgweb.cgi or use hg push to [:Push:push] it to another publicly available repository.

Then, for each feature you work on, create a new tree. [:Commit] early and commit often, merge with incoming regularly, and once you're satisfied with your feature, pull the changes into your outgoing tree.

Other ways to collaborate

Name

Scalability

Overhead

Description

CvsLikePractice

poor

low

keep things simple, use a few central repositories

KernelPractice

good

medium

distributed, semi-hierarchical development

ControlledPractice

good

medium

hierarchical development

See also


Question: Do you know which is the one HG takes itself?


CategoryHowTo

WorkingPractices (last edited 2013-08-31 09:38:15 by rcl)