57
57
Let's suppose we want to store a new project under Bazaar. First, we'll
58
58
make a *repository directory* to hold all our work related to this
59
project, where developers can create branches to test development of
60
specific features or, more generally, modifications to the working file
63
After creating the repository, change to that directory, and create the
64
project's main trunk branch.
59
project. We can then have multiple branch directories under here, and
60
they'll all store the committed history in the repository.
68
$ bzr init-repo sample
69
Shared repository with trees (format: 2a)
71
shared repository: sample
72
$ bzr init sample/trunk
74
Created a repository tree (format: 2a)
75
Using shared repository: /home/john/sample/
81
Now that we have the trunk, we need to move to that directory and
82
create some example files for the first version of that project. Create
83
a file ``test1.txt`` using a text editor (like emacs, nano, or notepad),
84
and save it. Then we'll "add" the file, which tells bzr we want it to
89
and then commit, which saves a snapshot of all versioned files::
91
bzr commit -m "Added first line of text"
94
70
Making changes to your files
95
71
============================
98
73
Let's change a file and commit that change to your branch.
100
Edit ``test1.txt`` in your favourite editor, then use ``bzr add`` to tell bzr
101
to track changes to this file ::
103
$ echo test test test > test1.txt
107
`bzr diff` shows the changes between the last revision in this branch, and your
108
current tree (or, with the ``-r`` option, between any two trees). ::
75
Edit ``test1.txt`` in your favourite editor, then check what have you done::
111
78
=== modified file 'test1.txt'
127
93
You can see the history of your branch by browsing its log::
96
------------------------------------------------------------
98
committer: John Doe <john.doe@gmail.com>
99
branch nick: myproject
100
timestamp: Mon 2007-10-08 17:56:14 +0000
102
Added first line of text
103
------------------------------------------------------------
131
105
committer: John Doe <john.doe@gmail.com>
106
branch nick: myproject
133
107
timestamp: Mon 2006-10-08 17:46:22 +0000
142
116
software projects. You can use it to publish your branch. (You can
143
117
also publish branches onto your own server or other hosting services.)
145
The steps to publishing branches on Launchpad are:
147
1. Create a Launchpad account: visit the `Launchpad login page`_ and choose to create a new account.
149
.. _Launchpad login page: https://launchpad.net/+login
151
2. Bazaar uses the SSH encryption and authentication protocol to connect
152
to Launchpad. You need to first `create an SSH key`_ on your own computer,
153
by running the command::
157
.. _create an SSH key: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair
159
3. `Upload your SSH public key to Launchpad`_.
161
.. _Upload your SSH public key to Launchpad: https://launchpad.net/~/+editsshkeys
163
4. `Make a team for your project`_. Even if you're starting as the only
164
developer on this project, creating a new one now will let you more
165
easily add other people later.
167
.. _Make a team for your project: https://help.launchpad.net/Teams/CreatingAndRunning
169
5. `Create a project`_.
171
.. _Create a project: https://help.launchpad.net/Projects/Registering
173
6. Tell Bazaar your Launchpad account name. If your account is john.doe, type ::
175
$ bzr launchpad-login john.doe
177
7. `Push the branch for your project`_. Once you've committed your changes
178
locally, you can publish them as the trunk of your new project by saying
180
$ bzr push lp:~sample-developers/sample/trunk
182
(Of course, using the team and project names you just chose.)
184
.. _Push the branch for your project: https://help.launchpad.net/Code/UploadingABranch
119
If you don't have a Launchpad account, follow the `account signup guide`_
120
and `register an SSH key`_ in your new Launchpad account.
122
.. _account signup guide: https://help.launchpad.net/CreatingYourLaunchpadAccount
123
.. _register an SSH key: https://launchpad.net/people/+me/+editsshkeys
125
Replacing ``john.doe`` with your own Launchpad username, type::
127
$ bzr push lp:~john.doe/+junk/myproject
129
**Note**: ``+junk`` is a place to store experimental branches not
130
associated with any particular project. Normally, you should push a
131
project into an existing project, or register a new project through the
134
Now, anyone can create their own copy of your branch by typing::
136
$ bzr branch lp:~john.doe/+junk/myproject
138
You can also see information about your branch, including its revision
139
history, at https://code.launchpad.net/people/+me/+junk/myproject
186
142
Creating your own copy of another branch
187
143
========================================
added
removed
doc/en/mini-tutorial/index.txt
