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

Re: svn commit: rev 5491 - in trunk/subversion: include libsvn_client

From: Robert Pluim <rpluim_at_bigfoot.com>
Date: 2003-03-31 11:25:54 CEST

rooneg@tigris.org writes:
> Author: rooneg
> Date: Fri Mar 28 20:19:07 2003
> New Revision: 5491
>
> Modified:
> trunk/subversion/include/svn_error_codes.h
> trunk/subversion/libsvn_client/diff.c
> Log:
> Attempt to reduce the number of bug reports from users who are used to using
> 'svn diff -x' and are confused by the internal diff library's inability to
> reproduce all the options of GNU diff.
>
> * subversion/include/svn_error_codes.h
> (SVN_ERR_INVALID_DIFF_OPTION): new error code.
>
> * subversion/libsvn_client/diff.c
> (diff_file_changed): when using our internal diff code, return an
> SVN_ERR_INVALID_DIFF_OPTION error if the client specified any diff options
> other than -u.

Great! Except I have one small nit to pick, namely that if there are
property changes, svn diff doesn't error out until after it's displayed
them: (Karl, this one's for you :)

Old svn:

  $ svn diff -x -w

  Property changes on: foo
  ___________________________________________________________________
  Name: aprop
     + aprop

  Index: foo/1061
  ===================================================================
  --- foo/1061 (revision 21)
  +++ foo/1061 (working copy)
  @@ -0,0 +1 @@
  +a change

New svn:

  rpluim: ~/wc-test/local-wc1
  $ ~/svn/subversion/clients/cmdline/svn diff -x -w

  Property changes on: foo
  ___________________________________________________________________
  Name: aprop
     + aprop

  subversion/libsvn_client/diff.c:303: (apr_err=200016)
  svn: The specified diff option is not supported
  svn: '-w' is not supported

-- 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 31 11:26:00 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.