Where should we put our tags?

William Roberts williamr at symbian.org
Wed Jan 13 04:50:34 CST 2010




Dirkjan Ochtman wrote:
> 
> That said, I'm with Greg on the fact that tagging on a separate branch
> probably isn't that useful, but it kind of depends on the rest of your
> workflow (e.g. do you use named branches or separate clones or
> named-branches-in-separate clones, do you merge everything back into a
> default-like branch or not).
> 

Simon could have put in some links to show you what we mean - for example

https://developer.symbian.org/oss/MCL/sf/app/webuis/graph

We use named branches (in this case default and "RCL_1"). These branches
never converge again, but we prefer to use a single repository rather than
having a repository per branch because our codebase is already divided into
150 repositories and we don't want to multiply that further.

We normally build from the tips of the branches, and tag once we get the
build into good shape: this is what leads to the tagging commits being later
tagged themselves.

We also have the problem that we get regular "code drops" from another CM
system, currently in a strictly "1-way" fashion: look for commit messages of
the form "Revision: 2009xx". We limit the damage of this by making sure that
each drop has the previous drop as the parent, but that means that it never
notices our tagging. 

The "webuis" repo is a simple example - if there's any real activity
conducted in Mercurial as well as the regular code drops, then the graph
goes crazy, for example

https://developer.symbian.org/oss/MCL/sf/os/security/graph

Putting the tags into a separate branch is "weird", but then the handling of
the .hgtags file is already very different from ordinary files. The main
motivation is the 1-way deliveries from the other CM system: it will become
a two-way synchronisation eventually, but the tags branch would help for the
time being, and probably doesn't do any lasting damage...

William
-- 
View this message in context: http://old.nabble.com/Where-should-we-put-our-tags--tp27130328p27142972.html
Sent from the Mercurial mailing list archive at Nabble.com.



More information about the Mercurial mailing list