lp:~maxb/bzr/deref-in-set-stacking

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:bzr/2.3

bzr-core: Pending requested 2011-05-20

Diff: 36 lines (+8/-0)

2 files modified

bzrlib/builtins.py (+3/-0)
bzrlib/reconfigure.py (+5/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5651. By Max Bowsher on 2011-05-20

Dereference via directory service the argument to --stacked-on (push &
reconfigure) so that stacked-on locations are not dependent on the directory
service plugins installed in a particular instance of Bazaar.

Unfortunately this does not _yet_ let us use lp: URLs in --stacked-on, as
Launchpad currently does not consider /+branch/... to be a valid stacking
location.

5650. By Max Bowsher on 2011-05-20

Fix bzrlib.urlutils.normalize_url when processing URLs with a scheme, but no
slash in the path - before this, lp:bzr was 'normalized' to lp:bzrlp:bzr (sic).

5649. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(spiv) Update "Using stacked branches" document. (Andrew Bennetts)

5648. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(vila) Merge 2.2 into 2.3 resolving conflicts (Vincent Ladeuil)

5647. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(vila) fix rst syntax in Japanese docs (Alexander Belchenko)

5646. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(vila) Backport fix for option names with dots for sphinx
 (#782289)(Vincent Ladeuil)

5645. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(vila) Tweak rest in ignore help. (Alexander Belchenko)

5644. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(vila) Open 2.3.4 for bugfixes (Vincent Ladeuil)

5643. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(vila) Release 2.3.3 (Vincent Ladeuil)

5642. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-12

(vila) Release 2.3.2 (Vincent Ladeuil)