/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/developers/implementation-notes.txt

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/implementation-notes.txt
1
 
Implementation notes
2
 
====================
3
 
 
4
 
.. toctree::
5
 
   :hidden:
6
 
 
7
 
   btree_index_prefetch
8
 
   last-modified
9
 
   content-filtering
10
 
   lca_tree_merging
11
 
 
12
 
 
13
 
* `BTree Index Prefetch <btree_index_prefetch.html>`_ |--| How bzr decides
14
 
  to pre-read extra nodes in the btree index.
15
 
 
16
 
* `Computing last_modified values <last-modified.html>`_ for inventory
17
 
  entries
18
 
 
19
 
* `Content filtering <content-filtering.html>`_
20
 
 
21
 
* `LCA Tree Merging <lca_tree_merging.html>`_ |--| Merging tree-shape when
22
 
  there is not a single unique ancestor (criss-cross merge).
23
 
 
24
 
 
25
 
.. |--| unicode:: U+2014
26
 
 
27
 
..
28
 
   vim: ft=rst tw=74 ai