Working with SVN branches

To keep all may changes different from the main development I’ve created a subversion branch. Now I want to keep the branch up to date with changes from the main trunk. Get all the history of this particular branch. ` svn log –stop-on-copy r421 | sstillwell | 2010-01-22 18:40:42 -0600 (Fri, 22 Jan 2010) | 1 line merged changes from trunk to branch, 406:420 r420 | sstillwell | 2010-01-22 18:30:52 -0600 (Fri, 22 Jan 2010) | 1 line

SVN add all unversioned files at once

If you want to add all the unversioned files at once to subversion, then you either have to type in all the paths or try this. Add this to your .bash_profile svn_add_all(){ svn status | grep "^?" | awk '{print $2}' | xargs svn add } Then typing svn_add_all will add all the files underneath your current working directory.

SVN ignore in all subdirectories

svn propset svn:ignore '*' .

Understanding Subversion Vendor Branching

Update If you haven’t switched to Git yet, you should. I can’t think of one reason to use Subversion over Git, Git is better in almost every way. Since I’m still a newbie at SVN, getting the hang of Vendor Branching has taken me a little longer than I’m willing to admit. Here are some resources that I found helpful. http://gotdrupal.

Merging a branch back into the trunk with Subversion

I’m just getting the hang of using Subversion for version control and the workflow is starting to gel. One issue I came against yesterday was merging a branch back into the trunk. The process is a bit interesting. 1. Copy your trunk to a branch svn copy 2. Switch your working copy to the branch 3. Check your URL with svn info 4. Make changes to code 5. Commit back to branch svn ci -m "made my changes to branch example" 5.