Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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"> |
| 4 | <head> |
| 5 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 6 | <meta name="generator" content="AsciiDoc 8.2.5" /> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 7 | <style type="text/css"> |
| 8 | /* Debug borders */ |
| 9 | p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { |
| 10 | /* |
| 11 | border: 1px solid red; |
| 12 | */ |
| 13 | } |
| 14 | |
| 15 | body { |
| 16 | margin: 1em 5% 1em 5%; |
| 17 | } |
| 18 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 19 | a { |
| 20 | color: blue; |
| 21 | text-decoration: underline; |
| 22 | } |
| 23 | a:visited { |
| 24 | color: fuchsia; |
| 25 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 26 | |
| 27 | em { |
| 28 | font-style: italic; |
| 29 | } |
| 30 | |
| 31 | strong { |
| 32 | font-weight: bold; |
| 33 | } |
| 34 | |
| 35 | tt { |
| 36 | color: navy; |
| 37 | } |
| 38 | |
| 39 | h1, h2, h3, h4, h5, h6 { |
| 40 | color: #527bbd; |
| 41 | font-family: sans-serif; |
| 42 | margin-top: 1.2em; |
| 43 | margin-bottom: 0.5em; |
| 44 | line-height: 1.3; |
| 45 | } |
| 46 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 47 | h1, h2, h3 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 48 | border-bottom: 2px solid silver; |
| 49 | } |
| 50 | h2 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 51 | padding-top: 0.5em; |
| 52 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 53 | h3 { |
| 54 | float: left; |
| 55 | } |
| 56 | h3 + * { |
| 57 | clear: left; |
| 58 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 59 | |
| 60 | div.sectionbody { |
| 61 | font-family: serif; |
| 62 | margin-left: 0; |
| 63 | } |
| 64 | |
| 65 | hr { |
| 66 | border: 1px solid silver; |
| 67 | } |
| 68 | |
| 69 | p { |
| 70 | margin-top: 0.5em; |
| 71 | margin-bottom: 0.5em; |
| 72 | } |
| 73 | |
| 74 | pre { |
| 75 | padding: 0; |
| 76 | margin: 0; |
| 77 | } |
| 78 | |
| 79 | span#author { |
| 80 | color: #527bbd; |
| 81 | font-family: sans-serif; |
| 82 | font-weight: bold; |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 83 | font-size: 1.1em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 84 | } |
| 85 | span#email { |
| 86 | } |
| 87 | span#revision { |
| 88 | font-family: sans-serif; |
| 89 | } |
| 90 | |
| 91 | div#footer { |
| 92 | font-family: sans-serif; |
| 93 | font-size: small; |
| 94 | border-top: 2px solid silver; |
| 95 | padding-top: 0.5em; |
| 96 | margin-top: 4.0em; |
| 97 | } |
| 98 | div#footer-text { |
| 99 | float: left; |
| 100 | padding-bottom: 0.5em; |
| 101 | } |
| 102 | div#footer-badges { |
| 103 | float: right; |
| 104 | padding-bottom: 0.5em; |
| 105 | } |
| 106 | |
| 107 | div#preamble, |
| 108 | div.tableblock, div.imageblock, div.exampleblock, div.verseblock, |
| 109 | div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, |
| 110 | div.admonitionblock { |
| 111 | margin-right: 10%; |
| 112 | margin-top: 1.5em; |
| 113 | margin-bottom: 1.5em; |
| 114 | } |
| 115 | div.admonitionblock { |
| 116 | margin-top: 2.5em; |
| 117 | margin-bottom: 2.5em; |
| 118 | } |
| 119 | |
| 120 | div.content { /* Block element content. */ |
| 121 | padding: 0; |
| 122 | } |
| 123 | |
| 124 | /* Block element titles. */ |
| 125 | div.title, caption.title { |
| 126 | font-family: sans-serif; |
| 127 | font-weight: bold; |
| 128 | text-align: left; |
| 129 | margin-top: 1.0em; |
| 130 | margin-bottom: 0.5em; |
| 131 | } |
| 132 | div.title + * { |
| 133 | margin-top: 0; |
| 134 | } |
| 135 | |
| 136 | td div.title:first-child { |
| 137 | margin-top: 0.0em; |
| 138 | } |
| 139 | div.content div.title:first-child { |
| 140 | margin-top: 0.0em; |
| 141 | } |
| 142 | div.content + div.title { |
| 143 | margin-top: 0.0em; |
| 144 | } |
| 145 | |
| 146 | div.sidebarblock > div.content { |
| 147 | background: #ffffee; |
| 148 | border: 1px solid silver; |
| 149 | padding: 0.5em; |
| 150 | } |
| 151 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 152 | div.listingblock { |
| 153 | margin-right: 0%; |
| 154 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 155 | div.listingblock > div.content { |
| 156 | border: 1px solid silver; |
| 157 | background: #f4f4f4; |
| 158 | padding: 0.5em; |
| 159 | } |
| 160 | |
| 161 | div.quoteblock > div.content { |
| 162 | padding-left: 2.0em; |
| 163 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 164 | |
| 165 | div.attribution { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 166 | text-align: right; |
| 167 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 168 | div.verseblock + div.attribution { |
| 169 | text-align: left; |
| 170 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 171 | |
| 172 | div.admonitionblock .icon { |
| 173 | vertical-align: top; |
| 174 | font-size: 1.1em; |
| 175 | font-weight: bold; |
| 176 | text-decoration: underline; |
| 177 | color: #527bbd; |
| 178 | padding-right: 0.5em; |
| 179 | } |
| 180 | div.admonitionblock td.content { |
| 181 | padding-left: 0.5em; |
| 182 | border-left: 2px solid silver; |
| 183 | } |
| 184 | |
| 185 | div.exampleblock > div.content { |
| 186 | border-left: 2px solid silver; |
| 187 | padding: 0.5em; |
| 188 | } |
| 189 | |
| 190 | div.verseblock div.content { |
| 191 | white-space: pre; |
| 192 | } |
| 193 | |
| 194 | div.imageblock div.content { padding-left: 0; } |
| 195 | div.imageblock img { border: 1px solid silver; } |
| 196 | span.image img { border-style: none; } |
| 197 | |
| 198 | dl { |
| 199 | margin-top: 0.8em; |
| 200 | margin-bottom: 0.8em; |
| 201 | } |
| 202 | dt { |
| 203 | margin-top: 0.5em; |
| 204 | margin-bottom: 0; |
| 205 | font-style: italic; |
| 206 | } |
| 207 | dd > *:first-child { |
| 208 | margin-top: 0; |
| 209 | } |
| 210 | |
| 211 | ul, ol { |
| 212 | list-style-position: outside; |
| 213 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 214 | div.olist2 ol { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 215 | list-style-type: lower-alpha; |
| 216 | } |
| 217 | |
| 218 | div.tableblock > table { |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 219 | border: 3px solid #527bbd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 220 | } |
| 221 | thead { |
| 222 | font-family: sans-serif; |
| 223 | font-weight: bold; |
| 224 | } |
| 225 | tfoot { |
| 226 | font-weight: bold; |
| 227 | } |
| 228 | |
| 229 | div.hlist { |
| 230 | margin-top: 0.8em; |
| 231 | margin-bottom: 0.8em; |
| 232 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 233 | div.hlist td { |
| 234 | padding-bottom: 5px; |
| 235 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 236 | td.hlist1 { |
| 237 | vertical-align: top; |
| 238 | font-style: italic; |
| 239 | padding-right: 0.8em; |
| 240 | } |
| 241 | td.hlist2 { |
| 242 | vertical-align: top; |
| 243 | } |
| 244 | |
| 245 | @media print { |
| 246 | div#footer-badges { display: none; } |
| 247 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 248 | |
| 249 | div#toctitle { |
| 250 | color: #527bbd; |
| 251 | font-family: sans-serif; |
| 252 | font-size: 1.1em; |
| 253 | font-weight: bold; |
| 254 | margin-top: 1.0em; |
| 255 | margin-bottom: 0.1em; |
| 256 | } |
| 257 | |
| 258 | div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { |
| 259 | margin-top: 0; |
| 260 | margin-bottom: 0; |
| 261 | } |
| 262 | div.toclevel2 { |
| 263 | margin-left: 2em; |
| 264 | font-size: 0.9em; |
| 265 | } |
| 266 | div.toclevel3 { |
| 267 | margin-left: 4em; |
| 268 | font-size: 0.9em; |
| 269 | } |
| 270 | div.toclevel4 { |
| 271 | margin-left: 6em; |
| 272 | font-size: 0.9em; |
| 273 | } |
| 274 | include1::./stylesheets/xhtml11-manpage.css[] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 275 | /* Workarounds for IE6's broken and incomplete CSS2. */ |
| 276 | |
| 277 | div.sidebar-content { |
| 278 | background: #ffffee; |
| 279 | border: 1px solid silver; |
| 280 | padding: 0.5em; |
| 281 | } |
| 282 | div.sidebar-title, div.image-title { |
| 283 | font-family: sans-serif; |
| 284 | font-weight: bold; |
| 285 | margin-top: 0.0em; |
| 286 | margin-bottom: 0.5em; |
| 287 | } |
| 288 | |
| 289 | div.listingblock div.content { |
| 290 | border: 1px solid silver; |
| 291 | background: #f4f4f4; |
| 292 | padding: 0.5em; |
| 293 | } |
| 294 | |
| 295 | div.quoteblock-content { |
| 296 | padding-left: 2.0em; |
| 297 | } |
| 298 | |
| 299 | div.exampleblock-content { |
| 300 | border-left: 2px solid silver; |
| 301 | padding-left: 0.5em; |
| 302 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 303 | |
| 304 | /* IE6 sets dynamically generated links as visited. */ |
| 305 | div#toc a:visited { color: blue; } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 306 | </style> |
| 307 | <title>git-cvsimport(1)</title> |
| 308 | </head> |
| 309 | <body> |
| 310 | <div id="header"> |
| 311 | <h1> |
| 312 | git-cvsimport(1) Manual Page |
| 313 | </h1> |
| 314 | <h2>NAME</h2> |
| 315 | <div class="sectionbody"> |
| 316 | <p>git-cvsimport - |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 317 | Salvage your data out of another SCM people love to hate |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 318 | </p> |
| 319 | </div> |
| 320 | </div> |
| 321 | <h2>SYNOPSIS</h2> |
| 322 | <div class="sectionbody"> |
Junio C Hamano | 235a91e | 2006-01-07 01:13:58 | [diff] [blame] | 323 | <div class="verseblock"> |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 324 | <div class="content"><em>git cvsimport</em> [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>] |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 325 | [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>] |
| 326 | [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>] |
| 327 | [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>] |
Junio C Hamano | 9e52d4e | 2007-06-13 08:29:33 | [diff] [blame] | 328 | [-r <remote>] [<CVS_module>]</div></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 329 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 330 | <h2 id="_description">DESCRIPTION</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 331 | <div class="sectionbody"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 332 | <div class="para"><p>Imports a CVS repository into git. It will either create a new |
| 333 | repository, or incrementally import into an existing one.</p></div> |
| 334 | <div class="para"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>. |
| 335 | At least version 2.1 is required.</p></div> |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 336 | <div class="para"><p><strong>WARNING:</strong> for certain situations the import leads to incorrect results. |
| 337 | Please see the section <a href="#issues">ISSUES</a> for further reference.</p></div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 338 | <div class="para"><p>You should <strong>never</strong> do any work of your own on the branches that are |
| 339 | created by <em>git-cvsimport</em>. By default initial import will create and populate a |
Junio C Hamano | 04a3286 | 2006-03-08 01:42:43 | [diff] [blame] | 340 | "master" branch from the CVS repository's main branch which you're free |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 341 | to work with; after that, you need to <em>git-merge</em> incremental imports, or |
Junio C Hamano | 9e52d4e | 2007-06-13 08:29:33 | [diff] [blame] | 342 | any CVS branches, yourself. It is advisable to specify a named remote via |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 343 | -r to separate and protect the incoming branches.</p></div> |
| 344 | <div class="para"><p>If you intend to set up a shared public repository that all developers can |
| 345 | read/write, or if you want to use <a href="git-cvsserver.html">git-cvsserver(1)</a>, then you |
| 346 | probably want to make a bare clone of the imported repository, |
| 347 | and use the clone as the shared repository. |
| 348 | See <a href="gitcvs-migration.html">gitcvs-migration(7)</a>.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 349 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 350 | <h2 id="_options">OPTIONS</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 351 | <div class="sectionbody"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 352 | <div class="vlist"><dl> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 353 | <dt> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 354 | -v |
| 355 | </dt> |
| 356 | <dd> |
| 357 | <p> |
| 358 | Verbosity: let <em>cvsimport</em> report what it is doing. |
| 359 | </p> |
| 360 | </dd> |
| 361 | <dt> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 362 | -d <CVSROOT> |
| 363 | </dt> |
| 364 | <dd> |
| 365 | <p> |
| 366 | The root of the CVS archive. May be local (a simple path) or remote; |
| 367 | currently, only the :local:, :ext: and :pserver: access methods |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 368 | are supported. If not given, <em>git-cvsimport</em> will try to read it |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 369 | from <tt>CVS/Root</tt>. If no such file exists, it checks for the |
| 370 | <tt>CVSROOT</tt> environment variable. |
| 371 | </p> |
| 372 | </dd> |
| 373 | <dt> |
| 374 | <CVS_module> |
| 375 | </dt> |
| 376 | <dd> |
| 377 | <p> |
| 378 | The CVS module you want to import. Relative to <CVSROOT>. |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 379 | If not given, <em>git-cvsimport</em> tries to read it from |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 380 | <tt>CVS/Repository</tt>. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 381 | </p> |
| 382 | </dd> |
| 383 | <dt> |
| 384 | -C <target-dir> |
| 385 | </dt> |
| 386 | <dd> |
| 387 | <p> |
| 388 | The git repository to import to. If the directory doesn't |
| 389 | exist, it will be created. Default is the current directory. |
| 390 | </p> |
| 391 | </dd> |
| 392 | <dt> |
Junio C Hamano | 9e52d4e | 2007-06-13 08:29:33 | [diff] [blame] | 393 | -r <remote> |
| 394 | </dt> |
| 395 | <dd> |
| 396 | <p> |
| 397 | The git remote to import this CVS repository into. |
| 398 | Moves all CVS branches into remotes/<remote>/<branch> |
Junio C Hamano | 1de7572 | 2009-03-26 08:39:38 | [diff] [blame] | 399 | akin to the way <em>git-clone</em> uses <em>origin</em> by default. |
Junio C Hamano | 9e52d4e | 2007-06-13 08:29:33 | [diff] [blame] | 400 | </p> |
| 401 | </dd> |
| 402 | <dt> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 403 | -o <branch-for-HEAD> |
| 404 | </dt> |
| 405 | <dd> |
| 406 | <p> |
Junio C Hamano | 9e52d4e | 2007-06-13 08:29:33 | [diff] [blame] | 407 | When no remote is specified (via -r) the <em>HEAD</em> branch |
| 408 | from CVS is imported to the <em>origin</em> branch within the git |
| 409 | repository, as <em>HEAD</em> already has a special meaning for git. |
| 410 | When a remote is specified the <em>HEAD</em> branch is named |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 411 | remotes/<remote>/master mirroring <em>git-clone</em> behaviour. |
Junio C Hamano | 9e52d4e | 2007-06-13 08:29:33 | [diff] [blame] | 412 | Use this option if you want to import into a different |
| 413 | branch. |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 414 | </p> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 415 | <div class="para"><p>Use <em>-o master</em> for continuing an import that was initially done by |
| 416 | the old cvs2git tool.</p></div> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 417 | </dd> |
| 418 | <dt> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 419 | -i |
| 420 | </dt> |
| 421 | <dd> |
| 422 | <p> |
| 423 | Import-only: don't perform a checkout after importing. This option |
| 424 | ensures the working directory and index remain untouched and will |
| 425 | not create them if they do not exist. |
| 426 | </p> |
| 427 | </dd> |
| 428 | <dt> |
| 429 | -k |
| 430 | </dt> |
| 431 | <dd> |
| 432 | <p> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 433 | Kill keywords: will extract files with <em>-kk</em> from the CVS archive |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 434 | to avoid noisy changesets. Highly recommended, but off by default |
| 435 | to preserve compatibility with early imported trees. |
| 436 | </p> |
| 437 | </dd> |
| 438 | <dt> |
| 439 | -u |
| 440 | </dt> |
| 441 | <dd> |
| 442 | <p> |
| 443 | Convert underscores in tag and branch names to dots. |
| 444 | </p> |
| 445 | </dd> |
| 446 | <dt> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 447 | -s <subst> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 448 | </dt> |
| 449 | <dd> |
| 450 | <p> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 451 | Substitute the character "/" in branch names with <subst> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 452 | </p> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 453 | </dd> |
| 454 | <dt> |
| 455 | -p <options-for-cvsps> |
| 456 | </dt> |
| 457 | <dd> |
| 458 | <p> |
| 459 | Additional options for cvsps. |
| 460 | The options <em>-u</em> and <em>-A</em> are implicit and should not be used here. |
| 461 | </p> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 462 | <div class="para"><p>If you need to pass multiple options, separate them with a comma.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 463 | </dd> |
| 464 | <dt> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 465 | -z <fuzz> |
| 466 | </dt> |
| 467 | <dd> |
| 468 | <p> |
| 469 | Pass the timestamp fuzz factor to cvsps, in seconds. If unset, |
| 470 | cvsps defaults to 300s. |
| 471 | </p> |
| 472 | </dd> |
| 473 | <dt> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 474 | -P <cvsps-output-file> |
| 475 | </dt> |
| 476 | <dd> |
| 477 | <p> |
| 478 | Instead of calling cvsps, read the provided cvsps output file. Useful |
| 479 | for debugging or when cvsps is being handled outside cvsimport. |
| 480 | </p> |
| 481 | </dd> |
| 482 | <dt> |
| 483 | -m |
| 484 | </dt> |
| 485 | <dd> |
| 486 | <p> |
| 487 | Attempt to detect merges based on the commit message. This option |
Junio C Hamano | 4f1d8c4 | 2008-03-03 02:01:16 | [diff] [blame] | 488 | will enable default regexes that try to capture the source |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 489 | branch name from the commit message. |
| 490 | </p> |
| 491 | </dd> |
| 492 | <dt> |
| 493 | -M <regex> |
| 494 | </dt> |
| 495 | <dd> |
| 496 | <p> |
| 497 | Attempt to detect merges based on the commit message with a custom |
Junio C Hamano | efe3c63 | 2008-02-14 00:51:31 | [diff] [blame] | 498 | regex. It can be used with <em>-m</em> to enable the default regexes |
| 499 | as well. You must escape forward slashes. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 500 | </p> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 501 | <div class="para"><p>The regex must capture the source branch name in $1.</p></div> |
| 502 | <div class="para"><p>This option can be used several times to provide several detection regexes.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 503 | </dd> |
| 504 | <dt> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 505 | -S <regex> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 506 | </dt> |
| 507 | <dd> |
| 508 | <p> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 509 | Skip paths matching the regex. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 510 | </p> |
| 511 | </dd> |
Junio C Hamano | 02d6fa5 | 2006-01-16 08:23:23 | [diff] [blame] | 512 | <dt> |
Junio C Hamano | d1204f0 | 2007-01-08 11:18:48 | [diff] [blame] | 513 | -a |
| 514 | </dt> |
| 515 | <dd> |
| 516 | <p> |
| 517 | Import all commits, including recent ones. cvsimport by default |
| 518 | skips commits that have a timestamp less than 10 minutes ago. |
| 519 | </p> |
| 520 | </dd> |
| 521 | <dt> |
Junio C Hamano | d1204f0 | 2007-01-08 11:18:48 | [diff] [blame] | 522 | -L <limit> |
| 523 | </dt> |
| 524 | <dd> |
| 525 | <p> |
| 526 | Limit the number of commits imported. Workaround for cases where |
| 527 | cvsimport leaks memory. |
| 528 | </p> |
| 529 | </dd> |
Junio C Hamano | db911ee | 2007-02-28 08:13:52 | [diff] [blame] | 530 | <dt> |
| 531 | -A <author-conv-file> |
| 532 | </dt> |
| 533 | <dd> |
| 534 | <p> |
| 535 | CVS by default uses the Unix username when writing its |
| 536 | commit logs. Using this option and an author-conv-file |
| 537 | in this format |
| 538 | </p> |
Junio C Hamano | a725a53 | 2006-03-21 08:33:47 | [diff] [blame] | 539 | <div class="listingblock"> |
Junio C Hamano | 02d6fa5 | 2006-01-16 08:23:23 | [diff] [blame] | 540 | <div class="content"> |
Junio C Hamano | a725a53 | 2006-03-21 08:33:47 | [diff] [blame] | 541 | <pre><tt> exon=Andreas Ericsson <ae@op5.se> |
| 542 | spawn=Simon Pawn <spawn@frog-pond.org> |
| 543 | </tt></pre> |
Junio C Hamano | 02d6fa5 | 2006-01-16 08:23:23 | [diff] [blame] | 544 | </div></div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 545 | <div class="para"><p><em>git-cvsimport</em> will make it appear as those authors had |
Junio C Hamano | 02d6fa5 | 2006-01-16 08:23:23 | [diff] [blame] | 546 | their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 547 | all along.</p></div> |
| 548 | <div class="para"><p>For convenience, this data is saved to <tt>$GIT_DIR/cvs-authors</tt> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 549 | each time the <em>-A</em> option is provided and read from that same |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 550 | file each time <em>git-cvsimport</em> is run.</p></div> |
| 551 | <div class="para"><p>It is not recommended to use this feature if you intend to |
Junio C Hamano | 02d6fa5 | 2006-01-16 08:23:23 | [diff] [blame] | 552 | export changes back to CVS again later with |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 553 | <em>git-cvsexportcommit</em>.</p></div> |
Junio C Hamano | db911ee | 2007-02-28 08:13:52 | [diff] [blame] | 554 | </dd> |
Junio C Hamano | 12a3a23 | 2007-04-07 10:18:10 | [diff] [blame] | 555 | <dt> |
| 556 | -h |
| 557 | </dt> |
| 558 | <dd> |
| 559 | <p> |
| 560 | Print a short usage message and exit. |
| 561 | </p> |
| 562 | </dd> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 563 | </dl></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 564 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 565 | <h2 id="_output">OUTPUT</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 566 | <div class="sectionbody"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 567 | <div class="para"><p>If <em>-v</em> is specified, the script reports what it is doing.</p></div> |
| 568 | <div class="para"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with |
| 569 | a zero exit status.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 570 | </div> |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 571 | <h2 id="issues">ISSUES</h2> |
| 572 | <div class="sectionbody"> |
| 573 | <div class="para"><p>Problems related to timestamps:</p></div> |
| 574 | <div class="ilist"><ul> |
| 575 | <li> |
| 576 | <p> |
| 577 | If timestamps of commits in the cvs repository are not stable enough |
Junio C Hamano | 9572e92 | 2009-04-02 06:52:03 | [diff] [blame] | 578 | to be used for ordering commits changes may show up in the wrong |
| 579 | order. |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 580 | </p> |
| 581 | </li> |
| 582 | <li> |
| 583 | <p> |
| 584 | If any files were ever "cvs import"ed more than once (e.g., import of |
Junio C Hamano | 9572e92 | 2009-04-02 06:52:03 | [diff] [blame] | 585 | more than one vendor release) the HEAD contains the wrong content. |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 586 | </p> |
| 587 | </li> |
| 588 | <li> |
| 589 | <p> |
| 590 | If the timestamp order of different files cross the revision order |
Junio C Hamano | 9572e92 | 2009-04-02 06:52:03 | [diff] [blame] | 591 | within the commit matching time window the order of commits may be |
| 592 | wrong. |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 593 | </p> |
| 594 | </li> |
| 595 | </ul></div> |
| 596 | <div class="para"><p>Problems related to branches:</p></div> |
| 597 | <div class="ilist"><ul> |
| 598 | <li> |
| 599 | <p> |
Junio C Hamano | 9572e92 | 2009-04-02 06:52:03 | [diff] [blame] | 600 | Branches on which no commits have been made are not imported. |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 601 | </p> |
| 602 | </li> |
| 603 | <li> |
| 604 | <p> |
| 605 | All files from the branching point are added to a branch even if |
Junio C Hamano | 9572e92 | 2009-04-02 06:52:03 | [diff] [blame] | 606 | never added in cvs. |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 607 | </p> |
| 608 | </li> |
| 609 | <li> |
| 610 | <p> |
Junio C Hamano | 9572e92 | 2009-04-02 06:52:03 | [diff] [blame] | 611 | This applies to files added to the source branch <strong>after</strong> a daughter |
| 612 | branch was created: if previously no commit was made on the daughter |
| 613 | branch they will erroneously be added to the daughter branch in git. |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 614 | </p> |
| 615 | </li> |
| 616 | </ul></div> |
| 617 | <div class="para"><p>Problems related to tags:</p></div> |
| 618 | <div class="ilist"><ul> |
| 619 | <li> |
| 620 | <p> |
Junio C Hamano | 9572e92 | 2009-04-02 06:52:03 | [diff] [blame] | 621 | Multiple tags on the same revision are not imported. |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 622 | </p> |
| 623 | </li> |
| 624 | </ul></div> |
| 625 | <div class="para"><p>If you suspect that any of these issues may apply to the repository you |
| 626 | want to import consider using these alternative tools which proved to be |
Junio C Hamano | ea86833 | 2009-04-21 08:11:06 | [diff] [blame] | 627 | more stable in practice:</p></div> |
Junio C Hamano | 625716a | 2009-03-25 18:49:30 | [diff] [blame] | 628 | <div class="ilist"><ul> |
| 629 | <li> |
| 630 | <p> |
| 631 | cvs2git (part of cvs2svn), <tt>http://cvs2svn.tigris.org</tt> |
| 632 | </p> |
| 633 | </li> |
| 634 | <li> |
| 635 | <p> |
| 636 | parsecvs, <tt>http://cgit.freedesktop.org/~keithp/parsecvs</tt> |
| 637 | </p> |
| 638 | </li> |
| 639 | </ul></div> |
| 640 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 641 | <h2 id="_author">Author</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 642 | <div class="sectionbody"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 643 | <div class="para"><p>Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from |
| 644 | various participants of the git-list <git@vger.kernel.org>.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 645 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 646 | <h2 id="_documentation">Documentation</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 647 | <div class="sectionbody"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 648 | <div class="para"><p>Documentation by Matthias Urlichs <smurf@smurf.noris.de>.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 649 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 650 | <h2 id="_git">GIT</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 651 | <div class="sectionbody"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 652 | <div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 653 | </div> |
| 654 | <div id="footer"> |
| 655 | <div id="footer-text"> |
Junio C Hamano | 73d812c | 2009-07-01 02:33:06 | [diff] [blame] | 656 | Last updated 2009-07-01 02:30:46 UTC |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 657 | </div> |
| 658 | </div> |
| 659 | </body> |
| 660 | </html> |