Phil Kernick wrote:
> I'd also like the opposite - a list of files that mergemaster will not update
> under any circumstances.
mergemaster does its comparison based on the presence or absence of
files in the live tree on the system, and the temproot tree created by
mergemaster. So, if you have f
Hi,
I think something like /etc/defaults/mergemaster.conf, where for each
file or for each directory (or pattern) can be defined the action, like
"always update", "never update", "merge".
There are many files wich can be always updated during mergemaster like
/etc/periodic or rc.*.
The user
Lucky Green wrote:
> Matthew Dillon wrote about mergemaster:
> -
> I also like the idea someone posted in regards to having a list of
> files 'typically never modified by the sysop', e.g. /etc/defaults/*,
> /etc/rc*, and so forth, though with the patches I have so far that
>From: "Lucky Green" <[EMAIL PROTECTED]>
>Date: Tue, 15 Oct 2002 02:11:22 -0700
>... What would also be
>helpful, though this may be diff's fault, would be if there were less
>tendency for mergemaster to combine changes the admin likely wants to
>make (adding a new user the OS requires) with cha
Matthew Dillon wrote about mergemaster:
-
I also like the idea someone posted in regards to having a list of
files 'typically never modified by the sysop', e.g. /etc/defaults/*,
/etc/rc*, and so forth, though with the patches I have so far that
particular problem is not
On Sun, Oct 13, 2002 at 01:05:27PM -0400, Trish Lynch wrote:
> I';ve done something semi-simple to manage things that possibly might get
> broken by mergemaster.
I don't recall ever having anything broken by mergemaster.
I have broken things for myself by failing to drive mergemaster
properly,