Modifications done as per Ben's suggestions.

A big thank-you to Jean-Noël Avila for his help.

Author: aollier

book/09-git-and-other-scms/sections/client-bzr.asc

@@ -1,5 +1,12 @@
 ==== Git and Bazaar
 
+Among the DVCS, another famous one is http://bazaar.canonical.com/[Bazaar].
+Bazaar is free and open source, and is part of the http://www.gnu.org/[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`:
@@ -10,15 +17,14 @@ $ chmod +x ~/bin/git-remote-bzr
 ----
 
 You also need to have Bazaar installed.
-
 That's all!
 
 ===== Create a Git repository from a Bazaar repository
 
 It is simple to use.
 It is enough to clone a Bazaar repository prefixing it by `bzr::`.
-If you worked in a local Bazaar repository and pushed to a remote one, it is better to clone the remote.
-That will make your work simpler; else you must go through your local repository and you may have problems when pushing to the remote if your Bazaar and Git repositories were not up-to-date.
+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:
@@ -28,7 +34,8 @@ $ git clone bzr::bzr+ssh://developer@mybazaarserver:myproject myProject-Git
 $ cd myProject-Git
 ----
 
-You should also clean and compact the created Git repository, especially if it is a big one:
+At this point, your Git repository is created but it is not optimized at the point of view of its disk size.
+That's why you should also clean and compact your Git repository, especially if it is a big one:
 [source,console]
 ----
 $ git gc --aggressive
@@ -40,7 +47,7 @@ Bazaar only allows you to clone branches, but a repository may contain several b
 For example, to clone a branch:
 [source,console]
 ----
-$ git config remote-bzr.branches 'trunk, xwindow'
+$ git clone bzr::bzr://bzr.savannah.gnu.org/emacs/trunk emacs-trunk
 ----
 
 And to clone the whole repository:
@@ -67,7 +74,7 @@ $ git fetch
 
 ===== Ignore what is ignored with .bzrignore
 
-As the format of the .bzrignore file is completely compatible with .gitignore's one, and as you shouldn't make a .gitignore file in your repository, it is enough to make a symbolic link to .bzrignore so that the potential changes of .bzrignore are taken into account:
+As the format of the `.bzrignore` file is completely compatible with `.gitignore`'s one, and as you shouldn't make a `.gitignore` file in your repository, it is enough to make a symbolic link to `.bzrignore` so that the potential changes of `.bzrignore` are taken into account:
 [source,console]
 ----
 $ ln -s .bzrignore .git/info/exclude
@@ -84,6 +91,8 @@ $ git pull --rebase origin
 
 ===== Push your work on the remote repository
 
+Because Bazaar supports very well 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:
 [source,console]
@@ -93,10 +102,13 @@ $ git push origin master
 
 ===== Caveats
 
-There are some limitations while pushing to a Bazaar repository.
-Please refer to the README file of the project's Git repository (https://github.com/felipec/git-remote-bzr[]) for more information about this.
+Limitations of the remote-helpers' framework 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)
 
 ===== Summary
 
-As Git and Bazaar are close, you can work in a Git repository and transparently push your work to a Bazaar repository.
-Be careful anyway to the limitations.
+Since Git's and Bazaar's models are similar, there isn't a lot of resistance when working across the boundary.
+As long as you watch out for the limitations, and are always aware that the remote repository isn't natively Git, you'll be fine.

book/09-git-and-other-scms/sections/import-bzr.asc

@@ -1,59 +1,78 @@
 ==== Bazaar
 (((Bazaar)))(((Importing, from Bazaar)))
 
-Bazaar is a distributed source management content like Git.
-It is very easy to convert a Bazaar repository into a Git repository thanks to Bazaar's plugin system.
-To convert a Bazaar repository into a Git repository, you have first to import the bzr-fastimport plugin.
-Here is the whole procedure if you have not yet imported any plugin:
+Bazaar is a DVCS tool much like Git, and as a result it's pretty straightforward to convert a Bazaar repository into a Git one.
+To accomplish this, you'll need to import the `bzr-fastimport` plugin.
+
+
+===== Getting the bzr-fastimport plugin
+
+According to you are using a UNIX-like operating system or Windows, the procedure differs.
+If you are using a UNIX-like operating system, the simplest is to install the `bzr-fastimport` package that will install all the required dependencies.
+
+For example, with Debian and derived, you would do the following:
 [source,console]
 ----
-$ mkdir --parents ~/.bazaar/plugins/bzr # creates the necessary folders for the plugins
-$ cd ~/.bazaar/plugins/bzr
-$ bzr branch lp:bzr-fastimport fastimport # imports the fastimport plugin
-$ cd fastimport
-$ sudo python setup.py install --record=files.txt
+$ sudo apt-get install bzr-fastimport
 ----
 
