Looking for a way to get merge directive contents

Aaron Bentley aaron at aaronbentley.com
Tue Jun 3 18:17:32 BST 2008


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

John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Erik Bågfors wrote:
> | When I run merge or pull, the directive acts like a branch "bzr pull
> | <directive>".
> |
> | Why shouldn't I be able to run "bzr log <directive>"?

> A directive only has meaning in the context of a branch.

A directive also indicates which branch it's supposed to be merged into,
so it can always use that branch.

> 'log' is
> defined in
> terms of a single branch, while 'pull' and 'merge' have 2 branches.

Well, they have an input, which may be a merge directive or a branch,
and they have an output branch.

 So
> you have
> context to understand the merge directive. (Mostly because a lot of the
> entries
> will be deltas against existing revisions, so we can't recreate the full
> text
> otherwise.)

However, revision entries in particular are always stored as fulltexts.

> That said, I believe Robert's work on stacked branches might make it a bit
> easier to pretend a merge directive is just another branch with limited
> history.

Indeed.

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

iD8DBQFIRXys0F+nu1YWqI0RAhF0AJ9nQFcQA9zJGv4UOAcSroI+ejcUTACeO7nh
Bx3IeFP1wSQjAfrqeeDC/XE=
=EQsr
-----END PGP SIGNATURE-----



More information about the bazaar mailing list