1
=== modified file 'doc/developers/container-format.txt'
2
--- doc/developers/container-format.txt	2009-02-22 16:54:02 +0000
3
+++ doc/developers/container-format.txt	2009-12-02 19:15:23 +0000
4
@@ -129,7 +129,7 @@
5
129
------------------
129
------------------
6
130
130
7
131
There is a requirement that each object can be given an arbitrary name.
131
There is a requirement that each object can be given an arbitrary name.
9
132
Some revision control systems address all content by the SHA-1 digest of
132
Some version control systems address all content by the SHA-1 digest of
10
133
that content, but this scheme is unsatisfactory for Bazaar's revision
133
that content, but this scheme is unsatisfactory for Bazaar's revision
11
134
objects.  We can still allow addressing by SHA-1 digest for those content
134
objects.  We can still allow addressing by SHA-1 digest for those content
12
135
types where it makes sense.
135
types where it makes sense.
13
136
136
14
=== modified file 'doc/en/tutorials/centralized_workflow.txt'
15
--- doc/en/tutorials/centralized_workflow.txt	2009-11-03 18:01:09 +0000
16
+++ doc/en/tutorials/centralized_workflow.txt	2009-12-02 19:15:23 +0000
17
@@ -294,7 +294,7 @@
18
294
-----------------
294
-----------------
19
295
295
20
296
Bazaar_ has the concept of a "Shared Repository". This is similar to
296
Bazaar_ has the concept of a "Shared Repository". This is similar to
22
297
the traditional concept of a repository in other RCSs like CVS and
297
the traditional concept of a repository in other VCSs like CVS and
23
298
Subversion. For example, in Subversion you have a remote repository,
298
Subversion. For example, in Subversion you have a remote repository,
24
299
which is where all of the history is stored, and locally you don't
299
which is where all of the history is stored, and locally you don't
25
300
have any history information, only a checkout of the working tree
300
have any history information, only a checkout of the working tree
26
301
301
27
=== modified file 'doc/en/tutorials/tutorial.txt'
28
--- doc/en/tutorials/tutorial.txt	2009-11-19 23:30:19 +0000
29
+++ doc/en/tutorials/tutorial.txt	2009-12-02 19:15:23 +0000
30
@@ -15,14 +15,14 @@
31
15
Introduction
15
Introduction
32
16
============
16
============
33
17
17
35
18
If you are already familiar with decentralized revision control, then
18
If you are already familiar with decentralized version control, then
36
19
please feel free to skip ahead to "Introducing Yourself to Bazaar". If,
19
please feel free to skip ahead to "Introducing Yourself to Bazaar". If,
39
20
on the other hand, you are familiar with revision control but not
20
on the other hand, you are familiar with version control but not
40
21
decentralized revision control, then please start at "How DRCS is
21
decentralized version control, then please start at "How DVCS is
41
22
different." Otherwise, get some coffee or tea, get comfortable and get
22
different." Otherwise, get some coffee or tea, get comfortable and get
42
23
ready to catch up. 
23
ready to catch up. 
43
24
24
45
25
The purpose of revision control
25
The purpose of version control
46
26
===============================
26
===============================
47
27
27
48
28
Odds are that you have worked on some sort of textual data -- the sources
28
Odds are that you have worked on some sort of textual data -- the sources
49
@@ -34,7 +34,7 @@
50
34
important information that you would desperately like to get back. If this
34
important information that you would desperately like to get back. If this
51
35
has ever happened to you, then you are probably ready for Bazaar.
35
has ever happened to you, then you are probably ready for Bazaar.
52
36
36
54
37
Revision control systems (which I'll henceforth call RCS) such as
37
Version control systems (which I'll henceforth call VCS) such as
55
38
Bazaar give you the ability to track changes for a directory by turning
38
Bazaar give you the ability to track changes for a directory by turning
56
39
it into something slightly more complicated than a directory that we call
39
it into something slightly more complicated than a directory that we call
57
40
a **branch**. The branch not only stores how the directory looks right
40
a **branch**. The branch not only stores how the directory looks right
58
@@ -42,7 +42,7 @@
59
42
do something you wish you hadn't, you can restore the directory to the way
42
do something you wish you hadn't, you can restore the directory to the way
60
43
it looked at some point in the past.
43
it looked at some point in the past.
61
44
44
63
45
Revision control systems give users the ability to save changes to a
45
Version control systems give users the ability to save changes to a
64
46
branch by "committing a **revision**". The revision created is essentially
46
branch by "committing a **revision**". The revision created is essentially
65
47
a summary of the changes that were made since the last time the tree was
47
a summary of the changes that were made since the last time the tree was
66
48
saved. 
48
saved. 
67
@@ -55,23 +55,23 @@
68
55
We keep these logs so that if later there is some sort of problem with
55
We keep these logs so that if later there is some sort of problem with
69
56
sftp, we can figure out when the problem probably happened. 
56
sftp, we can figure out when the problem probably happened. 
70
57
57
72
58
How DRCS is different
58
How DVCS is different
73
59
=====================
59
=====================
74
60
60
77
61
Many Revision Control Systems (RCS) are stored on servers. If one wants to
61
Many Version Control Systems (VCS) are stored on servers. If one wants to
78
62
work on the code stored within an RCS, then one needs to connect to the
62
work on the code stored within a VCS, then one needs to connect to the
79
63
server and "checkout" the code. Doing so gives one a directory in which a
63
server and "checkout" the code. Doing so gives one a directory in which a
82
64
person can make changes and then commit. The RCS client then connects to
64
person can make changes and then commit. The VCS client then connects to
83
65
the RCS server and stores the changes. This method is known as the
65
the VCS server and stores the changes. This method is known as the
84
66
centralized model. 
66
centralized model. 
85
67
67
87
68
The centralized model can have some drawbacks. A centralized RCS requires
68
The centralized model can have some drawbacks. A centralized VCS requires
88
69
that one is able to connect to the server whenever one wants to do version
69
that one is able to connect to the server whenever one wants to do version
89
70
control work. This can be a bit of a problem if your server is on some other
70
control work. This can be a bit of a problem if your server is on some other
90
71
machine on the internet and you are not. Or, worse yet, you **are** on the
71
machine on the internet and you are not. Or, worse yet, you **are** on the
91
72
internet but the server is missing!
72
internet but the server is missing!
92
73
73
94
74
Decentralized Revision Control Systems (which I'll call DRCS after this
74
Decentralized Version Control Systems (which I'll call DVCS after this
95
75
point) deal with this problem by keeping branches on the same machine as
75
point) deal with this problem by keeping branches on the same machine as
96
76
the client. In Bazaar's case, the branch is kept in the same place as
76
the client. In Bazaar's case, the branch is kept in the same place as
97
77
the code that is being version controlled. This allows the user to save
77
the code that is being version controlled. This allows the user to save
98
@@ -87,7 +87,7 @@
99
87
as Bazaar. These tools automate the process of storing data by creating
87
as Bazaar. These tools automate the process of storing data by creating
100
88
a **revision** of the directory tree whenever the user asks. 
88
a **revision** of the directory tree whenever the user asks. 
101
89
89
103
90
Revision control software such as Bazaar can do much more than just
90
Version control software such as Bazaar can do much more than just
104
91
storage and performing undo.  For example, with Bazaar a developer can
91
storage and performing undo.  For example, with Bazaar a developer can
105
92
take the modifications in one branch of software and apply them to a
92
take the modifications in one branch of software and apply them to a
106
93
related branch -- even if those changes exist in a branch owned by
93
related branch -- even if those changes exist in a branch owned by
Reviewer	Date Requested	Status
Ian Clatworthy		Approve on 2009-12-03
John A Meinel	2009-12-02	Approve on 2009-12-02
Review via email: mp+15568@code.launchpad.net
1	=== modified file 'doc/developers/container-format.txt'
2	--- doc/developers/container-format.txt 2009-02-22 16:54:02 +0000
3	+++ doc/developers/container-format.txt 2009-12-02 19:15:23 +0000
4	@@ -129,7 +129,7 @@
5	129	------------------	129	------------------
6	130		130
7	131	There is a requirement that each object can be given an arbitrary name.	131	There is a requirement that each object can be given an arbitrary name.
9	132	Some revision control systems address all content by the SHA-1 digest of	132	Some version control systems address all content by the SHA-1 digest of
10	133	that content, but this scheme is unsatisfactory for Bazaar's revision	133	that content, but this scheme is unsatisfactory for Bazaar's revision
11	134	objects. We can still allow addressing by SHA-1 digest for those content	134	objects. We can still allow addressing by SHA-1 digest for those content
12	135	types where it makes sense.	135	types where it makes sense.
13	136		136
14	=== modified file 'doc/en/tutorials/centralized_workflow.txt'
15	--- doc/en/tutorials/centralized_workflow.txt 2009-11-03 18:01:09 +0000
16	+++ doc/en/tutorials/centralized_workflow.txt 2009-12-02 19:15:23 +0000
17	@@ -294,7 +294,7 @@
18	294	-----------------	294	-----------------
19	295		295
20	296	Bazaar_ has the concept of a "Shared Repository". This is similar to	296	Bazaar_ has the concept of a "Shared Repository". This is similar to
22	297	the traditional concept of a repository in other RCSs like CVS and	297	the traditional concept of a repository in other VCSs like CVS and
23	298	Subversion. For example, in Subversion you have a remote repository,	298	Subversion. For example, in Subversion you have a remote repository,
24	299	which is where all of the history is stored, and locally you don't	299	which is where all of the history is stored, and locally you don't
25	300	have any history information, only a checkout of the working tree	300	have any history information, only a checkout of the working tree
26	301		301
27	=== modified file 'doc/en/tutorials/tutorial.txt'
28	--- doc/en/tutorials/tutorial.txt 2009-11-19 23:30:19 +0000
29	+++ doc/en/tutorials/tutorial.txt 2009-12-02 19:15:23 +0000
30	@@ -15,14 +15,14 @@
31	15	Introduction	15	Introduction
32	16	============	16	============
33	17		17
35	18	If you are already familiar with decentralized revision control, then	18	If you are already familiar with decentralized version control, then
36	19	please feel free to skip ahead to "Introducing Yourself to Bazaar". If,	19	please feel free to skip ahead to "Introducing Yourself to Bazaar". If,
39	20	on the other hand, you are familiar with revision control but not	20	on the other hand, you are familiar with version control but not
40	21	decentralized revision control, then please start at "How DRCS is	21	decentralized version control, then please start at "How DVCS is
41	22	different." Otherwise, get some coffee or tea, get comfortable and get	22	different." Otherwise, get some coffee or tea, get comfortable and get
42	23	ready to catch up.	23	ready to catch up.
43	24		24
45	25	The purpose of revision control	25	The purpose of version control
46	26	===============================	26	===============================
47	27		27
48	28	Odds are that you have worked on some sort of textual data -- the sources	28	Odds are that you have worked on some sort of textual data -- the sources
49	@@ -34,7 +34,7 @@
50	34	important information that you would desperately like to get back. If this	34	important information that you would desperately like to get back. If this
51	35	has ever happened to you, then you are probably ready for Bazaar.	35	has ever happened to you, then you are probably ready for Bazaar.
52	36		36
54	37	Revision control systems (which I'll henceforth call RCS) such as	37	Version control systems (which I'll henceforth call VCS) such as
55	38	Bazaar give you the ability to track changes for a directory by turning	38	Bazaar give you the ability to track changes for a directory by turning
56	39	it into something slightly more complicated than a directory that we call	39	it into something slightly more complicated than a directory that we call
57	40	a branch. The branch not only stores how the directory looks right	40	a branch. The branch not only stores how the directory looks right
58	@@ -42,7 +42,7 @@
59	42	do something you wish you hadn't, you can restore the directory to the way	42	do something you wish you hadn't, you can restore the directory to the way
60	43	it looked at some point in the past.	43	it looked at some point in the past.
61	44		44
63	45	Revision control systems give users the ability to save changes to a	45	Version control systems give users the ability to save changes to a
64	46	branch by "committing a revision". The revision created is essentially	46	branch by "committing a revision". The revision created is essentially
65	47	a summary of the changes that were made since the last time the tree was	47	a summary of the changes that were made since the last time the tree was
66	48	saved.	48	saved.
67	@@ -55,23 +55,23 @@
68	55	We keep these logs so that if later there is some sort of problem with	55	We keep these logs so that if later there is some sort of problem with
69	56	sftp, we can figure out when the problem probably happened.	56	sftp, we can figure out when the problem probably happened.
70	57		57
72	58	How DRCS is different	58	How DVCS is different
73	59	=====================	59	=====================
74	60		60
77	61	Many Revision Control Systems (RCS) are stored on servers. If one wants to	61	Many Version Control Systems (VCS) are stored on servers. If one wants to
78	62	work on the code stored within an RCS, then one needs to connect to the	62	work on the code stored within a VCS, then one needs to connect to the
79	63	server and "checkout" the code. Doing so gives one a directory in which a	63	server and "checkout" the code. Doing so gives one a directory in which a
82	64	person can make changes and then commit. The RCS client then connects to	64	person can make changes and then commit. The VCS client then connects to
83	65	the RCS server and stores the changes. This method is known as the	65	the VCS server and stores the changes. This method is known as the
84	66	centralized model.	66	centralized model.
85	67		67
87	68	The centralized model can have some drawbacks. A centralized RCS requires	68	The centralized model can have some drawbacks. A centralized VCS requires
88	69	that one is able to connect to the server whenever one wants to do version	69	that one is able to connect to the server whenever one wants to do version
89	70	control work. This can be a bit of a problem if your server is on some other	70	control work. This can be a bit of a problem if your server is on some other
90	71	machine on the internet and you are not. Or, worse yet, you are on the	71	machine on the internet and you are not. Or, worse yet, you are on the
91	72	internet but the server is missing!	72	internet but the server is missing!
92	73		73
94	74	Decentralized Revision Control Systems (which I'll call DRCS after this	74	Decentralized Version Control Systems (which I'll call DVCS after this
95	75	point) deal with this problem by keeping branches on the same machine as	75	point) deal with this problem by keeping branches on the same machine as
96	76	the client. In Bazaar's case, the branch is kept in the same place as	76	the client. In Bazaar's case, the branch is kept in the same place as
97	77	the code that is being version controlled. This allows the user to save	77	the code that is being version controlled. This allows the user to save
98	@@ -87,7 +87,7 @@
99	87	as Bazaar. These tools automate the process of storing data by creating	87	as Bazaar. These tools automate the process of storing data by creating
100	88	a revision of the directory tree whenever the user asks.	88	a revision of the directory tree whenever the user asks.
101	89		89
103	90	Revision control software such as Bazaar can do much more than just	90	Version control software such as Bazaar can do much more than just
104	91	storage and performing undo. For example, with Bazaar a developer can	91	storage and performing undo. For example, with Bazaar a developer can
105	92	take the modifications in one branch of software and apply them to a	92	take the modifications in one branch of software and apply them to a
106	93	related branch -- even if those changes exist in a branch owned by	93	related branch -- even if those changes exist in a branch owned by