Experimental Physics and
Industrial Control System

Andrew Johnson <[email protected]> · Tue, 2 Dec 2014 13:31:12 -0600

Having released 3.15.1 yesterday I have now created the 3.16 branch and
pushed it to Launchpad. The 3.15 branch should now only be used for bug
fixes, but bugs that originated in 3.14 should if possible be fixed on
that branch instead and the fix merged forward. There will probably be
at least one more release of 3.14.12 in the future.

I am planning to switch the "development focus" of the epics-base
project on Launchpad to the new 3.16 branch, which may bring some of
your working trees along with it depending on the URL that the branch is
bound to. You can work that out by looking at the output of "bzr info"
for each branch:

> tux% bzr info
> Repository checkout (format: 2a)
> Location:
>   repository checkout root: .
>         checkout of branch: bzr+ssh://bazaar.launchpad.net/~epics-core/epics-base/3.15/
>          shared repository: /local/anj
> 
> Related branches:
>   parent branch: /local/anj/base-3.14

The above checkout (mirror) branch is bound to Launchpad's 3.15 branch,
and will not change when I switch the development focus. However the
checkout branch below _is_ bound to the project's development focus
branch and will change when I make the switch:

> tux% bzr info
> Repository checkout (format: 2a)
> Location:
>   repository checkout root: .
>         checkout of branch: bzr+ssh://bazaar.launchpad.net/+branch/epics-base/
>          shared repository: /home/phoebus3/ANJ/epics/base
> 
> Related branches:
>   parent branch: bzr+ssh://bazaar.launchpad.net/+branch/epics-base/

If you have a mirror branch like this one that you want to remain on the
3.15 trunk, you can rebind it to the specific 3.15 URL like this:

> tux% bzr bind lp:epics-base/3.15/
> tux% bzr info
> Repository checkout (format: 2a)
> Location:
>   repository checkout root: .
>         checkout of branch: bzr+ssh://bazaar.launchpad.net/+branch/epics-base/3.15/
>          shared repository: /home/phoebus3/ANJ/epics/base
> 
> Related branches:
>   parent branch: bzr+ssh://bazaar.launchpad.net/+branch/epics-base/

You can also hand-edit the .bzr/branch/branch.conf file in each tree
instead of using 'bzr bind' or if you want to change the other related
branches as well.

Note that if the first line of the 'bzr info' output says "Repository
tree" instead of "Repository checkout" then the tree is not currently
bound to any launchpad branch and won't have a branch URL listed. It may
have related branches though, so you may still wish to hand-edit the
.bzr/branch/branch.conf file to update them.

- Andrew
-- 
People everywhere confuse what they read in newspapers with news.
-- A. J. Liebling

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System