Date: Mon, 11 Dec 2000 18:40:18 -0600 (CST) From: Mike Meyer <mwm@mired.org> To: kstewart@urx.com Cc: questions@FreeBSD.ORG Subject: Re: mergemaster Message-ID: <14901.29682.7392.873018@guru.mired.org> In-Reply-To: <3A357248.F363E2DA@urx.com> References: <14901.27724.457583.502180@guru.mired.org> <3A357248.F363E2DA@urx.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Kent Stewart <kstewart@urx.com> types: > Mike Meyer wrote: > > Artem Koutchine <matrix@ipform.ru> 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. Um, if I type :w! at my editor, it generally just inserts those characters. It doesn't work for me because I keep my config files in Perforce, which uses the same technic for deciding if I've touched a file without telling it. > 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. Well, you don't want what Artem wanted, which was that it automatically update files that you haven't changed. I discussed a method of adding an OPTION (<- Key word, that) to mergemaster to make it do that, and why I didn't do it myself. If it ever got added, you would simply not turn on that option. > 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. Actually, if you have x clients installed on the system you are upgrading, you can run start an xterm from it's console in single user mode, and have it display on any X server you please. That's how I manage to do long installs without being stuck in a machine room. <mike -- Mike Meyer <mwm@mired.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?14901.29682.7392.873018>