35
38
Introducing yourself
36
39
====================
38
Bazaar records changes to source code, and it records who made the change.
39
The person is identified by their name and email address. (If you're
40
concerned about spam, you don't need to use a real address that you
41
actually read, but the convention is that it looks like an email address.)
41
Before you start working, it is good to tell Bazaar who you are. That
42
way your work is properly identified in revision logs.
43
Before you start working, let's tell Bazaar who you are. Using your name
44
and email address, instead of John Doe's, type::
44
Using your name and email address, instead of John Doe's, type::
46
46
$ bzr whoami "John Doe <john.doe@gmail.com>"
48
You can check what identity is stored in Bazaar's configuration::
48
Bazaar will now create or modify a configuration file, including your
49
name and email address.
51
Now, check that your name and email address are correctly registered::
51
54
John Doe <john.doe@gmail.com>
54
Starting a new project
55
======================
57
Let's suppose we want to store a new project under Bazaar. First, we'll
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.
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"
57
Putting files under version control
58
===================================
60
Let's create a directory and some files to use with Bazaar::
65
$ touch test1.txt test2.txt test3.txt subdirectory/test4.txt
67
**Note for Windows users**: use Windows Explorer to create your
68
directories, then right-click in those directories and select
69
``New file`` to create your files.
71
Now get Bazaar to initialize itself in your project directory::
75
If it looks like nothing happened, don't worry. Bazaar has created a
76
branch_ where it will store your files and their revision histories.
78
.. _branch: http://wiki.bazaar.canonical.com/Branch
80
The next step is to tell Bazaar which files you want to track. Running
81
``bzr add`` will recursively add everything in the project::
88
added subdirectory/test4.txt
90
Next, take a snapshot of your files by committing them to your branch. Add
91
a message to explain why you made the commit::
93
$ bzr commit -m "Initial import"
95
As Bazaar is a distributed version control system, it doesn't need to
96
connect to a central server to make the commit. Instead, Bazaar stores your
97
branch and all its commits inside the directory you're working with; look
98
for the ``.bzr`` sub-directory.
94
101
Making changes to your files
95
102
============================
98
104
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). ::
106
Edit ``test1.txt`` in your favourite editor, then check what have you done::
111
109
=== modified file 'test1.txt'
142
147
software projects. You can use it to publish your branch. (You can
143
148
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
150
If you don't have a Launchpad account, follow the `account signup guide`_
151
and `register an SSH key`_ in your new Launchpad account.
153
.. _account signup guide: https://help.launchpad.net/CreatingYourLaunchpadAccount
154
.. _register an SSH key: https://launchpad.net/people/+me/+editsshkeys
156
Replacing ``john.doe`` with your own Launchpad username, type [#]_::
158
$ bzr push lp:~john.doe/+junk/myproject
160
.. [#] Use of the ``lp:`` URL scheme requires bzr 0.92 or later.
162
**Note**: ``+junk`` means that this branch isn't associated with any particular
163
project in Launchpad.
165
Now, anyone can create their own copy of your branch by typing::
167
$ bzr branch lp:~john.doe/+junk/myproject
169
You can also see information about your branch, including its revision
170
history, at https://code.launchpad.net/people/+me/+junk/myproject
186
175
Creating your own copy of another branch
187
176
========================================
189
178
To work with someone else's code, you can make your own copy of their
190
179
branch. Let's take a real-world example, Bazaar's GTK interface::
192
$ bzr init-repo ~/bzr-gtk
193
$ bzr branch lp:~bzr/bzr-gtk/trunk ~/bzr-gtk/john
181
$ bzr branch lp:~bzr/bzr-gtk/trunk bzr-gtk.john
194
182
Branched 292 revision(s).
196
184
Bazaar will download all the files and complete revision history from the
197
bzr-gtk project's trunk branch and create a copy called ``john``.
185
bzr-gtk project's trunk branch and create a copy called bzr-gtk.john.
199
187
Now, you have your own copy of the branch and can commit changes with
200
188
or without a net connection. You can share your branch at any time by
233
214
Committed revision 295.
217
Merging your work into the parent branch
218
========================================
220
After you've worked on your personal branch of bzr-gtk, you may want to
221
send your changes back upstream to the project. The easiest way is to
222
use a merge directive.
224
A merge directive is a machine-readable request to perform a
225
particular merge. It usually contains a patch preview of the merge
226
and either contains the necessary revisions, or provides a branch
227
where they can be found.
229
Replacing ``mycode.patch``, create your merge directive::
231
$ bzr send -o mycode.patch
232
Using saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
234
You can now email the merge directive to the bzr-gtk project who, if
235
they choose, can use it merge your work back into the parent branch.
added
removed
doc/en/mini-tutorial/index.txt
