From owner-freebsd-stable@FreeBSD.ORG Sun Apr 20 10:25:31 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 A9FC237B401 for ; Sun, 20 Apr 2003 10:25:31 -0700 (PDT) Received: from smtp807.mail.sc5.yahoo.com (smtp807.mail.sc5.yahoo.com [66.163.168.186]) by mx1.FreeBSD.org (Postfix) with SMTP id 2790F43FD7 for ; Sun, 20 Apr 2003 10:25:31 -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 17:25:30 -0000 From: "Anton Zavrin" To: Date: Sun, 20 Apr 2003 10:24:24 -0700 Message-ID: <003901c30761$b020fd40$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 X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4920.2300 Importance: Normal Subject: 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 17:25:32 -0000 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"? 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), then I hit "q" to get out and then I hit "i" to install merged file. I do not need to edit any of my files during update, I just need to save what I have and add enw stuff. If you see my logic, please let me know if it's correct. Big Thanks ;-) Best Regards, Anton