lp:bzr/2.4

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6079. By Patch Queue Manager <email address hidden> on 2013-05-30

(jameinel) Cleanup doc/en/release-notes/bzr-2.4.txt (John A Meinel)

Merged branch lp:~jameinel/bzr/2.4-doc

6078. By Patch Queue Manager <email address hidden> on 2013-05-29

(jameinel) Add bugfix for bug #855155 to the release notes. (John A Meinel)

Merged branch lp:~jameinel/bzr/2.4-dirstate-invalid-delta-855155

Bug #855155: InconsistentDelta error when using bzr update

6077. By Patch Queue Manager <email address hidden> on 2013-05-29

(jameinel) Fix bug #855155. Dirstate.update_basis_by_delta needs to handle
 adding entries to directories that were otherwise empty (in all trees).
 (John A Meinel)

6076. By Patch Queue Manager <email address hidden> on 2013-05-28

(jameinel) Bug #819604,
 merge the bzr-2.3 client-reconnect 819604 changes into bzr-2.4. (John A
 Meinel)

Merged branch lp:~jameinel/bzr/2.4-client-reconnect-819604

Bug #819604: when an idle ssh transport is interrupted, bzrlib errors; should reconnect instead

6075. By Patch Queue Manager <email address hidden> on 2013-05-23

(jameinel) Bug #1075108, handle when fdatasync returns EOPNOTSUPP,
 which should be considered a non-fatal error. (John A Meinel)

Merged branch lp:~jameinel/bzr/2.4-fdatasync-ENOTSUP-1075108

Bug #1075108: bzr branch fails on a ssh mount of remote ext4 fs with Error 95 Operation Not Supported

6074. By Patch Queue Manager <email address hidden> on 2013-05-23

(jameinel) Fix bug #830947. Dirstate.set_root_id() should update the
 id_index correctly.
 The symptom is that if you have a tree with the file_id TREE_ROOT somewhere
 other than at '',
 it could cause 'bzr co' to fail because it tries to lookup the file in the
 id_index map,
 but it incorrectly points to a location ('') where the id never existed.
 (John A Meinel)

6073. By Patch Queue Manager <email address hidden> on 2012-11-06

(jameinel) Teach TestCase.overrideAttr how to handle attributes that don't
 exist yet. (John A Meinel)

Merged branch lp:~jameinel/bzr/2.4-overridAttr-non-existant

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

(gz) Update docs as Python 2.6 is now the minimum supported version (Samuel
 Bronson)

Merged branch lp:~naesten/bzr/1044043-2.4-needs-python2.6

Bug #1044043: INSTALL specifies wrong minimum Python version

6071. By Patch Queue Manager <email address hidden> on 2012-07-25

(jelmer) Fix bug #1010339,
 use encoding_type='exact' for bzr testament (John A Meinel)

Merged branch lp:~jameinel/bzr/2.4-testament-binary-1010339

Bug #1010339: testament in binary

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

(jelmer) Merge 2.3. (Jelmer Vernooij)

Merged branch lp:~jelmer/bzr/merge-2.3-into-2.4