Thoughts on file ids

[Aaron Bentley]

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

On 11-05-16 11:39 AM, Jelmer Vernooij wrote:
> On Mon, 2011-05-09 at 11:34 -0400, Aaron Bentley wrote: 
>> On 11-05-09 11:09 AM, Jelmer Vernooij wrote:

>>> That would need some fancy hooks in "bzr merge" too though
>> I don't think so.  It's just a matter of preprocessing a tree before
>> handing it into the main merge code.
> As far as I can tell that still requires either a fancy hook in
> cmd_merge or a custom command - how else would you do it?

I would add a file_matcher parameter to merge.Merger.__init__ and add an
option to cmd_merge to set it to match files however I wanted.

>>> It might still be a good thing to store those relations explicitly as we
>>> are doing now, but I don't see why being able to browse those relations
>>> requires them to be stored up front.
>> Without storing them up front, I think generating the graph would be too
>> expensive.
> It's what git does, and it works reasonably well there.

Okay, if I'm wrong, great.

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

iEYEARECAAYFAk3Rhm8ACgkQ0F+nu1YWqI2JkgCdFV/xqZ6jfbIGYvoWewBQ0JHy
x+gAn29RbDvjFEnQJpzzH5ASqzIpcwA+
=dA1s
-----END PGP SIGNATURE-----