Skip to content

Commit 95fdbbf

Browse files
committed
minor modifications
1 parent 4900cd4 commit 95fdbbf

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ $ git clone bzr::bzr+ssh://developer@mybazaarserver:myproject myProject-Git
3434
$ cd myProject-Git
3535
----
3636

37-
At this point, your Git repository is created but it is not optimized at the point of view of its disk size.
37+
At this point, your Git repository is created but it is not compacted for optimal disk use.
3838
That's why you should also clean and compact your Git repository, especially if it is a big one:
3939
[source,console]
4040
----
@@ -91,7 +91,7 @@ $ git pull --rebase origin
9191

9292
===== Push your work on the remote repository
9393

94-
Because Bazaar supports very well merge commits, there will be no problem if you push a merge commit.
94+
Because Bazaar also has the concept of merge commits, there will be no problem if you push a merge commit.
9595
So you can work on a branch, merge the changes into `master` and push your work.
9696
Then, you create your branches, you test and commit your work as usual.
9797
You finally push your work to the Bazaar repository:
@@ -102,7 +102,8 @@ $ git push origin master
102102

103103
===== Caveats
104104

105-
Limitations of the remote-helpers' framework apply. In particular, these commands don't work:
105+
Git's remote-helpers framework has some limitations that apply.
106+
In particular, these commands don't work:
106107

107108
* git push origin :branch-to-delete (Bazaar can't accept ref deletions in this way.)
108109
* git push origin old:new (it will push 'old')

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ To accomplish this, you'll need to import the `bzr-fastimport` plugin.
77

88
===== Getting the bzr-fastimport plugin
99

10-
According to you are using a UNIX-like operating system or Windows, the procedure differs.
11-
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.
10+
The procedure for installing the fastimport plugin is different on UNIX-like operating systems and on Windows.
11+
In the first case, the simplest is to install the `bzr-fastimport` package that will install all the required dependencies.
1212

1313
For example, with Debian and derived, you would do the following:
1414
[source,console]
@@ -50,12 +50,12 @@ $ pip install fastimport
5050
----
5151
If it is not available, you can download it at address https://pypi.python.org/pypi/fastimport/.
5252

53-
With Windows, `bzr-fastimport` is automatically installed with the standalone version and the default installation (let all the checkboxes checked).
53+
In the second case (on Windows), `bzr-fastimport` is automatically installed with the standalone version and the default installation (let all the checkboxes checked).
5454
So in this case you have nothing to do.
5555

5656
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.
5757

58-
===== Case of a project with a single branch
58+
===== Project with a single branch
5959

6060
Now `cd` in the directory that contains your Bazaar repository and initialize the Git repository:
6161
[source,console]

0 commit comments

Comments
 (0)