All geek questions in one place

Svn and git version version difference

I would like to know what is the difference between the version approaches suggested by git (or other DVCS) and disruptive (or other CVCS).

Here is what I found at http://www.xsteve.at/prg/vc_svn/svn.txt on this subject:

Subversion manages the trees with the version as first-order objects (the repository is an array of trees), and changes are things that (by comparing neighboring trees). Systems such as Arch or Bitkeeper are built the other way around: they are designed to manage changeets as first-order objects (the repository is a bag of patches), and trees are produced by compiling patches.

But it is unclear how the subversion repository is stored, whether it contains the oldest version of the version file, and so on. Why couldn't we create a bunch of patches, for example, in the case of git? It is always mentioned as a fundamental difference between svn and git, which simplifies / complicates merges, but, unfortunately, I still do not understand.

+3
source share
3 answers

There is a good explanation of the main differences between VCS based on changesets and snapshots in the Martin blog . I will not repeat here.

, . VCS, , , , Subversion, .

VCS ( , git), . DAG (Directized acyclic graph), , -. node , , .

Subversion " " - . 1.4 , , , . 1.5 , , .. (svn: mergeinfo), , . , . , , . , , , .

+6

Git . , " " , .

, , , . Git tree/commit . , ​​ .

, , , Git, , . , , , -style diffs . Git , . , , CVS, --. RCA.

, , , Git SVN , , CVS.

+4

. , :

:

CVCS= C
DVCS= D istributed ( Git)

REPOSITORY= , , . :

./Project1/README
./Project1/myprogram.c
./Project1/Makefile
./Project1/images/1.gif
./Project1/images/2.gif

:

() , .

:

  • , (.. ),
  • ,
  • (.. , ).

.

:

, , , .

, .

:

  • ,
  • , , , .

, . ( git , , .)

I simplified this to focus on the main differences between centralized and distributed. (Now I admit that I am still studying how the changes you requested are actually recorded and I hope to update this as soon as I fully understand this.)

Link: This is a more complete article.

0
source

Source: https://habr.com/ru/post/1731111/

More articles:


All Articles