Checkout existing branch to established workspace (.moved)
Colin D Bennett
colin at gibibit.com
Wed Mar 28 16:34:06 UTC 2012
On Mon, 26 Mar 2012 11:49:32 +1100
Martin Pool <mbp at sourcefrog.net> wrote:
> I think for things that do an implicit merge (including checkout,
> update, and switch) it might be nice to have an option to
> warn/confirm if they're going to create conflicts when merged
> against the tree, or perhaps even if there are any uncommitted
> changes.
I can't tell you how frustrating it is when I do a 'switch',
forgetting I have outstanding changes in my working tree -- and
often get seriously hosed when conflicts occur! It has happened to
new Bazaar users here at work, and it is particularly confusing and
frustrating for them.
Only *very* rarely do I intentionally use 'switch' with
outstanding changes: usually if I realize I should have been
starting work on a feature in a different branch.
I would prefer to have to say “bzr switch --uncommitted
OTHER_BRANCH” or something when I do that, so that it can't be done
accidentally in the much more common case when you intend to simply
switch a checkout (no merges expected).
Regards,
Colin
More information about the bazaar
mailing list