Rev 2493: Note that multiparent deltas affect merge to, from the mailing list review discussion. in file:///home/robertc/source/baz/roadmap/

[Robert Collins]

At file:///home/robertc/source/baz/roadmap/

------------------------------------------------------------
revno: 2493
revision-id: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
parent: robertc at robertcollins.net-20070604033948-erld0bugxcbo62gf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 14:07:20 +1000
message:
  Note that multiparent deltas affect merge to, from the mailing list review discussion.
modified:
  doc/developers/merge-scaling.rst mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
=== modified file 'doc/developers/merge-scaling.rst'
--- a/doc/developers/merge-scaling.rst	2007-05-27 17:45:50 +0000
+++ b/doc/developers/merge-scaling.rst	2007-06-04 04:07:20 +0000
@@ -29,3 +29,7 @@
 - Access to revision graph proportional to number of revisions read
 - Access to changed file metadata proportional to number of changes and number of intervening revisions.
 - O(1) access to fulltexts
+
+Notes
+=====
+Multiparent deltas may offer some nice properties for performance of annotation based merging.