lp:~mbp/bzr/715000-stacking
Created by
Martin Pool
on
2011-02-08
and last modified on
2011-02-09
- Get this branch:
- bzr branch lp:~mbp/bzr/715000-stacking
Only
Martin Pool
can upload to this branch. If you are
Martin Pool
please log in for upload directions.
Branch merges
Propose for merging
- bzr-core: Pending requested 2011-02-09
-
Diff: 132 lines (+66/-3)6 files modifiedNEWS (+4/-0)
bzrlib/groupcompress.py (+2/-2)
bzrlib/knit.py (+1/-1)
bzrlib/tests/per_repository_reference/__init__.py (+1/-0)
bzrlib/tests/per_repository_reference/test_graph.py (+45/-0)
bzrlib/versionedfile.py (+13/-0)
- Robert Collins (community): Approve on 2011-02-08
-
Diff: 243 lines (+146/-3) (has conflicts)8 files modifiedbzr (+4/-0)
bzrlib/__init__.py (+4/-0)
bzrlib/groupcompress.py (+2/-2)
bzrlib/knit.py (+1/-1)
bzrlib/tests/per_repository_reference/__init__.py (+1/-0)
bzrlib/tests/per_repository_reference/test_graph.py (+45/-0)
bzrlib/versionedfile.py (+13/-0)
doc/en/release-notes/bzr-2.3.txt (+76/-0)
Branch information
Recent revisions
- 5124. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-04
-
(vila) Open 2.2.5 for bugfixes (Vincent Ladeuil)
- 5123. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-04
-
(vila) Release 2.2.4 (Vincent Ladeuil)
- 5122. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-02
-
(vila) Merge 2.1 into 2.2 for lp:707075, and add NEWS entry. (Max Bowsher)
- 5121. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-21
-
(vila) Open 2.2.4 for bugfixes (Vincent Ladeuil)
- 5120. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-20
-
(vila) Release 2.2.3 (Vincent Ladeuil)
- 5119. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-20
-
(spiv) Add reload-and-retry logic to RepositoryPackC
ollection. pack when a
concurrent pack happens. (#701940) (Andrew Bennetts) - 5118. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-14
-
(vila) Correctly resolve --take-
this/-- take-other for path/content conflicts
in subdirs. (Vincent Ladeuil)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr