Ok, I applied Russel's patch. I get an error:
CMD: cvs2svn.py "--trunk-only" "--create" "-s" "corrupt-svnrepos"
"E:/svn-trunk/
tools/cvs2svn/test-data/corrupt-cvsrepos" <TIME = 2.313000>
E:/svn-trunk/tools/cvs2svn/cvs2svn.py said:
Traceback (most recent call last):
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 2272, in ?
main()
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 2268, in main
convert(ctx, start_pass=start_pass)
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 2147, in convert
_passes[i](ctx)
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 1969, in pass1
os.path.walk(ctx.cvsroot, visit_file, (cd, p, stats))
File "C:\Python22\lib\ntpath.py", line 319, in walk
func(arg, top, names)
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 344, in
visit_file
p.parse(open(pathname, 'rb'), cd)
File "E:\svn-trunk\tools\cvs2svn\rcsparse\common.py", line 236, in
parse
self.sink.tree_completed()
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 226, in
tree_completed
print 'RESYNC: %s (%s) : old time="%s" new time="%s"' \
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 325, in
relative_name
assert fname[:l] == cvsroot and fname[l] == os.sep
NameError: global name 'l' is not defined
FAIL: run-tests.py 4: convert as much as can, despite a corrupt ,v file
I thought that maybe the "l" (lowercase L) was in reality a "1" (digit
1), so I changed it, and ran again:
CMD: cvs2svn.py "--create" "-s" "phoenix-svnrepos"
"E:/svn-trunk/tools/cvs2svn/t
est-data/phoenix-cvsrepos" <TIME = 2.273000>
E:/svn-trunk/tools/cvs2svn/cvs2svn.py said:
Traceback (most recent call last):
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 2272, in ?
main()
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 2268, in main
convert(ctx, start_pass=start_pass)
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 2147, in convert
_passes[i](ctx)
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 1969, in pass1
os.path.walk(ctx.cvsroot, visit_file, (cd, p, stats))
File "C:\Python22\lib\ntpath.py", line 319, in walk
func(arg, top, names)
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 344, in
visit_file
p.parse(open(pathname, 'rb'), cd)
File "E:\svn-trunk\tools\cvs2svn\rcsparse\common.py", line 236, in
parse
self.sink.tree_completed()
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 226, in
tree_completed
print 'RESYNC: %s (%s) : old time="%s" new time="%s"' \
File "E:\svn-trunk\tools\cvs2svn\cvs2svn.py", line 325, in
relative_name
assert fname[:1] == cvsroot and fname[1] == os.sep
AssertionError
FAIL: run-tests.py 5: convert a branch file rooted in a 'dead' revision
So, what's next ? Russell, can you confirm whether or not it is a "1"
(digit 1) or a "l" (lowercase L)
On 25 Jul 2003 12:38:37 -0500, cmpilato@collab.net said:
> "Francois Beausoleil" <fbos@users.sourceforge.net> writes:
>
> > I know, I know. I cannot remember the exact details. In fact, almost
> > all of run-tests.py fail because "cvs2svn-data.s-revs" is not found.
> > Here are the tests failing:
> >
> > E:\svn-trunk>svn up
> > U www\project_packages.html
> > PS: I sent a patch yesterday that corrects "/\" path elements. Check
> > "adding or changing 1.1 : trunk/\good" line above. The patch can be
> > found at:
> > http://article.gmane.org/gmane.comp.version-control.subversion.devel/31398
>
> Yeah, I saw your patch. Do me a favor though, and let me know if
> Russell's cvs2svn patch solves your problems.
>
Developer of Java Gui Builder
http://jgb.sourceforge.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 25 20:06:33 2003