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

Branch merges

Propose for merging

Merged into lp:bzr/2.5 at revision 6515

bzr-core: Pending requested 2013-05-30

Diff: 200 lines (+82/-19)

5 files modified

bzrlib/dirstate.py (+12/-3)
bzrlib/tests/blackbox/test_uncommit.py (+17/-0)
bzrlib/tests/per_workingtree/test_parents.py (+18/-3)
bzrlib/tests/test_dirstate.py (+14/-2)
doc/en/release-notes/bzr-2.4.txt (+21/-11)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6517. By John A Meinel on 2013-05-30

Merge the doc updates from 2.4

6516. By John A Meinel on 2013-05-30

Merge lp:bzr/2.4 @6078.

This brings in the fix for bug #855155 (Dirstate.update_basis_by_delta).

6515. By John A Meinel on 2013-05-30

Merge the 2.4 branch, and no-op out the changes for just the reconnection logic.

The reconnect code was already in 2.5, and the backporting lost the ancestry.
There is enough *other* code changes that it just caused lots of conflicts with what
was already correct.

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

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

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)

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)

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)

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)

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.

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

(gz) Merge 2.4 into 2.5 (Martin Packman)