[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: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 26 Oct 2017 12:21:34 +0200

On Thu, Oct 26, 2017 at 05:44:16PM +0800, wuzhouhui wrote:
> There is no option --no-ancestry for subcommand merge, I think option
> --ignore-ancestry is what you talk about.

Correct. Sorry about that.

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

You will have to specify a revision range as well when merging with
merge-tracking disabled: Use the -r or -c option.
Otherwise, SVN cannot know which changes should be merged.
Received on 2017-10-26 12:22:07 CEST

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