← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/tutorials/centralized_workflow.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-08-17 08:47:32 UTC
  • mfrom: (5377.2.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100817084732-nqa09at3c7h0wb7u
(spiv) Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859,
        #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/tutorials/centralized_workflow.txt
21
21
in sync.  This workflow is also applicable to a single developer working
22
22
on several different machines.
23
23
 
24
 
.. _Bazaar: http://bazaar-vcs.org
 
24
.. _Bazaar: http://bazaar.canonical.com
25
25
 
26
26
 
27
27
Initial Setup
100
100
document. See `Tracking Upstream`_ for some possibilities (section
101
101
"Converting and keeping history").
102
102
 
103
 
.. _Tracking Upstream: http://bazaar-vcs.org/TrackingUpstream
 
103
.. _Tracking Upstream: http://wiki.bazaar.canonical.com/TrackingUpstream
104
104
 
105
105
..
106
106
   XXX: We really need a different document for discussing conversion of a
231
231
 
232
232
   % bzr cbranch dev my-feature-branch
233
233
 
234
 
.. _bzrtools: http://bazaar-vcs.org/BzrTools
 
234
.. _bzrtools: http://wiki.bazaar.canonical.com/BzrTools
235
235
 
236
236
 
237
237
Merging changes back