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

Re: svn commit: r1619476 - /subversion/trunk/subversion/libsvn_client/diff.c

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 21 Aug 2014 19:39:21 +0100

Bert Huijben wrote:
>>  URL: http://svn.apache.org/r1619476
>>  Log:
>>  Fix missing diff header lines when diffing a file that has only property
>>  changes.
>>
>>  * subversion/libsvn_client/diff.c
>>    (diff_content_changed): If the text diff was empty, assume no header was
>>      printed (unless we printed one explicitly).

>>  -      /* We have a printed a diff for this path, mark it as visited. */
>>  -      *wrote_header = TRUE;
>>  +      /* If we have printed a diff for this path, mark it as visited. */
>>  +      if (exitcode == 1)
>>  +        *wrote_header = TRUE;
>
> I don't think we can really trust the exit code of any diff tool, to imply
> whether it reported a diff or not?
>
> We certainly don't document any of these dependencies.
>
> Does this even work for our own diff tools?

The book says:

"Subversion expects that your program return an error code of 1 if your program detected differences, or 0 if it did not - any other error code is considered a fatal error"

<http://svnbook.red-bean.com/nightly/en/svn.advanced.externaldifftools.html#svn.advanced.externaldifftools.diff>

- Julian
Received on 2014-08-21 20:46:31 CEST

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.