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

RE: Should TortoiseSvn be showing merges in Revision Graphs ?

From: Kerry, Richard <richard.kerry_at_atos.net>
Date: Thu, 29 Oct 2015 15:07:54 +0000

Can I also request that it be added. Default can be off if that’s safer.
I think my histories are generally quite simple so I’d not expect to hit performance problems from complex merges.
If it proves widely useful and there are genuine performance problems then perhaps something will be possible server-side to help.

I am seeking to test whether cvs2svn is doing a suitable accurate job of converting my old Cvsnt repos to Subversion, and I’d feel happier if I could see merges easily.

Unfortunately this looks like another case where Subversion is slightly less good than CVS(NT), where, since the history of any given file is held together, all the history can very easily be delivered together to the GUI for it to display the merge data.

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_01D1125A.8CF2E420]

From: Ben Fritz [mailto:fritzophrenic_at_gmail.com]
Sent: Wednesday, October 21, 2015 3:58 PM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Should TortoiseSvn be showing merges in Revision Graphs ?

It's a feature that has been requested several times in the past, and rejected, so no it's not currently possible in TortoiseSVN. Eclipse has a couple plugins to do this.

It has been rejected in the past with "it would take to long to get and parse all the information" even though svn mergeinfo already provides a similar view. I think the reasoning had to do with problems of scale when there are lots and lots of branches, since each branch would need to check each other branch's merge info, hitting the server each time. OTOH "svn mergeinfo" only ever needs to get information about two branches.

Still, I'd also really like to see this feature implemented, even if turned off by default, with the knowledge that it can take a really long time in some repositories.

On Wed, Oct 21, 2015 at 8:41 AM, Kerry, Richard <richard.kerry_at_atos.net<mailto:richard.kerry_at_atos.net>> wrote:

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:image003.png_at_01D1125A.8CF2E420]
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<tel:%2B44%20%280%2920%203618%202669>
M: +44 (0)7812 325518<tel:%2B44%20%280%297812%20325518>
Lync: +44 (0) 20 3618 0778<tel:%2B44%20%280%29%2020%203618%200778>
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.

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=3144577

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

image001.png
image002.png
image003.png
Received on 2015-10-29 16:08:37 CET

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