subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wuzhouhui <1530108...@qq.com>
Subject Re: svn merge failed
Date Thu, 26 Oct 2017 09:44:16 GMT
There is no option --no-ancestry for subcommand merge, I think option
--ignore-ancestry is what you talk about.

I run "svn merge --ignore-ancestry" and got this:
     svn: E200004: Cannot merge automatically while ignoring mergeinfo

On 10/26/2017 05:33 PM, Stefan Sperling wrote:
> 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