Messages in this thread | | | Date | Fri, 27 Oct 2006 11:58:44 +0200 (MEST) | From | Jan Engelhardt <> | Subject | Re: What about make mergeconfig ? |
| |
>> >What about RCS merge? >> >> I take it we do not want to depend on too many tools (remember the >> kconfig implementation language debate). > >If you have CVS installed, you have RCS merge.
11:54 ichi:~ > rpm -q cvs rcs cvs-1.12.12-19 package rcs is not installed
11:54 ichi:~ > gzip -cd /ARCHIVES.gz | grep "/merge$" ./CD1/suse/i586/rcs-5.7-879.i586.rpm: -rwxr-xr-x 1 root root 45252 May 2 09:42 /usr/bin/merge
CVS does not need RCS.
>>>merge -p other.config .config.old .config > other.config.new >> >> This also does not seem conflict-safe. > >Indeed, you can still have conflicts, which you have to resolve manually. > >But it depends on what you want to achieve: do you want to set each config >option in the destination config to max(config1.option, config2.option), or do >you want to apply the recent changes for one config (which may include >disabling options) to another config?
In my case, the latter.
>For the latter, merge should work fine.
Is merge a lot different from what `patch` is doing?
-`J' -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |