/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/plans.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/plans.txt
1
 
Plans
2
 
=====
3
 
 
4
 
.. toctree::
5
 
   :hidden:
6
 
 
7
 
   performance-roadmap
8
 
   colocated-branches
9
 
   tortoise-strategy
10
 
   improved_chk_index
11
 
 
12
 
 
13
 
* `Performance roadmap <performance-roadmap.html>`_ |--| The roadmap
14
 
  for fixing performance in bzr over the next few releases.
15
 
 
16
 
* `Co-located branches <colocated-branches.html>`_ |--| Planned(?) support
17
 
  for storing multiple branches in one file-system directory.
18
 
 
19
 
* `Bazaar Windows Shell Extension Options <tortoise-strategy.html>`_ |--|
20
 
  Implmentation strategy for Bazaar Windows Shell Extensions, aka
21
 
  TortoiseBzr.
22
 
 
23
 
* `CHK Optimized index <improved_chk_index.html>`_
24
 
 
25
 
 
26
 
.. |--| unicode:: U+2014
27
 
 
28
 
..
29
 
   vim: ft=rst tw=74 ai