SVN 1.8.x erroneously assumes a reintegrate merge and gives error E195016
From: Keath Milligan <keathmilligan_at_gmail.com>
Date: Thu, 16 Jan 2014 10:34:32 -0600
We are running into an issue similar to the one described in http://svn.haxx.se/users/archive-2013-12/0171.shtml when performing some sync merges. svn issues error "E195016: Reintegrate can only be used if revisions…” but this isn’t a reintegrate merge. When this happens, the only work around appears to be to specify the revision range to merge explicitly, which is very confusing and error prone for less experienced users.
Is there something we can do to help svn’s reintegrate logic work better?
Note that this is not the dropped character problem described in other posts. We have confirmed that all of the paths in svn:mergeinfo are correct.
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.