1
=== modified file 'doc/en/mini-tutorial/index.txt'
2
--- doc/en/mini-tutorial/index.txt	2011-06-28 16:03:09 +0000
3
+++ doc/en/mini-tutorial/index.txt	2011-07-01 22:03:32 +0000
4
@@ -56,8 +56,12 @@
5
56
56
6
57
Let's suppose we want to store a new project under Bazaar.  First, we'll
57
Let's suppose we want to store a new project under Bazaar.  First, we'll
7
58
make a *repository directory* to hold all our work related to this
58
make a *repository directory* to hold all our work related to this
10
59
project.  We can then have multiple branch directories under here, and
59
project, where developers can create branches to test development of
11
60
they'll all store the committed history in the repository.
60
specific features or, more generally, modifications to the working file
12
61
set.  
13
62
14
63
After creating the repository, change to that directory, and create the
15
64
project's main trunk branch.
16
61
65
17
62
::
66
::
18
63
67
19
@@ -67,9 +71,26 @@
20
67
  cd trunk
71
  cd trunk
21
68
72
22
69
73
23
74
Adding files
24
75
============
25
76
26
77
Now that we have the trunk, we need to move to that directory and
27
78
create some example files for the first version of that project.  Create
28
79
a file ``test1.txt`` using a text editor (like emacs, nano, or notepad),
29
80
and save it.  Then we'll "add" the file, which tells bzr we want it to
30
81
track changes::
31
82
32
83
  bzr add test1.txt
33
84
34
85
and then commit, which saves a snapshot of all versioned files::
35
86
36
87
  bzr commit -m "Added first line of text"
37
88
38
89
39
70
Making changes to your files
90
Making changes to your files
40
71
============================
91
============================
41
72
92
42
93
43
73
Let's change a file and commit that change to your branch.
94
Let's change a file and commit that change to your branch.
44
74
95
45
75
Edit ``test1.txt`` in your favourite editor, then check what have you done::
96
Edit ``test1.txt`` in your favourite editor, then check what have you done::
46
76
97
47
=== modified file 'doc/en/whats-new/whats-new-in-2.4.txt'
48
--- doc/en/whats-new/whats-new-in-2.4.txt	2011-06-22 16:04:52 +0000
49
+++ doc/en/whats-new/whats-new-in-2.4.txt	2011-07-01 22:03:32 +0000
50
@@ -1,6 +1,6 @@
54
1
*************************
1
***********************************
55
2
What's New in Bazaar 2.4?
2
What's New in Bazaar 2.4 (Oronsay)?
56
3
*************************
3
***********************************
57
4
4
58
5
Bazaar 2.4 is still under development, and will be released in August 2011.
5
Bazaar 2.4 is still under development, and will be released in August 2011.
59
6
This document accumulates a high level summary of what's changed.  See the
6
This document accumulates a high level summary of what's changed.  See the
Reviewer	Review Type	Date Requested	Status
bzr-core		2011-07-01	Pending
Review via email: mp+66592@code.launchpad.net
1	=== modified file 'doc/en/mini-tutorial/index.txt'
2	--- doc/en/mini-tutorial/index.txt 2011-06-28 16:03:09 +0000
3	+++ doc/en/mini-tutorial/index.txt 2011-07-01 22:03:32 +0000
4	@@ -56,8 +56,12 @@
5	56		56
6	57	Let's suppose we want to store a new project under Bazaar. First, we'll	57	Let's suppose we want to store a new project under Bazaar. First, we'll
7	58	make a repository directory to hold all our work related to this	58	make a repository directory to hold all our work related to this
10	59	project. We can then have multiple branch directories under here, and	59	project, where developers can create branches to test development of
11	60	they'll all store the committed history in the repository.	60	specific features or, more generally, modifications to the working file
12			61	set.
13			62
14			63	After creating the repository, change to that directory, and create the
15			64	project's main trunk branch.
16	61		65
17	62	::	66	::
18	63		67
19	@@ -67,9 +71,26 @@
20	67	cd trunk	71	cd trunk
21	68		72
22	69		73
23			74	Adding files
24			75	============
25			76
26			77	Now that we have the trunk, we need to move to that directory and
27			78	create some example files for the first version of that project. Create
28			79	a file ``test1.txt`` using a text editor (like emacs, nano, or notepad),
29			80	and save it. Then we'll "add" the file, which tells bzr we want it to
30			81	track changes::
31			82
32			83	bzr add test1.txt
33			84
34			85	and then commit, which saves a snapshot of all versioned files::
35			86
36			87	bzr commit -m "Added first line of text"
37			88
38			89
39	70	Making changes to your files	90	Making changes to your files
40	71	============================	91	============================
41	72		92
42			93
43	73	Let's change a file and commit that change to your branch.	94	Let's change a file and commit that change to your branch.
44	74		95
45	75	Edit ``test1.txt`` in your favourite editor, then check what have you done::	96	Edit ``test1.txt`` in your favourite editor, then check what have you done::
46	76		97
47	=== modified file 'doc/en/whats-new/whats-new-in-2.4.txt'
48	--- doc/en/whats-new/whats-new-in-2.4.txt 2011-06-22 16:04:52 +0000
49	+++ doc/en/whats-new/whats-new-in-2.4.txt 2011-07-01 22:03:32 +0000
50	@@ -1,6 +1,6 @@
54	1	*************************	1	***********************************
55	2	What's New in Bazaar 2.4?	2	What's New in Bazaar 2.4 (Oronsay)?
56	3	*************************	3	***********************************
57	4		4
58	5	Bazaar 2.4 is still under development, and will be released in August 2011.	5	Bazaar 2.4 is still under development, and will be released in August 2011.
59	6	This document accumulates a high level summary of what's changed. See the	6	This document accumulates a high level summary of what's changed. See the