From owner-freebsd-stable@FreeBSD.ORG Sun Apr 20 14:04:51 2003 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F103337B404 for ; Sun, 20 Apr 2003 14:04:50 -0700 (PDT) Received: from smtp805.mail.sc5.yahoo.com (smtp805.mail.sc5.yahoo.com [66.163.168.184]) by mx1.FreeBSD.org (Postfix) with SMTP id 0766143FBD for ; Sun, 20 Apr 2003 14:04:50 -0700 (PDT) (envelope-from antonzav@pacbell.net) Received: from adsl-64-172-96-108.dsl.snfc21.pacbell.net (HELO travel) (antonzav@pacbell.net@64.172.96.108 with login) by smtp-sbc-v1.mail.vip.sc5.yahoo.com with SMTP; 20 Apr 2003 21:04:49 -0000 From: "Anton Zavrin" To: "'Doug Barton'" Date: Sun, 20 Apr 2003 14:03:42 -0700 Message-ID: <004901c30780$5347d250$0200a8c0@travel> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook, Build 10.0.2627 In-Reply-To: <20030420134335.X631@znfgre.tberna.bet> X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4920.2300 Importance: Normal cc: freebsd-stable@freebsd.org Subject: RE: mergemaster tips X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2003 21:04:51 -0000 I don't understand what is written in man pages about mergemaster, that's the thing... But thanks for the tip anyway, that was a good one ;-) And yes, I do back up my /etc Best Regards, Anton -----Original Message----- From: owner-freebsd-stable@freebsd.org [mailto:owner-freebsd-stable@freebsd.org] On Behalf Of Doug Barton Sent: Sunday, April 20, 2003 2:00 PM To: Anton Zavrin Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster tips Step one with mergemaster, read the man page, thoroughly. It also helps to read the sdiff man page. Step two, ALWAYS back up /etc before starting. That way, at least you can undo anything you screw up. On Sun, 20 Apr 2003, Anton Zavrin wrote: > Hi, give me some tips please, first of all, first screen: > ============================================= > *** The directory specified for the temporary root environment, > /var/tmp/temproot, exists. This can be a security risk if untrusted > users have access to the system. > > Use 'd' to delete the old /var/tmp/temproot and continue > Use 't' to select a new temporary root directory > Use 'e' to exit mergemaster > > Default is to use /var/tmp/temproot as is > > How should I deal with this? [Use the existing /var/tmp/temproot] > ============================================== > Should I "d" the old temproot or should I just hit "Enter"? That depends. If the /var/tmp/temproot is left behind from an old run, then yes. If what you're actually trying to do is re-run mergemaster over a temproot directory that you've just recently merged, then what you really want to do is run 'mergemaster -r' instead, which will not prompt you this way. In general though, deleting this is the safest bet. > Second thing, when I actually merging files, what I do is I hit "v" - > variously include common lines and then I hit "m" to merge, primarily > using "r" right side. > By "verbosely include common lines" I only "Guess" that the mergemaster > will include everything common from both files and then by using "r" > switch I'm adding everything "fresh" from the new files (the files I > just cvsuped), Actually mergemaster isn't doing this, it's sdiff. Also, I don't recommend merging every file. The merge option is there for files that you've edited on that system, so that you can easily preserve the local edits. If you haven't edited the file, you should just [i]nstall it. This will be much less confusing for you. Finally, I'm not sure that the v option to sdiff (include common lines) is a good idea either. mergemaster runs sdiff with the suppress common lines option because it's a lot less confusing. What I generally do with a confusing merge is to use 'eb' which means "edit both" in your favorite editor, usually vi. One thing I've also found helpful is to include a comment on the line above anything I add to tell me what I did, and why. I recommend that you back up what you've got, read the man page, and then do 'mergemaster -s' to make sure that you've not missed something in a previous run. If you find anything unclear in the man page, let me know. Hope this helps, Doug -- This .signature sanitized for your protection _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org"