diff options
| author | Matthew Ogilvie <mmogilvi_git@miniinfo.net> | 2008-07-04 22:43:41 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-05 17:42:16 -0700 |
| commit | a41a32bf1ce74f3be5c1ab398db1a93b89e6a99e (patch) | |
| tree | be09b31f54da0425dfa341b7bdd3a737697b39c7 | |
| parent | 2b2da6846370978123935258890a059167dc73bd (diff) | |
| download | git-a41a32bf1ce74f3be5c1ab398db1a93b89e6a99e.tar.gz git-a41a32bf1ce74f3be5c1ab398db1a93b89e6a99e.tar.xz | |
Documentation cvs: Clarify when a bare repository is needed
New users sometimes import a project and then immediately
try to use the imported repository as a central shared repository.
This provides pointers about setting up a bare repository for that
in the parts of the documentation dealing with CVS migration.
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-cvsimport.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-cvsserver.txt | 3 | ||||
| -rw-r--r-- | Documentation/gitcvs-migration.txt | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 2f9b35f62..93b7d2dc9 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -31,6 +31,12 @@ to work with; after that, you need to 'git merge' incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via -r to separate and protect the incoming branches. +If you intend to set up a shared public repository that all developers can +read/write, or if you want to use linkgit:git-cvsserver[1], then you +probably want to make a bare clone of the imported repository, +and use the clone as the shared repository. +See linkgit:gitcvs-migration[7]. + OPTIONS ------- diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index 3310ae25f..19da87e71 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -133,6 +133,9 @@ write access to the log file and to the database (see <<dbbackend,Database Backend>>. If you want to offer write access over SSH, the users of course also need write access to the git repository itself. +You also need to ensure that each repository is "bare" (without a git index +file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]. + [[configaccessmethod]] All configuration variables can also be overridden for a specific method of access. Valid method names are "ext" (for SSH access) and "pserver". The diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index 1db3f5294..0325d6759 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -143,6 +143,11 @@ work, you must not modify the imported branches; instead, create new branches for your own changes, and merge in the imported branches as necessary. +If you want a shared repository, you will need to make a bare clone +of the imported directory, as described above. Then treat the imported +directory as another development clone for purposes of merging +incremental imports. + Advanced Shared Repository Management ------------------------------------- |