lp://staging/~mbp/bzr/484558-merge-directory

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/bzr

John A Meinel: Approve on 2010-03-30

Diff: 132 lines (+27/-34) (has conflicts)

4 files modified

NEWS (+10/-0)
bzrlib/bundle/__init__.py (+17/-5)
bzrlib/tests/test_http.py (+0/-8)
bzrlib/tests/test_read_bundle.py (+0/-21)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #484558: bzr 2.0.0 hang on merge & pull from location when trying to read directory as a file

Low

Won't Fix

Link a bug report

Related blueprints

4964. By Martin Pool on 2010-01-15

Check first whether a bundle location is a directory

4963. By Martin Pool on 2010-01-15

Remove tests for read_bundle_from_url

4962. By Martin Pool on 2010-01-14

Delete deprecated read_bundle_from_url

4961. By Canonical.com Patch Queue Manager <email address hidden> on 2010-01-14

(vila) Fix brittle test

4960. By Canonical.com Patch Queue Manager <email address hidden> on 2010-01-14

(andrew) Use add_cleanup to fix TooManyConcurrentRequests in
 bzrlib/reconcile.py. (#503878)

4959. By Canonical.com Patch Queue Manager <email address hidden> on 2010-01-14

(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

4958. By Canonical.com Patch Queue Manager <email address hidden> on 2010-01-13

(mbp) better help for bzr send

4957. By Canonical.com Patch Queue Manager <email address hidden> on 2010-01-13

(nmb) Implement mv for shell-like scripts

4956. By Canonical.com Patch Queue Manager <email address hidden> on 2010-01-13

(vila) Better fix for fancy_rename respecting callers file encoding

4955. By Canonical.com Patch Queue Manager <email address hidden> on 2010-01-13

(salgado) bug # 308122, Implement 'bzr unshelve --preview'