Rev 4829: (andrew) Update 'Using stacked branches' to reflect bug 375013 in file:///home/pqm/archives/thelove/bzr/2.1/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Mar 11 07:01:11 GMT 2010


At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4829 [merge]
revision-id: pqm at pqm.ubuntu.com-20100311070110-v411mlalodo74y19
parent: pqm at pqm.ubuntu.com-20100311060911-mj3s4u43a2jmb6fl
parent: andrew.bennetts at canonical.com-20100311062921-5iv3ioxeuas6pn36
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Thu 2010-03-11 07:01:10 +0000
message:
  (andrew) Update 'Using stacked branches' to reflect bug 375013
  	(cannot commit to stacked branch).
modified:
  doc/en/user-guide/stacked.txt  stacked.txt-20080711023247-4uh9oovoka0sze8b-1
=== modified file 'doc/en/user-guide/stacked.txt'
--- a/doc/en/user-guide/stacked.txt	2009-12-02 20:34:07 +0000
+++ b/doc/en/user-guide/stacked.txt	2010-03-11 06:29:21 +0000
@@ -65,25 +65,38 @@
 and only contains the revisions in the current branch that are not already
 in the branch at ``reference-url``.
 
-If the local branch was created as a stacked branch, then you can
-use the ``--stacked`` option to ``push`` and the *stacked-on* location
-will be implicit. For example::
-
-  bzr branch --stacked source-url my-dir
-  cd my-dir
-  (hack, hack, hack)
-  bzr commit -m "fix bug"
-  bzr push --stacked
+
+.. The following text is hidden because bug 375013 breaks the example.
+   When bug 375013 is fixed, we should unhide this text.
+      - Andrew Bennetts, 10 March 2010
+
+.. If the local branch was created as a stacked branch, then you can
+.. use the ``--stacked`` option to ``push`` and the *stacked-on* location
+.. will be implicit. For example::
+.. 
+..   bzr branch --stacked source-url my-dir
+..   cd my-dir
+..   (hack, hack, hack)
+..   bzr commit -m "fix bug"
+..   bzr push --stacked
 
 
 Limitations of stacked branches
 -------------------------------
 
+Currently, you cannot commit to a stacked branch, due to `bug 375013`_.
+
+.. _bug 375013: https://bugs.launchpad.net/bzr/+bug/375013
+
 The important thing to remember about a stacked branch is that the
 stacked-on branch needs to be available for almost all operations. This is
 not an issue when both branches are local or both branches are on the
 same server.
 
+Similarly, because most of the history is stored in the stacked-on repository,
+operations like ``bzr log`` can be slower when the stacked-on repository is
+accessed via a network.
+
 
 Changing branch stacking
 ------------------------




More information about the bazaar-commits mailing list