Bazaar Flow

Git flow is an implementation of a nice branching model for software development. I use Bazaar for private projects, but in a totally simplistic way. Here are notes to myself for using git flow with bzr. I’m quite certain I’m doing it wrong, so if anyone stumbles upon this post and has a better way of doing things I’d certainly appreciate the input.

To create lots of branches in bzr, it’s better to create a shared repository first. Go into that directory and make a branch that mirrors the main branch. Then make branches for develop and other features. After you’ve made some commits on a branch, go to the branch you want to merge the changes into. Then call merge from the feature branch into the main branch to add those commits. Fix any merge problems and call commit. This will not do a fast forward merge; instead, it preserves the branch info in the history.

  > bzr init-repo project
  > cd project
  > bzr branch /path/to/master 
  > bzr branch master develop
  > bzr branch develop feature1 
    ... hack on feature 1 ... 
  > cd develop
  > bzr merge ../feature1
  > bzr commit 
Advertisements

One comment

  1. Pingback: Bazaar Flow | Syngu

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s