From owner-freebsd-current@FreeBSD.ORG Tue Aug 31 20:31:21 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 D9A3816A4CE for ; Tue, 31 Aug 2004 20:31:21 +0000 (GMT) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5C8843D53 for ; Tue, 31 Aug 2004 20:31:21 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id i7VKVVGC029744; Tue, 31 Aug 2004 13:31:31 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id i7VKVVSx029742; Tue, 31 Aug 2004 13:31:31 -0700 Date: Tue, 31 Aug 2004 13:31:31 -0700 From: Brooks Davis To: Charles Swiger Message-ID: <20040831203131.GA25134@odin.ac.hmc.edu> References: <20040829213449.GA33843@hub.freebsd.org> <20040830135311.11040.qmail@web50603.mail.yahoo.com> <20040830163106.GA19044@dragon.nuxi.com> <20040830210817.GB749@galgenberg.net> <20040831195329.GB21995@odin.ac.hmc.edu> <2F14AAB9-FB8B-11D8-B6F3-003065A20588@mac.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BOKacYhQ+x31HxR3" Content-Disposition: inline In-Reply-To: <2F14AAB9-FB8B-11D8-B6F3-003065A20588@mac.com> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu cc: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= 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: Tue, 31 Aug 2004 20:31:22 -0000 --BOKacYhQ+x31HxR3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 31, 2004 at 04:20:21PM -0400, Charles Swiger wrote: > On Aug 31, 2004, at 3:53 PM, Brooks Davis wrote: > >On Tue, Aug 31, 2004 at 03:49:28PM -0400, Charles Swiger wrote: > >>OK. Submitted as gnu/71210, diffs to the code are at: > >> > >>http://www.pkix.net/~chuck/sdiff.diff > >> > >>...since the PR may have space-stuffed tabs. > > > >The environment variable seems like a good idea. Changing the default > >is a very bad one. My finger memory is just fine with sdiff and a > >change would suck. >=20 > While I agree that preserving reasonable defaults should be done, there= =20 > seems to be serious disagreement as to whether the current defaults=20 > actually do make sense. :-) >=20 > I am content to let any interested committer make that decision, but I=20 > ask that whoever first go through a trial mergemaster session using=20 > '1' & '2' as the keys. 'q' and 'e' are right there, and I found the=20 > improvement compared to using 'l' & 'r' immediately obvious and more=20 > intuitive. I agree the current default is confusing and counterintuitive, at least at first. That's not the point. The point is that it's been that way for ages and changing it would gratuitously screw all the users who have adapted to it. There's no reason why you couldn't preserve the old behavior by default and in fact I'd request a back out of any commit that didn't. I don't opposes adding a second set of keys such as 1 and 2, just breaking the old behavior. On the personal preference front, on a bad RSI day, forcing me to use my left hand in that corner of the keyboard for a large merge (say the whitespace at EOL or nojail changes) would cause me serious pain. :-P -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --BOKacYhQ+x31HxR3 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFBNOAiXY6L6fI4GtQRAuhOAJ9gq+m/AQc5wjyo0zzC92rT2a7CFwCgrSOA pFk7zZUcH/gqEJXq+RY/ibw= =6zgZ -----END PGP SIGNATURE----- --BOKacYhQ+x31HxR3--