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

[Arne Babenhauserheide]

Hi ike,

(only answering questions Harvey skipped)

Am Freitag, 25. Januar 2013, 14:43:36 schrieb ike:
> > * Hotfixes are simple commits on stable, so we also need no branch for
> > them (down to 3 branch-types)
> I can agree with this, but not all hotfixes are trivial.
> It's a hotfix because it needs to start from the stable-branch, but the
> amount of work that the hotfix implies would drive the decision if a
> hotfix-branch must be created or just be commits on stable.

You can always use branches to do a hotfix, if you want to keep intermediate commits of stable. Otherwise you can simply do the hotfix in a clone and push it back once you’re finished.

Or mark it with a bookmark, so people know that it’s a special line of work right now.

> > * And if we only maintain one release at a time, we only need one branch
> > for them: stable (down from branch-type to single branch)
> I don't understand what you mean here.

Instead of having 

release-1 (obsolete)
release-2 (soon obsolete)
release-3

you just have

stable

Essentially the release branches are a whole class of branches, likely identified by a common namespace (release-*). That not only complicates the diagram, but also complicates the model your developers have to hold in their head to understand the repository.

> > * And feature branches are not required for clean separation since
> > mercurial can easily cope with multiple heads in a branch, so developers
> > only have to worry about them if they want to use them (down to 2
> > mandatory branches).
> Clear and is a matter of preference I guess.

Yepp: That’s why it’s 2 *mandatory* branches. You don’t need feature branches, but you can use them.

You might want to enforce having one feature branch per issue in your bugtracker or similar. But at least for small projects, that’s a lot of overhead without direct gain.

Best wishes,
Arne
--
Ein Würfel System - einfach saubere Regeln: 

- http://1w6.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 316 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20130126/b3c317cc/attachment.asc>