Bazaar Workflow

[Daed Lee]

I'm making the switch to distributed version control after having used
Subversion for a while. I'm currently evaluating Mercurial, however it
doesn't quite seem to match my workflow. The issue I have is the same
one described here:

http://blogs.sun.com/tor/entry/mercurial_tip_checking_in_regularly

Essentially, when pulling changes from the master repository,
Mercurial prevents you from merging with uncommitted changes in your
local working copy. The workaround is to keep two clones locally, one
for your actual work, and another for syncing with the master
repository.

How does Bazaar handle the same workflow? Ideally, I'd like to avoid
keeping an extra clone for syncing (although I'd like to have the
option to do so for complicated merges) and be able to get by with a
single local clone.