[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: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 16 Sep 2013 11:34:47 +0200

On Fri, Sep 13, 2013 at 04:16:17PM -0400, Andrew Reedick wrote:
> > -----Original Message-----
> > From: Goor, Stefan [mailto:SGoor_at_thetasgroup.com]
> > 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?
>

Hi Andrew,

did you have time to answer Ivan's questions from this post?
http://svn.haxx.se/users/archive-2013-09/0142.shtml

Knowing where the mergeinfo corruption starts occurring would
help us greatly with hunting down the issue.

Does the corruption happen also if you use file:// URLs on the server
during checkout/merge, instead of http:// ?
Received on 2013-09-16 11:35:30 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.