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

Re: 1.6.10 up for testing/signing - merge tests failing

From: Paul Burba <ptburba_at_gmail.com>
Date: Thu, 1 Apr 2010 08:08:55 -0400

On Thu, Apr 1, 2010 at 7:40 AM, Julian Foad <julian.foad_at_wandisco.com> wrote:
> On Thu, 2010-04-01 at 11:43 +0100, Julian Foad wrote:
>> On Wed, 2010-03-31 at 13:01 -0600, Hyrum K. Wright wrote:
>> > 1.6.10 tarballs are up, the magic revision is r929659:
>> >
>> > http://orac.ece.utexas.edu/pub/svn/1.6.10/
>>
>> For me, merge_tests.py 45 77 79 124 126 all fail, on serf/fsfs.
>
> If I roll the 1.6.x branch back to r929629, it passes.

Hi Julian,

Doesn't really help you, but those all pass for me:

C:\SVN\src-branch-1.6.x\Release\subversion\tests\cmdline>python
C:\SVN\src-branch-1.6.x\subversion\tests\cmdline\merge_tests.py 45 77
79 124 126 --http-library serf --cleanup
PASS: merge_tests.py 45: target inherits mergeinfo from nearest ancestor
PASS: merge_tests.py 77: subtrees added after start of merge range are ok
PASS: merge_tests.py 79: merge --reintegrate with renamed file on branch
PASS: merge_tests.py 124: no self referential filtering on added path
PASS: merge_tests.py 126: merge --reintegrate with subtree mergeinfo

The likely culprit would seem r929603...can you confirm that is where
the failure starts?

Do you see the same failures on trunk?

Anyone else seeing this?

Paul
Received on 2010-04-01 14:09:24 CEST

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