Mark Phippard wrote:
> On Wed, Jun 11, 2008 at 12:54 PM, Blair Zajac <blair_at_orcaware.com> wrote:
>>>>> It sounds like the same bug. It is possible the merge of the
>>>>> issue-3000 branch to trunk has created an additional scenario where we
>>>>> are running into it. We have had this in our 1.5.x branch for a long
>>>>> time, but not trunk.
>>>>>
>>>>> I believe we can stop having the problem by removing some of our
>>>>> subtree mergeinfo, but to date we have chosen not to do any manual
>>>>> fixes. If you are using a trunk client, you can apply and review Paul
>>>>> Burba's patch.
>>>> Thanks. I'm going to try his patch. Reviewing the patch is going to
>>>> take
>>>> more cycles then I have though :)
>>>
>>> Well, using it is a form of review too :) Let us know how it goes.
>> Are we considering the fixes of these issues suitable for inclusion into a
>> 1.5.x release?
>
> Yes, if it is at all possible. I imagine we need to see what the
> fixes wind up being though.
I tried the patch this morning on the newly created file-external branch and the
merge fails:
subversion/libsvn_ra_neon/util.c:722: (apr_err=160013)
svn: Working copy path 'www/tasks.html' does not exist in repository
This branch has no commits in it and was copied yesterday.
It does improve merges into 1.5.x. Doing a full merge of trunk into 1.5.x does
work, while without the patch it does not.
subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
svn: Working copy path 'CHANGES' does not exist in repository
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-12 16:25:57 CEST