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

[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 11:36:03 +0400

If you merge "the old way", i.e. specifying --ignore-ancestry,
Subversion sometimes requires you to update your WC:

svn: E195020: Cannot merge into mixed-revision working copy
[xxxxx:xxxxx]; try updating first

It wasn't the case for 1.6, and thus may be considered a regression.

Current behavior is very annoying when doing multiple merge-commit
operations, especially into large working copy. In such case, I *know*
that I have up-to-date WC after each commit, but I still have to waste
time updating.

Best wishes,
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 09:37:04 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.