Martin Fuchs wrote:
> Hello Russel,
>
>> There's a small patch which fixes this issue and some other cvs2svn
windows
>> problems here:
>>
>> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=41909
>>
>> It might be a little out of date now though.
>
> Thank you, I applied it with a small adjustment on the current source
code.
> Attached is the diff against revision 7003.
>
> May be someone (Max?) can commit this patch?
> The Changelog is already there at:
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=41909
I've examined the patch. Many comments:
First, re the slash problem - what do you think of this:
--- cvs2svn.py (revision 7052)
+++ cvs2svn.py (working copy)
@@ -310,13 +310,19 @@
else:
return ctx.trunk_base
+if os.sep == '/':
+ def canonicalize_slashes(path):
+ return path
+else:
+ def canonicalize_slashes(path):
+ path.replace(os.sep, '/')
def relative_name(cvsroot, fname):
l = len(cvsroot)
if fname[:l] == cvsroot:
if fname[l] == '/':
- return fname[l+1:]
- return fname[l:]
+ return canonicalize_slashes(fname[l+1:])
+ return canonicalize_slashes(fname[l:])
sys.stderr.write('relative_path("%s", "%s"): fname is not a sub-path of'
' cvsroot\n' % (cvsroot, fname))
sys.exit(1)
Second, re escape_shell_arg:
There is a different implementation of it in gen_win.py. Why is it
different?
Third, re co -kb:
I think we do want keyword expansion here, so I'm not keen to use -kb.
Fourth, re this change:
- output = open(ctx.log_fname_base + CLEAN_REVS_SUFFIX, 'w')
+ output = open(ctx.log_fname_base + CLEAN_REVS_SUFFIX, 'wt')
It isn't in the log message. What is it for?
Fifth, in run-tests.py:
Does anyone know *why* invoking cvs2svn as "python cvs2svn.py" makes sort
work, when "cvs2svn.py" doesn't?
Max.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 13 14:20:44 2003