From owner-freebsd-stable Fri Apr 5 20:17:56 2002 Delivered-To: freebsd-stable@freebsd.org Received: from charter.net (dhcp-8-15.slidell.charter-ala.com [24.158.214.244]) by hub.freebsd.org (Postfix) with ESMTP id 5B1BB37B404; Fri, 5 Apr 2002 20:17:51 -0800 (PST) Received: from gforce.johnson.home (localhost [127.0.0.1]) by charter.net (8.12.2/8.12.2) with ESMTP id g364HSuC078514; Fri, 5 Apr 2002 22:17:28 -0600 (CST) (envelope-from glenn@gforce.johnson.home) Received: (from glenn@localhost) by gforce.johnson.home (8.12.2/8.12.2/Submit) id g364HIGO077069; Fri, 5 Apr 2002 22:17:18 -0600 (CST) From: Glenn Johnson Date: Fri, 5 Apr 2002 22:17:17 -0600 To: Ben Smithurst Cc: Brandon S Allbery KF8NH , James Long , freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster: what if I want both left and right? Message-ID: <20020406041717.GA992@gforce.johnson.home> References: <20020404232831.A95052@ns.museum.rain.com> <1017992158.15333.11.camel@rushlight.kf8nh.apk.net> <20020405160940.F86069@strontium.shef.vinosystems.com> <1018026874.3914.1.camel@pyanfar.ece.cmu.edu> <20020405182347.H86069@strontium.shef.vinosystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020405182347.H86069@strontium.shef.vinosystems.com> User-Agent: Mutt/1.3.28i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Apr 05, 2002 at 06:23:47PM +0100, Ben Smithurst wrote: > Brandon S Allbery KF8NH wrote: > > > Hm. I had just done a mergemaster run which involved using "e b" to > > integrate changes to /etc/inetd.conf, and it worked fine for me.... > > I think it's because my editor (vim) must be not writing the file in > place (i.e. it does unlink then creates a new file, or something). > The patch is simple enough but sdiff is vendor code. :-( I typically use vim as my editor but I ran into this same problem. What I do when I use mergemaster or sdiff is do an 'env EDITOR=vi' first, ie. 'env EDITOR=vi mergemaster'. -- Glenn Johnson glennpj@charter.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message