lp:~gz/bzr/2.5_2.4_integration

Branch merges

Propose for merging

Merged into lp:bzr/2.5 at revision 6508

bzr-core: Pending requested 2012-09-05

Diff: 129 lines (+24/-20)

6 files modified

INSTALL (+1/-3)
bzrlib/builtins.py (+3/-2)
bzrlib/tests/blackbox/test_testament.py (+11/-0)
doc/developers/code-style.txt (+3/-12)
doc/en/admin-guide/introduction.txt (+2/-3)
doc/en/release-notes/bzr-2.4.txt (+4/-0)

api

Merged into lp:bzr at revision 6513

bzr-core: Pending requested 2012-03-29

Diff: 93 lines (+37/-7)

3 files modified

bzrlib/_walkdirs_win32.pyx (+14/-7)
bzrlib/tests/test__walkdirs_win32.py (+19/-0)
doc/en/release-notes/bzr-2.4.txt (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6508. By Martin Packman on 2012-09-05

Merge 2.4 into 2.5 resolving conflict by taking existing code bzrlib.btree_index

6507. By Patch Queue Manager <email address hidden> on 2012-08-31

(gz) Ignore bzrlib/locale directory created by build process (Ross Lagerwall)

6506. By Patch Queue Manager <email address hidden> on 2012-08-01

(vila) Fixes '-d' handling for 'bzr config' (Wouter van Heyst)

6505. By Patch Queue Manager <email address hidden> on 2012-07-28

(gz) Fix two typos (Martin Packman)

6504. By Patch Queue Manager <email address hidden> on 2012-06-27

(jelmer) Revert patch to specify --no-tty argument to gpg. (Jelmer Vernooij)

6503. By Patch Queue Manager <email address hidden> on 2012-06-18

(jelmer) Merge 2.4 (Jelmer Vernooij)

6502. By Patch Queue Manager <email address hidden> on 2012-05-22

(vila) Open 2.5.2 for bug fixes (Vincent Ladeuil)

6501. By Patch Queue Manager <email address hidden> on 2012-05-22

(vila) Release 2.5.1 (Vincent Ladeuil)

6500. By Patch Queue Manager <email address hidden> on 2012-05-22

(gz) Backport fixes to rmbranch on colocated branches from 2.6 (Martin
 Packman)

6499. By Patch Queue Manager <email address hidden> on 2012-04-30

(gz) Treat spurious error on test case in per_interrepository as an expected
 failure (Martin Packman)