[MERGE/RFC] Merge prefers to use submit branch

Aaron Bentley aaron.bentley at utoronto.ca
Fri Dec 21 14:03:43 GMT 2007


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

Erik Bågfors wrote:
> Without actually thinking about the workflow here. For me it feels like
> this. Pull is a mechanism to get changes from another branch to my
> branch, in most cases merge is also to get changes from another branch
> to this one. So it feels very logical to use the same default URL.

They are fundamentally different because of the way they treat the log.

Pull is a mirroring tool.  Not only does it fetch changes, it turns the
target into a copy of the source.  That means it will change the way
revisions appear in the target, including their revnos.

Merge is an integration tool.  It combines changes from the source
branch with changes in the target branch. It preserves the way revisions
appear, including their revnos.

It's hard to get much further into this without discussing workflow,
because defaults only exist to make certain workflows easier.  They're
not fundamental to the operation.

> However, the submit branch is from this branch to another, so why would
> merge use it.

Because at some point, you have to merge from the branch you're going to
submit to.  Otherwise, your submission will fail.

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

iD8DBQFHa8e/0F+nu1YWqI0RAlBhAJ9DYa+HjKf6aYzjQDjQivSU/QdnwACffvJ0
uVxCy+4xOan3MuNKJ5Hk2Fs=
=vwh/
-----END PGP SIGNATURE-----



More information about the bazaar mailing list