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

Ambiguous property diff output (issue #3019)

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2007-11-14 06:04:58 CET

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

Received on Wed Nov 14 06:05:08 2007

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