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
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-11 16:55:45 CEST