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

Re: Playing with svnmover

From: Julian Foad <julianfoad_at_gmail.com>
Date: Thu, 9 Apr 2015 12:26:31 +0100

Julian Foad wrote:
> On 7 April 2015 at 21:59, Stefan Fuhrmann wrote:
>> * Trying to rename a sub-branch root:
>> svnmover> mv trunk/sub trunk/A
>> mv: moving by copy-and-delete
>> svnmover: warning: apr_err=SVN_ERR_ASSERTION_FAIL
>> svnmover: warning: W235000: In file 'subversion/libsvn_delta/editor3e.c'
>> line 293: assertion failed (eid != branch->sibling_defn->root_eid)
>
> OK, there's a bug. This move should just work, no need for
> 'copy-and-delete'. What's happening is a confusion over whether the
> move source is identified as 'the root element of branch <trunk/sub>'
> or as 'the element named <sub> in branch <trunk>'.
>
> I'm working on it.

Fixed in r1672160.

This fix caused the 'restructure repo: projects/ttb to ttb/projects'
test to fail, because the way it used the 'mv' command relied on the
broken behaviour. So now I need to provide an alternative UI for the
behaviour that test needs.

I noticed another bug:

'svnmover merge' doesn't raise a conflict when one side deletes a
directory and the other side changed something within that directory.

I think that is a simple omission in the merge implementation.

- Julian
Received on 2015-04-09 13:27:21 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.