lp:bzr/2.2

Branch merges

2 branches proposed for merging into this one.

Propose for merging

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5136. By Patch Queue Manager <email address hidden> on 2012-03-28

(jelmer) Add basic support for feature flags. (Jelmer Vernooij)

Merged branch lp:~jelmer/bzr/2.2-feature-flags

5135. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-20

(vila) Merge 2.1 into 2.2 (including fix for #614713,
 #609187 and #812928) (Vincent Ladeuil)

5134. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-05

(vila) Fix typo in whats-new (Vincent Ladeuil)

5133. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-05

(vila) Handle path conflicts involving different root-ids (Vincent Ladeuil)

Merged branch lp:~vila/bzr/805809-no-final-path

Bug #805809: merge fails with NoFinalPath

5132. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-25

(jameinel) When building the bzr executable,
 include python-fastimport as a package that needs to be bundled. (John A
 Meinel)

Merged branch lp:~jameinel/bzr/2.2-win32-include-fastimport-package

5131. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-21

(jam) Merge bzr-2.1 into bzr-2.2

5130. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(vila) Merge 2.1 into 2.2 resolving conflicts (Vincent Ladeuil)

5129. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-15

(mbp) merge 2.1 up to 2.2

5128. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-14

(mbp) treat python2.6 ImportWarning as indicating the module's not
 available

5127. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-08

(jam) Merge 2.1 into 2.2, including the fix for bug #437003