Skip to content

Commit 625716a

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.2.1-345-g89fb
1 parent 883263c commit 625716a

File tree

2 files changed

+105
-1
lines changed

2 files changed

+105
-1
lines changed

‎git-cvsimport.html‎

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,8 @@ <h2 id="_description">DESCRIPTION</h2>
333333
repository, or incrementally import into an existing one.</p></div>
334334
<div class="para"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.
335335
At least version 2.1 is required.</p></div>
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>
336338
<div class="para"><p>You should <strong>never</strong> do any work of your own on the branches that are
337339
created by <em>git-cvsimport</em>. By default initial import will create and populate a
338340
"master" branch from the CVS repository's main branch which you're free
@@ -566,6 +568,74 @@ <h2 id="_output">OUTPUT</h2>
566568
<div class="para"><p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with
567569
a zero exit status.</p></div>
568570
</div>
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
578+
to be used for ordering commits
579+
</p>
580+
</li>
581+
<li>
582+
<p>
583+
If any files were ever "cvs import"ed more than once (e.g., import of
584+
more than one vendor release)
585+
</p>
586+
</li>
587+
<li>
588+
<p>
589+
If the timestamp order of different files cross the revision order
590+
within the commit matching time window
591+
</p>
592+
</li>
593+
</ul></div>
594+
<div class="para"><p>Problems related to branches:</p></div>
595+
<div class="ilist"><ul>
596+
<li>
597+
<p>
598+
Branches on which no commits have been made are not imported
599+
</p>
600+
</li>
601+
<li>
602+
<p>
603+
All files from the branching point are added to a branch even if
604+
never added in cvs
605+
</p>
606+
</li>
607+
<li>
608+
<p>
609+
files added to the source branch <strong>after</strong> a daughter branch was
610+
created: If previously no commit was made on the daugther branch they
611+
will erroneously be added to the daughter branch in git
612+
</p>
613+
</li>
614+
</ul></div>
615+
<div class="para"><p>Problems related to tags:</p></div>
616+
<div class="ilist"><ul>
617+
<li>
618+
<p>
619+
Multiple tags on the same revision are not imported
620+
</p>
621+
</li>
622+
</ul></div>
623+
<div class="para"><p>If you suspect that any of these issues may apply to the repository you
624+
want to import consider using these alternative tools which proved to be
625+
more stable in practise:</p></div>
626+
<div class="ilist"><ul>
627+
<li>
628+
<p>
629+
cvs2git (part of cvs2svn), <tt>http://cvs2svn.tigris.org</tt>
630+
</p>
631+
</li>
632+
<li>
633+
<p>
634+
parsecvs, <tt>http://cgit.freedesktop.org/~keithp/parsecvs</tt>
635+
</p>
636+
</li>
637+
</ul></div>
638+
</div>
569639
<h2 id="_author">Author</h2>
570640
<div class="sectionbody">
571641
<div class="para"><p>Written by Matthias Urlichs &lt;smurf@smurf.noris.de&gt;, with help from
@@ -581,7 +651,7 @@ <h2 id="_git">GIT</h2>
581651
</div>
582652
<div id="footer">
583653
<div id="footer-text">
584-
Last updated 2009-02-14 08:18:10 UTC
654+
Last updated 2009-03-25 18:49:19 UTC
585655
</div>
586656
</div>
587657
</body>

‎git-cvsimport.txt‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ repository, or incrementally import into an existing one.
2424
Splitting the CVS log into patch sets is done by 'cvsps'.
2525
At least version 2.1 is required.
2626

27+
*WARNING:* for certain situations the import leads to incorrect results.
28+
Please see the section <<issues,ISSUES>> for further reference.
29+
2730
You should *never* do any work of your own on the branches that are
2831
created by 'git-cvsimport'. By default initial import will create and populate a
2932
"master" branch from the CVS repository's main branch which you're free
@@ -164,6 +167,37 @@ If '-v' is specified, the script reports what it is doing.
164167
Otherwise, success is indicated the Unix way, i.e. by simply exiting with
165168
a zero exit status.
166169

170+
[[issues]]
171+
ISSUES
172+
------
173+
Problems related to timestamps:
174+
175+
* If timestamps of commits in the cvs repository are not stable enough
176+
to be used for ordering commits
177+
* If any files were ever "cvs import"ed more than once (e.g., import of
178+
more than one vendor release)
179+
* If the timestamp order of different files cross the revision order
180+
within the commit matching time window
181+
182+
Problems related to branches:
183+
184+
* Branches on which no commits have been made are not imported
185+
* All files from the branching point are added to a branch even if
186+
never added in cvs
187+
* files added to the source branch *after* a daughter branch was
188+
created: If previously no commit was made on the daugther branch they
189+
will erroneously be added to the daughter branch in git
190+
191+
Problems related to tags:
192+
193+
* Multiple tags on the same revision are not imported
194+
195+
If you suspect that any of these issues may apply to the repository you
196+
want to import consider using these alternative tools which proved to be
197+
more stable in practise:
198+
199+
* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org`
200+
* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs`
167201

168202
Author
169203
------

0 commit comments

Comments
 (0)