/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: Jan Hudec
  • Date: 2006-11-25 20:38:39 UTC
  • mto: (2199.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2200.
  • Revision ID: bulb@ucw.cz-20061125203839-9nuhv32z63hb8811
Option --pull for merge command.

Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.

Simple test for this option is included.

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