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

Re: Mergeinfo overwritten from successive merges

From: Branko Čibej <brane_at_wandisco.com>
Date: Fri, 14 Mar 2014 06:21:03 +0100

On 14.03.2014 02:18, Jeb Wilson wrote:
>
> Hello,
>
>
>
> I’ve reproduced this mergeinfo overwriting issue using the following
> steps. We are seeing this with svn client v1.8.8, and using a remote
> VisualSVN server v2.7.0 (which uses svn v1.8.8). NOTE: This cannot be
> replicated by using a locally created repo…we’ve only been able to
> replicate with VisualSVN remotely.
>
>
>
> TO REPRODUCE:
>
> We started out by creating an empty repo called TestRepo on the
> server. Then:
>
>
>
> E:\Colspace\sandbox2>mkdir fullrepo
>
>
>
> E:\Colspace\sandbox2>svn checkout
> https://svn.colspace.com/svn/TestRepo fullrepo
>
>
>
> Checked out revision 0.
>
>
>
> E:\Colspace\sandbox2>cd fullrepo
>
>
>
> E:\Colspace\sandbox2\fullrepo>svn mkdir trunk
>
> A trunk
>
>
>
> E:\Colspace\sandbox2\fullrepo>svn mkdir branch
>
> A branch
>

I can reproduce this, using http:// and the exact structure you're using
-- i.e., when 'trunk' and 'branch' are not related, as in your case.
When they are related (that is, 'branch' is a copy of 'trunk'), the
commit after the second merge fails, as expected.

I'm not entirely sure if this is expected behaviour or not, but I
suspect it isn't. Can you please report an issue?

-- Brane

-- 
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane_at_wandisco.com
Received on 2014-03-14 06:22:12 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.