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.
