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

RE: SVN merge attempting to reintegrate on a merge to a branch

From: Andrew Reedick <Andrew.Reedick_at_cbeyond.net>
Date: Fri, 13 Sep 2013 16:16:17 -0400

> -----Original Message-----
> From: Goor, Stefan [mailto:SGoor_at_thetasgroup.com]
> Sent: Friday, September 13, 2013 3:53 PM
> To: Andrew Reedick; users_at_subversion.apache.org
> Subject: Re: SVN merge attempting to reintegrate on a merge to a branch
> Hi Andrew,
> Thanks for your response. You are right, I hadn't noticed but on the
> first line about the missing ranges the last letter of the project name
> is missing and I had just pasted over it when I sanitized the path
> names.
> I got around this as you suggested by using the -r 4401:HEAD option but
> this is becoming a recurring problem for us lately. We prefer to merge
> the trunk project to the branch in preparation of reintegrating the
> branch to trunk but we seem to hit this issue quite a bit lately.
> Is this a bug? Is it something we are doing wrong? Is there any
> information we could send that would help diagnose and prevent the
> issue?

No idea. But I posted about the missing char issue a couple of days ago: http://svn.haxx.se/users/archive-2013-09/0116.shtml

It's either a harmless presentation error, or the missing char implies a malformed pathname that is possibly mucking up the merge analysis?
Received on 2013-09-13 22:17:56 CEST

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.