From owner-freebsd-current@FreeBSD.ORG Thu Sep 2 01:38:06 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF2BC16A4CE for ; Thu, 2 Sep 2004 01:38:06 +0000 (GMT) Received: from sam.stral.net (sam.stral.net [61.14.141.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF74243D5D for ; Thu, 2 Sep 2004 01:38:05 +0000 (GMT) (envelope-from boris@brooknet.com.au) Received: from localhost.localdomain ([127.0.0.1] helo=webmail.bensley.net) by sam.stral.net with esmtp (Exim 3.36 #1 (Debian)) id 1C1w2b-000863-00; Tue, 31 Aug 2004 09:58:25 +1000 Received: from 134.148.20.1 (proxying for 134.148.100.153) (SquirrelMail authenticated user sam); by webmail.bensley.net with HTTP; Tue, 31 Aug 2004 09:58:25 +1000 (EST) Message-ID: <57506.134.148.20.1.1093910305.squirrel@134.148.20.1> In-Reply-To: <20040831011815.C40736-100000@electra.nolink.net> References: <20040830210817.GB749@galgenberg.net> <20040831011815.C40736-100000@electra.nolink.net> Date: Tue, 31 Aug 2004 09:58:25 +1000 (EST) From: "Sam Lawrance" To: "Lars Erik Gullerud" User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal cc: "freebsd-current@freebsd.org" Subject: Re: suggestion for /usr/src/UPDATING X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2004 01:38:06 -0000 > On Mon, 30 Aug 2004, Ulrich Spoerlein wrote: > >> On Mon, 30.08.2004 at 09:31:06 -0700, David O'Brien wrote: >> > > mergemasters is gross. Have you ever tried to run it on an >> 80-column display? >> > > I absolutely hate the "left" "right" stuff. You push the "l" with >> your right >> > > hand and the "r" with your left for crying out loud. >> > >> > LOL!! >> >> This is not funny. I myself have to think loud about which button to >> press. 'r' is on the left keyboard side and 'l' is to the right. > > I second the "don't laugh" - you have no idea how many times I have to > select "redo the merge" when upgrading servers usually during a > late-night maintenance window, with a brain only functioning due to > large amounts of caffeine in the bloodstream... > > (Not that I have any suggestions for other keys to use, mind you - but > the mind's wiring does have a problem with getting used to pressing a > key with the left hand to select the right side of the screen and > vice versa...) I think it would be nice if the 'merge then edit' command merged entire files at once instead of just parts, cvs conflict style.