On 10/25/2012 08:08 PM, Ben Walton wrote:
Hi Torsten,
On Thu, Oct 25, 2012 at 5:28 PM, Torsten Bögershausen <tboegi@xxxxxx> wrote:
BTW: While we are talking CVS: (I installed a fresh version)
cvs --version
Concurrent Versions System (CVS) 1.11.23 (client/server)
I have 1.12.13-MirDebian-8 here.
And t9200 fails:
git checkout t9200-git-cvsexportcommit.sh
tb@birne:~/projects/git/git.pu/t> ./t9200-git-cvsexportcommit.sh
cvs [init aborted]: Cannot initialize repository under existing CVSROOT: `/Users/tb/projects/git/git.pu/t/trash directory.t9200-git-cvsexportcommit'
FATAL: Unexpected exit with code 1
I'm not able to reproduce this manually...are you able to make it fail
this way outside of the test harness?
$ CVSROOT=$PWD/bw
$ export CVSROOT
$ mkdir $CVSROOT && cvs init && echo ok
ok
$ rm -rf $CVSROOT
$ cvs init && echo ok
ok
(cvs init || mkdir "$CVSROOT" && cvs init ) &&
If your version of cvs fails the checks above in manual testing, we
could see if there is a flag that works in all (old and new) versions
to override the failure if CVSROOT exists. Otherwise, this isn't a
bad fix, I don't think.
If your version does fail the manual checks, I think it's likely a
regression that was introduced and later reverted. I don't see those
strings inside my cvs binary at all...?
HTH.
Thanks
-Ben
Hej Ben,
thanks for looking into that - here some short answers:
a) The manual test (as you describe it) succeeds
b) The test case 9200 failes, and now I know why:
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index b59be9a..d2c3c37 100755
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -19,7 +19,7 @@ then
test_done
fi
-CVSROOT=$PWD/cvsroot
+CVSROOT=$PWD/xx
CVSWORK=$PWD/cvswork
GIT_DIR=$PWD/.git
export CVSROOT CVSWORK GIT_DIR
c) I need to send a patch tomorrow
d) FYI: I compiled cvs from scratch, from a file called cvs-1.11.23.tar.gz
and the code is in cvs-1.11.23/src/mkmodules.c:942
if (root_dir && strcmp (root_dir, current_parsed_root->directory))
error (1, 0,
"Cannot initialize repository under existing CVSROOT: `%s'",
root_dir);
free (root_dir);
/Torsten
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html