[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Naughty commits to tags

From: Ben Reser <ben_at_reser.org>
Date: 2004-10-13 18:58:47 CEST

On Wed, Oct 13, 2004 at 10:56:07PM +1000, Daniel Patterson wrote:
> (there are some naughty looking tag modifications in there ;-) )

We modify our release tags to match the tarball. This is the result of
juggling a couple of issues with respect to how our releases are cut.

* Releaseas are exported against a particular revision.

* We test the tarball to see if everything is good before we call it a
final release. If we were to modify the branches svn_version.h before
cutting the release and then decide that the release was bad and needed
another change then there would be multiple paths in the repo which you
could check out and identify themselves as a given release.

* Applying the svn_version.h changes to the branch and then committing
also only works if you can guarantee that no other commits happen on the
branch between when you commit the last change going in the rev (your
export rev), the change to svn_version.h, the tag revision, and the
bumping of svn_version.h to the dev version of next release number.

That said I believe there is another way to do this... That hadn't
occured to me until just now.

svn up -r releaserev
#modify svn_version.h to the tag markings
svn cp -m "Tagging 1.0.x release with svn_version.h matching tarball" \
  . https://svn.collab.net/repos/svn/tags/1.0.x

That should copy the files from the releaserev and apply my one local
change to the tag. I'll give it a try today when I cut the 1.0.9
release.

It should avoid the problems above and solve the one problem of
modifying the tag. There is one rev where if you look at the tag it
will be marked as the dev version of the version the tag represents, as
opposed to the release version.

-- 
Ben Reser <ben@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 13 18:59:07 2004

This is an archived mail posted to the Subversion Dev mailing list.