The Feature branches
option of Bazaar Explorer creates a so-called Shared Repository and a single branch called trunk
inside it (called a Repository Tree). In your example:
_Source Control
== Shared Repository_Source Control/trunk
== Repository Tree
The idea is that in this setup you can create multiple branches next to trunk
, and they will store revision data efficiently, by sharing stuff in the shared repository, to put it in a nutshell.
If you are a beginner, then don't worry about branches. At some point it will probably naturally come to you. For example you realize you want to do something experimental but you don't want to mess up your trunk. The obvious solution will be to create a branch.
Now about your workflow:
I think you can use the
bzr upload
plugin for both the staging site and the live site.To roll back your live site to a previous version, use
bzr upload -rREV --overwrite
whereREV
is the revision you want to rollback to. Using the--overwrite
there looks dirty, and it probably is. But that's the only way it works for me, I think it's a bug in my version of the plugin (1.0.1dev
), I suggest to try first without that flag.To fix the bug, no need to roll back locally, just fix the bug and confirm it, then upload again with
bzr upload
without the other flags to bring the website up to the latest version.
There are many ways of working with Bazaar. You can implement a beautiful and sophisticated workflow, or use this somewhat dirty but simple and easy to understand workflow. Let me know if you have further problems.
And no, you don't need checkout
in the setup you described.