Recommended use of Bazaar for single-committer multiple-machine projects?

John Arbash Meinel john at arbash-meinel.com
Fri Dec 12 23:14:06 GMT 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Marius Kruger wrote:
> 2008/12/13 Martin Pool <mbp at canonical.com <mailto:mbp at canonical.com>>
> 
>     Getting rid of them would mean we could still have checkouts, but
>     committing to a checkout would always go into its branch, whether that's
>     on the same machine or elsewhere.  So this would mean checkouts of a
>     remote branch would only really work if you had access to the server,
>     much like in svn, though you would be able to do wt-only operations with
>     no connection.
> 
>     We wouldn't need the four-way merge of wt-basis, wt, local branch,
>     remote branch, that can currently happen in updates.
> 
> Then you'd also have to remove unbind (because you can unbind, commit, bind)
> 

You could just change what happens during "bind". It could just refuse
if the branches are not at the same tip.

> I just think we should refuse if there are changes in wt and local branch,
> forcing people to do another commit --local to have a clean working tree
> before updating (like merge). In this way we protect the user from
> accidentally messing things up, and we don't loose functionality.

It still doesn't solve the

bzr co $UPSTREAM
bzr ci --local
bzr ci --local

# Now how do I push my local commits $UPSTREAM?
bzr push $UPSTREAM

With the big problem that you generally have to type out the whole url
to $UPSTREAM.

If you go back to having 'unbind', you just just have 'unbind' set the
default push/pull locations. So

bzr co $UPSTREAM
bzr unbind
bzr ci
bzr ci
bzr bind # fail
bzr push # default location Just Works
bzr bind # success

You can even define "unbind" for lightweight checkouts to download
whatever history they need. Perhaps becoming a 'stacked' branch if you
didn't want it to download the whole history.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAklC8D4ACgkQJdeBCYSNAAPRbgCgwhlLJLTQPkSzrtiartqVNEjq
lxAAoJMnrEeudX99J/Q2WuOV3L1Ykkdv
=Kv4A
-----END PGP SIGNATURE-----



More information about the bazaar mailing list