On Sep 20, 2009, at 20:33, Gavin Baumanis wrote:
> I have a file;
> /trunk/myFile.a
>
> It is currently undergoing significant development.
> One of those developments has been approved for release.
> Normally, we only do a small change or so per file and then create a
> new tag for release from HEAD.
>
> The sticking point for me is;
> The change that is approved - is at r1200. The repo currently sits at
> r1500 - with a significant number of changes made to File.a in between
> 1200 and HEAD.
> (Which is the bit that is odd for me - in that I have never dealt with
> that scenario before.)
>
> I could make a release tag_at_1200
> But then that locks all files to be of no greater a revision that
> 1200.
>
> I suppose I could simply do a diff of 1200:1199 for /trunk/File.a and
> obtain a unidiff.
> Make a copy of the current release tag. - Which is another problem -
> because we actually don't have a tag per release we just have a
> forever ongoing branch that we use for production uploads.
> And apply the new patch - then commit the new release tag?
So, do or don't you have a tag per release?
I think you probably just need to "svn merge -c1200" from the trunk
into your release branch. Then, if you use them, you can make a new
tag from the release branch.
How do you normally get changes from your trunk into your release
branch, if not by merging? Merging would be the usual way to do this.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2397197
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-21 06:43:29 CEST