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.
Best wishes, Andrey Paramonov -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.