Bazaar Branching & Merging on Subversion Repositories

In my last post, I talked about using Bazaar on Subversion repositories. Soon afterward, David Rubin asked me in IRC if I can do the standard branching and merging on a Bazaar working copy of a Subversion repository, and how easy it is.

The answer is, "Yes, very easy." In fact, you don't even need to care that it is from a Subversion repository. For instance:

@:~$ bzr checkout https+urllib:// trunk
@:~$ bzr branch trunk newfeature
@:~$ cd newfeature
[... do some stuff ...]
@:~$ bzr commit
@:~$ cd ../trunk
@:~$ bzr merge ../newfeature
@:~$ bzr commit

All done!