On Wed, Aug 8, 2012 at 2:42 AM, Tony Arcieri <[email protected]> wrote: > Awesome! Is the merge algorithm documented anywhere? Is it a patch-style > algorithm, or more advanced?
It is only for mutable directories, not for mutable files. Unfortunately it is not documented, I don't think, which is one of the reasons that I want(ed) to kill it. It is briefly alluded to in here: https://tahoe-lafs.org/trac/tahoe-lafs/browser/git/docs/specifications/mutable.rst?rev=08ea3dc512be2e331aa486f818ba9d5f2fe2c4cb And here's the source code that implements it: https://tahoe-lafs.org/trac/tahoe-lafs/browser/git/src/allmydata/dirnode.py?annotate=blame&rev=3d771132a843a85578dc23a6cac55b4fae09fc64#L606 https://tahoe-lafs.org/trac/tahoe-lafs/browser/git/src/allmydata/dirnode.py?annotate=blame&rev=3d771132a843a85578dc23a6cac55b4fae09fc64#L74 https://tahoe-lafs.org/trac/tahoe-lafs/browser/git/src/allmydata/mutable/filenode.py?annotate=blame&rev=5bae4a1bd26c32d0e78fede6e1e1c15aca0405e5#L792 Aha! And that last link there contains the documentation, in a docstring of the MutableFileVersion.modify() method. Regards, Zooko _______________________________________________ tahoe-dev mailing list [email protected] https://tahoe-lafs.org/cgi-bin/mailman/listinfo/tahoe-dev
