From owner-freebsd-questions Tue Dec 12 0:21:28 2000 From owner-freebsd-questions@FreeBSD.ORG Tue Dec 12 00:21:27 2000 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mailhost.esil.univ-mrs.fr (jiyu.esil.univ-mrs.fr [139.124.44.249]) by hub.freebsd.org (Postfix) with ESMTP id 0E07F37B400 for ; Tue, 12 Dec 2000 00:21:21 -0800 (PST) Received: from cam (IDENT:cam@cam.esil.univ-mrs.fr [139.124.44.65]) by mailhost.esil.univ-mrs.fr (8.9.3/ESIL/jtpda-5.3.1) with SMTP id JAA06239 ; Tue, 12 Dec 2000 09:21:13 +0100 (CET) Date: Tue, 12 Dec 2000 09:22:10 +0100 From: cam (Camille HUOT) To: "Artem Koutchine" 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: <20001211105219.B16205@fw.wintelcom.net> <001b01c063a5$a04676a0$0c00a8c0@ipform.ru> X-Mailer: Sylpheed version 0.4.2 (GTK+ 1.2.7; Linux 2.2.17; i686) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Mon, 11 Dec 2000 22:07:32 +0300 "Artem Koutchine" 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