More SVN commands

I love version control and SVN is really great.  Here's one of the best online books I have found on the subject http://svnbook.red-bean.com/en/1.5/index.html.

Here's a command I use frequently to update my branches with changes to the trunk to make sure everything is working correctly.
svn merge  file:///path/to/svn/repository/trunk
And I execute that command in the working directory of my branch.  I can then update resolve any conflicts and commit those changes to my branch.  This is covered in more detail in this section of the book above.  And then I can create a patch file by executing the following
svn diff file:///path/to/svn/repository/trunk file:///path/to/svn/repository/branches/branch > patchfile.txt

No comments: