Re: Merging from yourself fails

On Thu, Jun 12, 2008 at 10:25 AM, Blair Zajac <blair_at_orcaware.com> wrote:
> 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

That is sort of good news. It sounds like the patch is on the right
track, but we still need to fix that other issue Paul is looking at to
be back in business.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org