about summary refs log tree commit diff
path: root/usth/ICT2.7/P1L4 Version Control Subtitles/7 - Example Workflow - lang_en_vs5.srt
blob: c2f58df1812b07b9b6e2cb80e2221549d373fba1 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
1
00:00:00,160 --> 00:00:02,830
Before looking at additional actions, though, I would like to

2
00:00:02,830 --> 00:00:06,770
see what is the basic workflow in a version control system

3
00:00:06,770 --> 00:00:09,370
using the three actions that we just saw. And to

4
00:00:09,370 --> 00:00:11,760
do that I'm going to use two of our friends, Brad

5
00:00:11,760 --> 00:00:14,590
and Janet. So we have Janet here, Brad, and a

6
00:00:14,590 --> 00:00:18,440
VCS that they are using. Now imagine that Janet creates a

7
00:00:18,440 --> 00:00:23,020
file called foo.txt and puts some information in the file.

8
00:00:23,020 --> 00:00:25,250
At that point she might want to add the file to

9
00:00:25,250 --> 00:00:28,340
the repository and to commit it so that her changes

10
00:00:28,340 --> 00:00:31,210
and the file get to the central repository. And when she

11
00:00:31,210 --> 00:00:33,900
adds and commit, that's exactly what will happen, in foo

12
00:00:33,900 --> 00:00:36,870
will be come available here, and will be accessible to the

13
00:00:36,870 --> 00:00:40,330
other users. In this case it'll be accessible to Brad.

14
00:00:40,330 --> 00:00:44,190
If Brett were to run an update command, what will happen

15
00:00:44,190 --> 00:00:47,800
is that the file foo.txt will be copied on the local

16
00:00:47,800 --> 00:00:50,460
work space of Brad and Brad will be able to access

17
00:00:50,460 --> 00:00:52,980
the file. At this point Brad might want to modify

18
00:00:52,980 --> 00:00:57,110
the file, for example add something to this existing file.

19
00:00:57,110 --> 00:00:59,410
After doing that, he also may want to share the

20
00:00:59,410 --> 00:01:02,900
updated file with Janet. To do that, he will commit the

21
00:01:02,900 --> 00:01:06,070
file and the result will be exactly the same of

22
00:01:06,070 --> 00:01:09,470
when Janet committed her file. That the updated file will

23
00:01:09,470 --> 00:01:11,890
be sent to the repository and the repository will store

24
00:01:11,890 --> 00:01:15,570
that information and make it available for other users. So now,

25
00:01:15,570 --> 00:01:18,290
if Janet performs an update, she will get the

26
00:01:18,290 --> 00:01:21,860
new version of foo.txt with the additional information that was

27
00:01:21,860 --> 00:01:24,950
added by Brad. And we will see all of this

28
00:01:24,950 --> 00:01:27,350
in action in our next demo in a few minutes.