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

Re: Interesting mergeinfo corruption bug

From: Ulrich Eckhardt <ulrich.eckhardt_at_dominolaser.com>
Date: Wed, 15 Aug 2012 12:00:12 +0200

Am 14.08.2012 17:01, schrieb Chris Smith:
> 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).
> /svn/project/bb:8,9,13
> 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.

This shouldn't happen. If it does, it is a Subversion regression, it
definitely used to work.

> 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.

Typical problem there: "What is this mergeinfo? I didn't change it! I'm
not committing it." Another problem is not committing the root folder to
begin with but just the subfolder where the actual changes happen.

There is one way to determine this: If you look at the history of the
repository, you will be able to find out if the changed mergeinfo was
actually committed. My guess is that it wasn't committed.

Also, make sure your users are aware of the existance of this mergeinfo
and that they always merge with the root folder and also commit that
root folder.

Good luck!


Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
Visit our website at http://www.dominolaser.com
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-15 12:02:44 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.