[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: `svn diff' paths abbreviated wrongly

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Fri, 03 Oct 2008 05:05:03 +0200

Sorry, forgot to add the script for reference.

Neels J Hofmeyr wrote:
> Hi dev,
>
> When I diff two paths that begin similarly like this:
>
> /A/foo/baz
> /A/foobar/baz
>
> , then svn diff's output puts a path separator where there shouldn't be one:
>
> [[[
> $ svn diff svn://localhost/diffpaths/A/foo/baz \
> svn://localhost/diffpaths/A/foobar/baz
> Index: baz
> ===================================================================
> --- baz (.../baz) (revision 1)
> +++ baz (.../bar/baz) (revision 1)
> @@ -1 +1 @@
> -baz
> +quux
> ]]]
>
> It should say something like
> .../foo/baz
> .../foobar/baz
> but it says
> .../baz
> .../bar/baz
> which is wrong since there is no directory called "bar".
>
> I couldn't find an issue for it. (Maybe this is related, although it talks
> about the "Index:" line further above: #1498 "svn diff should mention full
> URL to file")
>
> What's the general stance on this?
>
> ~Neels
>

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

#!/bin/bash
set -x

## SETUP for using client and server as in the current path

which svn
which svnadmin
svn --version
svnadmin --version

rm -rf repos/diffpaths
rm -rf wc/diffpaths

cd repos
svnadmin create diffpaths || exit 1
echo -e "[general]\nanon-access = write\n" > diffpaths/conf/svnserve.conf
cd ..
pwd

svnserve -d -r /arch/elego/svn/test/repos

cd wc
pwd
svn co svn://localhost/diffpaths

cd diffpaths
pwd

## THE ACTUAL TEST STARTS HERE

mkdir -p A/foo
echo "baz" > A/foo/baz
mkdir -p A/foobar
echo "quux" > A/foobar/baz

svn add A
svn ci -m "message"

svn diff svn://localhost/diffpaths/A/foo/baz svn://localhost/diffpaths/A/foobar/baz

killall svnserve

set +x

Received on 2008-10-03 05:10:04 CEST

This is an archived mail posted to the Subversion Dev mailing list.