git-cvsimport.html

   1 <?xml version="1.0" encoding="UTF-8"?>
   2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   3     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   5 <head>
   6 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
   7 <meta name="generator" content="AsciiDoc 10.2.0" />
   8 <title>git-cvsimport(1)</title>
   9 <style type="text/css">
  10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
  11
  12 /* Default font. */
  13 body {
  14   font-family: Georgia,serif;
  15 }
  16
  17 /* Title font. */
  18 h1, h2, h3, h4, h5, h6,
  19 div.title, caption.title,
  20 thead, p.table.header,
  21 #toctitle,
  22 #author, #revnumber, #revdate, #revremark,
  23 #footer {
  24   font-family: Arial,Helvetica,sans-serif;
  25 }
  26
  27 body {
  28   margin: 1em 5% 1em 5%;
  29 }
  30
  31 a {
  32   color: blue;
  33   text-decoration: underline;
  34 }
  35 a:visited {
  36   color: fuchsia;
  37 }
  38
  39 em {
  40   font-style: italic;
  41   color: navy;
  42 }
  43
  44 strong {
  45   font-weight: bold;
  46   color: #083194;
  47 }
  48
  49 h1, h2, h3, h4, h5, h6 {
  50   color: #527bbd;
  51   margin-top: 1.2em;
  52   margin-bottom: 0.5em;
  53   line-height: 1.3;
  54 }
  55
  56 h1, h2, h3 {
  57   border-bottom: 2px solid silver;
  58 }
  59 h2 {
  60   padding-top: 0.5em;
  61 }
  62 h3 {
  63   float: left;
  64 }
  65 h3 + * {
  66   clear: left;
  67 }
  68 h5 {
  69   font-size: 1.0em;
  70 }
  71
  72 div.sectionbody {
  73   margin-left: 0;
  74 }
  75
  76 hr {
  77   border: 1px solid silver;
  78 }
  79
  80 p {
  81   margin-top: 0.5em;
  82   margin-bottom: 0.5em;
  83 }
  84
  85 ul, ol, li > p {
  86   margin-top: 0;
  87 }
  88 ul > li     { color: #aaa; }
  89 ul > li > * { color: black; }
  90
  91 .monospaced, code, pre {
  92   font-family: "Courier New", Courier, monospace;
  93   font-size: inherit;
  94   color: navy;
  95   padding: 0;
  96   margin: 0;
  97 }
  98 pre {
  99   white-space: pre-wrap;
 100 }
 101
 102 #author {
 103   color: #527bbd;
 104   font-weight: bold;
 105   font-size: 1.1em;
 106 }
 107 #email {
 108 }
 109 #revnumber, #revdate, #revremark {
 110 }
 111
 112 #footer {
 113   font-size: small;
 114   border-top: 2px solid silver;
 115   padding-top: 0.5em;
 116   margin-top: 4.0em;
 117 }
 118 #footer-text {
 119   float: left;
 120   padding-bottom: 0.5em;
 121 }
 122 #footer-badges {
 123   float: right;
 124   padding-bottom: 0.5em;
 125 }
 126
 127 #preamble {
 128   margin-top: 1.5em;
 129   margin-bottom: 1.5em;
 130 }
 131 div.imageblock, div.exampleblock, div.verseblock,
 132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 133 div.admonitionblock {
 134   margin-top: 1.0em;
 135   margin-bottom: 1.5em;
 136 }
 137 div.admonitionblock {
 138   margin-top: 2.0em;
 139   margin-bottom: 2.0em;
 140   margin-right: 10%;
 141   color: #606060;
 142 }
 143
 144 div.content { /* Block element content. */
 145   padding: 0;
 146 }
 147
 148 /* Block element titles. */
 149 div.title, caption.title {
 150   color: #527bbd;
 151   font-weight: bold;
 152   text-align: left;
 153   margin-top: 1.0em;
 154   margin-bottom: 0.5em;
 155 }
 156 div.title + * {
 157   margin-top: 0;
 158 }
 159
 160 td div.title:first-child {
 161   margin-top: 0.0em;
 162 }
 163 div.content div.title:first-child {
 164   margin-top: 0.0em;
 165 }
 166 div.content + div.title {
 167   margin-top: 0.0em;
 168 }
 169
 170 div.sidebarblock > div.content {
 171   background: #ffffee;
 172   border: 1px solid #dddddd;
 173   border-left: 4px solid #f0f0f0;
 174   padding: 0.5em;
 175 }
 176
 177 div.listingblock > div.content {
 178   border: 1px solid #dddddd;
 179   border-left: 5px solid #f0f0f0;
 180   background: #f8f8f8;
 181   padding: 0.5em;
 182 }
 183
 184 div.quoteblock, div.verseblock {
 185   padding-left: 1.0em;
 186   margin-left: 1.0em;
 187   margin-right: 10%;
 188   border-left: 5px solid #f0f0f0;
 189   color: #888;
 190 }
 191
 192 div.quoteblock > div.attribution {
 193   padding-top: 0.5em;
 194   text-align: right;
 195 }
 196
 197 div.verseblock > pre.content {
 198   font-family: inherit;
 199   font-size: inherit;
 200 }
 201 div.verseblock > div.attribution {
 202   padding-top: 0.75em;
 203   text-align: left;
 204 }
 205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 206 div.verseblock + div.attribution {
 207   text-align: left;
 208 }
 209
 210 div.admonitionblock .icon {
 211   vertical-align: top;
 212   font-size: 1.1em;
 213   font-weight: bold;
 214   text-decoration: underline;
 215   color: #527bbd;
 216   padding-right: 0.5em;
 217 }
 218 div.admonitionblock td.content {
 219   padding-left: 0.5em;
 220   border-left: 3px solid #dddddd;
 221 }
 222
 223 div.exampleblock > div.content {
 224   border-left: 3px solid #dddddd;
 225   padding-left: 0.5em;
 226 }
 227
 228 div.imageblock div.content { padding-left: 0; }
 229 span.image img { border-style: none; vertical-align: text-bottom; }
 230 a.image:visited { color: white; }
 231
 232 dl {
 233   margin-top: 0.8em;
 234   margin-bottom: 0.8em;
 235 }
 236 dt {
 237   margin-top: 0.5em;
 238   margin-bottom: 0;
 239   font-style: normal;
 240   color: navy;
 241 }
 242 dd > *:first-child {
 243   margin-top: 0.1em;
 244 }
 245
 246 ul, ol {
 247     list-style-position: outside;
 248 }
 249 ol.arabic {
 250   list-style-type: decimal;
 251 }
 252 ol.loweralpha {
 253   list-style-type: lower-alpha;
 254 }
 255 ol.upperalpha {
 256   list-style-type: upper-alpha;
 257 }
 258 ol.lowerroman {
 259   list-style-type: lower-roman;
 260 }
 261 ol.upperroman {
 262   list-style-type: upper-roman;
 263 }
 264
 265 div.compact ul, div.compact ol,
 266 div.compact p, div.compact p,
 267 div.compact div, div.compact div {
 268   margin-top: 0.1em;
 269   margin-bottom: 0.1em;
 270 }
 271
 272 tfoot {
 273   font-weight: bold;
 274 }
 275 td > div.verse {
 276   white-space: pre;
 277 }
 278
 279 div.hdlist {
 280   margin-top: 0.8em;
 281   margin-bottom: 0.8em;
 282 }
 283 div.hdlist tr {
 284   padding-bottom: 15px;
 285 }
 286 dt.hdlist1.strong, td.hdlist1.strong {
 287   font-weight: bold;
 288 }
 289 td.hdlist1 {
 290   vertical-align: top;
 291   font-style: normal;
 292   padding-right: 0.8em;
 293   color: navy;
 294 }
 295 td.hdlist2 {
 296   vertical-align: top;
 297 }
 298 div.hdlist.compact tr {
 299   margin: 0;
 300   padding-bottom: 0;
 301 }
 302
 303 .comment {
 304   background: yellow;
 305 }
 306
 307 .footnote, .footnoteref {
 308   font-size: 0.8em;
 309 }
 310
 311 span.footnote, span.footnoteref {
 312   vertical-align: super;
 313 }
 314
 315 #footnotes {
 316   margin: 20px 0 20px 0;
 317   padding: 7px 0 0 0;
 318 }
 319
 320 #footnotes div.footnote {
 321   margin: 0 0 5px 0;
 322 }
 323
 324 #footnotes hr {
 325   border: none;
 326   border-top: 1px solid silver;
 327   height: 1px;
 328   text-align: left;
 329   margin-left: 0;
 330   width: 20%;
 331   min-width: 100px;
 332 }
 333
 334 div.colist td {
 335   padding-right: 0.5em;
 336   padding-bottom: 0.3em;
 337   vertical-align: top;
 338 }
 339 div.colist td img {
 340   margin-top: 0.3em;
 341 }
 342
 343 @media print {
 344   #footer-badges { display: none; }
 345 }
 346
 347 #toc {
 348   margin-bottom: 2.5em;
 349 }
 350
 351 #toctitle {
 352   color: #527bbd;
 353   font-size: 1.1em;
 354   font-weight: bold;
 355   margin-top: 1.0em;
 356   margin-bottom: 0.1em;
 357 }
 358
 359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 360   margin-top: 0;
 361   margin-bottom: 0;
 362 }
 363 div.toclevel2 {
 364   margin-left: 2em;
 365   font-size: 0.9em;
 366 }
 367 div.toclevel3 {
 368   margin-left: 4em;
 369   font-size: 0.9em;
 370 }
 371 div.toclevel4 {
 372   margin-left: 6em;
 373   font-size: 0.9em;
 374 }
 375
 376 span.aqua { color: aqua; }
 377 span.black { color: black; }
 378 span.blue { color: blue; }
 379 span.fuchsia { color: fuchsia; }
 380 span.gray { color: gray; }
 381 span.green { color: green; }
 382 span.lime { color: lime; }
 383 span.maroon { color: maroon; }
 384 span.navy { color: navy; }
 385 span.olive { color: olive; }
 386 span.purple { color: purple; }
 387 span.red { color: red; }
 388 span.silver { color: silver; }
 389 span.teal { color: teal; }
 390 span.white { color: white; }
 391 span.yellow { color: yellow; }
 392
 393 span.aqua-background { background: aqua; }
 394 span.black-background { background: black; }
 395 span.blue-background { background: blue; }
 396 span.fuchsia-background { background: fuchsia; }
 397 span.gray-background { background: gray; }
 398 span.green-background { background: green; }
 399 span.lime-background { background: lime; }
 400 span.maroon-background { background: maroon; }
 401 span.navy-background { background: navy; }
 402 span.olive-background { background: olive; }
 403 span.purple-background { background: purple; }
 404 span.red-background { background: red; }
 405 span.silver-background { background: silver; }
 406 span.teal-background { background: teal; }
 407 span.white-background { background: white; }
 408 span.yellow-background { background: yellow; }
 409
 410 span.big { font-size: 2em; }
 411 span.small { font-size: 0.6em; }
 412
 413 span.underline { text-decoration: underline; }
 414 span.overline { text-decoration: overline; }
 415 span.line-through { text-decoration: line-through; }
 416
 417 div.unbreakable { page-break-inside: avoid; }
 418
 419
 420 /*
 421  * xhtml11 specific
 422  *
 423  * */
 424
 425 div.tableblock {
 426   margin-top: 1.0em;
 427   margin-bottom: 1.5em;
 428 }
 429 div.tableblock > table {
 430   border: 3px solid #527bbd;
 431 }
 432 thead, p.table.header {
 433   font-weight: bold;
 434   color: #527bbd;
 435 }
 436 p.table {
 437   margin-top: 0;
 438 }
 439 /* Because the table frame attribute is overridden by CSS in most browsers. */
 440 div.tableblock > table[frame="void"] {
 441   border-style: none;
 442 }
 443 div.tableblock > table[frame="hsides"] {
 444   border-left-style: none;
 445   border-right-style: none;
 446 }
 447 div.tableblock > table[frame="vsides"] {
 448   border-top-style: none;
 449   border-bottom-style: none;
 450 }
 451
 452
 453 /*
 454  * html5 specific
 455  *
 456  * */
 457
 458 table.tableblock {
 459   margin-top: 1.0em;
 460   margin-bottom: 1.5em;
 461 }
 462 thead, p.tableblock.header {
 463   font-weight: bold;
 464   color: #527bbd;
 465 }
 466 p.tableblock {
 467   margin-top: 0;
 468 }
 469 table.tableblock {
 470   border-width: 3px;
 471   border-spacing: 0px;
 472   border-style: solid;
 473   border-color: #527bbd;
 474   border-collapse: collapse;
 475 }
 476 th.tableblock, td.tableblock {
 477   border-width: 1px;
 478   padding: 4px;
 479   border-style: solid;
 480   border-color: #527bbd;
 481 }
 482
 483 table.tableblock.frame-topbot {
 484   border-left-style: hidden;
 485   border-right-style: hidden;
 486 }
 487 table.tableblock.frame-sides {
 488   border-top-style: hidden;
 489   border-bottom-style: hidden;
 490 }
 491 table.tableblock.frame-none {
 492   border-style: hidden;
 493 }
 494
 495 th.tableblock.halign-left, td.tableblock.halign-left {
 496   text-align: left;
 497 }
 498 th.tableblock.halign-center, td.tableblock.halign-center {
 499   text-align: center;
 500 }
 501 th.tableblock.halign-right, td.tableblock.halign-right {
 502   text-align: right;
 503 }
 504
 505 th.tableblock.valign-top, td.tableblock.valign-top {
 506   vertical-align: top;
 507 }
 508 th.tableblock.valign-middle, td.tableblock.valign-middle {
 509   vertical-align: middle;
 510 }
 511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
 512   vertical-align: bottom;
 513 }
 514
 515
 516 /*
 517  * manpage specific
 518  *
 519  * */
 520
 521 body.manpage h1 {
 522   padding-top: 0.5em;
 523   padding-bottom: 0.5em;
 524   border-top: 2px solid silver;
 525   border-bottom: 2px solid silver;
 526 }
 527 body.manpage h2 {
 528   border-style: none;
 529 }
 530 body.manpage div.sectionbody {
 531   margin-left: 3em;
 532 }
 533
 534 @media print {
 535   body.manpage div#toc { display: none; }
 536 }
 537
 538
 539 </style>
 540 <script type="text/javascript">
 541 /*<![CDATA[*/
 542 var asciidoc = {  // Namespace.
 543
 544 /////////////////////////////////////////////////////////////////////
 545 // Table Of Contents generator
 546 /////////////////////////////////////////////////////////////////////
 547
 548 /* Author: Mihai Bazon, September 2002
 549  * http://students.infoiasi.ro/~mishoo
 550  *
 551  * Table Of Content generator
 552  * Version: 0.4
 553  *
 554  * Feel free to use this script under the terms of the GNU General Public
 555  * License, as long as you do not remove or alter this notice.
 556  */
 557
 558  /* modified by Troy D. Hanson, September 2006. License: GPL */
 559  /* modified by Stuart Rackham, 2006, 2009. License: GPL */
 560
 561 // toclevels = 1..4.
 562 toc: function (toclevels) {
 563
 564   function getText(el) {
 565     var text = "";
 566     for (var i = el.firstChild; i != null; i = i.nextSibling) {
 567       if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
 568         text += i.data;
 569       else if (i.firstChild != null)
 570         text += getText(i);
 571     }
 572     return text;
 573   }
 574
 575   function TocEntry(el, text, toclevel) {
 576     this.element = el;
 577     this.text = text;
 578     this.toclevel = toclevel;
 579   }
 580
 581   function tocEntries(el, toclevels) {
 582     var result = new Array;
 583     var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
 584     // Function that scans the DOM tree for header elements (the DOM2
 585     // nodeIterator API would be a better technique but not supported by all
 586     // browsers).
 587     var iterate = function (el) {
 588       for (var i = el.firstChild; i != null; i = i.nextSibling) {
 589         if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
 590           var mo = re.exec(i.tagName);
 591           if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
 592             result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
 593           }
 594           iterate(i);
 595         }
 596       }
 597     }
 598     iterate(el);
 599     return result;
 600   }
 601
 602   var toc = document.getElementById("toc");
 603   if (!toc) {
 604     return;
 605   }
 606
 607   // Delete existing TOC entries in case we're reloading the TOC.
 608   var tocEntriesToRemove = [];
 609   var i;
 610   for (i = 0; i < toc.childNodes.length; i++) {
 611     var entry = toc.childNodes[i];
 612     if (entry.nodeName.toLowerCase() == 'div'
 613      && entry.getAttribute("class")
 614      && entry.getAttribute("class").match(/^toclevel/))
 615       tocEntriesToRemove.push(entry);
 616   }
 617   for (i = 0; i < tocEntriesToRemove.length; i++) {
 618     toc.removeChild(tocEntriesToRemove[i]);
 619   }
 620
 621   // Rebuild TOC entries.
 622   var entries = tocEntries(document.getElementById("content"), toclevels);
 623   for (var i = 0; i < entries.length; ++i) {
 624     var entry = entries[i];
 625     if (entry.element.id == "")
 626       entry.element.id = "_toc_" + i;
 627     var a = document.createElement("a");
 628     a.href = "#" + entry.element.id;
 629     a.appendChild(document.createTextNode(entry.text));
 630     var div = document.createElement("div");
 631     div.appendChild(a);
 632     div.className = "toclevel" + entry.toclevel;
 633     toc.appendChild(div);
 634   }
 635   if (entries.length == 0)
 636     toc.parentNode.removeChild(toc);
 637 },
 638
 639
 640 /////////////////////////////////////////////////////////////////////
 641 // Footnotes generator
 642 /////////////////////////////////////////////////////////////////////
 643
 644 /* Based on footnote generation code from:
 645  * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 646  */
 647
 648 footnotes: function () {
 649   // Delete existing footnote entries in case we're reloading the footnodes.
 650   var i;
 651   var noteholder = document.getElementById("footnotes");
 652   if (!noteholder) {
 653     return;
 654   }
 655   var entriesToRemove = [];
 656   for (i = 0; i < noteholder.childNodes.length; i++) {
 657     var entry = noteholder.childNodes[i];
 658     if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
 659       entriesToRemove.push(entry);
 660   }
 661   for (i = 0; i < entriesToRemove.length; i++) {
 662     noteholder.removeChild(entriesToRemove[i]);
 663   }
 664
 665   // Rebuild footnote entries.
 666   var cont = document.getElementById("content");
 667   var spans = cont.getElementsByTagName("span");
 668   var refs = {};
 669   var n = 0;
 670   for (i=0; i<spans.length; i++) {
 671     if (spans[i].className == "footnote") {
 672       n++;
 673       var note = spans[i].getAttribute("data-note");
 674       if (!note) {
 675         // Use [\s\S] in place of . so multi-line matches work.
 676         // Because JavaScript has no s (dotall) regex flag.
 677         note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
 678         spans[i].innerHTML =
 679           "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
 680           "' title='View footnote' class='footnote'>" + n + "</a>]";
 681         spans[i].setAttribute("data-note", note);
 682       }
 683       noteholder.innerHTML +=
 684         "<div class='footnote' id='_footnote_" + n + "'>" +
 685         "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
 686         n + "</a>. " + note + "</div>";
 687       var id =spans[i].getAttribute("id");
 688       if (id != null) refs["#"+id] = n;
 689     }
 690   }
 691   if (n == 0)
 692     noteholder.parentNode.removeChild(noteholder);
 693   else {
 694     // Process footnoterefs.
 695     for (i=0; i<spans.length; i++) {
 696       if (spans[i].className == "footnoteref") {
 697         var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
 698         href = href.match(/#.*/)[0];  // Because IE return full URL.
 699         n = refs[href];
 700         spans[i].innerHTML =
 701           "[<a href='#_footnote_" + n +
 702           "' title='View footnote' class='footnote'>" + n + "</a>]";
 703       }
 704     }
 705   }
 706 },
 707
 708 install: function(toclevels) {
 709   var timerId;
 710
 711   function reinstall() {
 712     asciidoc.footnotes();
 713     if (toclevels) {
 714       asciidoc.toc(toclevels);
 715     }
 716   }
 717
 718   function reinstallAndRemoveTimer() {
 719     clearInterval(timerId);
 720     reinstall();
 721   }
 722
 723   timerId = setInterval(reinstall, 500);
 724   if (document.addEventListener)
 725     document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
 726   else
 727     window.onload = reinstallAndRemoveTimer;
 728 }
 729
 730 }
 731 asciidoc.install();
 732 /*]]>*/
 733 </script>
 734 </head>
 735 <body class="manpage">
 736 <div id="header">
 737 <h1>
 738 git-cvsimport(1) Manual Page
 739 </h1>
 740 <h2>NAME</h2>
 741 <div class="sectionbody">
 742 <p>git-cvsimport -
 743    Salvage your data out of another SCM people love to hate
 744 </p>
 745 </div>
 746 </div>
 747 <div id="content">
 748 <div class="sect1">
 749 <h2 id="_synopsis">SYNOPSIS</h2>
 750 <div class="sectionbody">
 751 <div class="verseblock">
 752 <pre class="content"><em>git cvsimport</em> [-o &lt;branch-for-HEAD&gt;] [-h] [-v] [-d &lt;CVSROOT&gt;]
 753               [-A &lt;author-conv-file&gt;] [-p &lt;options-for-cvsps&gt;] [-P &lt;file&gt;]
 754               [-C &lt;git-repository&gt;] [-z &lt;fuzz&gt;] [-i] [-k] [-u] [-s &lt;subst&gt;]
 755               [-a] [-m] [-M &lt;regex&gt;] [-S &lt;regex&gt;] [-L &lt;commit-limit&gt;]
 756               [-r &lt;remote&gt;] [-R] [&lt;CVS-module&gt;]</pre>
 757 <div class="attribution">
 758 </div></div>
 759 </div>
 760 </div>
 761 <div class="sect1">
 762 <h2 id="_description">DESCRIPTION</h2>
 763 <div class="sectionbody">
 764 <div class="paragraph"><p><strong>WARNING:</strong> <code>git cvsimport</code> uses cvsps version 2, which is considered
 765 deprecated; it does not work with cvsps version 3 and later.  If you are
 766 performing a one-shot import of a CVS repository consider using
 767 <a href="http://cvs2svn.tigris.org/cvs2git.html">cvs2git</a> or
 768 <a href="https://gitlab.com/esr/cvs-fast-export">cvs-fast-export</a>.</p></div>
 769 <div class="paragraph"><p>Imports a CVS repository into Git. It will either create a new
 770 repository, or incrementally import into an existing one.</p></div>
 771 <div class="paragraph"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.
 772 At least version 2.1 is required.</p></div>
 773 <div class="paragraph"><p><strong>WARNING:</strong> for certain situations the import leads to incorrect results.
 774 Please see the section <a href="#issues">ISSUES</a> for further reference.</p></div>
 775 <div class="paragraph"><p>You should <strong>never</strong> do any work of your own on the branches that are
 776 created by <em>git cvsimport</em>.  By default initial import will create and populate a
 777 "master" branch from the CVS repository&#8217;s main branch which you&#8217;re free
 778 to work with; after that, you need to <em>git merge</em> incremental imports, or
 779 any CVS branches, yourself.  It is advisable to specify a named remote via
 780 -r to separate and protect the incoming branches.</p></div>
 781 <div class="paragraph"><p>If you intend to set up a shared public repository that all developers can
 782 read/write, or if you want to use <a href="git-cvsserver.html">git-cvsserver(1)</a>, then you
 783 probably want to make a bare clone of the imported repository,
 784 and use the clone as the shared repository.
 785 See <a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p></div>
 786 </div>
 787 </div>
 788 <div class="sect1">
 789 <h2 id="_options">OPTIONS</h2>
 790 <div class="sectionbody">
 791 <div class="dlist"><dl>
 792 <dt class="hdlist1">
 793 -v
 794 </dt>
 795 <dd>
 796 <p>
 797         Verbosity: let <em>cvsimport</em> report what it is doing.
 798 </p>
 799 </dd>
 800 <dt class="hdlist1">
 801 -d &lt;CVSROOT&gt;
 802 </dt>
 803 <dd>
 804 <p>
 805         The root of the CVS archive. May be local (a simple path) or remote;
 806         currently, only the :local:, :ext: and :pserver: access methods
 807         are supported. If not given, <em>git cvsimport</em> will try to read it
 808         from <code>CVS/Root</code>. If no such file exists, it checks for the
 809         <code>CVSROOT</code> environment variable.
 810 </p>
 811 </dd>
 812 <dt class="hdlist1">
 813 &lt;CVS-module&gt;
 814 </dt>
 815 <dd>
 816 <p>
 817         The CVS module you want to import. Relative to &lt;CVSROOT&gt;.
 818         If not given, <em>git cvsimport</em> tries to read it from
 819         <code>CVS/Repository</code>.
 820 </p>
 821 </dd>
 822 <dt class="hdlist1">
 823 -C &lt;target-dir&gt;
 824 </dt>
 825 <dd>
 826 <p>
 827         The Git repository to import to.  If the directory doesn&#8217;t
 828         exist, it will be created.  Default is the current directory.
 829 </p>
 830 </dd>
 831 <dt class="hdlist1">
 832 -r &lt;remote&gt;
 833 </dt>
 834 <dd>
 835 <p>
 836         The Git remote to import this CVS repository into.
 837         Moves all CVS branches into remotes/&lt;remote&gt;/&lt;branch&gt;
 838         akin to the way <em>git clone</em> uses <em>origin</em> by default.
 839 </p>
 840 </dd>
 841 <dt class="hdlist1">
 842 -o &lt;branch-for-HEAD&gt;
 843 </dt>
 844 <dd>
 845 <p>
 846         When no remote is specified (via -r) the <code>HEAD</code> branch
 847         from CVS is imported to the <em>origin</em> branch within the Git
 848         repository, as <code>HEAD</code> already has a special meaning for Git.
 849         When a remote is specified the <code>HEAD</code> branch is named
 850         remotes/&lt;remote&gt;/master mirroring <em>git clone</em> behaviour.
 851         Use this option if you want to import into a different
 852         branch.
 853 </p>
 854 <div class="paragraph"><p>Use <em>-o master</em> for continuing an import that was initially done by
 855 the old cvs2git tool.</p></div>
 856 </dd>
 857 <dt class="hdlist1">
 858 -i
 859 </dt>
 860 <dd>
 861 <p>
 862         Import-only: don&#8217;t perform a checkout after importing.  This option
 863         ensures the working directory and index remain untouched and will
 864         not create them if they do not exist.
 865 </p>
 866 </dd>
 867 <dt class="hdlist1">
 868 -k
 869 </dt>
 870 <dd>
 871 <p>
 872         Kill keywords: will extract files with <em>-kk</em> from the CVS archive
 873         to avoid noisy changesets. Highly recommended, but off by default
 874         to preserve compatibility with early imported trees.
 875 </p>
 876 </dd>
 877 <dt class="hdlist1">
 878 -u
 879 </dt>
 880 <dd>
 881 <p>
 882         Convert underscores in tag and branch names to dots.
 883 </p>
 884 </dd>
 885 <dt class="hdlist1">
 886 -s &lt;subst&gt;
 887 </dt>
 888 <dd>
 889 <p>
 890         Substitute the character "/" in branch names with &lt;subst&gt;
 891 </p>
 892 </dd>
 893 <dt class="hdlist1">
 894 -p &lt;options-for-cvsps&gt;
 895 </dt>
 896 <dd>
 897 <p>
 898         Additional options for cvsps.
 899         The options <code>-u</code> and <em>-A</em> are implicit and should not be used here.
 900 </p>
 901 <div class="paragraph"><p>If you need to pass multiple options, separate them with a comma.</p></div>
 902 </dd>
 903 <dt class="hdlist1">
 904 -z &lt;fuzz&gt;
 905 </dt>
 906 <dd>
 907 <p>
 908         Pass the timestamp fuzz factor to cvsps, in seconds. If unset,
 909         cvsps defaults to 300s.
 910 </p>
 911 </dd>
 912 <dt class="hdlist1">
 913 -P &lt;cvsps-output-file&gt;
 914 </dt>
 915 <dd>
 916 <p>
 917         Instead of calling cvsps, read the provided cvsps output file. Useful
 918         for debugging or when cvsps is being handled outside cvsimport.
 919 </p>
 920 </dd>
 921 <dt class="hdlist1">
 922 -m
 923 </dt>
 924 <dd>
 925 <p>
 926         Attempt to detect merges based on the commit message. This option
 927         will enable default regexes that try to capture the source
 928         branch name from the commit message.
 929 </p>
 930 </dd>
 931 <dt class="hdlist1">
 932 -M &lt;regex&gt;
 933 </dt>
 934 <dd>
 935 <p>
 936         Attempt to detect merges based on the commit message with a custom
 937         regex. It can be used with <code>-m</code> to enable the default regexes
 938         as well. You must escape forward slashes.
 939 </p>
 940 <div class="paragraph"><p>The regex must capture the source branch name in $1.</p></div>
 941 <div class="paragraph"><p>This option can be used several times to provide several detection regexes.</p></div>
 942 </dd>
 943 <dt class="hdlist1">
 944 -S &lt;regex&gt;
 945 </dt>
 946 <dd>
 947 <p>
 948         Skip paths matching the regex.
 949 </p>
 950 </dd>
 951 <dt class="hdlist1">
 952 -a
 953 </dt>
 954 <dd>
 955 <p>
 956         Import all commits, including recent ones. cvsimport by default
 957         skips commits that have a timestamp less than 10 minutes ago.
 958 </p>
 959 </dd>
 960 <dt class="hdlist1">
 961 -L &lt;limit&gt;
 962 </dt>
 963 <dd>
 964 <p>
 965         Limit the number of commits imported. Workaround for cases where
 966         cvsimport leaks memory.
 967 </p>
 968 </dd>
 969 <dt class="hdlist1">
 970 -A &lt;author-conv-file&gt;
 971 </dt>
 972 <dd>
 973 <p>
 974         CVS by default uses the Unix username when writing its
 975         commit logs. Using this option and an author-conv-file
 976         maps the name recorded in CVS to author name, e-mail and
 977         optional time zone:
 978 </p>
 979 <div class="listingblock">
 980 <div class="content">
 981 <pre><code>        exon=Andreas Ericsson &lt;ae@op5.se&gt;
 982         spawn=Simon Pawn &lt;spawn@frog-pond.org&gt; America/Chicago</code></pre>
 983 </div></div>
 984 <div class="paragraph"><p><em>git cvsimport</em> will make it appear as those authors had
 985 their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
 986 all along.  If a time zone is specified, GIT_AUTHOR_DATE will
 987 have the corresponding offset applied.</p></div>
 988 <div class="paragraph"><p>For convenience, this data is saved to <code>$GIT_DIR/cvs-authors</code>
 989 each time the <em>-A</em> option is provided and read from that same
 990 file each time <em>git cvsimport</em> is run.</p></div>
 991 <div class="paragraph"><p>It is not recommended to use this feature if you intend to
 992 export changes back to CVS again later with
 993 <em>git cvsexportcommit</em>.</p></div>
 994 </dd>
 995 <dt class="hdlist1">
 996 -R
 997 </dt>
 998 <dd>
 999 <p>
