At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/ ------------------------------------------------------------ revno: 6078 [merge] revision-id: p...@pqm.ubuntu.com-20130529083855-0l5uxl8yjrp7gskp parent: p...@pqm.ubuntu.com-20130529072208-27hyd1xzk2ygmlkh parent: j...@arbash-meinel.com-20130529081102-2fxc8agnq5fd38so committer: Patch Queue Manager <p...@pqm.ubuntu.com> branch nick: 2.4 timestamp: Wed 2013-05-29 08:38:55 +0000 message: (jameinel) Add bugfix for bug #855155 to the release notes. (John A Meinel) modified: doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1 === modified file 'doc/en/release-notes/bzr-2.4.txt' --- a/doc/en/release-notes/bzr-2.4.txt 2013-05-23 12:06:39 +0000 +++ b/doc/en/release-notes/bzr-2.4.txt 2013-05-29 08:38:55 +0000 @@ -134,6 +134,10 @@ * Fixed loading of external merge tools from config to properly decode command-lines which contain embedded quotes. (Gordon Tyler, #828803) +* Handle when an uncommit/update tries to add a file to an otherwise empty + directory. The ``Dirstate.update_basis_by_delta`` would end up + incorrectly flagging the delta as invalid. (Brian de Alwis, #855155) + * Include declaration of 'changed' to avoid an UnboundLocalError in dirstate pyrex code with new Cython versions. (Denys Duchier, #837221)
-- bazaar-commits mailing list bazaar-commits@lists.canonical.com https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
