Merge eats memory
aaron.bentley at utoronto.ca
Sun Jun 5 17:20:13 BST 2005
-----BEGIN PGP SIGNED MESSAGE-----
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/@"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar