gistfile1.sh

#!/bin/bash

rm -rf a b
mkdir a

# do some work
cd a
bzr init

# make a branch
cd ..
bzr branch a b

# trunk gets a new revision
cd a
echo "Foo" > foo.txt
bzr add foo.txt
bzr commit -m "Added foo"

# switch to branch
cd ../b

# try a merge
bzr merge ../a

# don't really like it, revert
bzr revert .

# try it again.. boom
bzr merge ../a