South East Michigan LabVIEW User Group

cancel
Showing results for 
Search instead for 
Did you mean: 

Introduction to Source Code Control using TortoiseSVN

Introduction to Source Code Control TortoiseSVN presented at the SEMLUG meeting Nov 5, 2009

Dan Shangraw, P.E.


   

Message 1 of 2
(9,328 Views)

I found this in the TortoiseSVN Book regarding using the Copy/Merge vs. Lock/Unlock

Here is a great article on how to merge VI's in subversion.

Subversion generally works best without locking, using the “Copy-Modify-Merge” methods described
earlier in Section 2.2.3, “The Copy-Modify-Merge Solution”. However there are a few instances when
you may need to implement some form of locking policy.
• You are using “unmergeable” files, for example, graphics files. If two people change the same file,
merging is not possible, so one of you will lose their changes.
• Your company has always used a  locking  revision control system  in  the past and  there has been a
management decision that “locking is best”

Dan Shangraw, P.E.


   

0 Kudos
Message 2 of 2
(3,283 Views)