Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 15E49E9B3 for ; Tue, 5 Feb 2013 23:08:41 +0000 (UTC) Received: (qmail 8581 invoked by uid 500); 5 Feb 2013 23:08:40 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 8521 invoked by uid 500); 5 Feb 2013 23:08:40 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 8514 invoked by uid 99); 5 Feb 2013 23:08:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 23:08:40 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [192.109.42.8] (HELO einhorn.in-berlin.de) (192.109.42.8) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 23:08:29 +0000 X-Envelope-From: stsp@stsp.name Received: from byrne.stsp.name (byrne.stsp.name [217.197.84.41]) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id r15N81Tg031473 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 6 Feb 2013 00:08:02 +0100 Received: from byrne.stsp.name (stsp@localhost [127.0.0.1]) by byrne.stsp.name (8.14.6/8.14.5) with ESMTP id r15N81ro024557; Wed, 6 Feb 2013 00:08:01 +0100 (CET) Received: (from stsp@localhost) by byrne.stsp.name (8.14.6/8.14.5/Submit) id r15N80Cf032017; Wed, 6 Feb 2013 00:08:00 +0100 (CET) Date: Wed, 6 Feb 2013 00:07:59 +0100 From: Stefan Sperling To: Johan Corveleyn Cc: Alexey Neyman , users@subversion.apache.org, Alfred Perlstein Subject: Re: FreeBSD project and subversion. Message-ID: <20130205230759.GE32341@byrne.stsp.name> Mail-Followup-To: Johan Corveleyn , Alexey Neyman , users@subversion.apache.org, Alfred Perlstein References: <510A8FAA.2020903@mu.org> <201302041154.22334.stilor@att.net> <20130204211729.GI32109@byrne.stsp.name> <1925822.W2HtcYFXhn@etoile> <20130205160840.GA32341@byrne.stsp.name> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 X-Virus-Checked: Checked by ClamAV on apache.org On Tue, Feb 05, 2013 at 09:18:33PM +0100, Johan Corveleyn wrote: > Hmm, okay, but I would have preferred some more discussion before you > implemented this. It's not clear to me that this decreases the > surprises. I can perfectly imagine just as many questions being asked > on users@ with the question: "Why does 'svn diff left.txt right.txt' > give me an empty diff, while 'svn diff ^/left.txt right.txt' does the > right thing?" > > I think it would be better to consistently point users to the > --old/--new syntax, so as to educate users more (so I'm okay with the > change in the error message), not hide it even more from them. Well, the point that convinced me was that previously 'svn diff' raised an error in the case of 'svn diff ^/left.txt right.txt'. That's clearly intended to be a comparison between a URL and a path, which the diff code already supports. So I think the diff code should just show an appropriate diff. I don't see how people could be conflating a URL->WC or WC->URL diff with a WC->WC diff. BTW, I'm thinking about adding more shortcuts: svn diff UNVERSIONED-PATH WCPATH svn diff WCPATH UNVERSIONED-PATH svn diff UNVERSIONED-PATH1 UNVERSIONED-PATH2 All of which are supported by 'svn diff --old=X --new=Y' (in 1.8-to-be, not in 1.7), but not by plain 'svn diff'. The --old --new syntax is specific to Subversion. Many users who are accustomed to "standard" diff commands will not try using --old and --new (unless they've taken the time to read 'svn help diff', of course, which apparently is too much time to ask from some users ;) That said, if you'd rather just print the error message instead, that's fine with me, too. I don't care strongly enough about this to the point where I'd say that we _must_ make this change to 'svn diff'. It's been committed, but that doesn't mean that this has to be in 1.8.0 at all costs. > Speaking of the error message: > How is this useful after r1442640? Seems to me we should either > improve the error message (which would be my preferred option) *or* > make 'svn diff' handle these automatically as a shorthand syntax > (hence no error message). But not both. > > Or am I missing something? The error message is triggered by an invocation like: svn diff -c42 foo ^/trunk bar Which is clearly invalid usage according to 'svn help diff'.