Bazaar

Merge lp:~jameinel/bzr/2.4-doc into lp:bzr/2.4

  1. 2.4-doc
  2. Merge into 2.4
Proposed by John A Meinel
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 6079
Proposed branch: lp:~jameinel/bzr/2.4-doc
Merge into: lp:bzr/2.4
Diff against target: 81 lines (+20/-21)
1 file modified
doc/en/release-notes/bzr-2.4.txt (+20/-21)
To merge this branch: bzr merge lp:~jameinel/bzr/2.4-doc
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+166492@code.launchpad.net

Commit message

Cleanup doc/en/release-notes/bzr-2.4.txt

Description of the change

This just cleans up the release notes. They are meant to be sorted alphabetically and we shouldn't put changes for 2.4.3 (not released yet) into the 2.4.2 section.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/en/release-notes/bzr-2.4.txt'
2--- doc/en/release-notes/bzr-2.4.txt 2013-05-29 08:38:55 +0000
3+++ doc/en/release-notes/bzr-2.4.txt 2013-05-30 12:03:27 +0000
4@@ -35,22 +35,20 @@
5 * Cope with Unix filesystems, such as smbfs, where chmod gives 'permission
6 denied'. (Martin Pool, #606537)
7
8-* Fix a traceback when trying to checkout a tree that also has an entry
9- with file-id `TREE_ROOT` somewhere other than at the root directory.
10- (John Arbash Meinel, #830947)
11-
12-* When the ``limbo`` or ``pending-deletion`` directories exist, typically
13- because of an interrupted tree update, but are empty, bzr no longer
14- errors out, because there is nothing for the user to clean up. Also,
15- errors in creation of these directories are no longer squelched.
16- (Martin Pool, #427773)
17-
18 * During merges, when two entries end up using the same path for two
19 different file-ids (the same file being 'bzr added' in two different
20 branches) , 'duplicate' conflicts are created instead of 'content'
21 ones. This was previously leading to a 'Malformed tramsform' exception.
22 (Vincent Ladeuil, #880701)
23
24+* Fix a traceback when trying to checkout a tree that also has an entry
25+ with file-id `TREE_ROOT` somewhere other than at the root directory.
26+ (John Arbash Meinel, #830947)
27+
28+* Handle when an uncommit/update tries to add a file to an otherwise empty
29+ directory. The ``Dirstate.update_basis_by_delta`` would end up
30+ incorrectly flagging the delta as invalid. (Brian de Alwis, #855155)
31+
32 * 'Malformed transform' exceptions are now recognized as internal errors
33 instead of user errors and report a traceback. This will reduce user
34 confusion as there is generally nothing users can do about them.
35@@ -63,10 +61,21 @@
36 This shouldn't be treated as a fatal error.
37 (John Arbash Meinel, #1075108)
38
39+* Teach the bzr client how to reconnect if we get ``ConnectionReset``
40+ while making an RPC request. This doesn't handle all possible network
41+ disconnects, but it should at least handle when the server is asked to
42+ shutdown gracefully. (John Arbash Meinel, #819604)
43+
44 * Use ``encoding_type='exact'`` for ``bzr testament`` so that on Windows
45 the sha hash of the long testament matches the sha hash in the short
46 form. (John Arbash Meinel, #1010339)
47
48+* When the ``limbo`` or ``pending-deletion`` directories exist, typically
49+ because of an interrupted tree update, but are empty, bzr no longer
50+ errors out, because there is nothing for the user to clean up. Also,
51+ errors in creation of these directories are no longer squelched.
52+ (Martin Pool, #427773)
53+
54 * _Win32Stat object provides members st_uid and st_gid, those are present
55 in Python's os.stat object. These members required for external tools like
56 bzr-git and dulwich. (Alexander Belchenko, #967060)
57@@ -134,10 +143,6 @@
58 * Fixed loading of external merge tools from config to properly decode
59 command-lines which contain embedded quotes. (Gordon Tyler, #828803)
60
61-* Handle when an uncommit/update tries to add a file to an otherwise empty
62- directory. The ``Dirstate.update_basis_by_delta`` would end up
63- incorrectly flagging the delta as invalid. (Brian de Alwis, #855155)
64-
65 * Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
66 pyrex code with new Cython versions. (Denys Duchier, #837221)
67
68@@ -148,13 +153,7 @@
69 * Return early from create_delta_index_from_delta given tiny inputs. This
70 avoids raising a spurious MemoryError on certain platforms such as AIX.
71 (John Arbash Meinel, #856731)
72-
73-* Teach the bzr client how to reconnect if we get ``ConnectionReset``
74- while making an RPC request. This doesn't handle all possible network
75- disconnects, but it should at least handle when the server is asked to
76- shutdown gracefully. (John Arbash Meinel, #819604)
77-
78-
79+
80 Documentation
81 *************
82

Subscribers

People subscribed via source and target branches