[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Help with tagging
Re: Help with tagging
Thu, 21 Jul 2005 08:32:37 -0400
On 7/19/05, Mark E. Hamilton <address@hidden> wrote:
> S I wrote:
> > I thought the sneakiest solution would be to get the latest from Main
> > (1.375) and bring it into my working copy of the branch and just check
> > it in which will bring the branch now to 1.369 since it'll be just like
> > as though somebody manually edited the file and checked it in. The
> > developers are ok with this method but for my own peace of mind...does
> > this method leave any history?
> This is not a sneaky solution; it's normal. When you have bug fixes that
> need to be made you have to commit them to both the mainline and to the
> branch separately. You could onsider this the first bug fix for the branch.
> However, I'd make the developers do this. If it's painful enough they
> might pay more attention to deadlines, (or at least informing you that
> they need the deadline delayed for a commit or two.)
> > OR
> > Should I force the tag on the file on the Mainline and then force the
> > branch on it? Is this even possible? How? And if so, is this a better
> > method? Please give me an example.
> If it's just the one file, and if no one has started using the branch
> yet, what I would is delete the branch and reference tags from just that
> file, then re-tag and re-branch the 1.375 revision. This would mean that
> the reference tag wouldn't represent a point in time (ie, the day you
> tagged it,) but it would represent the desired state of the code at that
> So, what I would do is:
> cvs tag -B -d branch_tag incorrect_file
> cvs tag -d reference_tag incorrect_file
> cvs tag -r 1.375 reference_tag incorrect_file
> cvs tag -b -r reference_tag incorrect_file
> > Thank you
> > Steve
> Mark E. Hamilton
> Orion International Technologies, Inc.
> Sandia National Laboratory, NM.
> Info-cvs mailing list
My two cents...
If you only have this one file that is different, and there have been
no changes to that file on the branch. Then all you need to do is
'cvs tag -FB 1.375 yourFile'. This simply moves the branch tag from
the old rev to the new one. No history will be made of this action.
Otherwise the above posters statements about re-doing the whole thing
or merging Main with Branch is required.
Another two cents. What we do is tag each release (actually each test build).
Make a build from the tag.
Have developers/testing sanity test their changes with the build.
Have the developers fix and move tags on fixed files.
Repeat (to a point).
After the final 'clean' build, the tag is up to date.
On major/minor releases we create a branch point _from the build
tag_. Then maintinance is done for a short time on Branch and main
devel keeps going on Main.
This ensures that the load that T&V recieves is always clean (that is
not to say bug free...), reproduceable and traceable.