From owner-freebsd-questions Tue Jun 19 22:28:13 2001 Delivered-To: freebsd-questions@freebsd.org Received: from maila.telia.com (maila.telia.com [194.22.194.231]) by hub.freebsd.org (Postfix) with ESMTP id C6A2237B403 for ; Tue, 19 Jun 2001 22:28:08 -0700 (PDT) (envelope-from ertr1013@student.uu.se) Received: from d1o913.telia.com (d1o913.telia.com [195.252.44.241]) by maila.telia.com (8.11.2/8.11.0) with ESMTP id f5K5S7026748 for ; Wed, 20 Jun 2001 07:28:07 +0200 (CEST) Received: from ertr1013.student.uu.se (h185n2fls20o913.telia.com [212.181.163.185]) by d1o913.telia.com (8.8.8/8.8.8) with SMTP id HAA23744 for ; Wed, 20 Jun 2001 07:28:06 +0200 (CEST) Received: (qmail 25889 invoked by uid 1001); 20 Jun 2001 05:27:37 -0000 Date: Wed, 20 Jun 2001 07:27:36 +0200 From: Erik Trulsson To: Keith Spencer Cc: fbsd Subject: Re: how do I use mergemaster? Message-ID: <20010620072736.A24314@student.uu.se> Mail-Followup-To: Keith Spencer , fbsd References: <20010619074707.A50989@student.uu.se> <20010619231947.95662.qmail@web12003.mail.yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20010619231947.95662.qmail@web12003.mail.yahoo.com> User-Agent: Mutt/1.3.19i Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Jun 20, 2001 at 09:19:47AM +1000, Keith Spencer wrote: > Hi Erik and all, > Thanks for the help. > Trouble is I have chosen h but what does left right > etc mean? How do I know what to do? > e.g. I have changed > rc.conf > do I choose left right what? > Unclear for me I am afraid. > Thanks for your patience > Keith It displays the lines in the file that differ between the file you have installed and the new file. The left version is the old one you have installed. The right version is the new one. Which one you choose depends on which you want. If you have done some modifications to the file then you probably want the left side for those parts containging those modifications. You almost alwasy want to update the line containing the CVS version. (I.e. choose the version on the right.) (Usually the first line in the file.) This is because mergemaster ignores files having the same CVS id even if they have different contents. In this way you can have files with local modifications without mergemaster asking about them every time you upgrade your system. -- Erik Trulsson ertr1013@student.uu.se To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message