← 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: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

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
 
 
38
8
bzr 2.2.5
39
9
#########
40
10
 
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.
 
11
:Codename: Suggestions welcome
 
12
:2.2.5: NOT RELEASED YET
47
13
 
48
14
Compatibility Breaks
49
15
********************
50
16
 
51
 
None.
52
 
 
53
17
New Features
54
18
************
55
19
 
56
 
None.
57
 
 
58
20
Bug Fixes
59
21
*********
60
22
 
65
27
* Don't crash while merging and encountering obscure path conflicts
66
28
  involving different root-ids. (Vincent Ladeuil, #805809)
67
29
 
 
30
Improvements
 
31
************
 
32
 
 
33
Documentation
 
34
*************
 
35
 
 
36
API Changes
 
37
***********
 
38
 
68
39
Internals
69
40
*********
70
41
 
72
43
  in the value string. Fix suggested by ConfigObj's author Michael Foord.
73
44
  (Alexander Belchenko, #710410)
74
45
 
 
46
Testing
 
47
*******
 
48
 
75
49
 
76
50
bzr 2.2.4
77
51
#########