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

Re: svn merge failed

From: wuzhouhui <1530108435_at_qq.com>
Date: Thu, 26 Oct 2017 17:44:16 +0800

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.
Received on 2017-10-26 11:44:34 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.