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

Re: Report of merge fixes not done to trunk

From: Ulrich Eckhardt <ulrich.eckhardt_at_dominolaser.com>
Date: Mon, 30 May 2011 14:40:06 +0200

On Monday 30 May 2011, you wrote:
> Like many dev teams we fix older branches, and then generally have to merge
> the fix into trunk.

I'd claim that few teams do that. Rather they fix a bug in trunk first, and
then merge it back into older branches (provided the risk/gain ratio is
right).

> Is there an easy way to get a report of some kind, so we can can check
> these merges are not forgotten?

Generally, I would advise using an issue tracking system that integrates with
SVN, like e.g. TRAC. That way you can keep track of what versions are affected
by a bug and where it still needs fixing.

Subversion itself has the "svn:mergeinfo" property, which records which
changes were merged into which branch, but this typically isn't enough,
because trunk receives way more changes than you merge to older branches. In
the case that you merge from branches to trunk it becomes much easier, because
there are only few changes on the branches. When TSVN displays the list of
merge candidates, the already merged revisions are greyed out, which makes it
easy to find and pick those still unmerged.

Good luck!

Uli

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

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2753151

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-30 14:37:36 CEST

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