[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Re: svn does not seem able to merge

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-08-17 22:36:32 CEST

Merlin Moncure wrote:
>>> Nope. One possibility: svn seems to be converting my text files to
>>> unix-style line endings. Our text editor is converting them
>>> back...would this cause a conflict?
>>>
>>> Corollary: is it possible to suppress conversion of text files to unix
>>> style line endings?
>>
>> Do you by any chance know which version of cvs2svn you used and what
>> options?
>
> I used the perl one. The options were stock except for warning
> suppression and file inclusion...did I err? :)

Perl!

Cvs2svn isn't written in perl, it's written in python.

Is there some other project out there calling itself cvs2svn? I know about
refinecvs, but that changed it's name from cvs2svn.pl some time ago. (And I
wouldn't recommend it. It appears to be one person's personal project -
there's no evidence of it being widely tested.)

Max.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 17 22:40:25 2004

This is an archived mail posted to the Subversion Users mailing list.