[OFBiz] Users - CVS merge problems due to dos file formats

[Si Chen]

Hi David,

I was trying to use cvs checkout -j  -j  to do the merging, and 
unfortunately cvs does not ignore these (the diff tools are better, and 
you can even set them to ignore white space differences.)  It seems in 
general the diff tools are fine with the cr/lf changes, but the cvs 
merge on checkout is what causes the problem.

I used a little Perl script to fix the files before checking them into 
my local cvs.  I put it into my upgrading to the new release wiki page 
if anyone else needs it.

Will subversion be able to standardize cr/lfs when files are checked 
in?  If so that'd be great.

Si

David E. Jones wrote:

>
> Si,
>
> SVN handles this a lot better than CVS, so hopefully when we move over 
> to it later this week it will help more than hurt. At least they will 
> be consistent for the future, but unfortunately for the inconsistent 
> ones right now it could still be a problem...
>
> BTW, if you are doing manual merges, ie with a side-by-side tool or 
> something, many of them can ignore white space to avoid this issue, 
> and I think the command line merge can as well...
>
> -David
>
>
> On Aug 18, 2004, at 10:41 AM, Si Chen wrote:
>
>> Hi Brett,
>>
>> We're going through our cvs merge right now, and there are many files 
>> which were checked in recently (since rel 3.0) in a dos format, so 
>> cvs is not merging them correctly.  Have you had a similar experience 
>> yourself?  I wrote a perl script to process all the files I checked 
>> out of the cvs, and I can post it to your wiki page as well.
>>
>> Also, does anyone know of a way to set up the cvs server so that we 
>> can pre-process all files to remove dos end of line strings?
>>
>> Si
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe at ofbiz.dev.java.net
>> For additional commands, e-mail: users-help at ofbiz.dev.java.net
>>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe at ofbiz.dev.java.net
For additional commands, e-mail: users-help at ofbiz.dev.java.net