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

Re: svn commit: r1656893 - in /subversion/trunk/subversion: svnsync/sync.c tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.expected.dump

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 4 Feb 2015 12:57:43 +0000

Hi Philip,

Thanks for fixing my embarrassing bug.

I've just finished fixing this too, and expanding the test, and then found you already committed this last night. We should have used more words to communicate. The fix was easy (not too different from yours) but I spent some time on the tests.

As I think I have made a considerably more thorough set of test cases for this issue, I'm taking the liberty of committing that part. r1657182.

Apparently we had no test that synced a repository containing merginfo at all. That's another deficiency we could address with the approach of running additional (svnsync in this case) tests at the end of existing tests. I'll look into doing that after reintegrating the 'dump-load-cross-check' branch.

- Julian

> Author: philip
> Date: Tue Feb  3 19:07:09 2015
> New Revision: 1656893
>
> URL: http://svn.apache.org/r1656893
> Log:
> Fix svnsync r0 filtering to handle svn:mergeinfo where not all
> lines contain r0.
>
> * subversion/svnsync/sync.c
>   (remove_r0_mergeinfo): Build up new string when r0 not present.
>
> [In subversion/tests/cmdline/svnsync_tests_data/]
>
> * mergeinfo-contains-r0.dump: Extend with svn:mergeinfo that has
>    only some, or no, lines with r0.
>
> * mergeinfo-contains-r0.expected.dump: Adjust.
>
> Modified:
>     subversion/trunk/subversion/svnsync/sync.c
>    
> subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump
>    
> subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.expected.dump
Received on 2015-02-04 14:01:45 CET

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