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

Re: Partial fix for merge_tests.py 66 failure on mergeinfoless-copies branch

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2007-11-21 07:27:17 CET

Paul Burba wrote:
> Try out this patch, it should fix the problem you mentioned -- the trick
> is *removing* paths from expected_disk rather than tweaking them -- I
> knew I'd run afoul of this before, it just took a long while to recall
> what the fix was :-(

Ah... gotcha!

> Unfortunately merge test 66 still fails on the last reverse merge, the
> A_COPY ends up with no mergeinfo, rather than it's pristine empty
> mergeinfo. I hven't had a chance to look into that any further yet.

Isn't that due to elision? I'm not convinced it's correct, but isn't that
the likely cause?

C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on Wed Nov 21 07:31:32 2007

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.