On Wed, Jun 11, 2008 at 10:59 AM, Blair Zajac <blair_at_orcaware.com> wrote:
> Mark Phippard wrote:
>>
>> On Wed, Jun 11, 2008 at 10:49 AM, Blair Zajac <blair_at_orcaware.com> 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
>>
>> Actually this bug prevents merging from all sorts of places into that
>> branch. I think the issue number is 3067. Paul Burba posted a patch
>> last week.
>
> This is also happening on my recent file-externals branch, see my reply to
> myself. My branch is a very simple branch that's only seen merges into it
> and no actual commits yet, IIRC.
>
> How are we supposed to keep a feature branch up to date with trunk now?
>
> Is this fixed in a newer rc than rc8?
No, it is not even fixed in trunk yet. We decided a long time ago to
ship 1.5.0 with this bug included.
--
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
Received on 2008-06-11 17:00:51 CEST