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)

How are you doing the resolve? You are just editing the VI? I haven't noticed any problems.

You can also manually resolve conflicts. Usually when a VI conflict happens, you will get 3 files instead of one:

MyFile.vi

MyFile.vi.r1234

MyFile.vi.r1200

If you just delete the second 2 files, Tortoise will think you have resolved the conflict. If that doesn't work either, then you may have more serious problems with your working copy.

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)

I don't know about your grandfather's SCC, but my grandfather's SCC is freakin' awesome!

PS: just posting about how one thing is better than another provides very little value to the community if you don't tell us why. We're all here to learn from each other, so please share what you know. Perhaps a feature comparison? Maybe a list of a few features that Accurev has that SVN doesn't?

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.