From: Manuel Dejonghe <manuel_at_dejonghe.de>
Date: Fri, 24 Feb 2006 18:29:38 +0100

On 2/24/06, gl <gl_at_ntlworld.com> wrote:
> One solution that just ocurred to me is to copy my build folder, strip mods
> I don't want included from the source files first, and then diff against
> CVS. Is there an easier way though?

Hi,
right, this is the only way that comes to my mind. One of the cvs
checkouts would be your very private build with a lot of patches,
another checkout the one that is the closest to the current cvs
version.
Now, diffing/merging/comparing those directories will give you the
possibility to extract the changes you want to submit from your very
private build to the close to cvs build.
After doing that, you can again check if it still compiles and if the
feature is working as expected without side effect from the other
things you are working on.

If you want to prevent conflicts due to cvs update and private changes
on your very private source, you can first update the close to cvs
version, then compare it into your own build.

lImbus
Received on 2006-02-24