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.5.2" />
7 <title>git-cvsimport(
1)
</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.0em;
131 div
.content
{ /* Block element content. */
135 /* Block element titles. */
136 div
.title
, caption
.title
{
138 font-family: sans-serif
;
142 margin-bottom: 0.5em;
148 td div
.title:first-child
{
151 div
.content div
.title:first-child
{
154 div
.content
+ div
.title
{
158 div
.sidebarblock
> div
.content
{
160 border: 1px solid silver
;
164 div
.listingblock
> div
.content
{
165 border: 1px solid silver
;
170 div
.quoteblock
, div
.verseblock
{
174 border-left: 5px solid
#dddddd;
178 div
.quoteblock
> div
.attribution
{
183 div
.verseblock
> div
.content
{
186 div
.verseblock
> div
.attribution
{
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 div
.verseblock
+ div
.attribution
{
195 div
.admonitionblock
.icon
{
199 text-decoration: underline
;
201 padding-right: 0.5em;
203 div
.admonitionblock td
.content
{
205 border-left: 3px solid
#dddddd;
208 div
.exampleblock
> div
.content
{
209 border-left: 3px solid
#dddddd;
213 div
.imageblock div
.content
{ padding-left: 0; }
214 span
.image img
{ border-style: none
; }
215 a
.image:visited
{ color: white
; }
219 margin-bottom: 0.8em;
232 list-style-position: outside
;
235 list-style-type: decimal
;
238 list-style-type: lower-alpha
;
241 list-style-type: upper-alpha
;
244 list-style-type: lower-roman
;
247 list-style-type: upper-roman
;
250 div
.compact ul
, div
.compact ol
,
251 div
.compact p
, div
.compact p
,
252 div
.compact div
, div
.compact div
{
254 margin-bottom: 0.1em;
257 div
.tableblock
> table
{
258 border: 3px solid
#527bbd;
260 thead
, p
.table
.header
{
261 font-family: sans-serif
;
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 div
.tableblock
> table
[frame
="void"] {
277 div
.tableblock
> table
[frame
="hsides"] {
278 border-left-style: none
;
279 border-right-style: none
;
281 div
.tableblock
> table
[frame
="vsides"] {
282 border-top-style: none
;
283 border-bottom-style: none
;
289 margin-bottom: 0.8em;
292 padding-bottom: 15px;
294 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
300 padding-right: 0.8em;
306 div
.hdlist
.compact tr
{
315 .footnote, .footnoteref {
319 span
.footnote
, span
.footnoteref
{
320 vertical-align: super
;
324 margin: 20px 0 20px 0;
328 #footnotes div
.footnote
{
334 border-top: 1px solid silver
;
344 div#footer-badges
{ display: none
; }
348 margin-bottom: 2.5em;
353 font-family: sans-serif
;
357 margin-bottom: 0.1em;
360 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
376 /* Overrides for manpage documents */
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver
;
381 border-bottom: 2px solid silver
;
391 div#toc
{ display: none
; }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
396 div
.sidebar-content
{
398 border: 1px solid silver
;
401 div
.sidebar-title
, div
.image-title
{
403 font-family: sans-serif
;
406 margin-bottom: 0.5em;
409 div
.listingblock div
.content
{
410 border: 1px solid silver
;
415 div
.quoteblock-attribution
{
420 div
.verseblock-content
{
423 div
.verseblock-attribution
{
428 div
.exampleblock-content
{
429 border-left: 3px solid
#dddddd;
433 /* IE6 sets dynamically generated links as visited. */
434 div#toc
a:visited
{ color: blue
; }
436 <script type=
"text/javascript">
438 window
.onload = function(){asciidoc
.footnotes();}
439 var asciidoc
= { // Namespace.
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
448 * Table Of Content generator
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
459 toc: function (toclevels
) {
461 function getText(el
) {
463 for (var i
= el
.firstChild
; i
!= null; i
= i
.nextSibling
) {
464 if (i
.nodeType
== 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
466 else if (i
.firstChild
!= null)
472 function TocEntry(el
, text
, toclevel
) {
475 this.toclevel
= toclevel
;
478 function tocEntries(el
, toclevels
) {
479 var result
= new Array
;
480 var re
= new RegExp('[hH]([2-'+(toclevels
+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
484 var iterate = function (el
) {
485 for (var i
= el
.firstChild
; i
!= null; i
= i
.nextSibling
) {
486 if (i
.nodeType
== 1 /* Node.ELEMENT_NODE */) {
487 var mo
= re
.exec(i
.tagName
);
488 if (mo
&& (i
.getAttribute("class") || i
.getAttribute("className")) != "float") {
489 result
[result
.length
] = new TocEntry(i
, getText(i
), mo
[1]-1);
499 var toc
= document
.getElementById("toc");
500 var entries
= tocEntries(document
.getElementById("content"), toclevels
);
501 for (var i
= 0; i
< entries
.length
; ++i
) {
502 var entry
= entries
[i
];
503 if (entry
.element
.id
== "")
504 entry
.element
.id
= "_toc_" + i
;
505 var a
= document
.createElement("a");
506 a
.href
= "#" + entry
.element
.id
;
507 a
.appendChild(document
.createTextNode(entry
.text
));
508 var div
= document
.createElement("div");
510 div
.className
= "toclevel" + entry
.toclevel
;
511 toc
.appendChild(div
);
513 if (entries
.length
== 0)
514 toc
.parentNode
.removeChild(toc
);
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
526 footnotes: function () {
527 var cont
= document
.getElementById("content");
528 var noteholder
= document
.getElementById("footnotes");
529 var spans
= cont
.getElementsByTagName("span");
532 for (i
=0; i
<spans
.length
; i
++) {
533 if (spans
[i
].className
== "footnote") {
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note
= spans
[i
].innerHTML
.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder
.innerHTML
+=
539 "<div class='footnote' id='_footnote_" + n
+ "'>" +
540 "<a href='#_footnoteref_" + n
+ "' title='Return to text'>" +
541 n
+ "</a>. " + note
+ "</div>";
543 "[<a id='_footnoteref_" + n
+ "' href='#_footnote_" + n
+
544 "' title='View footnote' class='footnote'>" + n
+ "</a>]";
545 var id
=spans
[i
].getAttribute("id");
546 if (id
!= null) refs
["#"+id
] = n
;
550 noteholder
.parentNode
.removeChild(noteholder
);
552 // Process footnoterefs.
553 for (i
=0; i
<spans
.length
; i
++) {
554 if (spans
[i
].className
== "footnoteref") {
555 var href
= spans
[i
].getElementsByTagName("a")[0].getAttribute("href");
556 href
= href
.match(/#.*/)[0]; // Because IE return full URL.
559 "[<a href='#_footnote_" + n
+
560 "' title='View footnote' class='footnote'>" + n
+ "</a>]";
573 git-cvsimport(
1) Manual Page
576 <div class=
"sectionbody">
578 Salvage your data out of another SCM people love to hate
583 <h2 id=
"_synopsis">SYNOPSIS
</h2>
584 <div class=
"sectionbody">
585 <div class=
"verseblock">
586 <div class=
"verseblock-content"><em>git cvsimport
</em> [-o
<branch-for-HEAD
>] [-h] [-v] [-d
<CVSROOT
>]
587 [-A
<author-conv-file
>] [-p
<options-for-cvsps
>] [-P
<file
>]
588 [-C
<git_repository
>] [-z
<fuzz
>] [-i] [-k] [-u] [-s
<subst
>]
589 [-a] [-m] [-M
<regex
>] [-S
<regex
>] [-L
<commitlimit
>]
590 [-r
<remote
>] [-R] [
<CVS_module
>]
</div>
591 <div class=
"verseblock-attribution">
594 <h2 id=
"_description">DESCRIPTION
</h2>
595 <div class=
"sectionbody">
596 <div class=
"paragraph"><p>Imports a CVS repository into git. It will either create a new
597 repository, or incrementally import into an existing one.
</p></div>
598 <div class=
"paragraph"><p>Splitting the CVS log into patch sets is done by
<em>cvsps
</em>.
599 At least version
2.1 is required.
</p></div>
600 <div class=
"paragraph"><p><strong>WARNING:
</strong> for certain situations the import leads to incorrect results.
601 Please see the section
<a href=
"#issues">ISSUES
</a> for further reference.
</p></div>
602 <div class=
"paragraph"><p>You should
<strong>never
</strong> do any work of your own on the branches that are
603 created by
<em>git cvsimport
</em>. By default initial import will create and populate a
604 "master" branch from the CVS repository
’s main branch which you
’re free
605 to work with; after that, you need to
<em>git merge
</em> incremental imports, or
606 any CVS branches, yourself. It is advisable to specify a named remote via
607 -r to separate and protect the incoming branches.
</p></div>
608 <div class=
"paragraph"><p>If you intend to set up a shared public repository that all developers can
609 read/write, or if you want to use
<a href=
"git-cvsserver.html">git-cvsserver(
1)
</a>, then you
610 probably want to make a bare clone of the imported repository,
611 and use the clone as the shared repository.
612 See
<a href=
"gitcvs-migration.html">gitcvs-migration(
7)
</a>.
</p></div>
614 <h2 id=
"_options">OPTIONS
</h2>
615 <div class=
"sectionbody">
616 <div class=
"dlist"><dl>
622 Verbosity: let
<em>cvsimport
</em> report what it is doing.
630 The root of the CVS archive. May be local (a simple path) or remote;
631 currently, only the :local:, :ext: and :pserver: access methods
632 are supported. If not given,
<em>git cvsimport
</em> will try to read it
633 from
<tt>CVS/Root
</tt>. If no such file exists, it checks for the
634 <tt>CVSROOT
</tt> environment variable.
642 The CVS module you want to import. Relative to
<CVSROOT
>.
643 If not given,
<em>git cvsimport
</em> tries to read it from
644 <tt>CVS/Repository
</tt>.
648 -C
<target-dir
>
652 The git repository to import to. If the directory doesn
’t
653 exist, it will be created. Default is the current directory.
661 The git remote to import this CVS repository into.
662 Moves all CVS branches into remotes/
<remote
>/
<branch
>
663 akin to the way
<em>git clone
</em> uses
<em>origin
</em> by default.
667 -o
<branch-for-HEAD
>
671 When no remote is specified (via -r) the
<em>HEAD
</em> branch
672 from CVS is imported to the
<em>origin
</em> branch within the git
673 repository, as
<em>HEAD
</em> already has a special meaning for git.
674 When a remote is specified the
<em>HEAD
</em> branch is named
675 remotes/
<remote
>/master mirroring
<em>git clone
</em> behaviour.
676 Use this option if you want to import into a different
679 <div class=
"paragraph"><p>Use
<em>-o master
</em> for continuing an import that was initially done by
680 the old cvs2git tool.
</p></div>
687 Import-only: don
’t perform a checkout after importing. This option
688 ensures the working directory and index remain untouched and will
689 not create them if they do not exist.
697 Kill keywords: will extract files with
<em>-kk
</em> from the CVS archive
698 to avoid noisy changesets. Highly recommended, but off by default
699 to preserve compatibility with early imported trees.
707 Convert underscores in tag and branch names to dots.
715 Substitute the character
"/" in branch names with
<subst
>
719 -p
<options-for-cvsps
>
723 Additional options for cvsps.
724 The options
<em>-u
</em> and
<em>-A
</em> are implicit and should not be used here.
726 <div class=
"paragraph"><p>If you need to pass multiple options, separate them with a comma.
</p></div>
733 Pass the timestamp fuzz factor to cvsps, in seconds. If unset,
734 cvsps defaults to
300s.
738 -P
<cvsps-output-file
>
742 Instead of calling cvsps, read the provided cvsps output file. Useful
743 for debugging or when cvsps is being handled outside cvsimport.
751 Attempt to detect merges based on the commit message. This option
752 will enable default regexes that try to capture the source
753 branch name from the commit message.
761 Attempt to detect merges based on the commit message with a custom
762 regex. It can be used with
<em>-m
</em> to enable the default regexes
763 as well. You must escape forward slashes.
765 <div class=
"paragraph"><p>The regex must capture the source branch name in $
1.
</p></div>
766 <div class=
"paragraph"><p>This option can be used several times to provide several detection regexes.
</p></div>
773 Skip paths matching the regex.
781 Import all commits, including recent ones. cvsimport by default
782 skips commits that have a timestamp less than
10 minutes ago.
790 Limit the number of commits imported. Workaround for cases where
791 cvsimport leaks memory.
795 -A
<author-conv-file
>
799 CVS by default uses the Unix username when writing its
800 commit logs. Using this option and an author-conv-file
803 <div class=
"listingblock">
804 <div class=
"content">
805 <pre><tt> exon=Andreas Ericsson
<ae@op5.se
>
806 spawn=Simon Pawn
<spawn@frog-pond.org
></tt></pre>
808 <div class=
"paragraph"><p><em>git cvsimport
</em> will make it appear as those authors had
809 their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
811 <div class=
"paragraph"><p>For convenience, this data is saved to
<tt>$GIT_DIR/cvs-authors
</tt>
812 each time the
<em>-A
</em> option is provided and read from that same
813 file each time
<em>git cvsimport
</em> is run.
</p></div>
814 <div class=
"paragraph"><p>It is not recommended to use this feature if you intend to
815 export changes back to CVS again later with
816 <em>git cvsexportcommit
</em>.
</p></div>
823 Generate a
<tt>$GIT_DIR/cvs-revisions
</tt> file containing a mapping from CVS
824 revision numbers to newly-created Git commit IDs. The generated file
825 will contain one line for each (filename, revision) pair imported;
826 each line will look like
828 <div class=
"listingblock">
829 <div class=
"content">
830 <pre><tt>src/widget.c
1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7
</tt></pre>
832 <div class=
"paragraph"><p>The revision data is appended to the file if it already exists, for use when
833 doing incremental imports.
</p></div>
834 <div class=
"paragraph"><p>This option may be useful if you have CVS revision numbers stored in commit
835 messages, bug-tracking systems, email archives, and the like.
</p></div>
842 Print a short usage message and exit.
847 <h2 id=
"_output">OUTPUT
</h2>
848 <div class=
"sectionbody">
849 <div class=
"paragraph"><p>If
<em>-v
</em> is specified, the script reports what it is doing.
</p></div>
850 <div class=
"paragraph"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with
851 a zero exit status.
</p></div>
853 <h2 id=
"issues">ISSUES
</h2>
854 <div class=
"sectionbody">
855 <div class=
"paragraph"><p>Problems related to timestamps:
</p></div>
856 <div class=
"ulist"><ul>
859 If timestamps of commits in the CVS repository are not stable enough
860 to be used for ordering commits changes may show up in the wrong
866 If any files were ever
"cvs import"ed more than once (e.g., import of
867 more than one vendor release) the HEAD contains the wrong content.
872 If the timestamp order of different files cross the revision order
873 within the commit matching time window the order of commits may be
878 <div class=
"paragraph"><p>Problems related to branches:
</p></div>
879 <div class=
"ulist"><ul>
882 Branches on which no commits have been made are not imported.
887 All files from the branching point are added to a branch even if
893 This applies to files added to the source branch
<strong>after
</strong> a daughter
894 branch was created: if previously no commit was made on the daughter
895 branch they will erroneously be added to the daughter branch in git.
899 <div class=
"paragraph"><p>Problems related to tags:
</p></div>
900 <div class=
"ulist"><ul>
903 Multiple tags on the same revision are not imported.
907 <div class=
"paragraph"><p>If you suspect that any of these issues may apply to the repository you
908 want to import consider using these alternative tools which proved to be
909 more stable in practice:
</p></div>
910 <div class=
"ulist"><ul>
913 cvs2git (part of cvs2svn),
<tt>http://cvs2svn.tigris.org
</tt>
918 parsecvs,
<tt>http://cgit.freedesktop.org/~keithp/parsecvs
</tt>
923 <h2 id=
"_git">GIT
</h2>
924 <div class=
"sectionbody">
925 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
928 <div id=
"footnotes"><hr /></div>
930 <div id=
"footer-text">
931 Last updated
2011-
09-
21 23:
01:
14 PDT