-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathDrupalGItWorkshop.mm
196 lines (194 loc) · 13.6 KB
/
DrupalGItWorkshop.mm
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
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
<map version="0.9.0">
<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
<node TEXT="Drupal GIt workshop" ID="ID_661121537" CREATED="1288560786821" MODIFIED="1288560808460">
<hook NAME="MapStyle" max_node_width="600"/>
<node TEXT="Agenda" POSITION="right" ID="ID_1436335499" CREATED="1288560815398" MODIFIED="1288560818541">
<node TEXT="Intro to VC and DVC" ID="ID_1942432645" CREATED="1288560820277" MODIFIED="1288560831310">
<node TEXT="VC" ID="ID_1413946970" CREATED="1288670142514" MODIFIED="1288670145029">
<node TEXT="Uses" ID="ID_925012081" CREATED="1288670146070" MODIFIED="1288670154736">
<node TEXT="Revert changes" ID="ID_1977764895" CREATED="1288670155726" MODIFIED="1288670178938"/>
<node TEXT="Change tracking" ID="ID_52341159" CREATED="1288670216668" MODIFIED="1288670226204"/>
<node TEXT="Support multiple changes" ID="ID_184926628" CREATED="1288670179438" MODIFIED="1288670194369"/>
<node TEXT="Forensic analysis" ID="ID_1588460029" CREATED="1288670195585" MODIFIED="1288670208656"/>
<node TEXT="Audit" ID="ID_928516657" CREATED="1288670209098" MODIFIED="1288670212694"/>
<node TEXT="Backup" ID="ID_1905530143" CREATED="1288670227752" MODIFIED="1288670231699">
<node TEXT="Not what VC is meant for" ID="ID_999305137" CREATED="1288671437551" MODIFIED="1288672937142"/>
<node TEXT="Depends on your workflow if this works" ID="ID_1049678393" CREATED="1288672910842" MODIFIED="1288672920827"/>
</node>
</node>
<node TEXT="Core concepts" ID="ID_1417469339" CREATED="1288670275097" MODIFIED="1288670281292">
<node TEXT="Version" ID="ID_96714878" CREATED="1288670282471" MODIFIED="1288670286228">
<node TEXT="Usually numeric" ID="ID_1362657764" CREATED="1288672473019" MODIFIED="1288672481311"/>
<node TEXT="Used to differencete one change from it's ancerters and succorros" ID="ID_842550666" CREATED="1288672481923" MODIFIED="1288672510094"/>
<node TEXT="In previous tools versions are specific to an item" ID="ID_307934678" CREATED="1288672510673" MODIFIED="1288672541160"/>
<node TEXT="Modern tools use a unique version for the each commit" ID="ID_1756070636" CREATED="1288672541631" MODIFIED="1288672590304">
<node TEXT="A version will refer ALL items in the repo" ID="ID_325844602" CREATED="1288672591223" MODIFIED="1288672604089"/>
</node>
<node TEXT="Many tools use version numbers to represent branches as well" ID="ID_139441174" CREATED="1288672609066" MODIFIED="1288672624490">
<node TEXT="e.g." ID="ID_1117916939" CREATED="1288672632485" MODIFIED="1288672635473">
<node TEXT="1.0" ID="ID_16646286" CREATED="1288672636680" MODIFIED="1288672638592">
<node TEXT="1st change on master" ID="ID_205131909" CREATED="1288672648072" MODIFIED="1288672655795"/>
</node>
<node TEXT="2.0" ID="ID_419235974" CREATED="1288672639365" MODIFIED="1288672641905">
<node TEXT="2nd change on master" ID="ID_1413547467" CREATED="1288672658297" MODIFIED="1288672663881"/>
<node TEXT="2.1.1" ID="ID_493811581" CREATED="1288672665984" MODIFIED="1288672671964">
<node TEXT="1st change on 1st branch of 2nd revision of master" ID="ID_602000259" CREATED="1288672673344" MODIFIED="1288672699446"/>
</node>
<node TEXT="2.1.2" ID="ID_319179695" CREATED="1288672704541" MODIFIED="1288672714229">
<node TEXT="2.1.2.1.1" ID="ID_1577811711" CREATED="1288672720191" MODIFIED="1288672725772"/>
<node TEXT="2.1.2.1.2" ID="ID_1530262581" CREATED="1288672983549" MODIFIED="1288672990980"/>
</node>
<node TEXT="2.1.3" ID="ID_1112600949" CREATED="1288672714893" MODIFIED="1288672717774"/>
</node>
</node>
<node TEXT="It's confusing" ID="ID_1070382572" CREATED="1288672756313" MODIFIED="1288672759780"/>
<node TEXT="Common error is to only add 1 .dot level on branch -- needs 2" ID="ID_1752767535" CREATED="1288672760361" MODIFIED="1288672782412"/>
<node TEXT="New tools use a different name space for revisons and branches" ID="ID_687033811" CREATED="1288672811444" MODIFIED="1288672827986">
<node TEXT="But tow commits on a repo will never have same number, even on different branches" ID="ID_1019920655" CREATED="1288672861602" MODIFIED="1288672885117"/>
</node>
</node>
</node>
<node TEXT="Tag" ID="ID_995171484" CREATED="1288670286764" MODIFIED="1288670288179"/>
<node TEXT="Branch" ID="ID_1610875586" CREATED="1288670288729" MODIFIED="1288670318280"/>
<node TEXT="Log" ID="ID_651830115" CREATED="1288670319110" MODIFIED="1288670320431"/>
<node TEXT="File locks" ID="ID_237073489" CREATED="1288670321064" MODIFIED="1288670333327"/>
<node TEXT="Work area and repo" ID="ID_1240345513" CREATED="1288670333838" MODIFIED="1288670343659"/>
<node TEXT="Commit bit" ID="ID_524996621" CREATED="1288670437769" MODIFIED="1288670441092"/>
</node>
</node>
<node TEXT="Git as DVCS" ID="ID_1267564116" CREATED="1288670349587" MODIFIED="1288670548370">
<node TEXT="Every work area has a repo" ID="ID_1402500117" CREATED="1288670365561" MODIFIED="1288670598349"/>
<node TEXT="Every developer has commit bit" ID="ID_1972110879" CREATED="1288670422318" MODIFIED="1288670433458"/>
<node TEXT="All repos are equal" ID="ID_1939812556" CREATED="1288670454719" MODIFIED="1288670467438">
<node TEXT="Logical hiercachies are important" ID="ID_223362968" CREATED="1288670490984" MODIFIED="1288670511344"/>
</node>
<node TEXT="Peer to peer sync" ID="ID_817746018" CREATED="1288670468126" MODIFIED="1288670477914"/>
<node TEXT="Cheap branching and merging" ID="ID_1189077423" CREATED="1288670517969" MODIFIED="1288670527397"/>
</node>
</node>
<node TEXT="Intro to Git" ID="ID_985219735" CREATED="1288561094561" MODIFIED="1288561103620">
<node TEXT="git config" ID="ID_725398523" CREATED="1288669971260" MODIFIED="1288670750351">
<node TEXT="name" ID="ID_141415182" CREATED="1288670107769" MODIFIED="1288670111876"/>
<node TEXT="email" ID="ID_737540353" CREATED="1288670112400" MODIFIED="1288670114127"/>
<node TEXT="crlf" ID="ID_644407364" CREATED="1288670115074" MODIFIED="1288670117793"/>
</node>
<node TEXT="git init" ID="ID_1327369962" CREATED="1288669980597" MODIFIED="1288669983301">
<node TEXT="ls -A" ID="ID_329974290" CREATED="1288669986306" MODIFIED="1288670102868" VSHIFT="7">
<node TEXT="GIt uses file based DB" ID="ID_1423470005" CREATED="1288669994168" MODIFIED="1288670003140"/>
<node TEXT="highly efficient and reliable" ID="ID_918063566" CREATED="1288670003665" MODIFIED="1288670843551"/>
</node>
<node TEXT="bare" ID="ID_1427145484" CREATED="1289027082482" MODIFIED="1289027093977"/>
</node>
<node TEXT="git status" ID="ID_1764018599" CREATED="1288670020162" MODIFIED="1288670023822"/>
<node TEXT="git add ." ID="ID_979448209" CREATED="1288670024494" MODIFIED="1288670030449">
<node TEXT="The git Index" ID="ID_852618275" CREATED="1288670031723" MODIFIED="1288670036516"/>
</node>
<node TEXT="the ,gitignore file" ID="ID_603681114" CREATED="1288670754648" MODIFIED="1288670761181"/>
<node TEXT="git commit" ID="ID_66352789" CREATED="1288670066264" MODIFIED="1288670744504"/>
<node TEXT="git log" ID="ID_1869770650" CREATED="1288670045483" MODIFIED="1288670734879"/>
<node TEXT="git branch" ID="ID_681958116" CREATED="1288670626318" MODIFIED="1288670631780"/>
<node TEXT="git merge" ID="ID_825065302" CREATED="1288670636830" MODIFIED="1288670652169"/>
<node TEXT="git rebase" ID="ID_1765825072" CREATED="1288670642023" MODIFIED="1288670645156"/>
</node>
<node TEXT="Practice local workflow" ID="ID_888976168" CREATED="1288560846397" MODIFIED="1288560863896">
<node TEXT="Init/add/commit" ID="ID_965249850" CREATED="1288560969874" MODIFIED="1288671498985"/>
<node TEXT="branch" ID="ID_288081197" CREATED="1288560972892" MODIFIED="1288560976252"/>
<node TEXT="hack hack" ID="ID_1429238214" CREATED="1288671656600" MODIFIED="1288671659615"/>
<node TEXT="add + commit" ID="ID_1039136593" CREATED="1288560976827" MODIFIED="1288560984598"/>
<node TEXT="Merge" ID="ID_859244184" CREATED="1288560985173" MODIFIED="1288560988272"/>
<node TEXT="rebase" ID="ID_172527232" CREATED="1288560995822" MODIFIED="1288561074492"/>
</node>
<node TEXT="Intro to GitHub" ID="ID_1838772659" CREATED="1288560865528" MODIFIED="1288560877658">
<node TEXT="Git networking concepts" ID="ID_1443246479" CREATED="1288671009440" MODIFIED="1288671054989">
<node TEXT="ssh" ID="ID_1946614372" CREATED="1288671060603" MODIFIED="1288671062405"/>
<node TEXT="https" ID="ID_615953491" CREATED="1288671062950" MODIFIED="1288671064856"/>
<node TEXT="git pull" ID="ID_1991882427" CREATED="1288670954884" MODIFIED="1288670959909"/>
<node TEXT="git sync" ID="ID_1042471747" CREATED="1288671106111" MODIFIED="1288671109199"/>
<node TEXT="git push" ID="ID_555669957" CREATED="1288670960553" MODIFIED="1288670963938"/>
</node>
<node TEXT="Other hosting options" ID="ID_573160906" CREATED="1288671125425" MODIFIED="1288671131191">
<node TEXT="Gitorious" ID="ID_1479237412" CREATED="1288671134252" MODIFIED="1288671138149"/>
<node TEXT="Your own" ID="ID_783593318" CREATED="1288671138605" MODIFIED="1288671141879"/>
<node TEXT="Google" ID="ID_820388774" CREATED="1288671142669" MODIFIED="1288671147884"/>
<node TEXT="sf.net" ID="ID_1748090372" CREATED="1288671148982" MODIFIED="1288671165922"/>
</node>
<node TEXT="Web Interface" ID="ID_1692583558" CREATED="1288561225484" MODIFIED="1288561233923"/>
<node TEXT="Workflow" ID="ID_188792841" CREATED="1288561234380" MODIFIED="1288561242296">
<node TEXT="Fork a project" ID="ID_337202145" CREATED="1288671169710" MODIFIED="1288671188042"/>
<node TEXT="git clone" ID="ID_1942291687" CREATED="1288671188634" MODIFIED="1288671210884"/>
<node TEXT="git remote add upstream" ID="ID_1077067981" CREATED="1288671253845" MODIFIED="1288671601681"/>
<node TEXT="git branch" ID="ID_711935613" CREATED="1288671211487" MODIFIED="1288671225137"/>
<node TEXT="hack hack" ID="ID_1668366316" CREATED="1288671226009" MODIFIED="1288671645707"/>
<node TEXT="git push" ID="ID_1828022260" CREATED="1288671232051" MODIFIED="1288671234226"/>
<node TEXT="pull request" ID="ID_330968752" CREATED="1288671234869" MODIFIED="1288671241561"/>
</node>
</node>
<node TEXT="Practice GitHub workflow" ID="ID_135638705" CREATED="1288560878138" MODIFIED="1288670987208"/>
</node>
<node TEXT="Details" POSITION="left" ID="ID_1141082185" CREATED="1288672047729" MODIFIED="1288672052078">
<node TEXT="Objectives" ID="ID_230170987" CREATED="1288679995790" MODIFIED="1288680000903">
<node TEXT="Understand basic DVC principles and terminology" ID="ID_1649109084" CREATED="1288680015202" MODIFIED="1288680038442"/>
<node TEXT="Practise some git commands" ID="ID_1488115748" CREATED="1288680038965" MODIFIED="1288680114032"/>
<node TEXT="Understand distributed git workflow using GitHub" ID="ID_1736021848" CREATED="1288680055686" MODIFIED="1288680097878"/>
</node>
<node ID="ID_625783686" CREATED="1288672056577" MODIFIED="1288696201043">
<richcontent TYPE="NODE">
<html>
<head>
</head>
<body>
<p>
Publicity Works<br/>139 Queensberry St<br/>Carlton South VIC 3053
</p>
</body>
</html></richcontent>
</node>
<node TEXT="18:00 - 20:00 9/Nov/2010" ID="ID_371929750" CREATED="1288560810063" MODIFIED="1288696257275"/>
<node TEXT="Website" ID="ID_316645109" CREATED="1288672063807" MODIFIED="1288672066089"/>
</node>
<node TEXT="Pre-req" POSITION="left" ID="ID_1567558208" CREATED="1288560916241" MODIFIED="1288560921719">
<node TEXT="Git installed" ID="ID_528851800" CREATED="1288560922719" MODIFIED="1288560925914"/>
<node TEXT="Git Hub account" ID="ID_1545969844" CREATED="1288560926701" MODIFIED="1288560957496">
<node TEXT="ssh key installed" ID="ID_885049030" CREATED="1288560959279" MODIFIED="1288560965911"/>
</node>
</node>
<node POSITION="left" ID="ID_1040900496" CREATED="1288561245163" MODIFIED="1288561265735">
<richcontent TYPE="NODE">
<html>
<head>
</head>
<body>
<p>
Resources and
</p>
<p>
further reading
</p>
</body>
</html></richcontent>
</node>
<node TEXT="Excluded topics" POSITION="left" ID="ID_1561825952" CREATED="1288670766347" MODIFIED="1288670771411">
<node TEXT=".git/config" ID="ID_886685158" CREATED="1288670772543" MODIFIED="1288670794685"/>
<node TEXT="Git patch support" ID="ID_1774917183" CREATED="1288670797224" MODIFIED="1288670816973"/>
<node TEXT="Server setup" ID="ID_272113829" CREATED="1289027061722" MODIFIED="1289027065693"/>
</node>
<node TEXT="TODO" POSITION="left" ID="ID_1971386873" CREATED="1288561545785" MODIFIED="1288561549728">
<node TEXT="Find a website to post" ID="ID_639065755" CREATED="1288561550739" MODIFIED="1288561557813"/>
<node TEXT="Update demo scripts" ID="ID_1819898198" CREATED="1288561558366" MODIFIED="1288561576309"/>
<node TEXT="Add resources" ID="ID_626719475" CREATED="1288561577391" MODIFIED="1288561581899"/>
<node TEXT="Get practice exercise" ID="ID_857654159" CREATED="1288561590745" MODIFIED="1288561600347"/>
</node>
<node TEXT="Sound bites" POSITION="left" ID="ID_1069694335" CREATED="1288671681891" MODIFIED="1288671689094">
<node TEXT="The key to succesful git use is the same as TDD" ID="ID_937805810" CREATED="1288671690132" MODIFIED="1288671710760">
<node TEXT="1) Understand what is going on" ID="ID_350955118" CREATED="1288671712031" MODIFIED="1288671722023"/>
<node TEXT="2) Reduce to a trivial process" ID="ID_1114889168" CREATED="1288671722455" MODIFIED="1288671736184"/>
<node TEXT="3) Follow the process without to much thinking" ID="ID_567855646" CREATED="1288671736628" MODIFIED="1288671862946"/>
<node TEXT="4) But sometimes you need to fix problems outside the box" ID="ID_1690630113" CREATED="1288671748141" MODIFIED="1288671764390"/>
</node>
<node TEXT="Git is like a swiss army knife with REALLY sharp blades" ID="ID_917013409" CREATED="1288671774031" MODIFIED="1288671807935">
<node TEXT="1) It's easy to cut yourself" ID="ID_1191654718" CREATED="1288671808836" MODIFIED="1288671815036"/>
<node TEXT="2) There is a build in kit to patch yourself up" ID="ID_229800785" CREATED="1288671815432" MODIFIED="1288671837607"/>
</node>
</node>
</node>
</map>