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 517CEE500 for ; Tue, 5 Feb 2013 18:56:00 +0000 (UTC) Received: (qmail 64975 invoked by uid 500); 5 Feb 2013 18:55:59 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 64956 invoked by uid 500); 5 Feb 2013 18:55:59 -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 64944 invoked by uid 99); 5 Feb 2013 18:55:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 18:55:59 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of lathan@andrews.edu designates 143.207.1.27 as permitted sender) Received: from [143.207.1.27] (HELO trumpkin.cc.andrews.edu) (143.207.1.27) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 18:55:50 +0000 Received: from secures.cc.andrews.edu (root@secures.cc.andrews.edu [143.207.1.47]) by trumpkin.cc.andrews.edu (8.14.4/8.14.4/Debian-2.1) with ESMTP id r15ItT6q010089 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Tue, 5 Feb 2013 13:55:29 -0500 Received: from [143.207.30.15] (a-30-15.imcpmc.andrews.edu [143.207.30.15]) (authenticated bits=0) by secures.cc.andrews.edu (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id r15ItTpP027210 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NOT) for ; Tue, 5 Feb 2013 13:55:29 -0500 Message-ID: <51115598.9010305@andrews.edu> Date: Tue, 05 Feb 2013 13:55:20 -0500 From: Lathan Bidwell User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: users@subversion.apache.org Subject: Re: FreeBSD project and subversion. References: <510A8FAA.2020903@mu.org> <20130205160840.GA32341@byrne.stsp.name> <3629059.HZCLfd0A0T@etoile> <20130205181421.GD32341@byrne.stsp.name> In-Reply-To: <20130205181421.GD32341@byrne.stsp.name> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.6 at secures X-Virus-Status: Clean X-Virus-Checked: Checked by ClamAV on apache.org On 02/05/2013 01:14 PM, Stefan Sperling wrote: > On Tue, Feb 05, 2013 at 09:19:19AM -0800, Alexey Neyman wrote: >> There is one more weird issue with svn diff, see the script below. The issue >> is that "--old=A --new=B" is not opposite of "--old=B --new=A". I don't know >> if it is a bug or another ambuguity I am not aware of :) >> >> Here is the script: >> [[[ >> #!/bin/bash >> >> REPO=/tmp/foo >> WC=/tmp/foo.wc >> >> rm -rf $REPO $WC >> svnadmin create $REPO >> svn co -q file://$REPO $WC >> cd $WC >> >> echo r1 > a >> svn add -q a >> svn ci -q -m R1 >> echo r2 > a >> svn ci -q -m R2 >> svn up -q -r 1 >> echo new > a >> echo "Issue: --old=A --new=B is not opposite of --old=B --new=A" >> echo " Running: svn di --old=^/ --new=." >> svn di --old=^/ --new=. >> echo " Running: svn di --old=. --new=^/" >> svn di --old=. --new=^/ >> ]]] >> >> And here is the output (svn 1.7.6): >> [[[ >> Issue: --old=A --new=B is not opposite of --old=B --new=A >> Running: svn di --old=^/ --new=. >> Index: a >> =================================================================== >> --- a (.../file:///tmp/foo) (revision 2) >> +++ a (working copy) >> @@ -1 +1 @@ >> -r2 >> +new >> Running: svn di --old=. --new=^/ >> Index: a >> =================================================================== >> --- a (working copy) >> +++ a (.../file:///tmp/foo) (revision 2) >> @@ -1 +1 @@ >> -r1 >> +r2 >> ]]] >> >> Regards, >> Alexey. > I can reproduce this with a trunk build. Can you please file an issue > for this? I'm not going to get to this right away. Thanks! > > Here is the issue that I see: The --old=. get's the workspace version of ., but --new get's the non-changed version of /. So, I believe it is comparing "r1" with the r2 contents of "r2" and not comparing both workspace versions. Rev Contents 1 r1 2 r2 2* new 2* only get's referenced when it is in the --old position, 2 get's used when its in the --new position. Please correct me if I'm wrong about this, but that is what seems to be a logical reasoning behind that behavior. Lathan