lp:bzr/2.5

Branch merges

Propose for merging

2 branches proposed for merging into this one.

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

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

(jameinel) Merge 2.4 into 2.5,
 bringing in the fix for bug #855155 (Dirstate.update_basis_by_delta) (John A
 Meinel)

Merged branch lp:~jameinel/bzr/2.5-merges-2.4

6514. By Patch Queue Manager <email address hidden> on 2013-05-27

(vila) Empty arguments in EDITOR are now properly preserved. (Vincent
 Ladeuil)

Merged branch lp:~vila/bzr/cmdline-empty-quotes-2.5

Bug #1089792: empty arguments lost in EDITOR

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

(jameinel) Merge bzr-2.4 to bring in bugfixes for bug #830947 and bug
 #1075108. (John A Meinel)

Merged branch lp:~jameinel/bzr/2.5-merges-2.4

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

(jameinel) Merge 2.4 into 2.5,
 and resolve a few conflicts wrt extract_format_string(). (John A Meinel)

Merged branch lp:~jameinel/bzr/2.5-merges-2.4

6511. By Patch Queue Manager <email address hidden> on 2012-09-11

(jameinel) Treat socket.error(EPIPE) as a ConnectionReset (bug #1047325) so
 that clients will properly reconnect. (John A Meinel)

Merged branch lp:~jameinel/bzr/2.5-conn-reset-socket-pipe-1047325

Bug #1047325: not properly interpreting EPIPE as connection reset

6510. By Patch Queue Manager <email address hidden> on 2012-09-11

(jameinel) Detect if we are not progressing during osutils.send_all() and
 fail rather than hang. (bug #1047309) (John A Meinel)

Merged branch lp:~jameinel/bzr/2.5-unending-sendall-1047309

Bug #1047309: osutils.send_all() loops endlessly sending 0 bytes if using paramiko for ssh

6509. By Patch Queue Manager <email address hidden> on 2012-09-07

(jam) Add per_workingtree test scenario for a lightweight checkout of
 a RemoteRepository (bug #1046697) and cleanup all associated fallout.

Merged branch lp:~jameinel/bzr/2.5.2-get_file_text-1046284

Bug #1046284: TooManyConcurrentRequests when committing to lightweight checkout

6508. By Patch Queue Manager <email address hidden> on 2012-09-05

(gz) Merge 2.4 into 2.5 (Martin Packman)

Merged branch lp:~gz/bzr/2.5_2.4_integration

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

(gz) Ignore bzrlib/locale directory created by build process (Ross Lagerwall)

Merged branch lp:~rosslagerwall/bzr/bzrignore-locale

6506. By Patch Queue Manager <email address hidden> on 2012-08-01

(vila) Fixes '-d' handling for 'bzr config' (Wouter van Heyst)

Merged branch lp:~larstiq/bzr/bug957049