TortoiseSVN and Subversion 1.5

A lot of people asked us about TortoiseSVN and its plans for merge tracking. For those of you who do not know, TortoiseSVN is a Subversion client for Windows users. It plugs into the Windows Shell and makes Subversion client commands available through right-click options within Windows Explorer and any of the open/save dialogues. TortoiseSVN is a great tool that rightfully won a Sourceforge.net Community Choice Award 2007. You can download it from openCollabNet and it is also part of CollabNet’s stack of supported integrations for Subversion.

I use TortoiseSVN myself all the time so I too was curious to find out about the TortoiseSVN plans for merge tracking. Some information is on their web site but I contacted the project lead for TortoiseSVN, Stefan Küng, and asked about the status. Here is his reply and some screenshots (thanks Stefan):


Merge tracking is usually done by the Subversion library without the user knowing about it. I.e., the user doesn’t see that Subversion skips already merged revisions when merging from trunk to a branch. That’s why there’s not really much done in TSVN UI-wise. Where we thought we have to show the user more information, we did. Otherwise we tried to hide the specifics as well as possible.

What we did for now:

The log dialog, when started from the merge dialog to select revisions to merge shows the already merged revisions in grey instead of black. This indicates to the user that the grey revisions shouldn’t be merged (again).

The log dialog shows merged revisions indented, with each indentation level being a merge level. This UI may change before the final 1.5 release because I’m not really happy with the way the indentation looks right now – it’s hard to see the different levels. I may add some vertical lines there or do something else to improve the indentation.

When showing blames, merged lines are shown with an italic font, and the user can optionally show the merged paths of every line.


Nightly builds are on the TortoiseSVN web site but they might not always work with the Subversion 1.5 pre-release binaries currently downloadable from the Merge Tracking Early Adopter Program. Next week we will update the Subversion 1.5 binaries to the latest development status and we’ll post a TortoiseSVN build that works with our latest Subversion build.

One more thing: On October 30th CollabNet will do another webinar on Subversion 1.5, covering advanced branching and merging with Subversion 1.5. The webinar follows up on the one from a month ago about branching strategies and answers many of the questions people asked. Register here.

Tagged with: , , , , , , , , , ,
Posted in Subversion
6 comments on “TortoiseSVN and Subversion 1.5
  1. Anonymous says:

    Why don’t you link directly to the TortoiseSvn site instead of
    the CollabNet site and require a download?
    http://tortoisesvn.net/download
    It’s annoying to have to register.
    It’s also rude. If you did your own build of TortoiseSvn, that
    would be fine, but honor the TortoiseSvn people by linking
    to them.

  2. Didn’t I honor the TortoiseSVN people with: “TortoiseSVN is a great tool that rightfully won a SourceForge.net Community Choice Award 2007.”? Also, I did link to their nightly builds page.
    The build on openCollabNet is in fact created (from the open source code) by CollabNet. We support TortoiseSVN as part of the CollabNet Integration Package support program. For supportability, we prefer customers to be on the same build as our support staff. Some of our major customers standardize on builds we distribute, whether it is for Subversion, TortoiseSVN or Subclipse.
    That said, I appreciate your feedback; the Subversion community owes the TortoiseSVN people a lot.

  3. TortoiseSVN与Subversion 1.5

    许多人在谈论TortoiseSVN以及它在合并跟踪方面的计划,有些人可能不知道TortoiseSVN ,TortoiseSVN是Windows下的一个Subversion客户端。它嵌入到了Windows Shell而且让Subversion客户端命令出现在Windows浏览器和任何打开保存对话框的右键当中。TortoiseSVN是赢得Sourceforge.net Community Choice Award 2007的伟大工具,你可以从openCollabNet下载,它也是CollabNet的一系…

  4. Locke Mason says:

    I guess I may be considered a subversion. now the way i see it is of course different. the issue is i’m very interested in receiving some project “participant” information. I am seen as a fool possibly, and if this is not allowed I see it as such. sorry for taking your time. thanks, Locke 630-879-0322 Lmason2926@aol.com

  5. MariusRugan says:

    Hi Guido
    “Next week we will update the Subversion 1.5 binaries to the latest development status and we’ll post a TortoiseSVN build that works with our latest Subversion build.”
    There has been over 1 month and still no news regarding TortoiseSVN 🙂
    http://downloads.open.collab.net/readmes/readme_TortoiseSVN.txt has no update regarding 1.5

  6. Guido says:

    Hi Marius,
    That readme is from the shipping version, updates to 1.5 are not in there.
    In the end we decided it would be better if developers get a nightly build from the TorToiseSVN site, rather than us posting an arbitraty one on openCollabNet. You can get nighly builds here: http://nightlybuilds.tortoisesvn.net/latest/ . The development status is at: http://tortoisesvn.net/status .
    Best,
    Guido

Leave a Reply

Your email address will not be published. Required fields are marked *

*