[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Help with tagging
Re: Help with tagging
Mon, 18 Jul 2005 17:38:10 -0500
S I wrote:
> I'm not sure what approach to take on this: I labeled or tagged the
> mainline on Friday for our release. Today I branched off successfully.
> However I found out that a file on Friday between my tagging and releasing
> had missed few revisions. i.e. the specific file on the mainline was at
> revision 1.368 when I tagged the tree but apparently there were couple of
> more checkins between my tagging and today's branching and the file on the
> mainline now is at revision 1.375. I need to bring revision 1.375 from
> mainline to the branch which currently has 1.368.
This may not be great advice, apply necessary salt, because I do not
normally use branching.
IFF, 1) no one has checked any changes in on the branch && 2) you had
intended for what ever the state was at the end of friday to be the branch
you might want to read up on `cvs tag -BF` (this was your second method).
It would probably also be a good idea to check your baseline and see if any
other changes were snuck in at the last moment.
`cvs diff -rNORMAL_TAG_AT_BRANCH -D0HUNDREDHOURS_SUNDAY_DATE_STRING`
if either you have several files that snuck in, or someone has checked in
changes to the branch already, then you would probably be better off
learning how to keep your checkpoint tags for merging between branches and
start doing it(this would be a better alternative to your first method).
If people have not started USING the new branch yet, it might be best to
abandon it, create a new set of tags (created at the same time) and tell
people to use that.
P.S. I believe that if you are going to use branching (see above salt
recommendation), you should probably attach the normal tag and then
immediately apply the branch tag, and get people on it so you don't have
these problems. Also it would probably be a good idea to give people a
DEADline if they want their changes in the branch.
Crane Division, Naval Surface Warfare Center (NSWC Crane)
Harnessing the Power of Technology for the Warfighter