distributed version control systems
DESCRIPTION
Презентация начального уровня по распределенным системам контроля версий.TRANSCRIPT
![Page 1: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/1.jpg)
Distributed Version Control Systems
Fix that bug NOW!Сделайте это вчера!
© your boss
Сидоров Игорь, ООО «СофТраст»
www.iteamlead.net
![Page 2: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/2.jpg)
Обзор•Что такое DVCS
•Преимущества
•Ветвление/Слияние
•Недостатки
•Hg vs. Git SVN – это не то, что вам нужно
![Page 3: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/3.jpg)
DVCS за 5 минутЦентральный репозиторий
![Page 4: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/4.jpg)
DVCS за 5 минутГибкий рабочий процесс
![Page 5: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/5.jpg)
DVCS за 5 минутРазвертывание
devprod
![Page 6: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/6.jpg)
DVCS за 5 минутИерархия доверия
![Page 7: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/7.jpg)
Работаем offline
![Page 8: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/8.jpg)
У каждого своя полная копия
![Page 9: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/9.jpg)
Это быстро!
![Page 10: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/10.jpg)
Ветвление
feature X
bugfix
release
“trunk”
feature branch
bugfix branch
feature X
![Page 11: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/11.jpg)
Слияние в SVN Merge before commit
update
run tests; no errors
write code
run tests; no errors
update + solve conflicts
run tests; errors
error in merge?
error in commit?
remote local
No commit to revert to!
![Page 12: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/12.jpg)
update + solve conflicts
Слияние в DVCSCommit before merge
update
run tests; no errors
write code
run tests; no errors
make local commit
run tests; errors
error in commit?
remote local
error in merge?
Revert to working
commit and try again
![Page 13: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/13.jpg)
Недостатки
•Потеря простоты модели
•Более, чем один путь сделать одно и тоже
•Нельзя взять часть репозитория
•Надо читать доки :)
![Page 14: Distributed Version Control Systems](https://reader033.vdocuments.site/reader033/viewer/2022052412/558c9672d8b42aeb248b46d2/html5/thumbnails/14.jpg)
Mercurial vs. Git
Who the FUCK cares?Use what YOU like