lp:~gz/bzr/2.5_2.4_integration
Created by
Martin Packman
and last modified
- Get this branch:
- bzr branch lp:~gz/bzr/2.5_2.4_integration
Only
Martin Packman
can upload to this branch. If you are
Martin Packman
please log in for upload directions.
Branch merges
Propose for merging
- bzr-core: Pending requested
-
Diff: 129 lines (+24/-20)6 files modifiedINSTALL (+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)
- bzr-core: Pending requested
-
Diff: 93 lines (+37/-7)3 files modifiedbzrlib/_walkdirs_win32.pyx (+14/-7)
bzrlib/tests/test__walkdirs_win32.py (+19/-0)
doc/en/release-notes/bzr-2.4.txt (+4/-0)
Branch information
Recent revisions
- 6508. By Martin Packman
-
Merge 2.4 into 2.5 resolving conflict by taking existing code bzrlib.btree_index
- 6507. By Patch Queue Manager <email address hidden>
-
(gz) Ignore bzrlib/locale directory created by build process (Ross Lagerwall)
- 6506. By Patch Queue Manager <email address hidden>
-
(vila) Fixes '-d' handling for 'bzr config' (Wouter van Heyst)
- 6504. By Patch Queue Manager <email address hidden>
-
(jelmer) Revert patch to specify --no-tty argument to gpg. (Jelmer Vernooij)
- 6502. By Patch Queue Manager <email address hidden>
-
(vila) Open 2.5.2 for bug fixes (Vincent Ladeuil)
- 6500. By Patch Queue Manager <email address hidden>
-
(gz) Backport fixes to rmbranch on colocated branches from 2.6 (Martin
Packman) - 6499. By Patch Queue Manager <email address hidden>
-
(gz) Treat spurious error on test case in per_interrepository as an expected
failure (Martin Packman)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr