From owner-freebsd-questions Mon Dec 11 16: 7:43 2000 From owner-freebsd-questions@FreeBSD.ORG Mon Dec 11 16:07:41 2000 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from guru.mired.org (okc-65-26-235-186.mmcable.com [65.26.235.186]) by hub.freebsd.org (Postfix) with SMTP id 3276037B400 for ; Mon, 11 Dec 2000 16:07:41 -0800 (PST) Received: (qmail 40335 invoked by uid 100); 12 Dec 2000 00:07:40 -0000 From: Mike Meyer MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <14901.27724.457583.502180@guru.mired.org> Date: Mon, 11 Dec 2000 18:07:40 -0600 (CST) To: "Artem Koutchine" Cc: questions@freebsd.org Subject: Re: mergemaster In-Reply-To: <28028884@toto.iv> X-Mailer: VM 6.75 under 21.1 (patch 10) "Capitol Reef" XEmacs Lucid X-face: "5Mnwy%?j>IIV\)A=):rjWL~NB2aH[}Yq8Z=u~vJ`"(,&SiLvbbz2W`;h9L,Yg`+vb1>RG% *h+%X^n0EZd>TM8_IB;a8F?(Fb"lw'IgCoyM.[Lg#r\ Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Artem Koutchine types: > 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 :) I suggested one way of doing that to the author, but never got a reply back. The idea was to add an option that does two things: 1) installs new files r/o (but not merged files); 2) if files are installed r/o, quietly install the new one. The act of editing a file should leave it r/w, thus automatically tagging new files. And it wouldn't work for me :-(, so I haven't implemented it. http://www.mired.org/home/mwm/ Independent WWW/Unix/FreeBSD consultant, email for more information. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message