From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Mar 2009 07:29:05 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eed1fcd76d8893ab687c700e1729faea025ba7a8?ds=inline;hp=-c

Merge branch 'maint'

* maint:
documentation: update cvsimport description of "-r" for recent clone
---

eed1fcd76d8893ab687c700e1729faea025ba7a8
diff --combined Documentation/git-cvsimport.txt
index 31237259e4,8f9ba74c8b..e1fd047bb5
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@@ -24,9 -24,6 +24,9 @@@ repository, or incrementally import int
  Splitting the CVS log into patch sets is done by 'cvsps'.
  At least version 2.1 is required.
  
 +*WARNING:* for certain situations the import leads to incorrect results.
 +Please see the section <<issues,ISSUES>> for further reference.
 +
  You should *never* do any work of your own on the branches that are
  created by 'git-cvsimport'.  By default initial import will create and populate a
  "master" branch from the CVS repository's main branch which you're free
@@@ -65,7 -62,7 +65,7 @@@ OPTION
  -r <remote>::
  	The git remote to import this CVS repository into.
  	Moves all CVS branches into remotes/<remote>/<branch>
- 	akin to the 'git-clone' "--use-separate-remote" option.
+ 	akin to the way 'git-clone' uses 'origin' by default.
  
  -o <branch-for-HEAD>::
  	When no remote is specified (via -r) the 'HEAD' branch
@@@ -167,37 -164,6 +167,37 @@@ If '-v' is specified, the script report
  Otherwise, success is indicated the Unix way, i.e. by simply exiting with
  a zero exit status.
  
 +[[issues]]
 +ISSUES
 +------
 +Problems related to timestamps:
 +
 + * If timestamps of commits in the cvs repository are not stable enough
 +   to be used for ordering commits
 + * If any files were ever "cvs import"ed more than once (e.g., import of
 +   more than one vendor release)
 + * If the timestamp order of different files cross the revision order
 +   within the commit matching time window
 +
 +Problems related to branches:
 +
 + * Branches on which no commits have been made are not imported
 + * All files from the branching point are added to a branch even if
 +   never added in cvs
 + * files added to the source branch *after* a daughter branch was
 +   created: If previously no commit was made on the daugther branch they
 +   will erroneously be added to the daughter branch in git
 +
 +Problems related to tags:
 +
 +* Multiple tags on the same revision are not imported
 +
 +If you suspect that any of these issues may apply to the repository you
 +want to import consider using these alternative tools which proved to be
 +more stable in practise:
 +
 +* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org`
 +* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs`
  
  Author
  ------