Differences between revisions 14 and 43 (spanning 29 versions)
Revision 14 as of 2008-12-30 03:17:44
Size: 2068
Editor: ibn
Comment:
Revision 43 as of 2013-08-31 08:42:13
Size: 438
Editor: UDORosaly
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
== 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 ===
 * How to write good ChangeSetComments
 * RepositoryNaming is important, because you'll probably have lots of them
 * [:Clone]
 * MultipleCommitters

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

 . Answer: Quote from [:ContributingChanges]: ''"Mercurial development process resembles the one described in KernelPractice"''

----
CategoryHowTo
I am Cathi Velasco though Do not really like being also known as like that. Mississippi is where me as my husband live however need to move to produce my family. Since I was 18 I have been working as a securities control and order for filler injections but soon I'll turn out to be on my own. To collect kites is something that I conducted for years. I in the morning running and maintaining weblog here: http://apotopkredytowy.soup.io/

I am Cathi Velasco though Do not really like being also known as like that. Mississippi is where me as my husband live however need to move to produce my family. Since I was 18 I have been working as a securities control and order for filler injections but soon I'll turn out to be on my own. To collect kites is something that I conducted for years. I in the morning running and maintaining weblog here: http://apotopkredytowy.soup.io/

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