1000         Generate a <code>$GIT_DIR/cvs-revisions</code> file containing a mapping from CVS
1001         revision numbers to newly-created Git commit IDs.  The generated file
1002         will contain one line for each (filename, revision) pair imported;
1003         each line will look like
1004 </p>
1005 <div class="listingblock">
1006 <div class="content">
1007 <pre><code>src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7</code></pre>
1008 </div></div>
1009 <div class="paragraph"><p>The revision data is appended to the file if it already exists, for use when
1010 doing incremental imports.</p></div>
1011 <div class="paragraph"><p>This option may be useful if you have CVS revision numbers stored in commit
1012 messages, bug-tracking systems, email archives, and the like.</p></div>
1013 </dd>
1014 <dt class="hdlist1">
1015 -h
1016 </dt>
1017 <dd>
1018 <p>
1019         Print a short usage message and exit.
1020 </p>
1021 </dd>
1022 </dl></div>
1023 </div>
1024 </div>
1025 <div class="sect1">
1026 <h2 id="_output">OUTPUT</h2>
1027 <div class="sectionbody">
1028 <div class="paragraph"><p>If <code>-v</code> is specified, the script reports what it is doing.</p></div>
1029 <div class="paragraph"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with
1030 a zero exit status.</p></div>
1031 </div>
1032 </div>
1033 <div class="sect1">
1034 <h2 id="issues">ISSUES</h2>
1035 <div class="sectionbody">
1036 <div class="paragraph"><p>Problems related to timestamps:</p></div>
1037 <div class="ulist"><ul>
1038 <li>
1039 <p>
1040 If timestamps of commits in the CVS repository are not stable enough
1041    to be used for ordering commits changes may show up in the wrong
1042    order.
1043 </p>
1044 </li>
1045 <li>
1046 <p>
1047 If any files were ever "cvs import"ed more than once (e.g., import of
1048    more than one vendor release) the HEAD contains the wrong content.
1049 </p>
1050 </li>
1051 <li>
1052 <p>
1053 If the timestamp order of different files cross the revision order
1054    within the commit matching time window the order of commits may be
1055    wrong.
1056 </p>
1057 </li>
1058 </ul></div>
1059 <div class="paragraph"><p>Problems related to branches:</p></div>
1060 <div class="ulist"><ul>
1061 <li>
1062 <p>
1063 Branches on which no commits have been made are not imported.
1064 </p>
1065 </li>
1066 <li>
1067 <p>
1068 All files from the branching point are added to a branch even if
1069    never added in CVS.
1070 </p>
1071 </li>
1072 <li>
1073 <p>
1074 This applies to files added to the source branch <strong>after</strong> a daughter
1075    branch was created: if previously no commit was made on the daughter
1076    branch they will erroneously be added to the daughter branch in git.
1077 </p>
1078 </li>
1079 </ul></div>
1080 <div class="paragraph"><p>Problems related to tags:</p></div>
1081 <div class="ulist"><ul>
1082 <li>
1083 <p>
1084 Multiple tags on the same revision are not imported.
1085 </p>
1086 </li>
1087 </ul></div>
1088 <div class="paragraph"><p>If you suspect that any of these issues may apply to the repository you
1089 want to import, consider using cvs2git:</p></div>
1090 <div class="ulist"><ul>
1091 <li>
1092 <p>
1093 cvs2git (part of cvs2svn), <code>https://subversion.apache.org/</code>
1094 </p>
1095 </li>
1096 </ul></div>
1097 </div>
1098 </div>
1099 <div class="sect1">
1100 <h2 id="_git">GIT</h2>
1101 <div class="sectionbody">
1102 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
1103 </div>
1104 </div>
1105 </div>
1106 <div id="footnotes"><hr /></div>
1107 <div id="footer">
1108 <div id="footer-text">
1109 Last updated
1110  2023-12-18 14:49:41 PST
1111 </div>
1112 </div>
1113 </body>
1114 </html>