Date: Tue, 12 Dec 2000 09:22:10 +0100 From: cam (Camille HUOT) <cam@bsdfr.org> To: "Artem Koutchine" <matrix@ipform.ru> Cc: Gilles.Guerrini@alcatel.fr, freebsd-questions@FreeBSD.ORG Subject: Re: mergemaster Message-ID: <20001212092210.3630a46b.cam@bsdfr.org> In-Reply-To: <001b01c063a5$a04676a0$0c00a8c0@ipform.ru> References: <C12569B2.0054F8EE.00@frmail19.netfr.alcatel.fr> <20001211105219.B16205@fw.wintelcom.net> <001b01c063a5$a04676a0$0c00a8c0@ipform.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 11 Dec 2000 22:07:32 +0300 "Artem Koutchine" <matrix@ipform.ru> wrote: > I wonder if this procedure can be a little bit more automatic. For example, > the mergmaster checks if the file have been actually changed, and it was not > (from the original file of the prev mergmaster) than it can pretty much > install a new > version of it, otherwiese - ask the user. The problem is to determine > whether it was > changed :) > We could modify the CVS tag for example, or add a string ### MODIFIED ### at the script's beginning cam To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001212092210.3630a46b.cam>