Differences between revisions 17 and 34 (spanning 17 versions)
Revision 17 as of 2009-05-14 10:18:01
Size: 2264
Editor: TorstenWill
Comment:
Revision 34 as of 2013-08-28 12:42:39
Size: 451
Editor: JaydenAug
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. These are a few tips for creating a scaleable workflow.

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"''

Question: What is the way to have ''commits'' go onto a backed-up drive? If my working computer is laptop with a safe `/samba` share?


----
CategoryHowTo
Reed Hodgdon is what any person can call me together with I totally love all of this name.<<BR>>
<<BR>>
I am a supervisor but soon my girlfriend and I will commencement our own business. Georgia is where we've been doing living for years while my parents live nearby. To coolect product tops is the point I love most. My wife and I maintain a website. You would probably want to check getting this done out here: http://coffeepurecleansereview.com

Reed Hodgdon is what any person can call me together with I totally love all of this name.

I am a supervisor but soon my girlfriend and I will commencement our own business. Georgia is where we've been doing living for years while my parents live nearby. To coolect product tops is the point I love most. My wife and I maintain a website. You would probably want to check getting this done out here: http://coffeepurecleansereview.com

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