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

Re: Property diff producing wrong results...

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-03-19 18:02:52 CET

Will you file a low-priority bug or enhancement request for this,
John?

On Mon, 19 Mar 2007, John Szakmeister wrote:

> I was taking a look at issue 1493 and trying to determine a way to
> maintain similarly formatted output, but using libsvn_diff to help
> generate the diff. Naturally, I headed to the keyboard, edited a
> property, and diff'd the file. I was surprised by the result.
>
> The attached script reproduces the problem. It basically sets
> svn:ignore to 'a', commits, and then sets svn:ignore to 'a\nb'. The
> resultant output was:
> Property changes on: .
> ___________________________________________________________________
> Name: svn:ignore
> - a
>
> + a
> b
>
>
> Notice that there seem to be a few things wrong. The +- a is indented
> from the rest of the diff, or rather b is not indented. But the real
> problem is that there should be just a '+ b' at the end.
>
> I tried this on both Linux and Mac OS X, and got the same results.
>
> I'll take a closer look, but wanted to throw this out there in case
> someone might know when this broke.
>
> -John

> #!/bin/bash
>
> rm -rf repo wc prop.tmp
>
> svnadmin create repo
> svn co file://`pwd`/repo wc
> cd wc
> svn ps svn:ignore a .
> svn ci -m '' .
> svn up
>
> echo a > prop.tmp
> echo b >> prop.tmp
>
> svn ps svn:ignore -F prop.tmp .
>
> svn diff .

  • application/pgp-signature attachment: stored
Received on Mon Mar 19 18:07:25 2007

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