Merge eats memory

[Aaron Bentley]

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

Michael Ellerman wrote:

> Actually you don't need git at all.
> 
> Just using a tar ball of the kernel (or probably any large tree) is enough to 
> see the behaviour.
> 
> This is from merging a 30K patch between two kernel trees (no .git), it took 
> about 8m44s.

Okay, if we're just talking about kernel trees, I've seen a merge on a
kernel tree take less than 20 seconds.  So you must be doing it wrong :-)

Are you merging the working tree or the last-committed revision?  In one
case, merge has to read every file in the tree.  In the other, it just
compares the text-ids, and only

So try "merge ../other-kernel-tree/@"

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

iD8DBQFCoyY90F+nu1YWqI0RAjxNAJ9yIcQCKV1nW450Sr2FcBsWn+4QqACfSp5M
++s9eMKH1BZoKzKKviKgoqU=
=nt4k
-----END PGP SIGNATURE-----