Experiences with Bazaar in a Commercial Environment
mbp at sourcefrog.net
Wed Feb 22 09:57:08 UTC 2012
On 22 February 2012 20:13, Stephen J. Turnbull <stephen at xemacs.org> wrote:
> No, it *is* specific to Bazaar. Bazaar is the only major DVCS that
> encourages you to merge into a dirty workspace.
Why do you say bzr encourages this? 'bzr merge' will error by default
if the tree is dirty.
There are bzr commands that implicitly merge the uncommitted changes
of the wt onto a new base: pull, switch, and update, leaving the
results uncommitted. They may conflict. But git-checkout also
carries your uncommitted changes without needing to be forced, and
istr hg does too.
More information about the bazaar