This repository has been archived by the owner on May 4, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
/
migrate-to-git.html
410 lines (273 loc) · 9.25 KB
/
migrate-to-git.html
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
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
<!DOCTYPE html>
<html>
<head>
<title>A New Beginning - Developer's Community of Practice</title>
<meta charset="utf-8">
<!--
H2: Lato, 36px, bold
H3: Lato, 24px, bold
H4: Lato, 22px, bold
H5: Lato, 20px, bold
H6: Lato, 19px, plain text
Body: Noto sans, 20px, plain text
$wbGray: #e1e4e7;
$button-blue: #284162;
$wbGrayLight: #eaebed;
$accent-blue: #335075;
$border-red: #af3c43;
$active-blue: #243850;
$search-gray: #e0e0e0;
$profile-gray: #eaebed;
-->
<style>
@import 'https://fonts.googleapis.com/css?family=Lato|Noto+Sans&display=swap';
body { font-family: 'Noto Sans', sans-serif; font-size: 20px; }
h1 { font-family: 'Lato', sans-serif; border-bottom: 1px solid #af3c43; font-size: 38px; font-weight:bold }
h2 { font-family: 'Lato', sans-serif; font-size: 36px; font-weight: bold }
h3 { font-family: 'Lato', sans-serif; font-size: 24px; font-weight: bold }
.remark-slide-content { background-image: url(./assets/background.jpg); background-size: cover; }
.remark-code, .remark-inline-code { font-family: 'Ubuntu Mono'; }
.whoah { color: #d3080c }
.okay { color: #278400 }
/* .column:first-of-type {float:left}
.column:last-of-type {float:right} */
.column-first :nth-child(n), .column-last :nth-child(n) {margin-top: 0px;}
/* .column img {
max-width:50%;
height: auto;
} */
.split-6040 .column-first {width: 60%; float:left}
.split-6040 .column-last {width: 40%; float:right}
</style>
</head>
<body>
<textarea id="source">
class: middle
# Developer's Community of Practice
## Building blocks towards modern software development.
.right[]
---
class: middle, center
## A new beginning
A new strategy
[https://esdc-devcop.github.io/strategy/](https://esdc-devcop.github.io/strategy/)
.okay[It's not going to be the same!]
Stopping the theoretical changes we want you to make, and show you how to implement **meaningful** changes **today**.
---
class: middle
## What are we talking about?
**Where are we at?**
--
.whoah[Broken manual builds, poorly documented features, not user-focused, complicated intertwined systems]
--
**Where do we need to be?**
--
Cloud-enabled, automated deployments, focused and isolated features
--
**What is practical right now?**
--
.okay[All of it!]
--
**How do we get there?**
--
Small incremental steps.
Breaking out of what we are comfortable with to do what is better.
Collaborating to share what works.
---
class: middle
## A Starting Point
### Platform
Where and how do we develop code?
How do we enable ourselves to be the most effective at achieving our goals?
--
.okay[Move source control to Git]
https://git-scm.com/
---
class: middle
## Why Git?
It's not an arbitrary choice, and it's not one that was looked at lightly.
- Globally accepted standard
- Versatility of being distributed (DVCS)
- Free & Open-Source!!
- Enabling better development practices
- Critical in taking further steps towards modern application development.
- And finally, even Microsoft made the jump!!!
There are tools to help the transition!
---
class: middle
## About Git
Free and open source version control system used for tracking changes in code during development
Similar but at the same time, very different from other version control systems (ex. SVN)
--
Distributed
- every developer’s working copy of code has a full history of all changes
--
Advantages of using Git
- available offline
- efficient
- no single point of failure
???
By far, the most widely used modern version control system in the world today is Git.
Git is a mature, actively maintained open source project originally developed in 2005 by Linus Torvalds, the famous creator of the Linux operating system kernel.
Having a distributed architecture, Git is an example of a DVCS (hence Distributed Version Control System).
Rather than have only one single place for the full version history of the software as is common in once-popular version control systems like CVS or Subversion (also known as SVN).
In Git, every developer's working copy of the code is also a repository that can contain the full history of all changes.
In addition to being distributed, Git has been designed with performance, security and flexibility in mind.
---
class: middle
## About Git
The branching model has been made easy
- Main branches:
- Master
- Develop
- Supporting branches:
- Feature
- Release
- Hotfix
--
Stages of Git
- Working directory
- Staging area
- Git directory
---
class: middle, center
## When can you start migrating to Git?
--
### .okay[Right now!]
---
## Migrating to Git
### How can you do it?
--
#### 1. Add a Git repository to your TFS Team Project.
- TFS supports mixing Git and TFVC repos in the same project.
- Integrated Git support in Visual Studio and Visual Studio Code.
- You will want to learn some basic commands.
???
- Git is the default version control provider in TFS and Azure DevOps.
--
#### 2. "Clone" your TFVC into a local Git repository.
- There's a tool for that! .okay[**git-tfs**]
- Recommended by [Microsoft](https://docs.microsoft.com/en-us/azure/devops/learn/git/migrate-from-tfvc-to-git#advanced-migrations), [GitLab](https://docs.gitlab.com/ee/user/project/import/tfvc.html) and Git-SCM's [Pro Git Book](https://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git#_git_tfs).
- Tool takes a long time to process. (~30 mins for 1 GB TFVC repo)
--
#### 3. Push local Git repo to Git hosting service.
- One basic command: `git push`
---
## Migration Tool
### git-tfs - Sample Run
```cs
# Clone from existing TFS Team Project.
git tfs quick-clone "http://tfs.intra.dmz:8080/tfs/projectcollection" "$/EWS-SWE" .
# Push to remote repository.
git remote add origin "http://tfs.intra.dmz:8080/tfs/projectcollection/EWS-SWE/_git/EWS-SWE-Git"
git push --all origin
```
---
class: middle, center
## How do you deal with the history?
---
## Migrating to Git
### Keep your history in the past!
--
#### Microsoft suggests doing *.okay[tip migrations]*.
- Bring only a snapshot of the most recent version of a branch into Git.
--
#### Why?
- Lossy process, at best.
- Possibly misleading.
- High level of effort involved.
- Relative rarity usage of the history.
--
#### Where *do* you keep the history then?
- In your old TFS Team Project or TFVC repository.
- Refer to your old repositories in your README.md files.
---
class: split-6040, middle, center
.column-first[
"For most development teams, the time spent trying to migrate history is typically better spent on other areas of the migration that have a higher return on investment, especially improving processes. [...] **.whoah[In almost all cases, we recommend the tip migration.]**"
\- Microsoft, [Plan your migration to Git - Migrating history](https://docs.microsoft.com/en-us/azure/devops/learn/git/centralized-to-git#migrating-history)
]
.column-last[
]
---
class: middle, center
## Moving day! But first, *the* choice...
---
## Hosting your Git Repositories
### Pick a hosting service for your version control.
- **TFS or Azure DevOps** - *Status Quo*
- **GCcode** - *New Initiatives/Projects*
- **GitHub** - *End Goal*
???
Git Hosting Services are where your remote repositories will live.
They all provide their own flavour of tools and methodologies around DevOps, Issue Tracking, etc.
---
class: split-6040
## Hosting your Git Repositories
### TFS or Azure DevOps *(Online and On-Premise)*
.column-first[
- Status Quo
- Keep your old toys.
- Work Items
- Build/Release Definitions
- Test Plans
- etc.
- Improved usability with Azure DevOps.
]
--
.column-last[
]
---
class: split-6040
## Hosting your Git Repositories
### GCcode
.column-first[
- Shiny new toys!
- Learning curve
- Work Items > Issues, Issue Boards
- Build/Release Definitions > Pipelines
- Labels
- Merge/Pull Requests (Code Reviews!)
- Branch Policies
- etc.
- Recommended for new initiatives or projects.
- Babystep towards sharing code publicly.
- *.whoah[Keep secrets out of your repos!]*
]
???
*Shiny new toys, compared to existing TFS 2015.
---
## Hosting your Git Repositories
### GitHub - End Goal
- Contributing to Open-Source Software (OSS), not just consuming!
---
class: middle, center
## We are going to help!
### Workshop!
#### .okay[September 17]
All afternoon, we are available for drop-in (online too!).
Bring your laptop to 7C001 and we'll help walk you through the migration to Git.
---
class: middle, center
## Collaboration
We need your collaboration to make this a success.
### GCDevOpsLeague
#### .okay[gcdevopsleague.slack.com]
???
Appeal to join the GCDevOpsLeague
---
class: middle, center
## Questions?
</textarea>
<script src="./remark-latest.min.js" type="text/javascript">
</script>
<script>
var slideshow = remark.create({
ratio: `16:9`,
// Enable or disable counting of incremental slides in the slide counting
countIncrementalSlides: false
});
</script>
</body>
</html>