Hello all, I have a question regarding the workflow for collaboratively working on a project in LabVIEW using Subversion. First of all a bit of information about our projects: We usually work on LabVIEW projects with 1-3 people at the same time. Even when it's just 1 person working a project, we have seen a great benefit in using Subversion, as it let's us roll back to previous versions and see what our first ideas were or transfer a new version of the software to the test bench easily and without creating loads of working copies and getting all confused. In this case, you don't really have the problem of two versions of the program existing at the same time except, when you make changes and don't commit properly. Our solution for this so far has been not to do this.When the projects grow and more people work on a project, the scenario of several people working in the same vi becomes real.We have had the case that my colleague couldn't commit his revision because someone had committed another revision before him and there was a mismatch. My question now is: How do you tackle this problem?So far I have not found a good way to solve this:- VIewpoint TSVN Diff from within LabVIEW works great for comparing the last revision to whatever I am working with. Changes have to be made manually, though, which can be a lot of work in bigger projects. I still think this is the method with the best results.- Using the LabVIEWs merge tool requires copying VIs from different revisions, which is also not the most comfortable way to go.- Using the TSVN merge in the explorer doesn't do anything even with a small primitive example (why would it, though, it just compares text files...) I'd be grateful for any input you can give me on this topic. Maybe you can share some insight into how you handle these issues. These are not show stoppers for us, just little problems that make an otherwise awesome tool imperfect. All the problems this has caused could be resolved quickly, too, because we had subversion to back us up. All this would have been a nightmare with USB Sticks and copies. Cheers,Pete

LabVIEW

Hi,

it seems to me that SVN's capabilities to make branches, then to merge it in the trunk should be a good answer to the initial question.

Phil

Message 11 of 11

(242 Views)