You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Res Pons <po...@hotmail.com> on 2006/08/10 21:20:57 UTC

Tagging

I have a small problem.

Normally when tagging after a build, I commit my working folder to the 
project's tag subdirectory by doing a -- svn cp wc url -m "comment"

We always do full builds everyday. Today we did an incremental build off the 
same pristine wc, the only change was the addition of 2 new .htm files and 
deletion of 4 other files.  So I did an update on wc from svn, which 
downloaded the 2 files and removed the 4 deleted files.  So my wc is in 
synch with the repo now.  But my original tagged folder still contains the 6 
affected files. How should I do this?  Should I remove the entire tagged 
folder in the repo and just copy my wc over again to have the latest 
changes.  Or just cp over the 2 new files and delete the 4 files from the 
tags folder directly?  Thanks.

_________________________________________________________________
On the road to retirement? Check out MSN Life Events for advice on how to 
get there! http://lifeevents.msn.com/category.aspx?cid=Retirement

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

RE: Tagging

Posted by Res Pons <po...@hotmail.com>.
This is great, I was wondering what the best approach was. Thank you for 
your help.

----Original Message Follows----
From: "Erik Hemdal" <er...@comprehensivepower.com>
To: "'Res Pons'" <po...@subversion.tigris.org>
Subject: RE: Tagging
Date: Fri, 11 Aug 2006 09:46:52 -0400


 > I have a small problem.
 >
 > Normally when tagging after a build, I commit my working
 > folder to the
 > project's tag subdirectory by doing a -- svn cp wc url -m "comment"
 >
 > We always do full builds everyday. Today we did an
 > incremental build off the
 > same pristine wc, the only change was the addition of 2 new
 > .htm files and
 > deletion of 4 other files.  So I did an update on wc from svn, which
 > downloaded the 2 files and removed the 4 deleted files.  So
 > my wc is in
 > synch with the repo now.  But my original tagged folder still
 > contains the 6
 > affected files. How should I do this?  Should I remove the
 > entire tagged
 > folder in the repo and just copy my wc over again to have the latest
 > changes.  Or just cp over the 2 new files and delete the 4
 > files from the
 > tags folder directly?  Thanks.

If I understand your question, you have created a tag, which is normally
supposed to be unchanged.  But then you made a new build and you want to
update the tag.

I've had to do this occasionally when last-minute changes were needed.
Here's how I do it.

- Create a build off the "build branch" (whatever that happens to be).
- Merge the build branch into the tag.
- Commit the updates to the tag.

This changes the contents of the tag.  But it also lets us add checkin
comments that document the reason for the change and who did the change.  It
saves the before-change and after-change state of the tag.

If you use TortoiseSVN, it will warn you about modifying a tag, but you can
ignore the warning and do this anyway.  If you use a hook script that
prevents commits against tags, then you will have to work around your hook
script.

I hope this helps.   Erik

_________________________________________________________________
On the road to retirement? Check out MSN Life Events for advice on how to 
get there! http://lifeevents.msn.com/category.aspx?cid=Retirement

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

RE: Tagging

Posted by Erik Hemdal <er...@comprehensivepower.com>.
> I have a small problem.
> 
> Normally when tagging after a build, I commit my working 
> folder to the 
> project's tag subdirectory by doing a -- svn cp wc url -m "comment"
> 
> We always do full builds everyday. Today we did an 
> incremental build off the 
> same pristine wc, the only change was the addition of 2 new 
> .htm files and 
> deletion of 4 other files.  So I did an update on wc from svn, which 
> downloaded the 2 files and removed the 4 deleted files.  So 
> my wc is in 
> synch with the repo now.  But my original tagged folder still 
> contains the 6 
> affected files. How should I do this?  Should I remove the 
> entire tagged 
> folder in the repo and just copy my wc over again to have the latest 
> changes.  Or just cp over the 2 new files and delete the 4 
> files from the 
> tags folder directly?  Thanks.

If I understand your question, you have created a tag, which is normally
supposed to be unchanged.  But then you made a new build and you want to
update the tag.

I've had to do this occasionally when last-minute changes were needed.
Here's how I do it.

- Create a build off the "build branch" (whatever that happens to be).
- Merge the build branch into the tag.  
- Commit the updates to the tag.

This changes the contents of the tag.  But it also lets us add checkin
comments that document the reason for the change and who did the change.  It
saves the before-change and after-change state of the tag.

If you use TortoiseSVN, it will warn you about modifying a tag, but you can
ignore the warning and do this anyway.  If you use a hook script that
prevents commits against tags, then you will have to work around your hook
script.

I hope this helps.   Erik


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org