rewritten Bazaar repository importation

Author: aollier

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

@@ -55,6 +55,7 @@ So in this case you have nothing to do.
 
 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.
 
+
 ===== Project with a single branch
 
 Now `cd` in the directory that contains your Bazaar repository and initialize the Git repository:
@@ -72,48 +73,6 @@ $ 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, the `.git` directory and your working tree are all set up, but the working tree and the index are not synchronized with HEAD:
-
-[source,console]
-----
-$ git status
-On master branch
-Changes that will be validated:
-  (use "git reset HEAD <fichier>..." to unstage)
-
-        removed :        .bzrignore
-        removed :        file.txt
-
-----
-
-This is fixed by typing:
-
-[source,console]
-----
-$ git reset --hard 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:
-[source,console]
-----
-$ git mv .bzrignore .gitignore
-----
-
-Then you have to create a commit that contains this change for the migration:
-[source,console]
-----
-$ git commit -am 'Migration from Bazaar to Git'
-----
-
-That's all!
-Now you can push the repository onto its new home server:
-[source,console]
-----
-$ git remote add origin git@my-git-server:mygitrepository.git
-$ git push origin --all
-$ git push origin --tags
-----
 
 ===== Case of a project with a main branch and a working branch
 
@@ -149,11 +108,38 @@ git fast-import --import-marks=../marks.git --export-marks=../marks.git
 Now `git branch` shows you the `master` branch as well as the `work` branch.
 Check the logs to make sure they’re complete and get rid of the `marks.bzr` and `marks.git` files.
 
-Your working copy is still unsynchronized, so let's reset it:
 
+===== Synchronize the staging area
+
+Whatever the number of branches you had and the import method you used, your staging area is not synchronized with HEAD, and with the import of several branches, your working directory is not synchronized neither.
+This situation is easily solved by the following command:
 [source,console]
 ----
 $ git reset --hard HEAD
 ----
 
+
+===== Ignore the files that were ignored with .bzrignore
+
+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.
+You will also have to create a commit that contains this change for the migration:
+[source,console]
+----
+$ git mv .bzrignore .gitignore
+$ git commit -am 'Migration from Bazaar to Git'
+----
+
+
+===== Send your repository to the server
+
+Here we are!
+Now you can push the repository onto its new home server:
+[source,console]
+----
+$ git remote add origin git@my-git-server:mygitrepository.git
+$ git push origin --all
+$ git push origin --tags
+----
+
 Your Git repository is ready to use.