[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Creating patches for a previous release using updates from the trunk
Re: Creating patches for a previous release using updates from the trunk?
Sat, 8 Mar 2003 17:09:04 -0500 (EST)
Daniel M. Quinlan writes:
> I am unclear how to keep and maintain a record of the patched release
> in the repository. Currently, we just tag the release, though we
> probably should make a branch tag also.
> Normally, the source revisions for the patches will be (or have already
> been) developed on the trunk, and are then integrated into the release
> by hand (eg, copying the relevant files to the right directory and
> running make).
> I would prefer to run some sort of update/commit commands on the
> release branch, to avoid the copy, and so that I could later checkout
> from the repository the patched release source. However, I get the
> impression from the documentation and info-cvs archives that this is
> either not possible or involves a potentially horrendous number of
Nope, it's actually quite easy. What you do is check out a working
directory on the branch that you created when you made the release, then
use update with two -j options to merge the changes you want from the
trunk. Once you've got all the changes you want and you've tested them,
you can then check in the fixed version on the branch. You'll probably
want to tag it so that you know exactly what was in each patched
version, but it isn't strictly necessary.
My upbringing is filled with inconsistent messages. -- Calvin