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

Re: svn commit: r35809 - branches/1.5.x

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Thu, 12 Feb 2009 00:36:43 -0600

On Feb 12, 2009, at 12:31 AM, Daniel Shahaf wrote:

> Hyrum K. Wright wrote on Wed, 11 Feb 2009 at 14:00 -0600:
>>> + * r35143, r35145
>>> + Make it impossible to add .svn (and children) to your working
>>> copy via
>>> + svn add --parents .svn/file
>>> + svn mkdir --parents .svn/dir/dir
>>> + svn cp --parents file .svn/dir/file
>>> + Note: Small merge conflict in the tests lists of basic_tests.py.
>>> + Justification:
>>> + Failing to catch this breaks our administrative area handling.
>>> + Votes:
>>> + +1: rhuijben, stylesen, danielsh
>>> +
>>
>> Did anybody try merging these changes to 1.5.x? I get both
>> textual, as well
>> as semantic conflicts when I attempt to merge r35143 and r35145 to
>> the
>> release branch.
>>
>
> I see one textual conflict in basic_tests.py, where it doesn't know
> which test function should be added (so it adds half a dozen functions
> instead of just the one from r35143). I don't see any other merge
> issues (semantic or not). What is the semantic conflict you see?

Bert resolved it when merging. I don't recall the exact error, but it
had something to do with the path/uri/dirent API dance we've been
doing on trunk. The text merged just fine, but the API call needed to
be changed.

But I still don't have an answer to my initial question: did anybody
bother actually doing the merge before voting +1 on this change?

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1143312
Received on 2009-02-12 20:27:54 CET

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