Re: Bug fixing and CVS tagging

[Pierre Asselin]

Mateusz [PEYN] Adamus <address@hidden> wrote:

> [ ... ] what I'd like to do is to fix some bugs in my release. No problem 
> with that. I'm onlu concerned about tagging files. I read somewhere that 
> it is a good practice to tag files before and after fixing a bug. Thanks 
> to it later on I will be able to retrieve what exactly have been changed 
> to fix what bug.

Yes, if you want to ship updates that fix only a subset of the
known bugs.  Or if your fix is so hasty that you may want to back
it out and do it over.  In either case, you could fix each bug in
its own branch, either a subbranch of the release branch, or a co-branch
rooted at the same point as the release branch itself.  I don't think
its worth the effort, though.

My advice:  tag when you ship and don't bother tagging anything
else.  Exception:  you should maintain a "moving tag" when
you merge your bug fixes to the trunk, like this:

First merge:
    cvs update -j bugfix-branch  # in a trunk sandbox
    # fix conflicts, etc.
    cvs commit
    cvs tag -r bugfix-branch bugfix-MERGED

All later merges:
    cvs update -j bugfix-MERGED -j bugfix-branch # trunk sandbox
    # fix
    cvs commit
    cvs tag -F -r bugfix-branch bugfix-MERGED # move the tag

last command has an "-F" option because the tag bugfix-MERGED
already exists.

If you run a team you have to be a little careful about others
committing stuff while you're doing this.  Post again if you
need details --but it seems you're working solo ?


> OK. Thats great. But what files should I tag?

All the files, just so you never have to think about it.

-- 
pa at panix dot com