NeverDown

No, no. I'm forced to use SVN for now. I just have my eyes on the prize.

QUOTE (jdunham @ Aug 18 2008, 06:41 PM) I actually found a workaround, I deleted the files ‘test.vi.r2′ and ‘test.vi.r3′ after merging. The menu entry "Conflict resolved" isn't available any more, but I can do a normal SVN commit and it seems OK. We'll see. I get tired of doing manual stuff with tools. Maybe I'm just spoiled using LV. :-) Thank you.

After editing my conflicts, I cannot set my file to resolved using Tortoise SVN. I get the following error: An unknown error occurred while accessing C:\Development\TestRepository\RandomNumberDisplay.vi. This is only for LV files. Has anyone else gotten this? Thanks!

QUOTE (crelf @ Aug 15 2008, 10:21 PM) Sorry about that. Busy couple weeks, but if you're really interested in learning about why a scc like Accurev can improve your life (if you're working on new and maintenance releases in parallel for e.g.) or have to worry about your 10 buddies across the hall or pond overwriting your hard work, the demo is 2 minutes and this paper I found on the website details some pretty nifty features you just won't find in a branch and label type scc tool. But of course this is all for not unless you're handy with APIs, and we don't have time for our own integrations at the moment. But believe me, we've got our eye on this. http://www.accurev.com/competitive/accurev...on-analysis.pdf http://www.accurev.com/demonstration.html Also, a few cool short video comparisons: http://www.accurev.com/scm-comparisons/acc...subversion.html

I wish there were an integration with LabView and Accurev. That source control tool makes Perforce and SVN look like my grandfather's source control.