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

Should TortoiseSvn be showing merges in Revision Graphs ?

From: Kerry, Richard <richard.kerry_at_atos.net>
Date: Wed, 21 Oct 2015 13:41:53 +0000

Should TortoiseSvn be showing merges in some way in the Revision Graph display ?
When I view a Revision Graph for a file I would expect to be seeing arrows to represent merges, but I don’t seem to be seeing anything. Nor seeing a configuration to enable them.

Is this feature present and I just can’t see it ? Or is it actually not available ?

I’m used to using TortoiseCVS (the CVSNT version) which does show merges (as pink arrows)
Here are some images snipped from that as examples, though I'm not sure if this list supports them.

[cid:abbca355-854a-4fa5-a6cd-52dd36d78795]

In the first example, the arrow represents an Undo, where 1.30 is to be undone. The merge acts so that 1.31 will actually be the same as 1.29.
The second example shows a couple of merges back to the Trunk/Head. 1.27.2.10 is merged to 1.28 and 1.29.2.1 is merged to 1.30.
The last example is to fix a "whoops I didn't intend to commit that to the trunk" situation. 1.4 was committed to the Trunk by mistake. There is then an Undo Merge back to 1.3. The mistaken commit is then merged onto a new branch as 1.5.2.1.

Regards,
Richard.

Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice

T: +44 (0)20 3618 2669
M: +44 (0)7812 325518
Lync: +44 (0) 20 3618 0778
Room G300, Stadium House, Wood Lane, London, W12 7TA
richard.kerry_at_atos.net<mailto:richard.kerry_at_atos.net>

[cid:image002.png_at_01D10A85.58382E20]

Atos, Atos Consulting, Worldline and Canopy The Open Cloud Company are trading names used by the Atos group. The following trading entities are registered in England and Wales: Atos IT Services UK Limited (registered number 01245534), Atos Consulting Limited (registered number 04312380), Atos Worldline UK Limited (registered number 08514184) and Canopy The Open Cloud Company Limited (registration number 08011902). The registered office for each is at 4 Triton Square, Regent’s Place, London, NW1 3HG.The VAT No. for each is: GB232327983.

This e-mail and the documents attached are confidential and intended solely for the addressee, and may contain confidential or privileged information. If you receive this e-mail in error, you are not authorised to copy, disclose, use or retain it. Please notify the sender immediately and delete this email from your systems. As emails may be intercepted, amended or lost, they are not secure. Atos therefore can accept no liability for any errors or their content. Although Atos endeavours to maintain a virus-free network, we do not warrant that this transmission is virus-free and can accept no liability for any damages resulting from any virus transmitted. The risks are deemed to be accepted by everyone who communicates with Atos by email.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

image001.png
image002.png
Merges.png
Received on 2015-10-21 15:50:14 CEST

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