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

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

From: Andrey Paramonov <paramon_at_acdlabs.ru>
Date: Tue, 03 Jul 2012 13:27:51 +0400

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.
Received on 2012-07-03 11:29:08 CEST

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

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