1 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.4.5" />
7 <title>gitcvs-migration(
7)
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.5em;
129 div
.content
{ /* Block element content. */
133 /* Block element titles. */
134 div
.title
, caption
.title
{
136 font-family: sans-serif
;
140 margin-bottom: 0.5em;
146 td div
.title:first-child
{
149 div
.content div
.title:first-child
{
152 div
.content
+ div
.title
{
156 div
.sidebarblock
> div
.content
{
158 border: 1px solid silver
;
162 div
.listingblock
> div
.content
{
163 border: 1px solid silver
;
172 div
.quoteblock
> div
.attribution
{
181 div
.verseblock
> div
.content
{
184 div
.verseblock
> div
.attribution
{
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div
.verseblock
+ div
.attribution
{
193 div
.admonitionblock
.icon
{
197 text-decoration: underline
;
199 padding-right: 0.5em;
201 div
.admonitionblock td
.content
{
203 border-left: 2px solid silver
;
206 div
.exampleblock
> div
.content
{
207 border-left: 2px solid silver
;
211 div
.imageblock div
.content
{ padding-left: 0; }
212 span
.image img
{ border-style: none
; }
213 a
.image:visited
{ color: white
; }
217 margin-bottom: 0.8em;
230 list-style-position: outside
;
233 list-style-type: decimal
;
236 list-style-type: lower-alpha
;
239 list-style-type: upper-alpha
;
242 list-style-type: lower-roman
;
245 list-style-type: upper-roman
;
248 div
.compact ul
, div
.compact ol
,
249 div
.compact p
, div
.compact p
,
250 div
.compact div
, div
.compact div
{
252 margin-bottom: 0.1em;
255 div
.tableblock
> table
{
256 border: 3px solid
#527bbd;
259 font-family: sans-serif
;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div
.tableblock
> table
[frame
="void"] {
275 div
.tableblock
> table
[frame
="hsides"] {
276 border-left-style: none
;
277 border-right-style: none
;
279 div
.tableblock
> table
[frame
="vsides"] {
280 border-top-style: none
;
281 border-bottom-style: none
;
287 margin-bottom: 0.8em;
290 padding-bottom: 15px;
292 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
298 padding-right: 0.8em;
304 div
.hdlist
.compact tr
{
314 div#footer-badges
{ display: none
; }
319 font-family: sans-serif
;
323 margin-bottom: 0.1em;
326 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
342 /* Overrides for manpage documents */
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver
;
347 border-bottom: 2px solid silver
;
357 div#toc
{ display: none
; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div
.sidebar-content
{
364 border: 1px solid silver
;
367 div
.sidebar-title
, div
.image-title
{
369 font-family: sans-serif
;
372 margin-bottom: 0.5em;
375 div
.listingblock div
.content
{
376 border: 1px solid silver
;
381 div
.quoteblock-attribution
{
386 div
.verseblock-content
{
389 div
.verseblock-attribution
{
394 div
.exampleblock-content
{
395 border-left: 2px solid silver
;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc
a:visited
{ color: blue
; }
406 gitcvs-migration(
7) Manual Page
409 <div class=
"sectionbody">
410 <p>gitcvs-migration -
415 <h2 id=
"_synopsis">SYNOPSIS
</h2>
416 <div class=
"sectionbody">
417 <div class=
"verseblock">
418 <div class=
"verseblock-content"><em>git cvsimport
</em> *
</div>
419 <div class=
"verseblock-attribution">
422 <h2 id=
"_description">DESCRIPTION
</h2>
423 <div class=
"sectionbody">
424 <div class=
"paragraph"><p>Git differs from CVS in that every working tree contains a repository with
425 a full copy of the project history, and no repository is inherently more
426 important than any other. However, you can emulate the CVS model by
427 designating a single shared repository which people can synchronize with;
428 this document explains how to do that.
</p></div>
429 <div class=
"paragraph"><p>Some basic familiarity with git is required. Having gone through
430 <a href=
"gittutorial.html">gittutorial(
7)
</a> and
431 <a href=
"gitglossary.html">gitglossary(
7)
</a> should be sufficient.
</p></div>
433 <h2 id=
"_developing_against_a_shared_repository">Developing against a shared repository
</h2>
434 <div class=
"sectionbody">
435 <div class=
"paragraph"><p>Suppose a shared repository is set up in /pub/repo.git on the host
436 foo.com. Then as an individual committer you can clone the shared
437 repository over ssh with:
</p></div>
438 <div class=
"listingblock">
439 <div class=
"content">
440 <pre><tt>$ git clone foo.com:/pub/repo.git/ my-project
441 $ cd my-project
</tt></pre>
443 <div class=
"paragraph"><p>and hack away. The equivalent of
<em>cvs update
</em> is
</p></div>
444 <div class=
"listingblock">
445 <div class=
"content">
446 <pre><tt>$ git pull origin
</tt></pre>
448 <div class=
"paragraph"><p>which merges in any work that others might have done since the clone
449 operation. If there are uncommitted changes in your working tree, commit
450 them first before running git pull.
</p></div>
451 <div class=
"admonitionblock">
454 <div class=
"title">Note
</div>
457 <div class=
"paragraph"><p>The
<em>pull
</em> command knows where to get updates from because of certain
458 configuration variables that were set by the first
<em>git clone
</em>
459 command; see
<tt>git config -l
</tt> and the
<a href=
"git-config.html">git-config(
1)
</a> man
460 page for details.
</p></div>
464 <div class=
"paragraph"><p>You can update the shared repository with your changes by first committing
465 your changes, and then using the
<em>git push
</em> command:
</p></div>
466 <div class=
"listingblock">
467 <div class=
"content">
468 <pre><tt>$ git push origin master
</tt></pre>
470 <div class=
"paragraph"><p>to
"push" those commits to the shared repository. If someone else has
471 updated the repository more recently,
<em>git push
</em>, like
<em>cvs commit
</em>, will
472 complain, in which case you must pull any changes before attempting the
473 push again.
</p></div>
474 <div class=
"paragraph"><p>In the
<em>git push
</em> command above we specify the name of the remote branch
475 to update (
<tt>master
</tt>). If we leave that out,
<em>git push
</em> tries to update
476 any branches in the remote repository that have the same name as a branch
477 in the local repository. So the last
<em>push
</em> can be done with either of:
</p></div>
478 <div class=
"listingblock">
479 <div class=
"content">
480 <pre><tt>$ git push origin
481 $ git push foo.com:/pub/project.git/
</tt></pre>
483 <div class=
"paragraph"><p>as long as the shared repository does not have any branches
484 other than
<tt>master
</tt>.
</p></div>
486 <h2 id=
"_setting_up_a_shared_repository">Setting Up a Shared Repository
</h2>
487 <div class=
"sectionbody">
488 <div class=
"paragraph"><p>We assume you have already created a git repository for your project,
489 possibly created from scratch or from a tarball (see
490 <a href=
"gittutorial.html">gittutorial(
7)
</a>), or imported from an already existing CVS
491 repository (see the next section).
</p></div>
492 <div class=
"paragraph"><p>Assume your existing repo is at /home/alice/myproject. Create a new
"bare"
493 repository (a repository without a working tree) and fetch your project into
495 <div class=
"listingblock">
496 <div class=
"content">
497 <pre><tt>$ mkdir /pub/my-repo.git
498 $ cd /pub/my-repo.git
499 $ git --bare init --shared
500 $ git --bare fetch /home/alice/myproject master:master
</tt></pre>
502 <div class=
"paragraph"><p>Next, give every team member read/write access to this repository. One
503 easy way to do this is to give all the team members ssh access to the
504 machine where the repository is hosted. If you don
’t want to give them a
505 full shell on the machine, there is a restricted shell which only allows
506 users to do git pushes and pulls; see
<a href=
"git-shell.html">git-shell(
1)
</a>.
</p></div>
507 <div class=
"paragraph"><p>Put all the committers in the same group, and make the repository
508 writable by that group:
</p></div>
509 <div class=
"listingblock">
510 <div class=
"content">
511 <pre><tt>$ chgrp -R $group /pub/my-repo.git
</tt></pre>
513 <div class=
"paragraph"><p>Make sure committers have a umask of at most
027, so that the directories
514 they create are writable and searchable by other group members.
</p></div>
516 <h2 id=
"_importing_a_cvs_archive">Importing a CVS archive
</h2>
517 <div class=
"sectionbody">
518 <div class=
"paragraph"><p>First, install version
2.1 or higher of cvsps from
519 <a href=
"http://www.cobite.com/cvsps/">http://www.cobite.com/cvsps/
</a> and make
520 sure it is in your path. Then cd to a checked out CVS working directory
521 of the project you are interested in and run
<a href=
"git-cvsimport.html">git-cvsimport(
1)
</a>:
</p></div>
522 <div class=
"listingblock">
523 <div class=
"content">
524 <pre><tt>$ git cvsimport -C
<destination
> <module
></tt></pre>
526 <div class=
"paragraph"><p>This puts a git archive of the named CVS module in the directory
527 <destination
>, which will be created if necessary.
</p></div>
528 <div class=
"paragraph"><p>The import checks out from CVS every revision of every file. Reportedly
529 cvsimport can average some twenty revisions per second, so for a
530 medium-sized project this should not take more than a couple of minutes.
531 Larger projects or remote repositories may take longer.
</p></div>
532 <div class=
"paragraph"><p>The main trunk is stored in the git branch named
<tt>origin
</tt>, and additional
533 CVS branches are stored in git branches with the same names. The most
534 recent version of the main trunk is also left checked out on the
<tt>master
</tt>
535 branch, so you can start adding your own changes right away.
</p></div>
536 <div class=
"paragraph"><p>The import is incremental, so if you call it again next month it will
537 fetch any CVS updates that have been made in the meantime. For this to
538 work, you must not modify the imported branches; instead, create new
539 branches for your own changes, and merge in the imported branches as
541 <div class=
"paragraph"><p>If you want a shared repository, you will need to make a bare clone
542 of the imported directory, as described above. Then treat the imported
543 directory as another development clone for purposes of merging
544 incremental imports.
</p></div>
546 <h2 id=
"_advanced_shared_repository_management">Advanced Shared Repository Management
</h2>
547 <div class=
"sectionbody">
548 <div class=
"paragraph"><p>Git allows you to specify scripts called
"hooks" to be run at certain
549 points. You can use these, for example, to send all commits to the shared
550 repository to a mailing list. See
<a href=
"githooks.html">githooks(
5)
</a>.
</p></div>
551 <div class=
"paragraph"><p>You can enforce finer grained permissions using update hooks. See
552 <a href=
"howto/update-hook-example.txt">Controlling access to branches using
553 update hooks
</a>.
</p></div>
555 <h2 id=
"_providing_cvs_access_to_a_git_repository">Providing CVS Access to a git Repository
</h2>
556 <div class=
"sectionbody">
557 <div class=
"paragraph"><p>It is also possible to provide true CVS access to a git repository, so
558 that developers can still use CVS; see
<a href=
"git-cvsserver.html">git-cvsserver(
1)
</a> for
561 <h2 id=
"_alternative_development_models">Alternative Development Models
</h2>
562 <div class=
"sectionbody">
563 <div class=
"paragraph"><p>CVS users are accustomed to giving a group of developers commit access to
564 a common repository. As we
’ve seen, this is also possible with git.
565 However, the distributed nature of git allows other development models,
566 and you may want to first consider whether one of them might be a better
567 fit for your project.
</p></div>
568 <div class=
"paragraph"><p>For example, you can choose a single person to maintain the project
’s
569 primary public repository. Other developers then clone this repository
570 and each work in their own clone. When they have a series of changes that
571 they
’re happy with, they ask the maintainer to pull from the branch
572 containing the changes. The maintainer reviews their changes and pulls
573 them into the primary repository, which other developers pull from as
574 necessary to stay coordinated. The Linux kernel and other projects use
575 variants of this model.
</p></div>
576 <div class=
"paragraph"><p>With a small group, developers may just pull changes from each other
’s
577 repositories without the need for a central maintainer.
</p></div>
579 <h2 id=
"_see_also">SEE ALSO
</h2>
580 <div class=
"sectionbody">
581 <div class=
"paragraph"><p><a href=
"gittutorial.html">gittutorial(
7)
</a>,
582 <a href=
"gittutorial-2.html">gittutorial-
2(
7)
</a>,
583 <a href=
"gitcore-tutorial.html">gitcore-tutorial(
7)
</a>,
584 <a href=
"gitglossary.html">gitglossary(
7)
</a>,
585 <a href=
"everyday.html">Everyday Git
</a>,
586 <a href=
"user-manual.html">The Git User
’s Manual
</a></p></div>
588 <h2 id=
"_git">GIT
</h2>
589 <div class=
"sectionbody">
590 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite.
</p></div>
593 <div id=
"footer-text">
594 Last updated
2011-
07-
23 00:
49:
30 UTC