10
10
.. level 3 ~~~~~~~~
11
11
.. level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
20
.. later include:: introducing_bazaar.txt
21
.. later include:: workflows.txt
27
.. later include:: download.txt
29
* `Introducing yourself <setting_up_email.html>`_ |--| The various ways that exist
30
to tell Bazaar your email address for commits.
32
* `Using configuration files <configuration.html>`_ |--| Information on how to configure
13
.. contents:: :depth: 2
39
* `Tutorial <tutorial.html>`_ |--| Explains how to use bzr.
42
* `Specifying revision identifiers <specifying_revisions.html>`_ |--| Description
43
of the subarguments for ``-r`` as used by commands such as
44
**bzr log** and **bzr merge**.
46
* `Running a Bazaar server <server.html>`_ |--| How to run a server
47
to allow remote access to Bazaar branches.
20
.. include:: introducing_bazaar.txt
21
.. include:: core_concepts.txt
22
.. include:: bazaar_workflows.txt
53
* `Conflict handling <conflicts.html>`_ |--| The various kind of conflicts
54
you may encounter, and how to handle them.
56
* `Centralized workflow <centralized_workflow.html>`_ |--| How to use Bazaar in
57
a centralized way like CVS or Subversion.
59
.. later include:: using_bound_branches.txt
60
.. later include:: shared_repositories.txt
28
.. include:: installing_bazaar.txt
29
.. include:: entering_commands.txt
30
.. include:: getting_help.txt
31
.. include:: configuring_bazaar.txt
32
.. include:: using_aliases.txt
33
.. include:: plugins.txt
36
Personal version control
37
########################
39
.. include:: solo_intro.txt
40
.. include:: starting_a_project.txt
41
.. include:: controlling_registration.txt
42
.. include:: reviewing_changes.txt
43
.. include:: recording_changes.txt
44
.. include:: browsing_history.txt
45
.. include:: releasing_a_project.txt
46
.. include:: undoing_mistakes.txt
52
.. include:: partner_intro.txt
53
.. include:: branching_a_project.txt
54
.. include:: merging_changes.txt
55
.. include:: resolving_conflicts.txt
56
.. include:: annotating_changes.txt
59
Team collaboration, central style
60
#################################
62
.. include:: central_intro.txt
63
.. include:: publishing_a_branch.txt
64
.. include:: using_checkouts.txt
65
.. include:: working_offline_central.txt
66
.. include:: reusing_a_checkout.txt
69
Team collaboration, distributed style
70
#####################################
72
.. include:: distributed_intro.txt
73
.. include:: organizing_branches.txt
74
.. include:: using_gatekeepers.txt
75
.. include:: sending_changes.txt
66
* `Running a Bazaar smart server <http_smart_server.html>`_ |--| How to run
67
a smart HTTP server to allow remote access to Bazaar branches.
69
* `Shared repositories layouts <shared_repository_layouts.html>`_ |--| The
70
pros and cons of various repository layouts.
72
.. later include:: tracking_upstream.txt
73
.. later include:: useful_tips.txt
81
.. include:: best_practice_intro.txt
82
.. include:: server.txt
83
.. include:: hooks.txt
84
.. include:: version_info.txt
85
.. include:: bug_trackers.txt
86
.. include:: shared_repository_layouts.txt
79
* `Plugins <plugins.html>`_ |--| Information on how to use plugins in Bazaar.
81
* `Hooks <hooks.html>`_ |--| How to set up hooks that are executed on certain
84
* `Using aliases <using_aliases.html>`_ |--| How to set up
85
and use command aliases.
88
Integrating Bazaar With Other Systems
89
#####################################
91
* `Bug trackers <bug_trackers.html>`_ |--| Information on how to integrate with bug trackers.
93
* `Exporting version information <version_info.html>`_ |--| How to export version numbers to a build system.
92
.. include:: specifying_revisions.txt
93
.. include:: conflicts.txt
94
.. include:: configuration.txt
95
.. include:: setting_up_email.txt
96
.. include:: authentication_conf.txt
97
.. include:: http_smart_server.txt
98
.. include:: writing_a_plugin.txt
95
100
.. |--| unicode:: U+2014
added
removed
doc/en/user-guide/index.txt
