[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: Blair Zajac <blair_at_orcaware.com>
Date: Wed, 11 Jun 2008 08:07:08 -0700

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


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 17:07:34 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.