Skip to content

Commit d6cee70

Browse files
committed
rewording as per Ben's recommendation
1 parent 209d2a5 commit d6cee70

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,12 @@ Bazaar uses the same model as Git to ignore files, but also has two features whi
8282
The complete description may be found in http://doc.bazaar.canonical.com/bzr.2.7/en/user-reference/ignore-help.html[the documentation].
8383
The two features are:
8484

85-
1. "!!" at the beginning of a character string takes prevail on "!" at the beginning of the string, which allows to ignore some files that would have been included with "!"
86-
2. character strings starting with "RE:".
87-
What follows "RE:" is a http://doc.bazaar.canonical.com/bzr.2.7/en/user-reference/patterns-help.html[regular expression].
88-
Git does not allow the use of regular expressions, only shell globs.
85+
1. "!!" allows you to ignore certain file patterns even if they're specified using a "!" rule.
86+
2. "RE:" at the beginning of a line allows you to specify a https://docs.python.org/3/library/re.html[Python regular expression] (Git only allows shell globs).
8987

9088
As a consequence, there are two different situations to consider:
9189

92-
1. 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.
90+
1. 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`
9391
2. Otherwise, you must create the `.git/info/exclude` file and adapt it to ignore exactly the same files in `.bzrignore`.
9492

9593
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`.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ $ git reset --hard HEAD
130130

131131
Now let's have a look at the files to ignore.
132132
The first thing to do is to rename `.bzrignore` into `.gitignore`.
133-
Moreover, if the `.bzrignore` file contains one or several lines starting with "!!" or "RE:", you'll have to modify it and perhaps create several `.gitignore` files in order to ignore exactly the same files that `.bzrignore` allowed.
133+
If the `.bzrignore` file contains one or several lines starting with "!!" or "RE:", you'll have to modify it and perhaps create several `.gitignore` files in order to ignore exactly the same files that Bazaar was ignoring.
134134

135135
Finally, you will have to create a commit that contains this modification for the migration:
136136

0 commit comments

Comments
 (0)