Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e7bfd4ae
Commit
e7bfd4ae
authored
Sep 06, 2017
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make clear changeset vs snapshot method. Also typos.
parent
0a835fbc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
doc/user/project/import/cvs.md
doc/user/project/import/cvs.md
+6
-7
No files found.
doc/user/project/import/cvs.md
View file @
e7bfd4ae
...
@@ -7,7 +7,7 @@ control system similar to [SVN](svn.md).
...
@@ -7,7 +7,7 @@ control system similar to [SVN](svn.md).
The following list illustrates the main differences between CVS and Git:
The following list illustrates the main differences between CVS and Git:
-
**Git is distributed
**
while
CVS is centralized using a client-server
-
**Git is distributed
.**
On the other hand,
CVS is centralized using a client-server
architecture. This translates to Git having a more flexible workflow since
architecture. This translates to Git having a more flexible workflow since
your working area is a copy of the entire repository. This decreases the
your working area is a copy of the entire repository. This decreases the
overhead when switching branches or merging for example, since you don't have
overhead when switching branches or merging for example, since you don't have
...
@@ -17,17 +17,16 @@ The following list illustrates the main differences between CVS and Git:
...
@@ -17,17 +17,16 @@ The following list illustrates the main differences between CVS and Git:
whole, or they fail without any changes. In CVS, commits (and other operations)
whole, or they fail without any changes. In CVS, commits (and other operations)
are not atomic. If an operation on the repository is interrupted in the middle,
are not atomic. If an operation on the repository is interrupted in the middle,
the repository can be left in an inconsistent state.
the repository can be left in an inconsistent state.
-
**Changesets.**
Changes in CVS are per file, while changes (commits) in Git
-
**Storage method.**
Changes in CVS are per file (changeset), while in Git
they always refer to the whole project. One of the consequences of this is that
a committed file(s) is stored in its entirety (snapshot). That means that's
it is very easy in Git to revert (create a change that undoes) or undo a whole
very easy in Git to revert or undo a whole change.
change.
-
**Revision IDs.**
The fact that in CVS changes are per files, the revision ID
-
**Revision IDs.**
The fact that in CVS changes are per files, the revision ID
is depicted by version numbers, for example
`1.4`
reflects how many time a
is depicted by version numbers, for example
`1.4`
reflects how many time a
given file has been changed. In Git, each version of a project as a whole
given file has been changed. In Git, each version of a project as a whole
(each commit) has its unique name given by SHA-1.
(each commit) has its unique name given by SHA-1.
-
**Merge tracking.**
Git uses a commit-before-merge approach rather than
-
**Merge tracking.**
Git uses a commit-before-merge approach rather than
merge-before-commit (or update-then-commit) like CVS. If while you were
merge-before-commit (or update-then-commit) like CVS. If while you were
preparing to create a new commit (new revision) somebody
other
created a
preparing to create a new commit (new revision) somebody created a
new commit on the same branch and pushed to the central repository, CVS would
new commit on the same branch and pushed to the central repository, CVS would
force you to first update your working directory and resolve conflicts before
force you to first update your working directory and resolve conflicts before
allowing you to commit. This is not the case with Git. You first commit, save
allowing you to commit. This is not the case with Git. You first commit, save
...
@@ -51,7 +50,7 @@ with (`git bisect` for one) which makes for a more productive workflow.
...
@@ -51,7 +50,7 @@ with (`git bisect` for one) which makes for a more productive workflow.
Migrating to Git/GitLab there is:
Migrating to Git/GitLab there is:
-
**Shorter learning curve**
, Git has a big community and a vast number of
-
**Shorter learning curve**
, Git has a big community and a vast number of
tutorials to get you started.
tutorials to get you started
(see our
[
Git topic
](
../../../topics/git/index.md
)
)
.
-
**Integration with modern tools**
, migrating to Git and GitLab you can have
-
**Integration with modern tools**
, migrating to Git and GitLab you can have
an open source end-to-end software development platform with built-in version
an open source end-to-end software development platform with built-in version
control, issue tracking, code review, CI/CD, and more.
control, issue tracking, code review, CI/CD, and more.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment