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

Re: SVN 1.8.x erroneously assumes a reintegrate merge and gives error E195016

From: Ben Reser <ben_at_reser.org>
Date: Thu, 16 Jan 2014 11:20:10 -0800

On 1/16/14, 8:34 AM, Keath Milligan wrote:
> 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.

Can you provide a minimal reproduction recipe (starting with a new repository)
that demonstrates the issue? It's very difficult to diagnose merge issues
without looking at the repository (which I'm going to assume you can't let us
do, though if you could that may be helpful) because the history is very
important to the behavior of merge.

Some general guidelines on how to report a bug are here:
Received on 2014-01-16 20:20:42 CET

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.