[ofw] [PATCH] Cleanup XXX_PTR64 macros from tests

[Tzachi Dar]

I believe that using a patch --binary should help with the problem of
the line endings.

One more tool to try and use is the TortoiseSvn merge.

Thanks
Tzachi 

> -----Original Message-----
> From: ofw-bounces at lists.openfabrics.org 
> [mailto:ofw-bounces at lists.openfabrics.org] On Behalf Of Fab Tillier
> Sent: Monday, June 30, 2008 10:32 PM
> To: Fab Tillier; Leonid Keller; ofw at lists.openfabrics.org
> Subject: RE: [ofw] [PATCH] Cleanup XXX_PTR64 macros from tests
> 
> >>> Tried to apply the patch and get conflict in cmtest.c
> >>
> >> Looks like changes in line endings...
> >
> > It also appears that I screwed up generating the patch...  
> Ignore this 
> > last one, I'll resend (yet again)...
> >
> > I'll eventually get the hang of it...
> 
> Ok, so I'm having a hard time with diff/patch and SVN...  
> Actually, I think it's just SVN.
> 
> I've updated to the latest version of patch from the gnuwin32 
> sourceforge project, version 2.5.9.2670.
> 
> I cannot apply patches generated by SVN if my changes touch a 
> file with non-Windows line endings.  I tried 'svn diff' as 
> well as 'svn diff -x --ignore-eol-style'.  So rather than 
> manually changing the line endings of the diff file, I will 
> change culprit files to consistent, Windows line ending, 
> check that in, and then resend my patches...
> 
> -Fab
> 
> 
> _______________________________________________
> ofw mailing list
> ofw at lists.openfabrics.org
> http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
>