Rev 4976: (nmb) Explain bound branches in "branches" help topic in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4976 [merge]
revision-id: pqm at pqm.ubuntu.com-20100120185504-es1x5ntwauunwxvp
parent: pqm at pqm.ubuntu.com-20100120171944-8gkub20gotjcye67
parent: nmb at wartburg.edu-20100120145308-obknuqnfarf1r9v8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-01-20 18:55:04 +0000
message:
  (nmb) Explain bound branches in "branches" help topic
modified:
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2010-01-08 07:34:31 +0000
+++ b/bzrlib/help_topics/__init__.py	2010-01-20 14:53:08 +0000
@@ -520,11 +520,19 @@
 branch history is stored), but multiple branches may share the same
 repository (a shared repository). Branches can be copied and merged.
 
+In addition, one branch may be bound to another one.  Binding to another
+branch indicates that commits which happen in this branch must also 
+happen in the other branch.  Bazaar ensures consistency by not allowing 
+commits when the two branches are out of date.  In order for a commit 
+to succeed, it may be necessary to update the current branch using 
+``bzr update``.
+
 Related commands::
 
   init    Change a directory into a versioned branch.
   branch  Create a new branch that is a copy of an existing branch.
   merge   Perform a three-way merge.
+  bind    Bind a branch to another one.
 """