From 4cdcbe952c6bed98d9c6844d66a249cf48a0876f Mon Sep 17 00:00:00 2001 From: Adrien Ollier Date: Sat, 16 Sep 2023 19:45:13 +0200 Subject: [PATCH 1/2] no longer mention Bazaar following #1901 --- book/01-introduction/sections/about-version-control.asc | 2 +- book/01-introduction/sections/what-is-git.asc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/book/01-introduction/sections/about-version-control.asc b/book/01-introduction/sections/about-version-control.asc index 5db49fb18..182fcedc0 100644 --- a/book/01-introduction/sections/about-version-control.asc +++ b/book/01-introduction/sections/about-version-control.asc @@ -50,7 +50,7 @@ Local VCSs suffer from this same problem -- whenever you have the entire history (((version control,distributed))) This is where Distributed Version Control Systems (DVCSs) step in. -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. +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. 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. Every clone is really a full backup of all the data. diff --git a/book/01-introduction/sections/what-is-git.asc b/book/01-introduction/sections/what-is-git.asc index 8953b9d48..466201b23 100644 --- a/book/01-introduction/sections/what-is-git.asc +++ b/book/01-introduction/sections/what-is-git.asc @@ -10,7 +10,7 @@ Even though Git's user interface is fairly similar to these other VCSs, Git stor The major difference between Git and any other VCS (Subversion and friends included) is the way Git thinks about its data. Conceptually, most other systems store information as a list of file-based changes. -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). +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). .Storing data as changes to a base version of each file image::images/deltas.png[Storing data as changes to a base version of each file] From fae387e53ab03853f12b44faa879f9a71ba88aa3 Mon Sep 17 00:00:00 2001 From: Adrien Ollier Date: Sat, 16 Sep 2023 20:10:23 +0200 Subject: [PATCH 2/2] removed Bazaar (bzr) from status.json --- status.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/status.json b/status.json index 68b368c69..03a8d8307 100644 --- a/status.json +++ b/status.json @@ -85,11 +85,9 @@ }, "09-git-and-other-scms": { "1-git-and-other-scms.asc": 0, - "sections/client-bzr.asc": 0, "sections/client-hg.asc": 0, "sections/client-p4.asc": 0, "sections/client-svn.asc": 0, - "sections/import-bzr.asc": 0, "sections/import-custom.asc": 0, "sections/import-hg.asc": 0, "sections/import-p4.asc": 0,