--strict as default

[Eli Zaretskii]

> Date: Fri, 15 Jan 2010 10:23:18 +1100
> From: Martin Pool <mbp at canonical.com>
> Cc: bazaar at lists.canonical.com
> 
> 2010/1/15 Jelmer Vernooij <jelmer.vernooij at canonical.com>:
> > At the moment there are several commands that default to --strict. While
> > it seems to be a good idea to make the user aware of uncommitted changes
> > by default, I think it should be a warning rather than an error by
> > default. Most people I've talked to also seem to prefer no-strict by
> > default.
> 
> I agree.  A patch to change it back for 2.1 would be welcome.

Sorry if I misunderstand: does this include `merge'?  That is, does
this mean that in 2.1 "bzr merge" will by default succeed (with a
warning) if there are uncommitted changes?

If so, does it mean using "bzr merge --force" in 2.0 is a good idea?

TIA