From owner-freebsd-questions Mon Dec 11 16:33:28 2000 From owner-freebsd-questions@FreeBSD.ORG Mon Dec 11 16:33:26 2000 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from 2711.dynacom.net (2711.dynacom.net [206.107.213.3]) by hub.freebsd.org (Postfix) with ESMTP id E600C37B400 for ; Mon, 11 Dec 2000 16:33:24 -0800 (PST) Received: from urx.com (dsl1-160.dynacom.net [206.159.132.160]) by 2711.dynacom.net (Build 101 8.9.3/NT-8.9.3) with ESMTP id QAA00048; Mon, 11 Dec 2000 16:33:12 -0800 Message-ID: <3A357248.F363E2DA@urx.com> Date: Mon, 11 Dec 2000 16:33:12 -0800 From: Kent Stewart Reply-To: kstewart@urx.com Organization: Dynacom X-Mailer: Mozilla 4.76 [en] (Windows NT 5.0; U) X-Accept-Language: en MIME-Version: 1.0 To: Mike Meyer Cc: Artem Koutchine , questions@FreeBSD.ORG Subject: Re: mergemaster References: <14901.27724.457583.502180@guru.mired.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Mike Meyer wrote: > > 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. That doesn't work because you can :w! to write the file and it will still be r/o. There are files that I don't want it to touch but I also want to know something has changed. I had to think the cvsup's refuse file was a good idea. Creating one for Mergemaster is something else. I turn off x-windows and do my world updates from a 2nd computer. The systems are pretty quiet when I do this. That leaves the files not touched in scrollable window when I run mergemaster. I come along afterwards and check the changes by hand in a different window and make them by hand if they are simple. Adding the header information to your modified file seems to keep it from bothering you in the future. Kent -- Kent Stewart Richland, WA mailto:kbstew99@hotmail.com http://kstewart.urx.com/kstewart/index.html FreeBSD News http://daily.daemonnews.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message