"diff -r submit:" should not need to look at the parent

[Aaron Bentley]

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

On 05/08/2010 09:30 AM, Martin Pool wrote:
>> PS: I really can't figure out why Bzr had to invent all those duplicate
>> names: "pull" uses "parent", "merge" uses "submit"?

"submit" is the branch that you plan to submit your changes to, e.g.
using "bzr pqm-submit".  It is also used by "bzr send".  I thought it
was likely that if you merged, you'd want to to merge the branch that
you'd later be sending to.

>>  Why not have the
>> "pull" branch, the "push" branch, the "merge" branch, so it's obvious
>> which setting is used with which command?
> 
> I've said before I think we should just rename them that way.

I think it would be a bad idea to rename "submit" to "merge".  Then
you'd have "pqm-submit" and "send" submitting to the "merge" branch,
which would be at least as confusing, and more likely to be inappropriate.

If you think we need to introduce another branch location, called
"merge", which is remembered and set by "merge", that's fine by me.

Just remember that branch locations are used by multiple commands (e.g.,
"parent" is used by "missing", "merge" and "reconfigure").  I don't
think that it would be practical to have a branch location for each
command.  We can only hope to designate the primary command that uses it.

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

iEYEARECAAYFAkvxgSYACgkQ0F+nu1YWqI1GlwCeLtY/koww65r14i2FQQL4ml/4
WhsAnjayx4+620FMli4hM1EvA5/Hdn2I
=a/Kn
-----END PGP SIGNATURE-----