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

Re: Ambiguous property diff output (issue #3019)

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-11-14 06:22:00 CET

I say you should do your proposal below. Nothing is parsing the
property-diffs; it's a lame format I wrote in a pinch years ago. It
needs to be replaced sorely.

On Nov 13, 2007 11:04 PM, C. Michael Pilato <cmpilato@collab.net> wrote:
> Devs, I just added the following to issue #3019[1] which describes ambiguous
> output from 'svn diff' with respect to property changes. Would this be a
> legal change to our output format, especially considering this portion of
> the diff is ignored by 'patch'?
>
> [1] http://subversion.tigris.org/issues/show_bug.cgi?id=3019#desc2
> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
>
> So, this problem isn't specific to merge tracking stuffs:
>
> $ svn pset foo bar iota
> property 'foo' set on 'iota'
> $ svn pset baz bloo iota
> property 'baz' set on 'iota'
> $ svn ci -m ""
> Sending iota
> Committed revision 3.
> $ svn pset foo blar iota
> property 'foo' set on 'iota'
> $ svn pdel baz iota
> property 'baz' deleted from 'iota'.
> $ svn pset broo bam iota
> property 'broo' set on 'iota'
> $ svn diff
>
> Property changes on: iota
> ___________________________________________________________________
> Name: foo
> - bar
> + blar
> Name: baz
> - bloo
> Name: broo
> + bam
>
> $
>
> There's got to be a better way. A really simple solution would be to
> replace "Name:" with an action, like so:
>
> Property changes on: iota
> ___________________________________________________________________
> Modified: foo
> - bar
> + blar
> Deleted: baz
> - bloo
> Added: broo
> + bam
>
> That way you could tell the difference between "this property's value was
> set to the empty string":
>
> Modified: propname
> - oldpropvalue
>
> and "this property was removed":
>
> Deleted: propname
> - oldpropvalue
>
> Thoughts?
>
> --
> C. Michael Pilato <cmpilato@collab.net>
> CollabNet <> www.collab.net <> Distributed Development On Demand
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 14 06:22:14 2007

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