~bzr-pqm/bzr/bzr.dev

(jam) Merge 2.3 into bzr.dev, resolving some conflicts

added added

removed removed

.. Fixes for situations where bzr would previously crash or give incorrect

or undesirable results.

* Bazaar now infers the default user email address on Unix from the local

account name plus the contents of ``/etc/mailname`` if that file exists.

In particular, this means that committing as root through etckeeper will

normally not require running ``bzr whoami`` first.

(Martin Pool, #616878)

* When reporting a crash without apport, don't print the full list of

plugins because it's often too long.

(Martin Pool, #716389)

* ``bzr push`` into a repository (that doesn't have a branch), will no

longer copy all revisions in the repository. Only the ones in the

ancestry of the source branch, like it does in all other cases.

(John Arbash Meinel, #465517)

* Fix ``UnboundLocalError: local variable 'lock_url' in wait_lock`` error,

especially while trying to save configuration from QBzr.

(Martin Pool, #733136)

* Fix "Unable to obtain lock" error when pushing to a bound branch if tags

had changed. Bazaar was attempting to open and lock the master branch

twice in this case. (Andrew Bennetts, #733350)

(<http://psf.upfronthosting.co.za/roundup/tracker/issue8194> should be fixed

in python > 2.7.1). (Vincent Ladeuil, #654733)

bzr 2.3.1

#########