/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/index.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/index.txt
1
 
=================================
2
 
Bazaar Developer Document Catalog
3
 
=================================
4
 
 
5
 
 
6
 
Introduction
7
 
============
8
 
 
9
 
.. toctree::
10
 
   :maxdepth: 1
11
 
 
12
 
   contribution-quickstart
13
 
 
14
 
 
15
 
Working on Bazaar
16
 
=================
17
 
 
18
 
.. toctree::
19
 
   :maxdepth: 1
20
 
 
21
 
   cycle
22
 
   profiling
23
 
   bug-handling
24
 
   HACKING
25
 
   testing
26
 
 
27
 
* `Contributing to Bazaar Documentation <http://wiki.bazaar.canonical.com/ContributingToTheDocs>`_ (wiki)
28
 
 
29
 
 
30
 
Releasing and Packaging
31
 
=======================
32
 
 
33
 
.. toctree::
34
 
   :maxdepth: 1
35
 
 
36
 
   releasing
37
 
   ppa
38
 
   ec2 
39
 
 
40
 
 
41
 
Developing using bzrlib
42
 
=======================
43
 
 
44
 
.. toctree::
45
 
   :maxdepth: 1
46
 
 
47
 
   overview
48
 
   integration
49
 
 
50
 
* `Writing plugins for Bazaar <http://doc.bazaar.canonical.com/plugins/en/plugin-development.html>`_ (web link)
51
 
 
52
 
* `bzrlib API reference <http://starship.python.net/crew/mwh/bzrlibapi/>`_
53
 
  (web link)
54
 
 
55
 
 
56
 
Other documents
57
 
===============
58
 
 
59
 
.. toctree::
60
 
   :maxdepth: 1
61
 
 
62
 
   principles
63
 
   plans
64
 
   specifications
65
 
   implementation-notes
66
 
   miscellaneous-notes
67
 
 
68
 
 
69
 
.. |--| unicode:: U+2014
70
 
 
71
 
..
72
 
   vim: ft=rst tw=74 ai