Automatic tagging

[Steve Borho]

On Tue, 2008-04-01 at 19:43 +0200, Andreas Axelsson wrote:
> > -----Original Message-----
> > From: Andreas Axelsson [mailto:andreas.axelsson at gmail.com]
> > Sent: den 1 april 2008 18:46
> > To: 'Roman Kennke'; 'Mercurial'
> > Subject: RE: Automatic tagging
> > 
> > > -----Original Message-----
> > > From: mercurial-bounces at selenic.com [mailto:mercurial-
> > > bounces at selenic.com] On Behalf Of Roman Kennke
> > > Sent: den 1 april 2008 15:42
> > > To: Mercurial
> > > Subject: Automatic tagging
> > >
> > > Now, with Mercurial there is one problem. How can the autobuilder
> > > automatically tag the repository in a reliable way? I mean, it can
> > tag
> > > its cloned copy. But the tag needs to be pushed to the master
> > > repository. However, this will likely abort, and a merge will be
> > > needed.
> > 
> > Would pushing a tag actually require any merging? And if it does,
> > wouldn't it be the .hgtags file only anyway? That should be pretty easy
> > to auto-merge, or am I missing something. Or do you submit changes from
> > the autobuild?
> > 
> 
> Forget what I said, I tried it and it requires merging. I've not use Hg enough it seems.

At least with 1.0, you can write a special merge wrapper specifically
for .hgtags.  Such a script should probably get added to contrib/.  Any
takers?

-- 
Steve Borho (steve at borho.org)
http://www.borho.org/~steve/steve.asc
Key fingerprint = 2D08 E7CF B624 624C DE1F  E2E4 B0C2 5292 F2C6 2C8C