lp:~dylanmccall/bzr/test_minimal_conflicts_with_offset

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

6512. By Dylan McCall on 2013-02-02

Added new test case, test_minimal_conflicts_with_offset, to test_merge3.

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)

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

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

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

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

6505. By Patch Queue Manager <email address hidden> on 2012-07-28

(gz) Fix two typos (Martin Packman)

6504. By Patch Queue Manager <email address hidden> on 2012-06-27

(jelmer) Revert patch to specify --no-tty argument to gpg. (Jelmer Vernooij)

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

(jelmer) Merge 2.4 (Jelmer Vernooij)