NDSU CS Department Wiki

This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
===== Merging and Branching =====

The following are notes for beginning of the semester preparation for merging work back into trunk, and creating a new branch for a new class.  

These tutorials are taken from Stack Overflow, regarding questions on [[http://stackoverflow.com/questions/7563693/svn-merge-branch-to-trunk|merging back into trunk]] and [[http://stackoverflow.com/questions/2041/how-do-i-create-a-branch-in-svn|the proper way to create a branch in SVN]].

==== Merging back into Trunk ====

First off, I'd highly recommend using a Unix machine for this work.  Trying to get third party clients on Windows or other wacky binaries to pull this off would work, but it's a bit non-standard.  The best solution is to log into lions.cs.ndsu.nodak.edu to complete the following, as the SVN versions will be (obviously) compatible.

First, check out the latest version of trunk.  Run an SVN command to merge your current working copy with the branch you wish to merge with.  Then commit those results.  The following commands make that happen:

<code>
# Checks out the repository and places it in the directory named "blackwood_trunk"
svn checkout https://lions.cs.ndsu.nodak.edu/svn/blackwood/trunk blackwood_trunk
cd blackwood_trunk

# This is the command to merge some branch with your present working copy.  This is targeting CS345_Spring2012.
# This will merge your local trunk with the branch.  This does not change anything on the server side, just your local copy.
svn merge https://lions.cs.ndsu.nodak.edu/svn/blackwood/branches/CS345_Spring2012

# Now commit your merged copy of trunk.
svn commit
</code>

==== Making a new Branch ====

Making a new branch is relatively simple.  You don't even need to check anything locally, you can just run the following command:

<code>
# svn copy "TRUNK" "New Branch Location" 
svn copy https://lions.cs.ndsu.nodak.edu/svn/blackwood/trunk https://lions.cs.ndsu.nodak.edu/svn/blackwood/branches/CS345_Spring2013
</code>