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

Re: Subversion Branch/Merge Graphical Display

From: Ulrich Eckhardt <ulrich.eckhardt_at_dominolaser.com>
Date: Mon, 1 Aug 2011 11:03:41 +0200

On Monday 01 August 2011, Tony Butt wrote:
> Some tools (noticeably TortoiseSVN and kdesvn) are quite capable of
> showing the branch history.

I wonder, what exactly do you mean with that? The reason I ask is because
there is nothing in SVN that provides you a mapping from trunk to all branches
that were made off trunk. The references only point from the branch to where
it was made from ("copy from..").

> I have found nothing which is capable of showing merge history. I would
> have thought that with the advent of svn:mergeinfo, that sufficient
> information is present to deduce the merges.

Try the

  [x] Include merged revisions

checkbox in TSVN's log view. If you merge, it also shows already merged
revisions with grey text.

> Since it has not been done, I can only assume that the task is
> non-trivial (certainly), probably difficult, and perhaps not practical.
> Is that correct?
>
> In any event, does anyone know of a tool which will provide such a
> history?

You already know about the mergeinfo property and how merge-tracking works
with SVN. This can be used to generate a merge history, too, and quite easily
so. I'm wondering what exactly you need...

Cheers!

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.
**************************************************************************************
Received on 2011-08-01 10:56:49 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.