Version Control System (a portmanteau of the Control the System the Version, the VCS.) - This code storage. Like a dropbox , for developers only!
It is geared specifically towards product development. That is, for storing code, synchronizing the work of several people, creating releases (branches) ... But let me tell you better with an example why it is better than a dropbox. Everything is as always, a story with a bunch of pictures for clarity))
And then I'll tell you more about how VCS works - what it means to "create a repository", "commit and merge changes", and other scary words. In the end, we will touch one of the VCS systems with our hands, download the code from the open repository.
Total content:
What is it and why is it needed
-
Popular VCS and the differences between them
Example - downloading a project from Git
-
What is it and why is it needed
, Java ( ). — , . , :
;
— ;
— , , .
, . , . — . !
, . :
Main.java —
GUI.java —
!
, — , ! , . (Sum.java), ( GUI.java) Main.java.
-, , ... — ! — ! . ( — Minus.java), Main.java GUI.java.
, , .
, . , .
— , ??
— , ! . !
:
— ? !
. , , : Main.java GUI.java. — .
. , . , .
, , . Sum.java, .
! , . Main.java GUI.java, . , , .
( — , -):
— ?
— , , ! . , 9 . . 9 , , .
— , !
, ! . , ... .
, . , - ! , .
, . :
— !!! !
, :
— ??
. , , , . , . .
. , , . , .
— ! , ?
— , ...
:
— ! :
, .
- — «» , - .
, — , .
. .
:
— ... , , . !
:
— . , Dropbox, ?
. , . . . , , , .
:
— ?
— . , !
:
— , Main.java, . ... ! 100 ... .
— , , , .
— , !
. :
— ?
— , !
— ?
— ??? !
— .
— . - Main.java. :
— , .
— , , !
— , .
— ? , ...
— , ? ...
, . - . !
— , , - , ? « »?
— . . AraxisMerge, !
— , ! IDEA ( Ctrl + C ). !
— !
— . :
— , ! , ! . , !
— ? ?
— . SVN, . ?
— !
. ! , . ? !
VCS
, .
1.
, . . .
SVN. , , . , «» .
, VCS . , — , .
! ! .
2.
. , , , , -!
, , . , . Mercurial ( VCS) — clone. , — () , , !
, . -.
, — .
, .
1. ,
, . - ?
, , Main.java GUI.java. , . !
SVN «update», Mercurial — «pull». . , . - — . - , .
— clone? , ! ?
. , - . , . , .
, «» . , . , .
— . 5 1000, ?
2.
. , . , ( — , . refactor), Main.java.
() , . . — VCS, .
1 — commit
— SVN.
, . «commit» — . .
2 — commit + push
— Mercurial, Git.
, . «commit» — . !
, «». «push».
, , . , code freeze . . , , !
. , , . =) .
, :
— .
:
— .
. — , !
3. (merge)
, — . , 3 Main.java Gui.java.
Minus.java, , .
. , . :
Percent.java
Main.java ( 3)
Gui.java ( 3)
:
Percent.java — 1
Main.java — 4
Gui.java — 4
. :
Division.java
Main.java ( 3, )
Gui.java ( 3)
, ! :
Division.java — 1
Main.java — 4
Gui.java — 4
, , ! !
, «merge». , , Main.java Gui.java , . . «» — 4 .
, ? . , . :
, — ,
, — ,
—
— . , , . — .
, , . , -. . , , , — ? ?
— , . , ant gradle, . , .
, 200 , .
? . , .
, , . , . . merge , !
4. ()
. , . ? :
— ? ?
— . , .
:
— , , ? !
:
— !
:
— ?
:
— — . , trunk-, .
- , « » — , .
— 1 .
— 2.
VCS , :
1
1 2 — , ,
, 2 .
— 3.
— , . , . (branch . — ). trunk-.
, , - . ( , . branch, trunk, )
trunk. branch, , - .
!
— , ! ? ! , 2. !
— . , « ». , . , ( ).
, , 3, . , . 30 .
, — , . ! , :
3
( , )
=
33 ()
- . ? , ? ? ?
! - , . , , , .
— . branch (trunk). , , merge, !
- — . + .
. , — 1, 2... 52...
, , , . , =) ( ):
!
— , ?
— , . , Mercurial «hg sum»: , . :
D:\vcs_project\test>hg sum
parent: 3:66a91205d385 tip
Try to fix bug with device
branch: default
«parent» — . . , ? . 3. , ID .
, . «Try to fix bug with device».
, , «branch»! default — . trunk-. , . . .
— ! !
*****
Git «», , — https://learngitbranching.js.org
*****
, — VCS. — , . .
( . Version Control System, VCS) — dropbox .
VCS
— :
SVN — ,
Mercurial ( HG), Git — ( )
SVN — , . — . ! . , . , , .
Mercurial Git — . — , push. , , , . . .
« ». , . , , , , , ... .
. . «» — Tortoise<VCS>. TortoiseSVN, TortoiseHG, TortoiseGit... — IDEA, Eclipse, etc.
? , Tortoise «-», .
:
API — , .
VCS:
|
SVN |
GIT |
HG |
|
svn checkout <> <> |
git clone <> <> |
hg clone <> <> |
|
svn update |
git pull |
hg pull -u |
( ?) |
svn log --revision HEAD |
git show -s |
hg sum |
|
svn commit -m "MESSAGE" |
git commit -a -m "MESSAGE"
|
hg commit -m "MESSAGE"
|
branch |
svn checkout <> <> |
git checkout BRANCH |
hg update BRANCH |
, , . , , =)
— Git
Folks. !
Git. , . 3 ( , ):
IDEA
TortoiseGit
D:\git.
1.
1. git:
2. :
git clone
↓
git clone https://bitbucket.org/testbasecode/folks/src/master/ D:\\git\\folks_console
. !
« » . .
2. IDEA
1. IDEA
2. Check out from Version Control → Git
3. :
URL — https://bitbucket.org/testbasecode/folks/src/master/ ( )
— D:\git\folks_idea ( )
4. Clone — ! IDEA !
, !
, «Project» ( ) , :
— , ! , . .
3. TortoiseGit
— , «» (tortoise):
1. TortoiseGit
2. → , , : Git Clone, Git Create repository here, TortoiseGit
3. , . , D:\git.
4. → Git Clone
:
URL — https://bitbucket.org/testbasecode/folks/src/master/ ( )
Directory — D:\git\folks_tortoise_git ( )
5. «»
! - — !
3 ! , , :
SVN, Mercurial, Git, VCS — . , . ! =) .
. «TODO ». , . , , .
. , . , , . , , . .
, . , !
. , VCS , . , «» — .
, . . . VCS Tortoise Hg.
=) — 1 .
, , — . , !
PPS: the author of the pictures for this article is Anya Chernomortseva , the author of the style is Victoria Lapis =)