pqm-submit: support for bound branches

[Robert Collins]

On Mon, 2006-03-06 at 11:25 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:

> > 
> > This lets one have a branch bound to its nominal public location, which
> > is sftp published to a slightly different url, and submit from the
> > public location by:
> > 
> > bzr push
> > bzr pqm-submit -m foo
> 
> Here's my topology:
> 
>   panometrics.com
>   ^         ^
>   /          \
>  V            V
> Home         Work
> 
> I am constantly pulling from the public location, and pushing to a
> private one.  It's essentially, a manual bound branch.  So I would
> prefer that the order went:
> 
> 1. parent location
> 2. bound location
> 3. push location
> 
> I have to say, I think it will be unusual for a branch to be bound to
> its public location, because the binding implies writing, implies SFTP,
> implies non-public.

I think the question is 'how to represent a branches public
location' :).

the bound location says 'this branch is the same as that one over
there', and will try to commit to it at the same time - but commit
--local plus a push to the branches push_location will let you manually
simulate a bound branch easily. 

So, heres another way you could simulate your bound branches. Checking I
have your topology right you have:

panometrics http: 'public'
panometrics sftp: 'master'
home: 'slave 1'
work: 'slave 2'

if you configure slave 1 and slave 2 to push to 'master' and to be bound
to 'public', you can set 'parent' to be
http://bazaar-vcs.org/bzr/bzr.dev, and the following workflow will work:


'bzr update': in home or work: gets the latest code the other slave did.
'bzr commit --local && bzr push': publish a commit to the public branch.
'bzr merge': merge in work from bzr.dev.
'bzr pqm-submit -m something': send in a merge request with a source of
public and a target of bzr.dev.

Thats what I'm using now, and really, I'd love to teach bound branches
that it has two places for the bound location - public and private, then
I would not need to commit --local & push.

Rob




-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060307/b169df89/attachment.pgp