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 23807E298 for ; Wed, 6 Feb 2013 12:23:51 +0000 (UTC) Received: (qmail 74063 invoked by uid 500); 6 Feb 2013 12:23:50 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 73978 invoked by uid 500); 6 Feb 2013 12:23:47 -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 73951 invoked by uid 99); 6 Feb 2013 12:23:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2013 12:23:46 +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 (athena.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; Wed, 06 Feb 2013 12:23:38 +0000 X-Envelope-From: stsp@stsp.name Received: from ted.stsp.name (ted.stsp.name [217.197.84.34]) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id r16CNGnh027866 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 6 Feb 2013 13:23:16 +0100 Received: from ted.stsp.name (stsp@localhost [127.0.0.1]) by ted.stsp.name (8.14.6/8.14.3) with ESMTP id r16CNFoP025902; Wed, 6 Feb 2013 13:23:15 +0100 (CET) Received: (from stsp@localhost) by ted.stsp.name (8.14.6/8.14.3/Submit) id r16CNFNd013400; Wed, 6 Feb 2013 13:23:15 +0100 (CET) Date: Wed, 6 Feb 2013 13:23:15 +0100 From: Stefan Sperling To: Branko =?utf-8?B?xIxpYmVq?= Cc: users@subversion.apache.org Subject: 2-params diff (was: Re: FreeBSD project and subversion.) Message-ID: <20130206122315.GB31356@ted.stsp.name> Mail-Followup-To: Branko =?utf-8?B?xIxpYmVq?= , users@subversion.apache.org References: <20130204211729.GI32109@byrne.stsp.name> <1925822.W2HtcYFXhn@etoile> <20130205160840.GA32341@byrne.stsp.name> <20130205230759.GE32341@byrne.stsp.name> <20130205235813.GG32341@byrne.stsp.name> <5111F650.5020509@wandisco.com> <51124151.7060405@wandisco.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <51124151.7060405@wandisco.com> 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 Wed, Feb 06, 2013 at 12:41:05PM +0100, Branko Čibej wrote: > One other option would be, as was noted elsewhere in this thread, to > invent a new subcommand for tree comparisons, keeping only the > historical differences feature in "svn diff". > > That would solve the ambiguity, but it would (a) break backward > compatibility, and (b) invent yet another subcommand, which we don't like. I don't think we need to change how 'svn diff' works. A new subcommand could simply provide nicer syntax than 'svn diff' for some use cases. We can keep 'svn diff' working as it is. I don't think we should ever change how 'svn diff URL1 URL2' and 'svn diff WC-PATH1 WC-PATH2' work. But a new subcommand could behave differently in the 'WC-PATH1 WC-PATH2' case, and compare WC-PATH1 to WC-PATH2. It would essentially be an alias for 'diff --old --new'. It may need to overlap a lot with 'svn diff', for options such as --summarize perhaps, and all the little options that control little aspects of the diff (--ignore-properties, --show-copies-as-adds, etc). Would it be worth adding? Not sure. > Yet another option would be to introduce a new option, so instead of using > > svn diff --old A --new B > > you'd get > > svn diff --compare A B > > to generate a diff between the two targets, and plain > > svn diff A B > > to get the historical diff of each target. I don't think adding a new option to 'svn diff' would help at all. The point is to unclutter the user interface by providing a more straightforward way of comparing two paths/URLs with each other. Another option (especially one that overlaps with functionality provided by existing --old and --new options) would make the UI even more complicated than it already is.