|
|
| (One intermediate revision by the same user not shown) |
| Line 1: |
Line 1: |
| − | [[svn]] or “Subversion” is a 3rd party tool [[Hash Inc.]] uses in house to allow us to work on the same files at the same time. <span class="caps">V13</span> incorporates features of <span class="caps">SVN</span> for users contributing to the <span class="caps">TWO</span> project. | + | #Redirect [[SVN]] |
| − | | |
| − | If you are part of the <span class="caps">TWO</span> project and have installed [[v13.0]] then you’ll want to read the [[Svn Walkthrough]] to learn how to get started using it.
| |
| − | | |
| − | ===SVN Links:===
| |
| − | | |
| − | [[Svn Walkthrough]] Initial set-up instructions and daily work cycle.<br />[[Svn Install]] Downloading and installing <span class="caps">SVN</span> on to your PC or Mac.<br />[[Svn Conflict]] Conflict avoidance and resolution.<br />[http://svnbook.red-bean.com/en/1.1/ch02s02.html#svn-ch-2-sect-2.1 Official <span class="caps">SVN</span> conflict explanation] Explains how conflicts happen and how they are resolved. <span class="caps">TWO</span> management uses the “Copy-Modify-Merge” method, not “Lock-Modify-Unlock.” If you’re having a hard time wrapping your head around the file management system, this may help clear things up.<br />[[Svn Faq]]
| |
| − | | |
| − | ===Svn News===
| |
| − | | |
| − | The [[Hash Svn Repository Browser]] wiki page has info on how to use this new feature. And the [[Svn Walkthrough]] was updated to include it.
| |
| − | | |
| − | “What the heck does it do?” you ask?
| |
| − | | |
| − | Here is how it works.
| |
| − | | |
| − | ===Svn as file sharing===
| |
| − | | |
| − | Say you want to work on <span class="caps">TWO</span>, so you download v13 and press the update button to receive the <span class="caps">TWO</span> data you need into a folder you specify. Then you add or change a file in that folder. When you are done with a change you press “commit” and A:M will use svn to check for new or changed files in the <span class="caps">TWO</span> folder and send only the changes to them to the repository of <span class="caps">TWO</span> data on the server, merging your changes with other peoples work. Then you tell your friend, who is helping you on this file, to press “update” and your changes are merged into his local copy of the file.
| |
| − | | |
| − | ===Svn as a collaboration tool===
| |
| − | | |
| − | Even if two people work on the same file at the same time it is usually ok unless they are working on the same part of the file. In the rare case you both work on the same part of that file, svn will warn you of the conflict and let you merge it yourself.
| |
| − | | |
| − | ===Svn as a back up mechanism===
| |
| − | | |
| − | If you are working on something and are happy with your progress, and want to make sure you don’t lose your changes, just save and commit. That way if you happen to save later and decide you don’t like what you did, you can always use your svn client to get back what you have committed.
| |
| − | | |
| − | If you are assigned to make a major change to say “tinman.mdl”, and you want to be able commit your steps of this change with out messing up the original then you can make a copy called “tinman reason of change.mdl” in the same location. Make your changes there. As you are working if you want to save a backup just add that file and ‘commit’ your steps. That way you won’t mess up the original tinman.mdl. When you are satisfied with your changes, copy your temporary copy over the top of tinman.mdl and ‘commit’. Then you can svn delete your temporary model. Here is some [[svn backup history]].
| |
| − | | |
| − | Eventually v13 will allow you to roll back a file to a previous version, and see who changed what files. In the mean time you can use [http://tortoisesvn.tigris.org/ tortoisesvn] on the pc or [http://www.lachoseinteractive.net/en/community/subversion/svnx/features/ svnx] on <span class="caps">OSX</span> to manage your svn data more technically than A:M will at first.
| |
| − | | |
| − | ===What about [[Svn Conflicts]]?===
| |
| − | | |
| − | If you are on <span class="caps">OSX</span> or choose not to use the tortoise client on the PC you’ll find a [[Diff/Merge]] tool like [[KDiff3]]<br />very handy.
| |
| − | | |
| − | See [[Data Management]] for a section on how svn will work for backups.
| |
| − | | |
| − | If you are interested in the specifics of svn look at the [http://svnbook.red-bean.com/en/1.1/index.html svn book] or the [http://subversion.tigris.org/ svn website]
| |
| − | | |
| − | [[Svn Trouble Shooting]]
| |
