/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/centralized_workflow.txt

  • Committer: John Arbash Meinel
  • Date: 2006-09-09 14:04:50 UTC
  • mto: This revision was merged to the branch mainline in revision 1994.
  • Revision ID: john@arbash-meinel.com-20060909140450-787dc70dce713090
Adding a footnote to help understand nesting

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/centralized_workflow.txt
179
179
We now have a place to make any fixes to doodles that we need. And we
180
180
won't interrupt people who are working on other parts of the code.
181
181
Because we have a checkout, any commits made in the ``doodle-fixes/`` will
182
 
also show up on ``centralhost``.
 
182
also show up on ``centralhost``. [#nestedbranches_]
183
183
It is also completely possible to have 2 developers collaborate on one of
184
184
these branches, just like they would have collaborated on the ``dev``
185
185
branch.[#cbranch]_
193
193
   Configuring ``cbranch`` is outside the scope of this document, but the
194
194
   final commands look like ``bzr cbranch dev my-feature-branch``
195
195
 
 
196
.. [#nestedbranches] It may look odd to have a branch in a subdirectory of
 
197
   another branch. However, this is just fine, and you can think of it as
 
198
   a heirarchial namespace. Where the nested branch is derived from the
 
199
   outer branch.
 
200
 
196
201
.. _bzrtools: https://launchpad.net/products/bzrtools
197
202
 
198
203