[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Handling 3rd party sources
From: |
Ted Stern |
Subject: |
Re: Handling 3rd party sources |
Date: |
Tue, 20 Dec 2005 09:52:12 -0800 |
User-agent: |
Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) |
On 20 Dec 2005 at 03:41 UTC-0800, Gianluca Sforna wrote:
> Hi,
> I am tracking a third party project in my CVS server and, when they
> make new releases, I am able to import and use the new sources.
> Now, they fixed a bug I am hitting but a new version is not released
> yet so my question is:
> what is the best/preferred/safest way to handle this situation?
> I am worried by the fact that, if I apply the patch and commit the
> canges in HEAD, future imports will have to be merged manually (at
> least for the files affected by this patch).
>
> Thanks in advance
Assuming you've been importing like this ...
cvs -d <cvsroot> import modulepath vendor-name VENDOR_RELEASE_TAG
^^^^^^^^^^^
vendor branch tag
What you're going to do is apply the patch to the vendor-name branch
instead of HEAD. Do this
cd tmpworkarea
cvs -d <cvsroot> checkout -r vendor-name modulepath
which checks out the vendor branch. Then apply the patches there:
cd modulepath # on vendor-name branch
patch <-p flags> < vendor-patch
Now import that area:
cd tmpworkarea # same as before
cvs -d <cvsroot> import modulepath vendor-name VENDOR_PATCH_TAG
Only the patched files will be updated, and this merges the patch into
HEAD. Voila, no conflicts.
Ted
--
dodecatheon at gmail dot com
Frango ut patefaciam -- I break so that I may reveal