FIRST Tech Challenge Discussions

cancel
Showing results for 
Search instead for 
Did you mean: 

How do you handle source control?

Solved!
Go to solution

I was wondering how other teams handle source control for small teams of two or three programmers. What software do you use (e.g. CVS) and specifically how do you handle splits and merges? Thanks in advance.

Dave

0 Kudos
Message 1 of 5
(4,164 Views)

We use the 'share'operation and save onto flash drives (.zip can be emailed). This creates our backups too.

We extract into the project directory for use.

We use the ADD VI to bring vi's together.

We often have to rewire blocks for Schematc Editor references in this approach. 😞

If we discover a more elegant way to handle this, we'll share. 🙂

@Hueter: I can't wait to try those! Thanks.

0 Kudos
Message 2 of 5
(3,229 Views)
Solution
Accepted by chi-town_biker

I use Tortoise SVN, you can configure it to use the LabVIEW diff and merge tools.

How do I use Subversion (SVN) and TortoiseSVN for source code controlling LabVIEW projects?

http://digital.ni.com/public.nsf/allkb/C751F800E258087B86257535006DB160

How Do I configure TortoiseSVN to use LabVIEW Compare for Diff Viewing?

http://digital.ni.com/public.nsf/allkb/1A300A1BB1833EE786257A7C0077B422

Message 3 of 5
(3,229 Views)

@Hueter: I can't wait to try those! Thanks.

Last year I tried to turn on the automatic commenting, and version options (from the native LV environment); however, it really 'broke' some of the LVLM behaviors to the point that we couldn't function. We had quite a few 'file management' issues the last couple seasons and have had to keep things very basic in that regard I look forward to the 2012 version, and trying this again.

Thanks.

0 Kudos
Message 4 of 5
(3,229 Views)

Our team tried SVN early in the year but was a little combersome and they switched to GitHub.  This seems to be pretty easy to use.  GitHub.com.

-Steve

0 Kudos
Message 5 of 5
(3,229 Views)