I'm using tortoisehg and am a little confused on a workflow for branching.

peter at peterkellner.net peter at peterkellner.net
Sat Jan 22 07:11:15 CST 2011


Actually, I do want everyone else to be able to see the dev's working code but not have it affect the main trunk until the dev decides to merge it back into the main trunk.

-----Original Message-----
From: Dilip M [mailto:dilipm79 at gmail.com] 
Sent: Saturday, January 22, 2011 1:06 AM
To: peter at peterkellner.net
Cc: mercurial at selenic.com
Subject: Re: I'm using tortoisehg and am a little confused on a workflow for branching.

On Sat, Jan 22, 2011 at 9:41 AM, peter at peterkellner.net <peter at peterkellner.net> wrote:

> We have 3 dev's and we all check into the trunk and sync and merge 
> with our bitbucket repository practically every commit.
>
> I want to have one of the dev's start working on new stuff that would 
> break everyone's build if he were to check it into the trunk.

Ok, just do not 'push' until that one of the dev have tested locally.

> I want him to keep his stuff up to date with everyone else, but don't 
> want everyone else to see his stuff.

Ok. Keep only 'pulling'.

> Then eventually, when his stuff is stable, merge it back into the trunk.

Ok. when pulled and dev has fixed the code for succeful build, 'push' it.

> I think to everyone else it seems obvious how to do this, but I'm kind 
> of lost on this.

Check if this helps.
http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/

--
DM


More information about the Mercurial mailing list