Rev 6055: (mbp) improvements and corrections to mini-tutorial (Martin Pool) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/

Patch Queue Manager pqm at pqm.ubuntu.com
Tue Oct 18 07:35:55 UTC 2011 

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.4/

------------------------------------------------------------
revno: 6055 [merge]
revision-id: pqm at pqm.ubuntu.com-20111018073555-xk677r8n7cprtvco
parent: pqm at pqm.ubuntu.com-20111014055800-wksh8stpfxuvcvvh
parent: mbp at canonical.com-20111018070914-qm4i1v63k92oacri
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Tue 2011-10-18 07:35:55 +0000
message:
  (mbp) improvements and corrections to mini-tutorial (Martin Pool)
modified:
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt	2011-06-28 16:03:09 +0000
+++ b/doc/en/mini-tutorial/index.txt	2011-10-18 07:09:14 +0000
@@ -61,10 +61,14 @@
 
 ::
 
-  bzr init-repo sample
-  cd sample
-  bzr init trunk
-  cd trunk
+  $ bzr init-repo sample
+  Shared repository with trees (format: 2a)
+  Location:
+    shared repository: sample
+  $ bzr init sample/trunk
+  $ cd sample/trunk
+  Created a repository tree (format: 2a)                                         
+  Using shared repository: /home/john/sample/
 
 
 Making changes to your files
@@ -72,7 +76,15 @@
 
 Let's change a file and commit that change to your branch.
 
-Edit ``test1.txt`` in your favourite editor, then check what have you done::
+Edit ``test1.txt`` in your favourite editor, then use ``bzr add`` to tell bzr
+to track changes to this file ::
+
+  $ echo test test test > test1.txt 
+  $ bzr add test1.txt
+  adding test1.txt
+
+`bzr diff` shows the changes between the last revision in this branch, and your
+current tree (or, with the ``-r`` option, between any two trees). ::
 
  $ bzr diff
  === modified file 'test1.txt'
@@ -84,8 +96,9 @@
 Commit your work to the Bazaar branch::
 
   $ bzr commit -m "Added first line of text"
-  Committed revision 2.
-
+  Committing to: /home/john/sample/trunk/                             
+  added test1.txt
+  Committed revision 1.
 
 Viewing the revision log
 ========================
@@ -93,17 +106,9 @@
 You can see the history of your branch by browsing its log::
 
   $ bzr log
-  ------------------------------------------------------------
-  revno: 2
-  committer: John Doe <john.doe at gmail.com>
-  branch nick: myproject
-  timestamp: Mon 2007-10-08 17:56:14 +0000
-  message:
-    Added first line of text
-  ------------------------------------------------------------
   revno: 1
   committer: John Doe <john.doe at gmail.com>
-  branch nick: myproject
+  branch nick: trunk
   timestamp: Mon 2006-10-08 17:46:22 +0000
   message:
     Initial import
@@ -116,28 +121,46 @@
 software projects. You can use it to publish your branch.  (You can 
 also publish branches onto your own server or other hosting services.)
 
-If you don't have a Launchpad account, follow the `account signup guide`_
-and `register an SSH key`_ in your new Launchpad account.
-
-.. _account signup guide: https://help.launchpad.net/CreatingYourLaunchpadAccount
-.. _register an SSH key: https://launchpad.net/people/+me/+editsshkeys
-
-Replacing ``john.doe`` with your own Launchpad username, type::
-
- $ bzr push lp:~john.doe/+junk/myproject
-
-**Note**: ``+junk`` is a place to store experimental branches not
-associated with any particular project.  Normally, you should push a
-project into an existing project, or register a new project through the
-web interface.
-
-Now, anyone can create their own copy of your branch by typing::
-
- $ bzr branch lp:~john.doe/+junk/myproject
-
-You can also see information about your branch, including its revision
-history, at https://code.launchpad.net/people/+me/+junk/myproject
-
+The steps to publishing branches on Launchpad are:
+
+1. Create a Launchpad account: visit the `Launchpad login page`_ and choose to create a new account.
+    
+.. _Launchpad login page: https://launchpad.net/+login
+    
+2. Bazaar uses the SSH encryption and authentication protocol to connect
+   to Launchpad.  You need to first `create an SSH key`_ on your own computer,
+   by running the command::
+    
+       $ ssh-keygen
+
+.. _create an SSH key: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair    
+       
+3. `Upload your SSH public key to Launchpad`_.
+ 
+.. _Upload your SSH public key to Launchpad: https://launchpad.net/~/+editsshkeys
+    
+4. `Make a team for your project`_.  Even if you're starting as the only
+   developer on this project, creating a new now will let you more easily 
+   add other people later.
+ 
+.. _Make a team for your project: https://help.launchpad.net/Teams/CreatingAndRunning
+      
+5. `Create a project`_.
+  
+.. _Create a project: https://help.launchpad.net/Projects/Registering
+
+6. Tell Bazaar your Launchpad account name.  If your account is john.doe, type ::
+  
+      $ bzr launchpad-login john.doe
+
+7. `Push the branch for your project`_.  Once you've committed your changes 
+   locally, you can publish them as the trunk of your new project by saying
+    
+       $ bzr push lp:~sample-developers/sample/trunk
+       
+   (Of course, using the team and project names you just chose.)
+ 
+.. _Push the branch for your project: https://help.launchpad.net/Code/UploadingABranch
 
 Creating your own copy of another branch
 ========================================

More information about the bazaar-commits mailing list