74
74
This creates a new branch at ``my-url`` that is stacked on ``reference-url``
75
75
and only contains the revisions in the current branch that are not already
76
76
in the branch at ``reference-url``. In particular, ``my-url`` and
77
``reference-url`` can be on the same host, and the ``--stacked-on`` option
77
``reference-url`` can be on the same host, and the ``--stacked`` option
78
78
can be used additionally to inform ``push`` to reference the
79
79
revisions in ``reference-url``. For example::
81
bzr push --stacked-on bzr+ssh://host/project bzr+ssh://host/user/stacked-branch
81
bzr push --stacked-on sftp://host/project --stacked sftp://host/user/stacked-branch
83
83
This usage fits the scenario described in the Motivation section.
85
You can also use the ``--stacked`` option without specifying ``--stacked-on``.
86
This will automatically set the *stacked-on* location to the parent branch of
87
the branch you are pushing (or its ``public_location`` if configured). For
90
bzr branch source-url my-dir
93
bzr commit -m "fix bug"
96
You can combine ``bzr branch --stacked`` and ``bzr push --stacked`` to work on a
97
branch without downloading or uploading the whole history::
99
bzr branch --stacked source-url my-dir
102
bzr commit -m "fix bug"
86
.. The following text is hidden because bug 375013 breaks the example.
87
When bug 375013 is fixed, we should unhide this text.
88
- Andrew Bennetts, 10 March 2010
90
.. If the local branch was created as a stacked branch, then you can
91
.. use the ``--stacked`` option to ``push`` and the *stacked-on* location
92
.. will be implicit. For example::
94
.. bzr branch --stacked source-url my-dir
97
.. bzr commit -m "fix bug"
106
101
Limitations of stacked branches
107
102
-------------------------------
109
The important thing to remember about a stacked branch is that the stacked-on
110
branch needs to be accessible for almost all operations. This is not an issue
111
when both branches are local, or when both branches are on the same server and
112
the stacked-on location is a relative path. But clearly a branch hosted on a
113
server with a stacked-on location of ``file:///...`` is not going to work for
114
anyone except the user that originally pushed it. It's a good idea to configure
115
``public_location`` to help prevent that.
104
Currently, you cannot commit to a stacked branch, due to `bug 375013`_.
106
.. _bug 375013: https://bugs.launchpad.net/bzr/+bug/375013
108
The important thing to remember about a stacked branch is that the
109
stacked-on branch needs to be available for almost all operations. This is
110
not an issue when both branches are local or both branches are on the
117
113
Similarly, because most of the history is stored in the stacked-on repository,
118
114
operations like ``bzr log`` can be slower when the stacked-on repository is
119
115
accessed via a network.
121
If a stacked branch is in a format older than 2a, you cannot commit to it due to
124
.. _bug 375013: https://bugs.launchpad.net/bzr/+bug/375013
127
118
Changing branch stacking
128
119
------------------------
added
removed
doc/en/user-guide/stacked.txt
