Re: svn commit: r1211199 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py tests/cmdline/mergeinfo_tests.py

On Wed, Dec 7, 2011 at 6:45 PM, Philip Martin
<philip.martin_at_wandisco.com> wrote:
> pburba_at_apache.org writes:
>
>> Author: pburba
>> Date: Tue Dec  6 22:04:22 2011
>> New Revision: 1211199
>>
>> URL: http://svn.apache.org/viewvc?rev=1211199&view=rev
>> Log:
>> Fix issue #4057 "don't record non-inheritable mergeinfo in shallow merge
>> if entire diff is within requested depth".
>
> This commit causes merge_tests.py 120 and 124 to fail for BDB
> repositories on one of the buildbots and on my machine.  The tests pass
> with FSFS repositories.  valgrind doesn't give any warnings.

Hi Philip,

Thanks for the heads-up, I'm aware of the problem and working on a fix.

Paul
Received on 2011-12-08 16:09:17 CET