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

Re: Merging from yourself fails

From: Paul Burba <ptburba_at_gmail.com>
Date: Wed, 11 Jun 2008 13:01:10 -0400

On Wed, Jun 11, 2008 at 12:54 PM, 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.
>
> Are we considering the fixes of these issues suitable for inclusion into a
> 1.5.x release?

We absolutely need them in 1.5.1 IMO.

---------------------------------------------------------------------
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 19:01:20 CEST

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