[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: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 3 Jul 2012 11:20:17 +0200

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".

So please use --allow-mixed-revisions. It was added precisely because
people might want to disable this check for some reason.
Received on 2012-07-03 11:20:59 CEST

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