http://doc.bazaar.canonical.com/

Bazaar glossary

http://doc.bazaar.canonical.com/latest/en/user-guide/core_concepts.html Bazaar wiki: http://wiki.bazaar.canonical.com/CategoryTerm

                         │ No separate repository │ Shared repository   
─────────────────────────┼────────────────────────┼─────────────────────
Local branch only:       │                        │                     
  • without tree         │ standalone branch      │ repository tree     
  • with tree            │ standalone tree        │ repository branch   
─────────────────────────┼────────────────────────┼─────────────────────
Bound remote branch:     │                        │                     
  • with local branch    │ heavyweight checkout   │ repository checkout 
  • without local branch │ lightweight checkout   │ –                   
─────────────────────────┼────────────────────────┼─────────────────────
With ancestor branch     │ stacked branch         │ ?                   
─────────────────────────┴────────────────────────┴─────────────────────

repository

Stores revisions of history

Bazaar help: repositories

• Revisions ids have a random component by default. See bzrlib.generate_ids.gen_revision_id https://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/view/head:/bzrlib/generate_ids.py. So the revision id would need to be saved in order to reconstruct it exactly.

branch

Records history leading up to single point (?)

• Has the revision numbers corresponding to development history
• History is stored in a repository
• standalone branch: Repository and branch stored in same place
• shared repository (also [sometimes?] simply repository): Stores revisions of multiple branches
• repository branch (also sharing branch): If repository shared with other branches. Lives within a repository. May be nested.
• stacked branch: Only stores revisions additional to the branch it is stacked over

Bazaar help: branches; wiki: Branch, StandaloneBranch, SharedRepository, RepositoryBranch, StackedBranch

working tree

User files (for inspecting and generating revisions?)

• Associated with a branch. In general may be stored in a different place to the branch.
• standalone tree: The working tree stored with a standalone branch. Repository, branch and working tree all stored in the same place.
• repository tree: Repository branch containing a working tree

Bazaar help: working-trees; wiki: WorkingTree, StandaloneTree, RepositoryTree

checkout

Working tree (non-strictly?) bound to a remote branch

• Checkout of the remote branch
• Have local branch(es?)
• (Both local and remote?) branches updated by commits
• Remote branch may be accessed through network
• Commit within a checkout is like commit and push without the checkout status

Bazaar help: checkouts; wiki: Checkout

lightweight checkout

Does not have the local branch(es?)

• Distinguished by calling other checkouts heavyweight
• Does not contain a copy of the history
• Most operations are online to remote branch