From owner-freebsd-current@FreeBSD.ORG Mon Mar 27 18:57:54 2006 Return-Path: X-Original-To: freebsd-current@FreeBSD.org 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 9F87016A400; Mon, 27 Mar 2006 18:57:54 +0000 (UTC) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (gate.funkthat.com [69.17.45.168]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F04F43D48; Mon, 27 Mar 2006 18:57:54 +0000 (GMT) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (nnyonsp4jdoaori1@localhost.funkthat.com [127.0.0.1]) by hydrogen.funkthat.com (8.13.4/8.13.3) with ESMTP id k2RIvr66005141; Mon, 27 Mar 2006 10:57:53 -0800 (PST) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.13.4/8.13.3/Submit) id k2RIvrLZ005140; Mon, 27 Mar 2006 10:57:53 -0800 (PST) (envelope-from jmg) Date: Mon, 27 Mar 2006 10:57:53 -0800 From: John-Mark Gurney To: Robert Watson Message-ID: <20060327185752.GG7001@funkthat.com> Mail-Followup-To: Robert Watson , Doug Barton , freebsd-current@FreeBSD.org, Ruslan Ermilov , Steve Kargl References: <20060320221741.GA13699@troutmask.apl.washington.edu> <20060320230009.GA55254@troutmask.apl.washington.edu> <20060320231604.GH83781@ip.net.ua> <20060320232746.GI83781@ip.net.ua> <20060320234006.GV35129@funkthat.com> <20060320234145.GB33003@troutmask.apl.washington.edu> <20060321064528.GD77849@ip.net.ua> <44206E9F.6020702@FreeBSD.org> <20060327093402.H43553@fledge.watson.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060327093402.H43553@fledge.watson.org> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD 5.4-RELEASE-p6 i386 X-PGP-Fingerprint: B7 EC EF F8 AE ED A7 31 96 7A 22 B3 D8 56 36 F4 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html Cc: freebsd-current@FreeBSD.org, Doug Barton , Ruslan Ermilov , Steve Kargl Subject: Re: mergemaster broken? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: John-Mark Gurney List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 18:57:54 -0000 Robert Watson wrote this message on Mon, Mar 27, 2006 at 09:38 +0000: > So while I don't have opinions about the implementation details, I think > what Ruslan is proposing is architecturally the right thing. How to handle > the command line argument, I don't have an opinion, except that user > surprise is bad, so a new argument with some compatibility and a warning is > probably better than changing "-m". Why not detect etc as the last component of -m and print a nice little warning, and then remove /etc from the path? (or adding .. if we end up with an empty path).. and after a year or so, remove the warning and the compat code... I doubt people are doing something really crazy like making foobarbaz a symlink to etc, and depending upon that.. If they are, they get what the deserve... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not."