benjaminhysell Posted February 20, 2009 Report Share Posted February 20, 2009 Hey everyone, I was able to use: http://expressionflow.com/2007/08/28/using...th-tortoisesvn/ and integrated SVN with the merge command, and it works great! What about using the Diff command from Tortoise SVN Windows client? I've googled around a bit and found an application called 'lvdiff', but I haven't seen any recent activity on the project since 2005. Has LVMerge replaced lvdiff? If so, has anyone figured out how to configure Tortoise to use LVMerge when attempting to diff a vi? Thanks! -ben Quote Link to comment
PaulL Posted February 20, 2009 Report Share Posted February 20, 2009 This thread New Software Engineering and LabVIEW Wiki links to pages that have detailed instructions on how to set up TortoiseSVN to use lvdiff. Paul Quote Link to comment
benjaminhysell Posted February 20, 2009 Author Report Share Posted February 20, 2009 QUOTE (Paul_at_Lowell @ Feb 19 2009, 11:44 AM) This thread New Software Engineering and LabVIEW Wiki links to pages that have detailed instructions on how to set up TortoiseSVN to use lvdiff.Paul Excellent! I was through those links in the past, but I suppose I did not dig deep enough :-). A shortcut: http://wiki.lavag.org/Set_up_differencing_capabilities Just tried it out with 8.6.1, everything works great! -ben Quote Link to comment
JustinThomas Posted March 11, 2009 Report Share Posted March 11, 2009 The LVDiff works well for simple VIs. One problem I am currently unable to solve is how to Diff VI's which have SubVIs. If using LVDiff with VIs having subvis in the repository LabVIEW would give me the Browse for VI option. I want the working copy VI to use SubVIs from the working copy and the repository VI to use SubVIs from the repository. Is this possible? Justin Thomas Quote Link to comment
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.