35
35
* Cope with Unix filesystems, such as smbfs, where chmod gives 'permission
36
36
denied'. (Martin Pool, #606537)
38
* Fix a traceback when trying to checkout a tree that also has an entry
39
with file-id `TREE_ROOT` somewhere other than at the root directory.
40
(John Arbash Meinel, #830947)
42
* When the ``limbo`` or ``pending-deletion`` directories exist, typically
43
because of an interrupted tree update, but are empty, bzr no longer
44
errors out, because there is nothing for the user to clean up. Also,
45
errors in creation of these directories are no longer squelched.
46
(Martin Pool, #427773)
48
38
* During merges, when two entries end up using the same path for two
49
39
different file-ids (the same file being 'bzr added' in two different
50
40
branches) , 'duplicate' conflicts are created instead of 'content'
51
41
ones. This was previously leading to a 'Malformed tramsform' exception.
52
42
(Vincent Ladeuil, #880701)
44
* Fix a traceback when trying to checkout a tree that also has an entry
45
with file-id `TREE_ROOT` somewhere other than at the root directory.
46
(John Arbash Meinel, #830947)
48
* Handle when an uncommit/update tries to add a file to an otherwise empty
49
directory. The ``Dirstate.update_basis_by_delta`` would end up
50
incorrectly flagging the delta as invalid. (Brian de Alwis, #855155)
54
52
* 'Malformed transform' exceptions are now recognized as internal errors
55
53
instead of user errors and report a traceback. This will reduce user
56
54
confusion as there is generally nothing users can do about them.
63
61
This shouldn't be treated as a fatal error.
64
62
(John Arbash Meinel, #1075108)
64
* Teach the bzr client how to reconnect if we get ``ConnectionReset``
65
while making an RPC request. This doesn't handle all possible network
66
disconnects, but it should at least handle when the server is asked to
67
shutdown gracefully. (John Arbash Meinel, #819604)
66
69
* Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
67
70
the sha hash of the long testament matches the sha hash in the short
68
71
form. (John Arbash Meinel, #1010339)
73
* When the ``limbo`` or ``pending-deletion`` directories exist, typically
74
because of an interrupted tree update, but are empty, bzr no longer
75
errors out, because there is nothing for the user to clean up. Also,
76
errors in creation of these directories are no longer squelched.
77
(Martin Pool, #427773)
70
79
* _Win32Stat object provides members st_uid and st_gid, those are present
71
80
in Python's os.stat object. These members required for external tools like
72
81
bzr-git and dulwich. (Alexander Belchenko, #967060)
134
143
* Fixed loading of external merge tools from config to properly decode
135
144
command-lines which contain embedded quotes. (Gordon Tyler, #828803)
137
* Handle when an uncommit/update tries to add a file to an otherwise empty
138
directory. The ``Dirstate.update_basis_by_delta`` would end up
139
incorrectly flagging the delta as invalid. (Brian de Alwis, #855155)
141
146
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
142
147
pyrex code with new Cython versions. (Denys Duchier, #837221)
148
153
* Return early from create_delta_index_from_delta given tiny inputs. This
149
154
avoids raising a spurious MemoryError on certain platforms such as AIX.
150
155
(John Arbash Meinel, #856731)
152
* Teach the bzr client how to reconnect if we get ``ConnectionReset``
153
while making an RPC request. This doesn't handle all possible network
154
disconnects, but it should at least handle when the server is asked to
155
shutdown gracefully. (John Arbash Meinel, #819604)