← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/release-notes/bzr-2.2.txt

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.2.txt
5
5
.. toctree::
6
6
   :maxdepth: 1
7
7
 
 
8
bzr 2.2.6
 
9
#########
 
10
 
 
11
:2.2.6: NOT RELEASED YET
 
12
 
 
13
Compatibility Breaks
 
14
********************
 
15
 
 
16
New Features
 
17
************
 
18
 
 
19
Bug Fixes
 
20
*********
 
21
 
 
22
Improvements
 
23
************
 
24
 
 
25
Documentation
 
26
*************
 
27
 
 
28
API Changes
 
29
***********
 
30
 
 
31
Internals
 
32
*********
 
33
 
 
34
Testing
 
35
*******
 
36
 
 
37
 
8
38
bzr 2.2.5
9
39
#########
10
40
 
11
 
:Codename: Suggestions welcome
12
 
:2.2.5: NOT RELEASED YET
 
41
:2.2.5: 2011-09-01
 
42
 
 
43
This is a bugfix release. One regression introduced in 2.2b1 has been fixed
 
44
for some rare conflict resolutions. Also a warning is now emmitted when
 
45
branching an out-of-date ubuntu packaging branch. Upgrading is recommended
 
46
for all users on earlier 2.2 releases.
13
47
 
14
48
Compatibility Breaks
15
49
********************
16
50
 
 
51
None.
 
52
 
17
53
New Features
18
54
************
19
55
 
 
56
None.
 
57
 
20
58
Bug Fixes
21
59
*********
22
60
 
27
65
* Don't crash while merging and encountering obscure path conflicts
28
66
  involving different root-ids. (Vincent Ladeuil, #805809)
29
67
 
30
 
Improvements
31
 
************
32
 
 
33
 
Documentation
34
 
*************
35
 
 
36
 
API Changes
37
 
***********
38
 
 
39
68
Internals
40
69
*********
41
70
 
43
72
  in the value string. Fix suggested by ConfigObj's author Michael Foord.
44
73
  (Alexander Belchenko, #710410)
45
74
 
46
 
Testing
47
 
*******
48
 
 
49
75
 
50
76
bzr 2.2.4
51
77
#########