[MERGE/RFC] Merge prefers to use submit branch
Aaron Bentley
aaron at aaronbentley.com
Wed Jan 16 03:53:47 GMT 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
John Arbash Meinel wrote:
> I think it should be well documented in NEWS, since it is a behavior change.
Okay
> I know it fits your use case, I'm not sure how universal it is. Having 1
> use case is more than having 0, though.
I'm not sure what you're questioning-- my desire for separate defaults
for merge and pull, or using submit_branch for merge's default.
I hope the rationale for the first is clear. For the second, I did
offer to make it a new location if that would make you more comfortable.
> Actually it goes back to something we had a long time ago. Which is
> having a "if you branch from THIS, set your submit location to X". That
> was at least part of the original "submit" spec. Which would have fit the:
>
> bzr branch upstream
> <hack>
> bzr commit -m "foo"
> bzr send
Right, but the "submit location" was a different concept. It was a
means of performing the submission, e.g. a mailto or sftp URL.
> Having it be:
>
> bzr branch upstream
> <hack>
> bzr commit -m "foo"
> bzr merge
> bzr commit -m "updating to tip"
> bzr send
>
> However, both of these would also work if we used the 'parent' as the
> send location and the merge location.
Right. It's only when you want to do pulling *and* merging that you
have a need for differing defaults. i.e. when you want to work on a
branch from two different machines.
> I'm not sure how you are doing it that your parent is not your submit
> location.... I would be interested to have you write down your steps.
All my branches in /home/abentley/bzrrepo have submit_branch set to
/home/abentley/bzrrepo/others/bzr.dev in locations.conf
[/home/abentley/bzrrepo]
...
submit_branch = /home/abentley/bzrrepo/others/bzr.dev
But also, "bzr send" can set the submit location.
> Anyway, long winded just to say that I don't really care. If it works
> for you and makes something easier, I'm okay with it.
Okay, I'll take that for bb:tweak. Thanks.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHjX/L0F+nu1YWqI0RAu5vAJ0cYv7tFfT2HNhDiLoZt+lrbGtVoACeNHIl
ov2HJUZZT0+eb0iN7ooGhek=
=/6+a
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list