← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/mini-tutorial/index.txt

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/mini-tutorial/index.txt
225
225
the parent into your personal branch::
226
226
 
227
227
  $ bzr merge
228
 
  Using saved location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
 
228
  Merging from saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
229
229
  All changes applied successfully.
230
230
            
231
231
Check what has changed::
254
254
Replacing ``mycode.patch``, create your merge directive::
255
255
 
256
256
 $ bzr send -o mycode.patch
257
 
 Using saved location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
 
257
 Using saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
258
258
 
259
259
You can now email the merge directive to the bzr-gtk project who, if
260
260
they choose, can use it merge your work back into the parent branch.