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.
