subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: svn merge failed
Date Thu, 26 Oct 2017 09:33:30 GMT
On Thu, Oct 26, 2017 at 04:39:11PM +0800, wuzhouhui wrote:
> I'm wondering if higher Subversion client can disable some features for
> compatible with older Subversion server.

The --no-ancestry option disables merge-tracking on the client.
You could try again with 'svn merge --no-ancestry'.

But the recommended option is to upgrade the repository filesystem
on the server.

Mime
View raw message