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

Re: 1.7.15 up for testing/signing

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 14 Feb 2014 13:51:02 +0000

Philip Martin <philip.martin_at_wandisco.com> writes:

> Ivan Zhakov <ivan_at_visualsvn.com> writes:
>> I am getting diff_tests#10 failure over all protocols on Windows. All
>> other tests pass.
>> [[[
>> FAIL: diff_tests.py 10: diff when property was changed but text was not
>> ]]]
>> The failure is reproducible. Is it known issue? What I should to check?
> The test creates r2 for the file iota that adds svn:eol-style=native.
> Then it runs various diffs: -r1:2, -r2:1, etc. The one that fails is
> -rPREV which compares r1 in the repository to r2 in the working copy.
> The test expects the diff to show a property change only but a text
> change is seen.
> Perhaps the code that converts the working file to repository form is
> failing? The code in question is
> libsvn_client/diff.c:diff_repos_wc_file_target:2320
> and that code certainly is invoked on my Linux machine.

So it looks as if this code is converting the wrong way. It's supposed
to convert from working copy form to repository form but is doing the
reverse conversion. On Linux the conversion is a noop so it works. At
some point we need

          if (eol_style == svn_subst_eol_style_native)
            eol_str = SVN_SUBST_NATIVE_EOL_STR;

but I don't know if this should go directly in client/diff.c or whether
some other translation function should be used.

Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Received on 2014-02-14 14:51:37 CET

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.