So the command that worked for me (thanks for the help Tim) was:
~/go/src/github.com/juju/juju$ (cd ~/go/src/launchpad.net/juju-core && bzr diff --color=never -r ancestor::parent) | patch -p0 --merge
-- Juju-dev mailing list Juju-dev@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/juju-dev
