Bazaar branches for Smart
Anders F Björklund
afb at algonet.se
Sat Mar 6 00:45:30 PST 2010
Something to be aware of when making branches for Smart, is that
bzr doesn't have very good support for cherry-picking or rebasing:
http://doc.bazaar.canonical.com/bzr.1.18/en/user-guide/#pseudo-merging
"Unlike a normal merge, Bazaar does not currently track cherrypicks."
This makes it lose all context, if you merge anything but the whole
branch. So making "sandbox" type branches causes problems later on.
The lack of proper rebasing typically only causes a large number of
"merge changes from trunk" commits cluttering the branch changelog.
So my best practice is to use it like a "disconnected VCS" rather
than a "distributed VCS". And stick to one issue per branch/commit...
The current Smart workflow is described in the Bazaar User Guide:
http://doc.bazaar.canonical.com/bzr.1.18/en/user-guide/#decentralized-
with-human-gatekeeper
--anders
https://code.launchpad.net/smart
More information about the Smart
mailing list