lp:~mbp/bzr/715000-stacking

Branch merges

Merged into lp:bzr/2.2 at revision 5125

bzr-core: Pending requested 2011-02-09

Diff: 132 lines (+66/-3)

6 files modified

NEWS (+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)

api

Merged into lp:bzr at revision 5657

Robert Collins (community): Approve on 2011-02-08

Diff: 243 lines (+146/-3) (has conflicts)

8 files modified

bzr (+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)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #715000: Stacking is not fully transitive

Critical

Fix Released

Link a bug report

Related blueprints

5127. By Martin Pool on 2011-02-09

News for bug 715000

5126. By Martin Pool on 2011-02-08

Search all fallbacks for get_known_graph_ancestry

5125. By Martin Pool on 2011-02-08

Add failing test for bug 715000

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 RepositoryPackCollection.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)