From owner-freebsd-questions@FreeBSD.ORG Tue Sep 16 16:53:36 2003 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D5D316A55C for ; Tue, 16 Sep 2003 16:53:33 -0700 (PDT) Received: from spam1.snu.ac.kr (spam2.snu.ac.kr [147.46.10.68]) by mx1.FreeBSD.org (Postfix) with SMTP id CF44343F75 for ; Tue, 16 Sep 2003 16:53:22 -0700 (PDT) (envelope-from lahaye@snu.ac.kr) Received: (snipe 30826 invoked by alias); 17 Sep 2003 00:22:03 -0000 Received: from lahaye@snu.ac.kr with Spamsniper2.0 (Processed in 0.052043 secs); Received: from unknown (HELO sis1.snu.ac.kr) (147.46.10.36) by 0 with SMTP; 17 Sep 2003 00:22:03 -0000 X-RCPTTO: freebsd-questions@freebsd.org,m.seaman@infracaninophile.co.uk, Received: from snu.ac.kr ([147.46.44.183]) by sis1.snu.ac.kr (8.12.9/8.12.9) with ESMTP id h8GNqR9H291446; Wed, 17 Sep 2003 08:52:28 +0900 Message-ID: <3F67A270.4070403@snu.ac.kr> Date: Wed, 17 Sep 2003 08:53:20 +0900 From: Rob Lahaye Organization: Seoul National University - South Korea User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4) Gecko/20030726 X-Accept-Language: en-us, ko-kr MIME-Version: 1.0 To: Matthew Seaman References: <3F64552C.7060900@snu.ac.kr> <20030914160132.GB26949@happy-idiot-talk.infracaninophile.co.uk> In-Reply-To: <20030914160132.GB26949@happy-idiot-talk.infracaninophile.co.uk> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: freebsd-questions@freebsd.org Subject: Re: Q: mergemaster 'm'-merge option results in empty file X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Sep 2003 23:53:37 -0000 Thank you so much for the long and detailed description. I'm waiting for the first release candidate of 4.9 to test it out. (BTW: RC1 should have been there already; is there a delay?). Regards, Rob. Matthew Seaman wrote: > On Sun, Sep 14, 2003 at 08:46:52PM +0900, Rob Lahaye wrote: > > >>What is left and right in the mergemaster context??? >>'man sdiff' doesn't seem to help out here. >>I've tried a bit (I typed 'v' and 'q'), but then found /etc/hosts >>totally empty!! >> >>Any idea where I went wrong? > > > 'sdiff' does a side-by-side comparison of two files, and lets you > generate a file where some or all of those differences have been > merged together. 'left' and 'right' in this context refer to the two > columns that sdiff divides the screen into, where it shows you the > blocks of lines that differ between the two files you're comparing. > > Perhaps an example is in order. Run these commands to get two > different versions of the GENERIC kernel configuration from cvs: [...]