RE: Patching and Releasing

[Teala Spitzbarth]

and if you are tagging each fix on some kind of 'fixes-branch'
then you should be able to use cvs rdiff to create the patch 
you want directly, using something like "cvs rdiff -c -rTAG1 -rTAG2
modulename"
as long as TAG1 and TAG2 are on the branch you will only get branch
changes

see also:

http://www.cvshome.org/docs/manual/cvs_16.html#SEC144

Cheers,
-teala

-----Original Message-----
From: Eric Siegerman [mailto:address@hidden
Sent: Friday, July 27, 2001 7:03 PM
To: address@hidden
Subject: Re: Patching and Releasing


On Fri, Jul 27, 2001 at 03:08:08PM -0700, Kent Henneuse wrote:
> I want to be able to determine the changes that have happend on
> a branch between two different dates.  This will then be used
> to make up a patch that can be added to fix defects.
> 
> Ideas I have had are:
>   Tag the branch with each patch that goes out.

Absolutely!  I don't trust -D -- not because of any bugs; I don't
know of any -- but because it's imprecise.  Do you remember
*exactly*, to the second, when you did the "cvs update" that went
into that distribution you made three weeks ago?  Then how do you
know, when you do an "update -D" or "diff -D", that you're
getting *exactly* the same set of revisions you got then.

>   Create a branch for each defect fix

Consider a hybrid approach:
  - create a single branch, rooted at the latest release, for all
    post-release bug fixes 
  - commit fixes to that branch, tagging each one