1
.. _using-stacked-branches:
3
Использование стека веток
4
=========================
6
What is a stacked branch?
7
-------------------------
9
A stacked branch is a branch that knows how to find revisions
10
in another branch. Stacked branches store just the
11
unique revisions, making them faster to create and more
12
storage efficient. In these respects, stacked branches are
13
similar to shared repositories. However, stacked branches have
16
* The new branch can be in a completely different location to the
17
branch being stacked on.
19
* Deleting the stacked branch really deletes the revisions (rather
20
than leaving them in a shared repository).
22
* Security is improved over shared repositories, because the stacked-on
23
repository can be physically readonly to developers committing to stacked
26
These benefits make stacked branches ideal for various scenarios
27
including experimental branches and code hosting sites.
30
Creating a stacked branch
31
-------------------------
33
To create a stacked branch, use the ``stacked`` option of the branch command.
36
bzr branch --stacked source-url my-dir
38
This will create ``my-dir`` as a stacked branch with no local revisions.
39
If it is defined, the public branch associated with ``source-url`` will be
40
used as the *stacked-on* location. Otherwise, ``source-url`` will be the
41
*stacked-on* location.
44
Creating a stacked checkout
45
---------------------------
47
Direct creation of a stacked checkout is expected to be supported soon.
48
In the meantime, a two step process is required:
50
1. Create a stacked branch as shown above.
52
2. Convert the branch into a checkout using either the ``reconfigure``
56
Pushing a stacked branch
57
------------------------
59
Most changes on most projects build on an existing branch such as the
60
*development trunk* or *current stable* branch. Creating a new
61
branch stacked on one of these is easy to do using the ``push``
64
bzr push --stacked-on reference-url my-url
66
This creates a new branch at ``my-url`` that is stacked on ``reference-url``
67
and only contains the revisions in the current branch that are not already
68
in the branch at ``reference-url``.
70
If the local branch was created as a stacked branch, then you can
71
use the ``--stacked`` option to ``push`` and the *stacked-on* location
72
will be implicit. For example::
74
bzr branch --stacked source-url my-dir
77
bzr commit -m "fix bug"
81
Limitations of stacked branches
82
-------------------------------
84
The important thing to remember about a stacked branch is that the
85
stacked-on branch needs to be available for almost all operations. This is
86
not an issue when both branches are local or both branches are on the
added
removed
doc/ru/user-guide/stacked.txt
