/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
1
Branching a project
2
===================
3
4
Branch URLs
5
-----------
6
7
Before someone else can get a copy of your work, you need to
8
agree on a transfer technology.
9
You may decide to make the top level directory of your branch
10
a network share, an approach familiar to Windows users.
5278.1.5 by Martin Pool
Correct more sloppy use of the term 'Linux'
11
Unix users might prefer access to be
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
12
via SFTP, a secure protocol built-in to most SSH servers.
13
Bazaar is *very* flexible in this regard with support for
14
lots of protocols some of which are given below.
15
16
  ===========         ======================================================
17
  Prefix              Description
18
  ===========         ======================================================
4734.1.1 by John Szakmeister
Prevent several partial URLs from being highlighted by Sphinx.
19
  \file://            Access using the standard filesystem (default)
20
  \sftp://            Access using SFTP (most SSH servers provide SFTP).
21
  \bzr://             Fast access using the Bazaar smart server.
22
  \ftp://             Access using passive FTP.
5439.3.1 by John C Barstow
Make it clearer that we support HTTPS
23
  \http://            Access to branches exported by a web server.
24
  \https://           Encrypted access to branches exported by a web server.
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
25
  ===========         ======================================================
26
27
As indicated above, branches are identified using URLs with the
28
prefix indicating the transfer technology. If no prefix is given,
29
normal filenames are assumed. For a complete list of supported
30
protocols, see the ``urlspec`` online help topic or the
4634.164.2 by Alexander Belchenko
change links to user-reference/bzr_man.html to user-reference/index.html everywhere in the User Guide.
31
`URL Identifiers <../user-reference/index.html#url-identifiers>`_
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
32
section of the Bazaar User Reference.
33
5077.3.3 by Martin Pool
Add doc about root and homedir-relative URLs
34
URLs are normally resolved relative to the root directory of the server,
35
so ``ftp://example.com/repo/foo`` means the ``/repo/foo`` directory of
36
that host.  (We say 'normally' because some server software like Apache
37
can be configured to remap URLs arbitrarily, in which case you'll need to
38
look at the server configuration to find out which URL corresponds to
39
which directory.)
40
41
To address a path relative to your home directory on the server, use a
42
tilde like so: ``sftp://example.com/~/public_html`` should map to
43
``public_html`` within your home directory.
44
5439.3.2 by John C Barstow
Fix wrapping of note directive so inline ref directive is properly parsed.
45
.. note:: Access over HTTP or HTTPS is read-only by default.
5538.2.1 by Zearin
Fixed capitalization of XML and HTTP. Fixed by hand and only where appropriate (e.g., left http://some/url lowercase, but capitalized "When making an HTTP request…").
46
   See `Pushing over the HTTP smart server
5439.3.4 by John C Barstow
Really fix the docutils link
47
   <http_smart_server.html#pushing-over-the-http-smart-server>`_ for
5439.3.3 by John C Barstow
Convert link to plain docutils
48
   details on configuring read-write access.
5439.3.1 by John C Barstow
Make it clearer that we support HTTPS
49
3234.1.1 by Neil Martinsen-Burrell
minor doc changes
50
A reminder about shared repositories
51
------------------------------------
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
52
53
Before getting a copy of a branch, have a quick think about
54
where to put it on your filesystem. For maximum storage
55
efficiency down the track, it is recommended that branches
3234.1.1 by Neil Martinsen-Burrell
minor doc changes
56
be created somewhere under a directory that has been set up
4634.39.41 by Ian Clatworthy
Fix the broken links in the User Guide
57
as a shared repository. (See `Feature branches
58
<organizing_your_workspace.html#feature-branches>`_ in
59
`Organizing your workspace <organizing_your_workspace.html>`_
60
for a commonly used layout.) For example::
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
61
62
  bzr init-repo my-repo
63
  cd my-repo
64
65
You are now ready to grab a branch from someone else and
66
hack away.
67
68
The branch command
69
------------------
70
3427.6.1 by James Westby
Small tweaks to the "branch" command documentation in the user guide.
71
To get a branch based on an existing branch, use the ``branch`` command.
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
72
The syntax is::
73
74
  bzr branch URL [directory]
75
76
If a directory is not given, one is created based on the last part of
3427.6.2 by James Westby
Refer to a "drive qualified path" as suggested by Aaron.
77
the URL. Here are some examples showing a drive qualified path (M:/) and an
5538.2.2 by Zearin
Continued capitalization fixes ([S]FTP, SSH).
78
SFTP URL respectively::
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
79
3427.6.2 by James Westby
Refer to a "drive qualified path" as suggested by Aaron.
80
  bzr branch M:/cool-trunk
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
81
  bzr branch sftp://bill@mary-laptop/cool-repo/cool-trunk
82
83
This example shows explicitly giving the directory name to use for the
84
new branch::
85
86
  bzr branch /home/mary/cool-repo/cool-trunk cool
87
88
Time and space considerations
89
-----------------------------
90
91
Depending on the size of the branch being transferred and the
92
speed and latency of the network between your computer and the
93
source branch, this initial transfer might take some time.
2977.1.11 by Ian Clatworthy
make fixes suggested by proof-readers
94
Subsequent updates should be much faster as only the
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
95
changes are transferred then.
96
97
Keep in mind that Bazaar is transferring the
98
complete history of the branch, not just the latest snapshot.
99
As a consequence, you can be off the network (or disconnected
100
from the network share) after ``branch`` completes but you'll
101
still be able to ``log`` and ``diff`` the history of the
102
branch as much as you want. Furthermore, these operations
103
are quick as the history is stored locally.
104
105
Note that Bazaar uses smart compression technology to
106
minimize the amount of disk space required to store version
107
history. In many cases, the complete history of a project
108
will take up less disk space than the working copy of
109
the latest version.
110
111
As explained in later chapters, Bazaar also has support for
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
112
`lightweight checkouts <using_checkouts.html#getting-a-lightweight-checkout>`_
3779.2.1 by mernst at mit
Improved documentation of stacked and lightweight branches
113
of a branch, i.e. working trees with
2977.1.5 by Ian Clatworthy
added chapter on Sharing with a peer
114
no local storage of history. Of course, disconnected usage
115
is not available then but that's a tradeoff you can decide
116
to make if local disk space is really tight for you. Support for
117
limited lookback into history - *history horizons* - is
118
currently under development as well.
119
120
Viewing branch information
121
--------------------------
122
123
If you wish to see information about a branch including where it came from,
124
use the ``info`` command. For example::
125
126
  bzr info cool
127
128
If no branch is given, information on the current branch is displayed.