How to work with bazaar on the command line: Difference between revisions

From OpenPetra Wiki
Jump to navigation Jump to search
(Replaced content with "We are not using Bazaar anymore, but Git.")
Tag: Replaced
 
(22 intermediate revisions by 3 users not shown)
Line 1: Line 1:
= Alternative: use the GUI for bazaar =
We are not using Bazaar anymore, but Git.
If the command line is not your prefered way of doing things, please see [[How to work with bazaar through the GUI on Windows]]
 
= Setup your environment =
 
Install bazaar.
 
Set your E-Mail address:
bzr whoami "John Doe <john.doe@gmail.com>"
 
Create a directory where you want to store all bazaar checkout you are using with openpetra, e.g. C:\openpetra\bzr. Especially when using Windows 7 it is recommended to create a local directory (e.g. on C:) and not one on the network as otherwise compiling with NAnt can give problems.Compiling from a network drive gave the following error on Windows 7:
System.Security.SecurityException: Request for the permission of type 'System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.0.0, ... failed
 
Go into this directory and create a shared repository for holding all branches you checkout:
C:\openpetra\bzr>bzr init-repo --no-trees ./
Shared repository (format: 2a)
Location:
  shared repository: .
C:\openpetra\bzr>
 
== Configure your account on Launchpad ==
You only need to do this once!
# First get an account on Launchpad, which is a service provided by the company Canonical, who develop Ubuntu and Bazaar: https://login.launchpad.net/+new_account
# Create a public and private key on launchpad. This is explained [https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair here]. It is quite important to execute pageant and to load the private key into pageant.
# In your bazaar, you need to tell your launchpad username: <code>bzr launchpad-login LAUNCHPADUSERID</code>
 
== Line Ending issues ==
To avoid problems with the line endings, and the code generators, on Windows create the file <code>C:\Documents and Settings\''My User''\Application Data\bazaar\2.0\rules</code> (on Windows 7: <code>C:\Users\''My User''\AppData\Roaming\bazaar\2.0\rules</code>) and on Linux <code>$BZR_HOME/.bazaar/rules</code> with this content:
<pre>
[name *.cs]
eol = native
[name *.csproj]
eol = native
[name *.sln]
eol = native
[name *.yaml]
eol = native
[name *.xml]
eol = native
[name *.config]
eol = native
[name *.build]
eol = native
[name *.js]
eol = native
[name *.html]
eol = native
[name *.htm]
eol = native
[name *.sql]
eol = native
</pre>
See also http://doc.bazaar.canonical.com/development/en/user-reference/eol-help.html
 
= Create a working branch =
Go into your shared rep directory created above, and type:
bzr branch lp:openpetraorg lp:~LAUNCHPADUSERID/openpetraorg/mytest20111115
 
This will create a branch on Launchpad based on the trunk of openpetraorg (lp:openpetraorg), that is associated with the openpetraorg project.
 
You could also create branches that are unrelated to the openpetraorg project: eg. lp:~tpokorra/+junk/BRANCHNAME
 
Our naming convention for branches is to use dev_0000<Mantis Issue number>_<keywords to describe the issue>. So for example it could be: dev_0000167_import_cc_hierarchy
 
= Get files =
On the website https://code.launchpad.net/openpetraorg you could see the history of all active branches.
 
Now you could checkout a branch:
 
In the shared repo from above, e.g. C:\openpetra\bzr:
bzr checkout lp:~tpokorra/openpetraorg/mytest20111115
 
= See changed files =
bzr status
 
= Graphical Interface =
 
Call the explorer in directory of the branch you are interested in:
bzr explorer ./
 
 
= Branches =
 
See all branches in OpenPetra:
bzr branches bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/
Alternatively, you can go to [http://bzr.openpetra.org:8008/openpetra/ this] website, which might well be faster as the commandline command is rather slow.
 
Add a new branch (the directory, where the command is executed, is not relevant):
bzr branch bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/trunk bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/dev_id_whatever
 
Our naming convention for branches is to use dev_0000<Mantis Issue number>_<keywords to describe the issue>.
 
Afterwards you need to checkout it out with the command described above (Get files)
 
For info about your branch, execute in the directory of your checkout:
bzr info
 
You can branch on a specific revision by using the -r parameter, eg.
bzr branch bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/trunk -r1026.1.4 bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/rel_0.2.6
== Rebase branch / Merge from trunk ==
 
For this commands you need to be in the directory, where the checkout files are in.
 
For the first rebase of the branch, you need to add the info, from where to merge:
bzr merge bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/trunk
This information you see on the operation
bzr info
 
For the next rebase merges, following command is working:
bzr merge
 
Checkin the changes:
bzr commit --fixes op:<Mantis Tracker id of the bug that was fixed in this commit>
 
== Update a branch with the newest info from remote ==
Needed for the getting the newest changes for trunk or for branches, where more than one person is working on:
bzr update
 
 
== Resolve conflicts during merge or update ==
 
http://doc.bazaar.canonical.com/bzr.2.2/en/user-reference/conflict-types-help.html and http://doc.bazaar.canonical.com/bzr.2.2/en/user-guide/resolving_conflicts.html include an overview about problems, which could arise and how they are fixed.
 
The command
bzr conflicts
shows all conflicts, the command
bzr resolve
marks conflicts as resolved.
 
== Merge to trunk ==
# Checkout or update the trunk branch
# Go to the directory of the trunk
# Merge in the branch:
#:  bzr merge bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/dev_id_whatever
# Resolve conflicts
# bzr commit
 
== Drop a branch ==
Sometimes a branch has been created by mistake and should be deleted/removed.
bzr rmbranch bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/my_wrong_branch
 
= Back out a commit =
 
Backing out a commit is done by merging. First, you should identify the revision number, e.g. 284.
Then you are able to undo the commit by merging the difference between 284 and 283:
bzr merge -r 284..283 ./
bzr commit

Latest revision as of 04:35, 16 March 2023

We are not using Bazaar anymore, but Git.

Retrieved from ‘https://wiki.openpetra.org/index.php?title=How_to_work_with_bazaar_on_the_command_line&oldid=4928’