[MERGE/RFC] Merge prefers to use submit branch

Aaron Bentley aaron.bentley at utoronto.ca
Mon Dec 17 16:09:07 GMT 2007


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

Hi all,

This patch updates merge to use the submit location by default, falling
back to the parent location if necessary.

This certainly works much better for my workflow, because I work with
mirrors that I update with "pull".  At work, the location to pull from
is therefore "http://aaronbentley.com/*", while the location I merge
from is the same as the location I ultimately submit to: (a local mirror
of) bzr.dev.

If only the parent branch is set, or the parent branch is the same as
the submit branch, this change will have no effect.  But in situations
where they are different, I think this is better.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHZp8j0F+nu1YWqI0RAmd6AJ4rFaxustHckKgxX+lKK1s6XPrzIQCcD1wV
e/8wG2QoeZ73fpb3Jq9UzaY=
=oX1N
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-cfL7qw.patch
Type: text/x-patch
Size: 12267 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071217/5b2638aa/attachment.bin 


More information about the bazaar mailing list