-There you go!
-You've just installed the fastimport plugin.
-
-
-===== Case of a project with a single branch
+With RHEL, you would do the following:
+[source,console]
+----
+$ sudo yum install bzr-fast-import
+----
 
-Now go in the directory that contains your Bazaar repository and initialize the Git repository:
+With Fedora, since release 22, the new package manager is dnf:
 [source,console]
 ----
-$ cd path/to/the/bzr/repository
-$ git init
+$ sudo dnf install bzr-fastimport
 ----
 
-Now, you can simply export your Bazaar repository and convert it into a Git repository using the following command:
+If the package is not available, you may install it as a plugin:
 [source,console]
 ----
-$ bzr fast-export --plain . | git fast-import
+$ mkdir --parents ~/.bazaar/plugins/bzr     # creates the necessary folders for the plugins
+$ cd ~/.bazaar/plugins/bzr
+$ bzr branch lp:bzr-fastimport fastimport   # imports the fastimport plugin
+$ cd fastimport
+$ sudo python setup.py install --record=files.txt   # installs the plugin
 ----
 
-You may get the following error message:
+For this plugin to work, you'll also need the `fastimport` Python module.
+You can check whether it is present or not and install it with the following commands:
 [source,console]
 ----
-bzr: ERROR: Unable to import library "fastimport": bzr-fastimport requires the fastimport python module
+$ python -c "import fastimport"
+Traceback (most recent call last):
+  File "<string>", line 1, in <module>
+ImportError: No module named fastimport
+$ pip install fastimport
 ----
+If it is not available, you can download it at address https://pypi.python.org/pypi/fastimport/.
+
+With Windows, `bzr-fastimport` is automatically installed with the standalone version and the default installation (let all the checkboxes checked).
+So in this case you have nothing to do.
 
-This message is displayed because the fastimport python module that the `bzr fast-export` command needs is missing.
-Install it from your package manager if you are under GNU/Linux or download it at address https://pypi.python.org/pypi/fastimport/[] if you are under Windows.
-For example, with Fedora, you would do the following:
+At this point, the way to import a Bazaar repository differs according to that you have a single branch or you are working with a repository that has several branches.
 
+===== Case of a project with a single branch
+
+Now `cd` in the directory that contains your Bazaar repository and initialize the Git repository:
 [source,console]
 ----
-$ sudo dnf install python-fastimport
+$ cd /path/to/the/bzr/repository
+$ git init
 ----
 
-Now you can export your Bazaar repository to the Git repository.
+Now, you can simply export your Bazaar repository and convert it into a Git repository using the following command:
+[source,console]
+----
+$ bzr fast-export --plain . | git fast-import
+----
 
 Depending on the size of the project, your Git repository is built in a lapse from a few seconds to a few minutes.
 
-At this point, if you type `git status`, you'll see that the tracked files are now marked as removed for the next commit.
-Here is an example:
+At this point, the `.git` directory and your working tree are all set up, but Git's index isn't synchronised with the working tree:
 [source,console]
 ----
 $ git status
@@ -71,38 +90,20 @@ Untracked files:
         .bzrignore
         file.txt
 ----
-
-You can restore the repository in a correct state very simply with the `git reset` command:
+Type this to fix that:
 [source,console]
 ----
 $ git reset HEAD .
 ----
 
 Now let us have a look at the files to ignore.
-As .bzrignore's format is completely compatible with .gitignore's format, the simplest is to rename your .bzrignore file:
+As `.bzrignore`'s format is completely compatible with `.gitignore`'s format, the simplest is to rename your `.bzrignore` file:
 [source,console]
 ----
 $ git mv .bzrignore .gitignore
 ----
 
-Let us check your repository's status:
-[source,console]
-----
-$ git status
-On master branch
-Changes that will be validated :
-  (use "git reset HEAD <fichier>..." to unstage)
-
-        renamed :         .bzrignore -> .gitignore
-
-Untracked files:
-  (use "git add <fichier>..." to include in what will be validated)
-
-        .bzr/
-
-----
-
-Then you have to create a commit that contains those changes for the migration:
+Then you have to create a commit that contains this change for the migration:
 [source,console]
 ----
 $ git commit -am 'Migration from Bazaar to Git'
@@ -127,7 +128,7 @@ $ ls
 myProject.trunk myProject.work
 ----
 
-Create the Git repository and go into it:
+Create the Git repository and `cd` into it:
 [source,console]
 ----
 $ git init git-repo