Google Git
Sign in
chromium / external / gitster / git-htmldocs / 1291d1a1ed65a3d56c1c3dae7e3d1770eeba618c / . / git-cvsimport.html
blob: 1eb5a4bf81a1cfe99944a7ff15f2eb88e68eb08e [file] [log] [blame]
Junio C Hamano944ce252018-05-30 22:25:26[diff] [blame]1<?xml version="1.0" encoding="UTF-8"?>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]6<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamano944ce252018-05-30 22:25:26[diff] [blame]7<meta name="generator" content="AsciiDoc 8.6.10" />
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]8<title>git-cvsimport(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]9<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]10/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
11
12/* Default font. */
13body {
14 font-family: Georgia,serif;
15}
16
17/* Title font. */
18h1, h2, h3, h4, h5, h6,
19div.title, caption.title,
20thead, p.table.header,
21#toctitle,
22#author, #revnumber, #revdate, #revremark,
23#footer {
24 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]25}
26
27body {
28 margin: 1em 5% 1em 5%;
29}
30
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]31a {
32 color: blue;
33 text-decoration: underline;
34}
35a:visited {
36 color: fuchsia;
37}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]38
39em {
40 font-style: italic;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]41 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]42}
43
44strong {
45 font-weight: bold;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]46 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]47}
48
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]49h1, h2, h3, h4, h5, h6 {
50 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 margin-top: 1.2em;
52 margin-bottom: 0.5em;
53 line-height: 1.3;
54}
55
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]57 border-bottom: 2px solid silver;
58}
59h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]60 padding-top: 0.5em;
61}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]62h3 {
63 float: left;
64}
65h3 + * {
66 clear: left;
67}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]68h5 {
69 font-size: 1.0em;
70}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]71
72div.sectionbody {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]73 margin-left: 0;
74}
75
76hr {
77 border: 1px solid silver;
78}
79
80p {
81 margin-top: 0.5em;
82 margin-bottom: 0.5em;
83}
84
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]85ul, ol, li > p {
86 margin-top: 0;
87}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]88ul > li { color: #aaa; }
89ul > li > * { color: black; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]90
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]91.monospaced, code, pre {
92 font-family: "Courier New", Courier, monospace;
93 font-size: inherit;
94 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]95 padding: 0;
96 margin: 0;
97}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]98pre {
99 white-space: pre-wrap;
100}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]101
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]102#author {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]103 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]104 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]105 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]106}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]107#email {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]108}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]109#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]110}
111
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]112#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]113 font-size: small;
114 border-top: 2px solid silver;
115 padding-top: 0.5em;
116 margin-top: 4.0em;
117}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]118#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]119 float: left;
120 padding-bottom: 0.5em;
121}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]122#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]123 float: right;
124 padding-bottom: 0.5em;
125}
126
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]127#preamble {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]128 margin-top: 1.5em;
129 margin-bottom: 1.5em;
130}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]131div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]132div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]134 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]135 margin-bottom: 1.5em;
136}
137div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]138 margin-top: 2.0em;
139 margin-bottom: 2.0em;
140 margin-right: 10%;
141 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]142}
143
144div.content { /* Block element content. */
145 padding: 0;
146}
147
148/* Block element titles. */
149div.title, caption.title {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]150 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]151 font-weight: bold;
152 text-align: left;
153 margin-top: 1.0em;
154 margin-bottom: 0.5em;
155}
156div.title + * {
157 margin-top: 0;
158}
159
160td div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content div.title:first-child {
164 margin-top: 0.0em;
165}
166div.content + div.title {
167 margin-top: 0.0em;
168}
169
170div.sidebarblock > div.content {
171 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]172 border: 1px solid #dddddd;
173 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]174 padding: 0.5em;
175}
176
177div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]178 border: 1px solid #dddddd;
179 border-left: 5px solid #f0f0f0;
180 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]181 padding: 0.5em;
182}
183
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]184div.quoteblock, div.verseblock {
185 padding-left: 1.0em;
186 margin-left: 1.0em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]187 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]188 border-left: 5px solid #f0f0f0;
189 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]190}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]191
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]192div.quoteblock > div.attribution {
193 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]194 text-align: right;
195}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]196
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]197div.verseblock > pre.content {
198 font-family: inherit;
199 font-size: inherit;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]200}
201div.verseblock > div.attribution {
202 padding-top: 0.75em;
203 text-align: left;
204}
205/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]206div.verseblock + div.attribution {
207 text-align: left;
208}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]209
210div.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}
218div.admonitionblock td.content {
219 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]220 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]221}
222
223div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]224 border-left: 3px solid #dddddd;
225 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]228div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]229span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]230a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]231
232dl {
233 margin-top: 0.8em;
234 margin-bottom: 0.8em;
235}
236dt {
237 margin-top: 0.5em;
238 margin-bottom: 0;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]239 font-style: normal;
240 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]241}
242dd > *:first-child {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]243 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]244}
245
246ul, ol {
247 list-style-position: outside;
248}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]249ol.arabic {
250 list-style-type: decimal;
251}
252ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]253 list-style-type: lower-alpha;
254}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]255ol.upperalpha {
256 list-style-type: upper-alpha;
257}
258ol.lowerroman {
259 list-style-type: lower-roman;
260}
261ol.upperroman {
262 list-style-type: upper-roman;
263}
264
265div.compact ul, div.compact ol,
266div.compact p, div.compact p,
267div.compact div, div.compact div {
268 margin-top: 0.1em;
269 margin-bottom: 0.1em;
270}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]271
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]272tfoot {
273 font-weight: bold;
274}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]275td > div.verse {
276 white-space: pre;
277}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]278
279div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]280 margin-top: 0.8em;
281 margin-bottom: 0.8em;
282}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]283div.hdlist tr {
284 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]285}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]286dt.hdlist1.strong, td.hdlist1.strong {
287 font-weight: bold;
288}
289td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]290 vertical-align: top;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]291 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]292 padding-right: 0.8em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]293 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]294}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]295td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]296 vertical-align: top;
297}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]298div.hdlist.compact tr {
299 margin: 0;
300 padding-bottom: 0;
301}
302
303.comment {
304 background: yellow;
305}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]307.footnote, .footnoteref {
308 font-size: 0.8em;
309}
310
311span.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
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]334div.colist td {
335 padding-right: 0.5em;
336 padding-bottom: 0.3em;
337 vertical-align: top;
338}
339div.colist td img {
340 margin-top: 0.3em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]341}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]342
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]343@media print {
344 #footer-badges { display: none; }
345}
346
347#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]348 margin-bottom: 2.5em;
349}
350
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]351#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]352 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]353 font-size: 1.1em;
354 font-weight: bold;
355 margin-top: 1.0em;
356 margin-bottom: 0.1em;
357}
358
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]359div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]360 margin-top: 0;
361 margin-bottom: 0;
362}
363div.toclevel2 {
364 margin-left: 2em;
365 font-size: 0.9em;
366}
367div.toclevel3 {
368 margin-left: 4em;
369 font-size: 0.9em;
370}
371div.toclevel4 {
372 margin-left: 6em;
373 font-size: 0.9em;
374}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]375
376span.aqua { color: aqua; }
377span.black { color: black; }
378span.blue { color: blue; }
379span.fuchsia { color: fuchsia; }
380span.gray { color: gray; }
381span.green { color: green; }
382span.lime { color: lime; }
383span.maroon { color: maroon; }
384span.navy { color: navy; }
385span.olive { color: olive; }
386span.purple { color: purple; }
387span.red { color: red; }
388span.silver { color: silver; }
389span.teal { color: teal; }
390span.white { color: white; }
391span.yellow { color: yellow; }
392
393span.aqua-background { background: aqua; }
394span.black-background { background: black; }
395span.blue-background { background: blue; }
396span.fuchsia-background { background: fuchsia; }
397span.gray-background { background: gray; }
398span.green-background { background: green; }
399span.lime-background { background: lime; }
400span.maroon-background { background: maroon; }
401span.navy-background { background: navy; }
402span.olive-background { background: olive; }
403span.purple-background { background: purple; }
404span.red-background { background: red; }
405span.silver-background { background: silver; }
406span.teal-background { background: teal; }
407span.white-background { background: white; }
408span.yellow-background { background: yellow; }
409
410span.big { font-size: 2em; }
411span.small { font-size: 0.6em; }
412
413span.underline { text-decoration: underline; }
414span.overline { text-decoration: overline; }
415span.line-through { text-decoration: line-through; }
416
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]417div.unbreakable { page-break-inside: avoid; }
418
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]419
420/*
421 * xhtml11 specific
422 *
423 * */
424
425div.tableblock {
426 margin-top: 1.0em;
427 margin-bottom: 1.5em;
428}
429div.tableblock > table {
430 border: 3px solid #527bbd;
431}
432thead, p.table.header {
433 font-weight: bold;
434 color: #527bbd;
435}
436p.table {
437 margin-top: 0;
438}
Junio C Hamano725b0da2020-01-22 22:02:40[diff] [blame]439/* Because the table frame attribute is overridden by CSS in most browsers. */
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]440div.tableblock > table[frame="void"] {
441 border-style: none;
442}
443div.tableblock > table[frame="hsides"] {
444 border-left-style: none;
445 border-right-style: none;
446}
447div.tableblock > table[frame="vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
450}
451
452
453/*
454 * html5 specific
455 *
456 * */
457
458table.tableblock {
459 margin-top: 1.0em;
460 margin-bottom: 1.5em;
461}
462thead, p.tableblock.header {
463 font-weight: bold;
464 color: #527bbd;
465}
466p.tableblock {
467 margin-top: 0;
468}
469table.tableblock {
470 border-width: 3px;
471 border-spacing: 0px;
472 border-style: solid;
473 border-color: #527bbd;
474 border-collapse: collapse;
475}
476th.tableblock, td.tableblock {
477 border-width: 1px;
478 padding: 4px;
479 border-style: solid;
480 border-color: #527bbd;
481}
482
483table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
486}
487table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
490}
491table.tableblock.frame-none {
492 border-style: hidden;
493}
494
495th.tableblock.halign-left, td.tableblock.halign-left {
496 text-align: left;
497}
498th.tableblock.halign-center, td.tableblock.halign-center {
499 text-align: center;
500}
501th.tableblock.halign-right, td.tableblock.halign-right {
502 text-align: right;
503}
504
505th.tableblock.valign-top, td.tableblock.valign-top {
506 vertical-align: top;
507}
508th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
510}
511th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
513}
514
515
516/*
517 * manpage specific
518 *
519 * */
520
521body.manpage h1 {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]522 padding-top: 0.5em;
523 padding-bottom: 0.5em;
524 border-top: 2px solid silver;
525 border-bottom: 2px solid silver;
526}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]527body.manpage h2 {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]528 border-style: none;
529}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]530body.manpage div.sectionbody {
531 margin-left: 3em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]532}
533
534@media print {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]535 body.manpage div#toc { display: none; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]536}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]537
538
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]539</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]540<script type="text/javascript">
541/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]542var 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.
562toc: 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;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]583 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]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");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]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];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]612 if (entry.nodeName.toLowerCase() == 'div'
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]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.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]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
648footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]649 // Delete existing footnote entries in case we're reloading the footnodes.
650 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]651 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]652 if (!noteholder) {
653 return;
654 }
655 var entriesToRemove = [];
656 for (i = 0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]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");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]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++;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]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 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n + "'>" +
685 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
686 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]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 }
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]706},
707
708install: 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;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]728}
729
730}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]731asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]732/*]]>*/
733</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]734</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]735<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]736<div id="header">
737<h1>
738git-cvsimport(1) Manual Page
739</h1>
740<h2>NAME</h2>
741<div class="sectionbody">
742<p>git-cvsimport -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]743 Salvage your data out of another SCM people love to hate
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]744</p>
745</div>
746</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]747<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]748<div class="sect1">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]749<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]750<div class="sectionbody">
Junio C Hamano235a91e2006-01-07 01:13:58[diff] [blame]751<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]752<pre class="content"><em>git cvsimport</em> [-o &lt;branch-for-HEAD&gt;] [-h] [-v] [-d &lt;CVSROOT&gt;]
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]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;commitlimit&gt;]
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]756 [-r &lt;remote&gt;] [-R] [&lt;CVS_module&gt;]</pre>
757<div class="attribution">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]758</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]759</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]760</div>
761<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]762<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]763<div class="sectionbody">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]764<div class="paragraph"><p><strong>WARNING:</strong> <code>git cvsimport</code> uses cvsps version 2, which is considered
Junio C Hamano0d1122e2013-02-01 21:37:02[diff] [blame]765deprecated; it does not work with cvsps version 3 and later. If you are
766performing a one-shot import of a CVS repository consider using
767<a href="http://cvs2svn.tigris.org/cvs2git.html">cvs2git</a> or
Junio C Hamanoad70bf02016-09-26 23:44:27[diff] [blame]768<a href="http://www.catb.org/esr/cvs-fast-export/">cvs-fast-export</a>.</p></div>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]769<div class="paragraph"><p>Imports a CVS repository into Git. It will either create a new
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]770repository, or incrementally import into an existing one.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]771<div class="paragraph"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]772At least version 2.1 is required.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]773<div class="paragraph"><p><strong>WARNING:</strong> for certain situations the import leads to incorrect results.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]774Please see the section <a href="#issues">ISSUES</a> for further reference.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]775<div class="paragraph"><p>You should <strong>never</strong> do any work of your own on the branches that are
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]776created by <em>git cvsimport</em>. By default initial import will create and populate a
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]777"master" branch from the CVS repository&#8217;s main branch which you&#8217;re free
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]778to work with; after that, you need to <em>git merge</em> incremental imports, or
Junio C Hamano9e52d4e2007-06-13 08:29:33[diff] [blame]779any CVS branches, yourself. It is advisable to specify a named remote via
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]780-r to separate and protect the incoming branches.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]781<div class="paragraph"><p>If you intend to set up a shared public repository that all developers can
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]782read/write, or if you want to use <a href="git-cvsserver.html">git-cvsserver(1)</a>, then you
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]783probably want to make a bare clone of the imported repository,
784and use the clone as the shared repository.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]785See <a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]786</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]787</div>
788<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]789<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]790<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]791<div class="dlist"><dl>
792<dt class="hdlist1">
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]793-v
794</dt>
795<dd>
796<p>
797 Verbosity: let <em>cvsimport</em> report what it is doing.
798</p>
799</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]800<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]807 are supported. If not given, <em>git cvsimport</em> will try to read it
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]808 from <code>CVS/Root</code>. If no such file exists, it checks for the
809 <code>CVSROOT</code> environment variable.
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]810</p>
811</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]812<dt class="hdlist1">
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]813&lt;CVS_module&gt;
814</dt>
815<dd>
816<p>
817 The CVS module you want to import. Relative to &lt;CVSROOT&gt;.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]818 If not given, <em>git cvsimport</em> tries to read it from
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]819 <code>CVS/Repository</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]820</p>
821</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]822<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]823-C &lt;target-dir&gt;
824</dt>
825<dd>
826<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]827 The Git repository to import to. If the directory doesn&#8217;t
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]828 exist, it will be created. Default is the current directory.
829</p>
830</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]831<dt class="hdlist1">
Junio C Hamano9e52d4e2007-06-13 08:29:33[diff] [blame]832-r &lt;remote&gt;
833</dt>
834<dd>
835<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]836 The Git remote to import this CVS repository into.
Junio C Hamano9e52d4e2007-06-13 08:29:33[diff] [blame]837 Moves all CVS branches into remotes/&lt;remote&gt;/&lt;branch&gt;
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]838 akin to the way <em>git clone</em> uses <em>origin</em> by default.
Junio C Hamano9e52d4e2007-06-13 08:29:33[diff] [blame]839</p>
840</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]841<dt class="hdlist1">
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]842-o &lt;branch-for-HEAD&gt;
843</dt>
844<dd>
845<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]846 When no remote is specified (via -r) the <code>HEAD</code> branch
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]847 from CVS is imported to the <em>origin</em> branch within the Git
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]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
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]850 remotes/&lt;remote&gt;/master mirroring <em>git clone</em> behaviour.
Junio C Hamano9e52d4e2007-06-13 08:29:33[diff] [blame]851 Use this option if you want to import into a different
852 branch.
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]853</p>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]854<div class="paragraph"><p>Use <em>-o master</em> for continuing an import that was initially done by
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]855the old cvs2git tool.</p></div>
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]856</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]857<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]858-i
859</dt>
860<dd>
861<p>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]862 Import-only: don&#8217;t perform a checkout after importing. This option
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]863 ensures the working directory and index remain untouched and will
864 not create them if they do not exist.
865</p>
866</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]867<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]868-k
869</dt>
870<dd>
871<p>
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]872 Kill keywords: will extract files with <em>-kk</em> from the CVS archive
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]873 to avoid noisy changesets. Highly recommended, but off by default
874 to preserve compatibility with early imported trees.
875</p>
876</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]877<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]878-u
879</dt>
880<dd>
881<p>
882 Convert underscores in tag and branch names to dots.
883</p>
884</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]885<dt class="hdlist1">
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]886-s &lt;subst&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]887</dt>
888<dd>
889<p>
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]890 Substitute the character "/" in branch names with &lt;subst&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]891</p>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]892</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]893<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]894-p &lt;options-for-cvsps&gt;
895</dt>
896<dd>
897<p>
898 Additional options for cvsps.
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]899 The options <code>-u</code> and <em>-A</em> are implicit and should not be used here.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]900</p>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]901<div class="paragraph"><p>If you need to pass multiple options, separate them with a comma.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]902</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]903<dt class="hdlist1">
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]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>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]912<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]921<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]922-m
923</dt>
924<dd>
925<p>
926 Attempt to detect merges based on the commit message. This option
Junio C Hamano4f1d8c42008-03-03 02:01:16[diff] [blame]927 will enable default regexes that try to capture the source
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]928 branch name from the commit message.
929</p>
930</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]931<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]932-M &lt;regex&gt;
933</dt>
934<dd>
935<p>
936 Attempt to detect merges based on the commit message with a custom
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]937 regex. It can be used with <code>-m</code> to enable the default regexes
Junio C Hamanoefe3c632008-02-14 00:51:31[diff] [blame]938 as well. You must escape forward slashes.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]939</p>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]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>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]942</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]943<dt class="hdlist1">
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]944-S &lt;regex&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]945</dt>
946<dd>
947<p>
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]948 Skip paths matching the regex.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]949</p>
950</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]951<dt class="hdlist1">
Junio C Hamanod1204f02007-01-08 11:18:48[diff] [blame]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>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]960<dt class="hdlist1">
Junio C Hamanod1204f02007-01-08 11:18:48[diff] [blame]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>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]969<dt class="hdlist1">
Junio C Hamanodb911ee2007-02-28 08:13:52[diff] [blame]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
Junio C Hamano4eb2b9c2012-11-15 21:12:29[diff] [blame]976 maps the name recorded in CVS to author name, e-mail and
Junio C Hamanoe3acfb82013-11-12 23:22:57[diff] [blame]977 optional time zone:
Junio C Hamanodb911ee2007-02-28 08:13:52[diff] [blame]978</p>
Junio C Hamanoa725a532006-03-21 08:33:47[diff] [blame]979<div class="listingblock">
Junio C Hamano02d6fa52006-01-16 08:23:23[diff] [blame]980<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]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>
Junio C Hamano02d6fa52006-01-16 08:23:23[diff] [blame]983</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]984<div class="paragraph"><p><em>git cvsimport</em> will make it appear as those authors had
Junio C Hamano02d6fa52006-01-16 08:23:23[diff] [blame]985their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
Junio C Hamanoe3acfb82013-11-12 23:22:57[diff] [blame]986all along. If a time zone is specified, GIT_AUTHOR_DATE will
Junio C Hamano4eb2b9c2012-11-15 21:12:29[diff] [blame]987have the corresponding offset applied.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]988<div class="paragraph"><p>For convenience, this data is saved to <code>$GIT_DIR/cvs-authors</code>
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]989each time the <em>-A</em> option is provided and read from that same
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]990file each time <em>git cvsimport</em> is run.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]991<div class="paragraph"><p>It is not recommended to use this feature if you intend to
Junio C Hamano02d6fa52006-01-16 08:23:23[diff] [blame]992export changes back to CVS again later with
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]993<em>git cvsexportcommit</em>.</p></div>
Junio C Hamanodb911ee2007-02-28 08:13:52[diff] [blame]994</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]995<dt class="hdlist1">
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]996-R
997</dt>
998<dd>
999<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1000 Generate a <code>$GIT_DIR/cvs-revisions</code> file containing a mapping from CVS
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]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">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1007<pre><code>src/widget.c 1.1 1d862f173cdc7325b6fa6d2ae1cfd61fd1b512b7</code></pre>
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]1008</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1009<div class="paragraph"><p>The revision data is appended to the file if it already exists, for use when
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]1010doing incremental imports.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1011<div class="paragraph"><p>This option may be useful if you have CVS revision numbers stored in commit
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]1012messages, bug-tracking systems, email archives, and the like.</p></div>
1013</dd>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1014<dt class="hdlist1">
Junio C Hamano12a3a232007-04-07 10:18:10[diff] [blame]1015-h
1016</dt>
1017<dd>
1018<p>
1019 Print a short usage message and exit.
1020</p>
1021</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1022</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1023</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1024</div>
1025<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1026<h2 id="_output">OUTPUT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1027<div class="sectionbody">
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1028<div class="paragraph"><p>If <code>-v</code> is specified, the script reports what it is doing.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1029<div class="paragraph"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1030a zero exit status.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1031</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1032</div>
1033<div class="sect1">
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1034<h2 id="issues">ISSUES</h2>
1035<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1036<div class="paragraph"><p>Problems related to timestamps:</p></div>
1037<div class="ulist"><ul>
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1038<li>
1039<p>
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1040If timestamps of commits in the CVS repository are not stable enough
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]1041 to be used for ordering commits changes may show up in the wrong
1042 order.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1043</p>
1044</li>
1045<li>
1046<p>
1047If any files were ever "cvs import"ed more than once (e.g., import of
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]1048 more than one vendor release) the HEAD contains the wrong content.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1049</p>
1050</li>
1051<li>
1052<p>
1053If the timestamp order of different files cross the revision order
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]1054 within the commit matching time window the order of commits may be
1055 wrong.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1056</p>
1057</li>
1058</ul></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1059<div class="paragraph"><p>Problems related to branches:</p></div>
1060<div class="ulist"><ul>
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1061<li>
1062<p>
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]1063Branches on which no commits have been made are not imported.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1064</p>
1065</li>
1066<li>
1067<p>
1068All files from the branching point are added to a branch even if
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1069 never added in CVS.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1070</p>
1071</li>
1072<li>
1073<p>
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]1074This 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.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1077</p>
1078</li>
1079</ul></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1080<div class="paragraph"><p>Problems related to tags:</p></div>
1081<div class="ulist"><ul>
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1082<li>
1083<p>
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]1084Multiple tags on the same revision are not imported.
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1085</p>
1086</li>
1087</ul></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1088<div class="paragraph"><p>If you suspect that any of these issues may apply to the repository you
Junio C Hamanofb5ffde2014-11-04 22:38:56[diff] [blame]1089want to import, consider using cvs2git:</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]1090<div class="ulist"><ul>
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1091<li>
1092<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1093cvs2git (part of cvs2svn), <code>http://subversion.apache.org/</code>
Junio C Hamano625716a2009-03-25 18:49:30[diff] [blame]1094</p>
1095</li>
1096</ul></div>
1097</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1098</div>
1099<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1100<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1101<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1102<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1103</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1104</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1105</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1106<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1107<div id="footer">
1108<div id="footer-text">
Junio C Hamano2ef0ba32018-01-26 23:13:53[diff] [blame]1109Last updated
Junio C Hamano7a46cd62020-03-15 21:57:10[diff] [blame]1110 2016-09-26 16:43:51 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1111</div>
1112</div>
1113</body>
1114</html>