On Wed, 12 Jan 2005, Peter Jeremy wrote: > On Wed, 2005-Jan-12 09:33:00 +0100, Anton Berezin wrote: >> A colleague of mine came up with an idea which I did not see before: >> >> Optionally, if CVS revisions are different, and CVS repository is >> available, fetch the file with the same revision as the installed one >> from CVS, and compare it with the installed one. If they are identical, >> mergemaster can safely assume that the file was not modified by hand and >> can therefore overwrite it without doing a diff loop hoop-la. > > I think this has been suggested before but you are the first person to > actually code it. Thank you. > > Note that there are still risks in blindly applying CVS changes. There > have been a couple of cases where defaults have changed meaning that > corresponding changes to local system configuration is required to > retain previous behaviour. One would have to use the -R flag to obtain this behavior. Blindly running mergemaster -i isn't going to be affected by this. If you follow the recommended system upgrade path, you would have read UPDATING before the installkernel and reboot anyway... ;) Cheers, Andy | Andre Guibert de Bruet | Enterprise Software Consultant > | Silicon Landmark, LLC. | http://siliconlandmark.com/ >Received on Fri Jan 14 2005 - 12:30:35 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:38:26 UTC