lp:~jameinel/bzr/2.5-merges-2.4
- Get this branch:
- bzr branch lp:~jameinel/bzr/2.5-merges-2.4
Branch merges
- bzr-core: Pending requested
-
Diff: 200 lines (+82/-19)5 files modifiedbzrlib/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)
Branch information
Recent revisions
- 6516. By John A Meinel
-
Merge lp:bzr/2.4 @6078.
This brings in the fix for bug #855155 (Dirstate.
update_ basis_by_ delta). - 6515. By John A Meinel
-
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>
-
(vila) Empty arguments in EDITOR are now properly preserved. (Vincent
Ladeuil) - 6513. By Patch Queue Manager <email address hidden>
-
(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>
-
(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>
-
(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>
-
(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>
-
(jam) Add per_workingtree test scenario for a lightweight checkout of
a RemoteRepository (bug #1046697) and cleanup all associated fallout.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr