Among the DVCS, another famous one is Bazaar. Bazaar is free and open source, and is part of the GNU Project. It behaves very differently from Git. Sometimes, to do the same thing as with Git, you have to use a different keyword, and some keywords that are common don’t have the same meaning. In particular, the branch management is very different and may cause confusion, especially when someone comes from Git’s universe. Nevertheless, it is possible to work on a Bazaar repository from a Git one.
There are many projects that allow you to use Git as a Bazaar client.
Here we’ll use Felipe Contreras' project that you may find at https://github.com/felipec/git-remote-bzr.
To install it, you just have to download the file git-remote-bzr in a folder contained in your $PATH
:
$ wget https://raw.github.com/felipec/git-remote-bzr/master/git-remote-bzr -O ~/bin/git-remote-bzr
$ chmod +x ~/bin/git-remote-bzr
You also need to have Bazaar installed. That’s all!
It is simple to use.
It is enough to clone a Bazaar repository prefixing it by bzr::
.
Since Git and Bazaar both do full clones to your machine, it’s possible to attach a Git clone to your local Bazaar clone, but it isn’t recommended.
It’s much easier to attach your Git clone directly to the same place your Bazaar clone is attached to ‒ the central repository.
Let’s suppose that you worked with a remote repository which is at address bzr+ssh://developer@mybazaarserver:myproject
.
Then you must clone it in the following way:
$ git clone bzr::bzr+ssh://developer@mybazaarserver:myproject myProject-Git
$ cd myProject-Git
At this point, your Git repository is created but it is not compacted for optimal disk use. That’s why you should also clean and compact your Git repository, especially if it is a big one:
$ git gc --aggressive
Bazaar only allows you to clone branches, but a repository may contain several branches, and git-remote-bzr
can clone both.
For example, to clone a branch:
$ git clone bzr::bzr://bzr.savannah.gnu.org/emacs/trunk emacs-trunk
And to clone the whole repository:
$ git clone bzr::bzr://bzr.savannah.gnu.org/emacs emacs
The second command clones all the branches contained in the emacs repository; nevertheless, it is possible to point out some branches:
$ git config remote-bzr.branches 'trunk, xwindow'
Some remote repositories don’t allow you to list their branches, in which case you have to manually specify them, and even though you could specify the configuration in the cloning command, you may find this easier:
$ git init emacs
$ git remote add origin bzr::bzr://bzr.savannah.gnu.org/emacs
$ git config remote-bzr.branches 'trunk, xwindow'
$ git fetch
Since you are working on a project managed with Bazaar, you shouldn’t create a .gitignore
file because you may accidentally set it under version control and the other people working with Bazaar would be disturbed.
The solution is to create the .git/info/exclude
file either as a symbolic link or as a regular file.
We’ll see later on how to solve this question.
Bazaar uses the same model as Git to ignore files, but also has two features which don’t have an equivalent into Git. The complete description may be found in the documentation. The two features are:
-
"!!" allows you to ignore certain file patterns even if they’re specified using a "!" rule.
-
"RE:" at the beginning of a line allows you to specify a Python regular expression (Git only allows shell globs).
As a consequence, there are two different situations to consider:
-
If the
.bzrignore
file does not contain any of these two specific prefixes, then you can simply make a symbolic link to it in the repository:ln -s .bzrignore .git/info/exclude
-
Otherwise, you must create the
.git/info/exclude
file and adapt it to ignore exactly the same files in.bzrignore
.
Whatever the case is, you will have to remain vigilant against any change of .bzrignore
to make sure that the .git/info/exclude
file always reflects .bzrignore
.
Indeed, if the .bzrignore
file were to change and contained one or more lines starting with "!!" or "RE:", Git not being able to interpret these lines, you’ll have to adapt your .git/info/exclude
file to ignore the same files as the ones ignored with .bzrignore
.
Moreover, if the .git/info/exclude
file was a symbolic link, you’ll have to first delete the symbolic link, copy .bzrignore
to .git/info/exclude
and then adapt the latter.
However, be careful with its creation because with Git it is impossible to re-include a file if a parent directory of that file is excluded.
To fetch the changes of the remote, you pull changes as usually, using Git commands.
Supposing that your changes are on the master
branch, you merge or rebase your work on the origin/master
branch:
$ git pull --rebase origin
Because Bazaar also has the concept of merge commits, there will be no problem if you push a merge commit.
So you can work on a branch, merge the changes into master
and push your work.
Then, you create your branches, you test and commit your work as usual.
You finally push your work to the Bazaar repository:
$ git push origin master
Git’s remote-helpers framework has some limitations that apply. In particular, these commands don’t work:
-
git push origin :branch-to-delete (Bazaar can’t accept ref deletions in this way.)
-
git push origin old:new (it will push 'old')
-
git push --dry-run origin branch (it will push)