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 Fri, 27 Oct 2017 01:09:42 GMT
On 10/26/2017 06:21 PM, Stefan Sperling wrote:
> 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.
> 
Thanks, it works.



Mime
View raw message