Tortoisehg change diff tool
![tortoisehg change diff tool tortoisehg change diff tool](https://helpx.adobe.com/content/dam/photoshop/hero-images/Photoshop-Tool-HorizontalType-hero-2x.jpg)
![tortoisehg change diff tool tortoisehg change diff tool](https://i.stack.imgur.com/Po2af.png)
I was thinking a hierarchy ordering of the vi's to merge might be necessary in order to get it correct, but LVMerge (at least in 2010) is very good. The only way I see is to use the Mercurial commands directly to "update" to each of the changesets being compared in their entirety and then compare them in different directly structures. Unfortunately LabVIEW's compile at edit time and sub vi dependency means that if multiple related files are different then the single file diff won't be entirely accurate. A diff tool also needs a little work to support to diff changesets when multiple related files are different. The merging is a little lacking, but I am working on a simple tool to allow multi-file merges with TortoiseHG (LVMerge ends execution before the merge is actually complete and you miss the next file merge). Meanwhile I have another branch where I am gutting the entire structure of the program. I have a major project where another developer is making sweeping changes that are not all backward compatible yet, but we are working from the same repository and I can still perform stable maintence releases. It has literally saved me days of work because of how easy it is to manage releases, bug fixes, major changes with the branching and merging features. The ability to go back to a tagged release, make a small change, perform a build and release (and tag), and then merge that change to the mainline is so easy in mercurial and next to impossible in the other environments I have used. It is really easy to manage when I am the only developer, but also isn't too bad in a multi-developer environment either.
#TORTOISEHG CHANGE DIFF TOOL FREE#
I've been using Mercurial with TortoiseHG and Kiln (Kiln is free for two developers) since this last summer and I love it! It sometimes surprises me how easy some activities are compared to how I used to have to do them with VSS / Perforce / Surround SCM / DesignSync (don't ask about that one.