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

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

From: Paul Burba <pburba_at_collab.net>
Date: 2007-11-21 02:45:51 CET

Mike,

Re our IRC discussion about the mergeinfoless-copies branch:

<cmpilato> i'm still working through failures farther down in test 66
<cmpilato> i don't think these are code issue, just test expectation
issues.
<pburba> Oh, didn't realize that! I was messing around with reverse
merges on your branch, fishing for problems.
<cmpilato> that's cool.
<cmpilato> fish away.
<cmpilato> dealing with the oh-so-informational:
<cmpilato> Couldn't find node '.' in actual tree
<cmpilato> * Node name: .
<cmpilato> Path: __SVN_ROOT_NODE/.
<cmpilato> Contents: None
<cmpilato> Properties: {}
<cmpilato> Attributes: {}
<cmpilato> Children: N/A (node is a file)

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 :-(

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.

Paul

P.S. I'm assuming that the changes I made to
libsvn_client/merge.c:get_most_inclusive_end_rev() in the attached patch
are similar to what you have locally in get_most_inclusive_end_rev()?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Wed Nov 21 02:46:01 2007

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