[RFC] I want to disable submit_branch on my computer for all branches. How can I do that?
John Arbash Meinel
john at arbash-meinel.com
Fri May 13 09:10:25 UTC 2011
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 5/13/2011 9:14 AM, Martin Pool wrote:
> +0.9 to adding a new merge_default_location. I think having it clear
> which command it affects is easier than having apparently magic
> relations between the commands. We can possibly have dallas between the
> commands.
I think there are a couple of different workflows, and it might be
better to be clear about what we are trying to support.
Short answer:
For my use case, merge remembering the location doesn't help. It is rare
that I do the same merge more than once. Also, in my head it is always
"I want to merge THIS_BRANCH", which means I already have a target I'm
typing. I have to think harder if I want to remember what the default
branch would be, and if that matches THIS_BRANCH.
Longer answer.
Some people work like Aaron does/did, and have multiple locations that
they sync. (desktop/laptop/server/smart phone)
As such, the default location they would push/pull is likely to be one
of their other locations.
Some people work primarily in one location, and have their work in a
star-topology around a trunk branch. In which case, there is a small
chance they will merge between feature branches, and a fairly large
chance they will merge from trunk. Probably the largest chance is that
they will merge into trunk, but each of those merges is unlikely to be
repeated.
I will say that *for me*, I pretty much never write just "bzr merge". I
always give a source (fairly frequently bzr merge ../bzr.dev). I don't
know if the current algorithm is confusing enough that I don't use it,
or just that I work on 20 different branches, and have no idea what each
one things is the merge target. So I'm just always explicit.
In fact, I generally never *think* to run just "bzr merge". In my head
it is never "I want to sync using merge", it is always "I want to merge
*this* branch".
I *do* have submit_branch configured, but rarely use "-rsubmit:".
The one default setting I use 10 times a day is "push_location". I set
up most of my locations to push to the appropriate place on launchpad.
So I don't have to re-type the long branch names all the time.
And occasionally I really wish "bzr pull :push" would work (:push
doesn't expand lp:foo). Mostly when I'm moving into another VM/machine
where I've been also updating a branch. (Such as performance testing on
both Windows and Linux.)
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk3M9YEACgkQJdeBCYSNAANuvQCfSn70dgWCfHM9ITy84c5SuYmh
jugAn0NiqNWDZbBR474Sr2T0RzopO28U
=XBJg
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list