Re: help with cvs import

[Pierre Asselin]

Kevin Rodgers <address@hidden> wrote:

> The manual says:

>         If you modify a program to better fit your site, you probably
>         want to include your modifications when the next release of the
>         program arrives. CVS can help you with this task.

> ...

> But that is wrong.  I don't want to include my modifications in
> subsequent vendor releases; my modifications are just temporary
> workarounds until the vendor fixes the official distribution; until
> then, I can simply apply my patch to subsequent vendor releases
> (generally not necessary) and create a branch for that purpose.

Or you can follow Larry's advice and let CVS synthesize and reapply
the patch after each import, until the vendor fixes the problem.

When the vendor fixes the bug and you are absolutely certain that
your tweaks have become superfluous, you can return to using the
vendor version with something like cvs admin -b1.1.1 .


> I don't own this package, the vendor does, and those releases should form
> the trunk.

The trunk in your vendor's CVS repository (if they use CVS).  In *your*
repository, it should be the vendor branch.  That's just the way
the tool works.


> -- 
> Kevin Rodgers




-- 
pa at panix dot com