[MERGE REQUEST] merge work

[Aaron Bentley]

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

Martin Pool wrote:

> I think the next thing to do is better tracking of merged-in revisions.
> The steps would seem to be:
> 
>  - when merging, make sure the destination branch includes the revision 
>    and inventory objects for everything merged in (and everything
>    indirectly merged)

My plan is to implement greedy_fetch, to pull in all revisions that are
present in the remote, but missing locally, and then do the merge
operation using the copies in the local branch.

>  - add the tip of the merged branch to pending-merges
> 
> What do you think?

Oh, is that why you've been holding off on merging my pending-merges patch?

Sure it's nice to copy everything in the remote branch into the local
one, but I didn't think it was a prerequisite for pending-merges.

Anyhow, now that we've got sane ways of dealing with missing revisions,
we can do both.

>  - bzr log should show them indented

I don't really understand how this is supposed to work, yet.  Is it only
logs for parent merges, not all ancestor merges?

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

iD8DBQFDA+vE0F+nu1YWqI0RAvihAJ9F8E/+cD0s6rdHot9clKyYCQ31vwCeIjdG
POCyQx3n8zgoDPZ+HvvyiHc=
=U8DQ
-----END PGP SIGNATURE-----