lp:~mbp/bzr/402022-merge-preview

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~bzr/bzr/trunk-old

Martin Pool: Disapprove on 2009-07-30

Diff: 112 lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #402022: merge --preview fails with TypeError: _do_preview() takes exactly 2 arguments (3 given)

High

Invalid

Link a bug report

Related blueprints

4564. By Martin Pool on 2009-07-24

News for 402022

4563. By Martin Pool on 2009-07-24

Make cmd_merge.cleanups an attribute not a passed-around variable

4562. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-23

(robertc) Support timestamping subunit streams. (Robert Collins)

4561. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-23

(igc) Allow rename of items already removed from the inventory
 (Marius Kruger)

4560. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-22

(jam) Add AbsentContentFactory.get_bytes_as,
 which just raises a better error.

4559. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-22

(mbp) workaround for ftp servers without APPE

4558. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-22

(mbp) various UIFactory cleanups including bug 387717

4557. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-22

(robertc) Add interface enforcement for the behaviour of iter_changes
 with missing subtrees with explicit paths - the whole subtree
 is returned. (Robert Collins)

4556. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-20

(jam) Bug #375867,
 don't prompt for password if ssh host doesn't support password auth.

4555. By Canonical.com Patch Queue Manager <email address hidden> on 2009-07-20

(andrew) Fix minor KeyError bug in -Dhpss when logging requests for
 unregistered methods.