Cross-project merges

[Aaron Bentley]

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

On 06/22/2010 01:00 AM, Andrew Bennetts wrote:
> Jelmer Vernooij wrote:
> [...]
>> Yeah, I was wondering about that. How is merge-into different from join
>> and do we really need to have both in the core?
> 
> First, there's the trivial: join doesn't work with 2a either, for
> similar reasons to why merge-into doesn't work.  (It expects to be able
> to mutate inventory._byid).
> 
> Second, join works in terms of trees on disk.  You can't use join with a
> remote branch the way you can use merge.

I don't think that's a big difference.  You need to have a working tree
for merge-into or for join.  The only difference is that with join, you
need get a local tree for the remote branch explicitly, whereas
merge-into creates it as part of the merge.

> Third, join works with whole trees, but there are use cases for partial
> merge-intos (somewhat like there are uses for partial merges).

You always need to have a whole tree at the end.  If you only want to
join part of the tree, you can extract that part using "split".

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

iEYEARECAAYFAkwgz2wACgkQ0F+nu1YWqI3dSwCfe3bMTn/1wT7Hb1JIEiIGG/Z9
iRgAni5UDY+qT6MlMEbqrDT7o1HARV5Z
=qrLr
-----END PGP SIGNATURE-----