From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Ogilvie Subject: [PATCH 1/2] cvsserver doc: database generally can not be reproduced consistently Date: Sun, 22 Nov 2009 19:07:29 -0700 Message-ID: <1258942050-11423-2-git-send-email-mmogilvi_git@miniinfo.net> References: <1258942050-11423-1-git-send-email-mmogilvi_git@miniinfo.net> Cc: Matthew Ogilvie To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Mon Nov 23 03:08:11 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1NCOLI-0008Gi-Ej for gcvg-git-2@lo.gmane.org; Mon, 23 Nov 2009 03:07:52 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755527AbZKWCHk (ORCPT ); Sun, 22 Nov 2009 21:07:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754065AbZKWCHk (ORCPT ); Sun, 22 Nov 2009 21:07:40 -0500 Received: from qmta02.emeryville.ca.mail.comcast.net ([76.96.30.24]:34899 "EHLO QMTA02.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbZKWCHk (ORCPT ); Sun, 22 Nov 2009 21:07:40 -0500 Received: from OMTA02.emeryville.ca.mail.comcast.net ([76.96.30.19]) by QMTA02.emeryville.ca.mail.comcast.net with comcast id 8RuJ1d0040QkzPwA2S7nsM; Mon, 23 Nov 2009 02:07:47 +0000 Received: from mmogilvi.homeip.net ([24.8.125.243]) by OMTA02.emeryville.ca.mail.comcast.net with comcast id 8S7m1d0015FCJCg8NS7mkR; Mon, 23 Nov 2009 02:07:47 +0000 Received: from localhost.localdomain (bean [192.168.30.96]) by mmogilvi.homeip.net (Postfix) with ESMTP id 48FDE89114; Sun, 22 Nov 2009 19:07:45 -0700 (MST) X-Mailer: git-send-email 1.6.4.GIT In-Reply-To: <1258942050-11423-1-git-send-email-mmogilvi_git@miniinfo.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: A regenerated git-cvsserver database is at risk of having different CVS revision numbers from an incrementally updated database. Mention this in the the documentation, and remove an erroneous statement to the contrary. Signed-off-by: Matthew Ogilvie --- Documentation/git-cvsserver.txt | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index 785779e..99a7c14 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -182,10 +182,9 @@ Database Backend ---------------- 'git-cvsserver' uses one database per git head (i.e. CVS module) to -store information about the repository for faster access. The -database doesn't contain any persistent data and can be completely -regenerated from the git repository at any time. The database -needs to be updated (i.e. written to) after every commit. +store information about the repository to maintain consistent +CVS revision numbers. The database needs to be +updated (i.e. written to) after every commit. If the commit is done directly by using `git` (as opposed to using 'git-cvsserver') the update will need to happen on the @@ -204,6 +203,18 @@ write so it might not be enough to grant the users using 'git-cvsserver' write access to the database file without granting them write access to the directory, too. +The database can not be reliably regenerated in a +consistent form after the branch it is tracking has changed. +Example: For merged branches, 'git-cvsserver' only tracks +one branch of development, and after a 'git-merge' an +incrementally updated database may track a different branch +than a database regenerated from scratch, causing inconsistent +CVS revision numbers. `git-cvsserver` has no way of knowing which +branch it would have picked if it had been run incrementally +pre-merge. So if you have to fully or partially (from old +backup) regenerate the database, you should be suspicious +of pre-existing CVS sandboxes. + You can configure the database backend with the following configuration variables: -- 1.6.4.GIT