/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: 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/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