On Wed, Jun 11, 2008 at 11:24 AM, Blair Zajac <blair_at_orcaware.com> wrote:
> Mark Phippard wrote:
>>
>> On Wed, Jun 11, 2008 at 11:07 AM, Blair Zajac <blair_at_orcaware.com> wrote:
>>>
>>> Mark Phippard wrote:
>>>>
>>>> On Wed, Jun 11, 2008 at 10:55 AM, Blair Zajac <blair_at_orcaware.com>
>>>> wrote:
>>>>>
>>>>> Blair Zajac wrote:
>>>>>>
>>>>>> Working on the file externals branch this morning, I accidentally
>>>>>> tried
>>>>>> to
>>>>>> merge trunk into it but merged itself.
>>>>>>
>>>>>> With rc8:
>>>>>>
>>>>>> $ svn co http://svn.collab.net/repos/svn/branches/1.5.x
>>>>>> $ cd 1.5.x
>>>>>> $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x
>>>>>> subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
>>>>>> svn: Working copy path 'CHANGES' does not exist in repository
>>>>>
>>>>> Hold on, I can't even merge from trunk into my branch this morning.
>>>>> This
>>>>> is
>>>>> with the same svn binaries that I compiled on June 1st. And this
>>>>> worked
>>>>> yesterday morning:
>>>>>
>>>>> $ rm -fr svn-file-externals-pristine-merges
>>>>> $ svn co http://svn.collab.net/repos/svn/branches/file-externals
>>>>> svn-file-externals-pristine-merges
>>>>>
>>>>> $ rm -fr svn-trunk-pristine
>>>>> $ svn co http://svn.collab.net/repos/svn/trunk svn-trunk-pristine
>>>>>
>>>>> $ cd svn-file-externals-pristine-merges
>>>>> $ svn merge ../svn-trunk-pristine
>>>>> subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
>>>>> svn: Working copy path 'www/tasks.html' does not exist in repository
>>>>
>>>> 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.
>
> It doesn't work. I applied the patch to trunk_at_31704 and I get this error:
>
> $ svn --version
> svn, version 1.6.0 (dev build)
> compiled Jun 11 2008, 08:09:37
>
> $ svn co http://svn.collab.net/repos/svn/branches/file-externals@31704
> $ cd file-externals
> $ svn merge http://svn.collab.net/repos/svn/trunk
> subversion/libsvn_ra_neon/util.c:722: (apr_err=160013)
> svn: Working copy path 'www/tasks.html' does not exist in repository
As 'www/tasks.html' has explicit mergeinfo and was copied from
'www/project_tasks.html' in r31665, this problem is almost certainly
issue #3174 'Merge algorithm chokes on subtrees needing special
attention that have been renamed', not issue #3067 (though the two are
closely related). When Karl copied 'www/project_tasks.html' to
'www/tasks.html', that latter got explicit mergeinfo, inherited from
the root of trunk.
SIDEBAR: This partly gets to the problem of setting mergeinfo on
copy/move destinations. I know it's been discussed many times on IRC,
but we probably don't need to set mergeinfo in all the cases that we
do.
there are no patches for 3174 yet...let me take a quick look at the
latest 3067 patch and see what needs to be done on top of that to fix
3174 too...it *might* not be too difficult to solve some of the 3174
use cases.
Paul
---------------------------------------------------------------------
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-11 18:40:42 CEST