Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Jan 2004 22:17:44 +0100 (CET)
From:      Peter Ulrich Kruppa <root@pukruppa.de>
To:        Bill Moran <wmoran@potentialtech.com>
Cc:        freebsd-current@freebsd.org
Subject:   Re: question on mergemaster
Message-ID:  <20040119221449.W1109@pukruppa.net>
In-Reply-To: <400C0E5F.5010606@potentialtech.com>
References:  <400C012E.4040002@mail.ru> <400C0E5F.5010606@potentialtech.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 19 Jan 2004, Bill Moran wrote:

> If mergemaster checked each file for a magic value, such as:
> # mergemaster autoreplace
> and automatically updated those files without prompting the user, then
> users could add such a line to the beginning of each file in /etc that
> they are comfortable updating without feedback.  It may seem like a lot
> of work, but it's only done _once_ (although mergemaster would need to
> be taught to preserve this magic when it updates the file)
>
> The optimistic way to do this would be to have some sort of switch to
> mergemaster to tell it to go into autoupdate mode, and it will only ask
> for files that contain a "negative magic" like:
> # mergemaster noautoreplace
> In which case the administrator should put this string at the beginning
> of every file that he tweaks in /etc
>
> Comments?
What about a file "mergemaster_ignore" where I put in the six or
seven names of files that should never be touched?

Regards,

Uli.


>
> --
> Bill Moran
> Potential Technologies
> http://www.potentialtech.com
>
> _______________________________________________
> freebsd-current@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"
>

	+---------------------------+
	|    Peter Ulrich Kruppa    |
        |         Wuppertal         |
        |          Germany          |
        +---------------------------+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040119221449.W1109>