26Jan 2020 by Ajayvignesh MV No Comments

LabVIEW or TestStand File Diff using TortoiseSVN or TortoiseGit

Blogs, LabVIEW Blog
When you're extensively working in LabVIEW or TestStand with multiple developers, you could easily end up in the need of merging different VIs or sequences. The LVCompare tool and TestStand File Diff and Merge Utility come in handy. Here is how you set up the Tortoise settings to make the diff handier right from the context menu using TortoiseSVN or TortoiseGit. You can diff the files this way without the need to go through the file selection dialog boxes. https://www.youtube.com/watch?v=UsvqPt8MB0g&feature=youtu.be For .vi file of LabVIEW "C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine For .seq file of Teststand "C:\Program Files\National Instruments\Shared\TestStand\FileDifferLauncher.exe" %base %mine References For LabVIEW diff with merge, there is a good article here from Delacor.
Read More
08Jan 2019 by Ajayvignesh MV No Comments

SVN Externals

Blogs, LabVIEW Blog, Snippets
If you are looking to reuse a project which already exists in another project and if you need that new project gets updates of the already existing project then-and-there, there is a very good feature in SVN called as externals to help on this kind of requirements. Advantages You can avoid multiple copies of the same source in SVN/source control repositories. Get updates from the root project as and when there is an update.  So no need to manually copy the project again when there is an update. SVN-logs are maintained for the root project from the new project and hence better historical control. In case you don't need updates from root project, use specific revision to freeze to selective version. How does that works? This can be best explained…
Read More
31Jan 2018 by Ajayvignesh MV No Comments

SVN Error – Currently locked by other user

Blogs, Snippets
When this error happens in your Tortoise SVN Commit screen as shown below, then it means (I assume) that some time back that user had svn-locked that file and later deleted from SVN by using keep-lock in svn commit window (or in somewhere the keep-lock played badly). How to fix it then? Go to the logs of that folder in which that the file was locked as explained in error message above (in my case, I went to UserAccountAuthentication logs).  Look for the file in one of the recent revision as below, right click and choose "Browse repository". This should bring up the repo version when that file existed in repo.  In the repo browser, right click that error file and choose the "Break Lock".  This should break the lock…
Read More