why does merge command sometimes not carry meta-data?

[Aaron Bentley]

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

Christophe TROESTLER wrote:
> If all you are interested in is not merging your most recent revisions
> (because, say, they are work in progress), just drop the first number
> (e.g. do "bzr merge -r ..1378 ../flydra-ads") and the meta-data will
> be carried.

If the merge that is carried out *can* have pending merges, it will.
That is not affected by whether you specify any base revision.

So if bzr merge -r 2..3 does produce pending merges, that means that the
target branch has not merged 1 yet.

>  (Do not worry about previous revisions, they will not be
> merged in twice!)

Another way of thinking about this is that we do not merge revisions--
we merge the changes that each branch has.

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

iD8DBQFIid7U0F+nu1YWqI0RAi38AKCIPpJ/s05sxRaKWJAqJLzTjV8hfwCfas3Z
GhQ7d0IfIu3VMW0KpXD3Ae8=
=tzq7
-----END PGP SIGNATURE-----