Skip to content

Commit bcc57ac

Browse files
authored
Merge pull request #1902 from aollier/bzr
no longer mention Bazaar following #1901
2 parents 8bd7c8e + fae387e commit bcc57ac

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

book/01-introduction/sections/about-version-control.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Local VCSs suffer from this same problem -- whenever you have the entire history
5050

5151
(((version control,distributed)))
5252
This is where Distributed Version Control Systems (DVCSs) step in.
53-
In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files; rather, they fully mirror the repository, including its full history.
53+
In a DVCS (such as Git, Mercurial or Darcs), clients don't just check out the latest snapshot of the files; rather, they fully mirror the repository, including its full history.
5454
Thus, if any server dies, and these systems were collaborating via that server, any of the client repositories can be copied back up to the server to restore it.
5555
Every clone is really a full backup of all the data.
5656

book/01-introduction/sections/what-is-git.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Even though Git's user interface is fairly similar to these other VCSs, Git stor
1010

1111
The major difference between Git and any other VCS (Subversion and friends included) is the way Git thinks about its data.
1212
Conceptually, most other systems store information as a list of file-based changes.
13-
These other systems (CVS, Subversion, Perforce, Bazaar, and so on) think of the information they store as a set of files and the changes made to each file over time (this is commonly described as _delta-based_ version control).
13+
These other systems (CVS, Subversion, Perforce, and so on) think of the information they store as a set of files and the changes made to each file over time (this is commonly described as _delta-based_ version control).
1414

1515
.Storing data as changes to a base version of each file
1616
image::images/deltas.png[Storing data as changes to a base version of each file]

status.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,9 @@
8585
},
8686
"09-git-and-other-scms": {
8787
"1-git-and-other-scms.asc": 0,
88-
"sections/client-bzr.asc": 0,
8988
"sections/client-hg.asc": 0,
9089
"sections/client-p4.asc": 0,
9190
"sections/client-svn.asc": 0,
92-
"sections/import-bzr.asc": 0,
9391
"sections/import-custom.asc": 0,
9492
"sections/import-hg.asc": 0,
9593
"sections/import-p4.asc": 0,

0 commit comments

Comments
 (0)