Re: [Bug] Should allow to merge into mixed-revision working copy when specifying --ignore-ancestry

On 03.07.2012 13:20, Stefan Sperling wrote:
> On Tue, Jul 03, 2012 at 11:56:47AM +0400, Andrey Paramonov wrote:
>> On 03.07.2012 11:50, Johan Corveleyn wrote:
>>> Try '--allow-mixed-revisions'
>>>
>>
>> Hmmm, svn help merge says:
>>
>> --allow-mixed-revisions : Allow merge into mixed-revision working copy.
>> Use of this option is not recommended!
>> Please run 'svn update' instead.
>>
>> I believe --ignore-ancestry should be enough to disable
>> mixed-revisions check.
>
> --ignore-ancestry (and --notice-ancestry) controls comparison behaviour
> in diff/merge/mergeinfo subcommands. It does not mean "run a merge like
> Subversion 1.4 did".
>

I believe it's more important that --ignore-ancestry disables *write* of
mergeinfo in this case. So no mergeinfo = no problem with mixed-revision
working copy, right?

> So please use --allow-mixed-revisions. It was added precisely because
> people might want to disable this check for some reason.
>

Well, that's fair workaround.

Thank you for your work,
Andrey Paramonov

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.