On Sun, 2001-10-14 at 04:03, Hristo Grigorov wrote:
> I want to patch the xfs CVS tree with the kernel preemptive patch.
> But, what happens on the next cvs update? Does it remove it automatically ?
> And, is it in general recommended to do that or I have to clone the CVS tree
> every time and do my "nasty" expreriments there ? What's your opinion on
> that ?
for some time i've been merging various things into my xfs tree - ext3
(useful after installing 7.2 beta) and patches for acpi.
if changes in cvs are not to code you've patched, cvs will merge them in
fine. however, there is no guarantee that the code works or builds. if
the changes in cvs conflict with your patches, cvs will tell you this,
but you will need to resolve these conflicts.
so - if you feel comfortable resolving conflicts in the code (most of
the time (for me) they haven't been complicated), then it's definitely
an option. i find that having the linux tree in cvs makes this kind of
thing much much easier compared with applying patches to a non-cvs tree.