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

Interesting mergeinfo corruption bug

From: Chris Smith <chris.smith_at_intelliflo.com>
Date: Tue, 14 Aug 2012 08:01:18 -0700 (PDT)


I've encountered a rather interesting merging bug. We are using the following stack:

Client side: TSVN 1.7.7 on Windows 7 x64
Server side: Apache 2.0.27, Subversion 1.7.5 on Windows 2008 Server R2 behind an IIS 7.5 ARR proxy.

The issue is as follows (with false names of course :-):

1. We have trunk and two branches running (ba, bb). Merges have been done from each branch.

2. bob merges a revision 12 from ba into trunk. This causes the mergeinfo property to be set on trunk to:

/svn/project/ba:10,11,12 #(adding the 12).

3. bill comes along and immediately merges revision 14 from bb into trunk. This causes the merge info to set on the root to:

/svn/project/ba:10,11 #(removing the 12?!?!?)
/svn/project/bb:8,9,13,14 #(adding the 14)

This unexpectedly removes rev 12 from the mergeinfo for a branch which is not being merged against. Inevitably this means that rev 12 now shows up as eligible again.

We've been playing whack a mole with this for a couple of weeks now. The problem is entirely intermittent and there appears to be no way of reliably isolating it (I've tried for days now).

There is the possibility of human error here either on my understanding or at this end but it's shown up on several people's workstations now.

Does anyone know why this occurs or can anyone help us?

Best Regards,

Chris Smith


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-14 17:05:40 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.