Rev 3960: NEWS about fixing bug #305006 in lp:///~jameinel/bzr/win32-shelve
John Arbash Meinel
john at arbash-meinel.com
Fri Jan 23 21:40:10 GMT 2009
At lp:///~jameinel/bzr/win32-shelve
------------------------------------------------------------
revno: 3960
revision-id: john at arbash-meinel.com-20090123214001-ne09cun6jmamy9fm
parent: john at arbash-meinel.com-20090123182924-ievv132uozxyzjhv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32-shelve
timestamp: Fri 2009-01-23 15:40:01 -0600
message:
NEWS about fixing bug #305006
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-01-23 07:42:35 +0000
+++ b/NEWS 2009-01-23 21:40:01 +0000
@@ -9,11 +9,19 @@
IMPROVEMENTS:
+ * ``bzr shelve`` now works on Windows. (John Arbash Meinel, #305006)
+
* Progress bars now show the rate of activity for some sftp
operations, and they are drawn different. (Martin Pool, #172741)
BUG FIXES:
+ * Fix a variety of bugs dealing with lock contention on Windows, when
+ we would try to lock the same file multiple times. Internally, when
+ using ``WorkingTree.basis_tree()`` the returned object accesses the
+ dirstate file via the ``WorkingTree`` itself, rather than
+ maintaining its own reference. (John Arbash Meinel, #305006)
+
* There was a bug in how we handled resolving when a file is deleted
in one branch, and modified in the other. If there was a criss-cross
merge, we would cause the deletion to conflict a second time.
More information about the bazaar-commits
mailing list