[PATCH] Merge needs no BASE_SPEC, better docs

Aaron Bentley aaron.bentley at utoronto.ca
Thu May 26 18:01:09 BST 2005


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

John Arbash Meinel wrote:
| Aaron Bentley wrote:
|
|>I would really, really like to do last-common-merge instead of
|>last-common-ancestor.  I don't have the metadata I need yet.
|
| Sure. Is that what .bzr/merged-patches is for? At least in theory?
| Obviously it isn't used at all right now.

Yes, exactly.

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

iD8DBQFClgDV0F+nu1YWqI0RAtKoAJ4skcd5KYb3+NDySy+TQTKctmcO3QCfYPJ6
pKiNLjlIcgAhDmg5dxLQS4Y=
=ZNwG
-----END PGP SIGNATURE-----




More information about the bazaar mailing list