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

RE: svn commit: r966822 - in /subversion/trunk/subversion: libsvn_client/repos_diff.c tests/cmdline/merge_tests.py

From: Bert Huijben <bert_at_qqmail.nl>
Date: Thu, 22 Jul 2010 23:04:02 +0200

> -----Original Message-----
> From: pburba_at_apache.org [mailto:pburba_at_apache.org]
> Sent: donderdag 22 juli 2010 21:43
> To: commits_at_subversion.apache.org
> Subject: svn commit: r966822 - in /subversion/trunk/subversion:
> libsvn_client/repos_diff.c tests/cmdline/merge_tests.py
>
> Author: pburba
> Date: Thu Jul 22 19:43:08 2010
> New Revision: 966822
>
> URL: http://svn.apache.org/viewvc?rev=966822&view=rev
> Log:
> Fix issue #3657 'phantom svn:eol-style changes cause spurious merge
> text
> conflicts'.
>
> * subversion/libsvn_client/repos_diff.c
>
> (change_file_prop): Only stash true property differences in the file
> baton. The DAV RA providers may be sending us all the properties on
> a
> file, not just the differences.

Shouldn't this be fixed in the ra layer implementations then?

This would be just 'guessing' if it is a change or a complete set.

        Bert
Received on 2010-07-22 23:04:52 CEST

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