transforming the 5-branch-types !git model to the 2-branch !hg model with the same functionality

[Ike Casteleyn]

Hi all,

Thanks for the replies.

@Victor: It's was to better describe to which system I was referring (Arne's or Nvie's), but true both models can be applied to most SCMs.

@Harvey/@Arne:
I think I need to work with the system first at my company. Get a feel of what is overhead and what not.
For instance I would not create new release branches all the time 
rel-1.0
rel-1.1
...
As that seems indeed bloat.
I would just have one branch "release".
* I need to have a branch that can receive bugfixes during testing, but no more new features -> testers need to be able to continue without having to start all over because new feature was incorporated (that's the release branch)
* For that same reason I also need a branch "default" to still be able to receive new features -> other developers need to continue to work too.
So the release-branch is just a step between merging everything to stable (so it keeps beeing stable).
Note: release-branch could also be a bookmark (I will try both to see how it feels)
I want my collegues to easily go to "release" or "feature"

Same for hotfixes: bookmarks could work or perhaps if you are the only person working on the hotfix you could work directly in stable (and only push when finished) -> still forgot sometimes that a commit in mercurial doesn't mean it shared for other developers (unlike subversion).

Again thanks for the input.

Best regards,
Ike

 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20130127/c546cc84/attachment-0002.html>