RE: [Cppunit-devel] Re: [CppUnit] New repository layout...

[Bastiaan B. <bas...@li...>]

-----Oorspronkelijk bericht-----
Van: Baptiste Lepilleur [mailto:bl...@cl...]
Verzonden: Friday, April 20, 2001 9:42 AM
Aan: cpp...@li...
Onderwerp: Re: [Cppunit-devel] Re: [CppUnit] New repository layout...


> OK, I've merged this patch, it's in CVS now.

    I checked it out. There has been a problem. Each line of the new file
(dsp,dsw) ends with "\r\r\n" instead of "\r\n". My guess is that the unix
version of patch did not recognize the diff file has being a windows format
file, and created the new text file in the windows format on the unix
machine. I'll submit the next patch in the unix format, and hopefully it
will correct that problem.

No, my guess is that it's my own fault :-).
The patch utility very conveniently recognizes CRLF line endings and
converts them to LF. To be helpful, I converted the dsw and dsp files back
to CRLF. 
Now, when you check out files on windows, CVS will already automatically
convert LF's to CRLF's. In our case that leaves you with CRCRLF :-(
I'll update the files to LF line endings.

    Also, the patch for cppunit/examples/hierarchy/main.cpp is missing.

Ah, yes, good of you to remind me: when applied your patch, the one on
main.cpp was rejected because of changes I'd already made to the file
myself. I'll try to merge it by hand.

Bastiaan

    Baptiste.


---
Baptiste Lepilleur <gai...@fr...>   http://gaiacrtn.free.fr/index.html
Author of The Text Reformatter, a tool for fanfiction readers and writers.
Language: English, French (Well, I'm French).


_______________________________________________
Cppunit-devel mailing list
Cpp...@li...
http://lists.sourceforge.net/lists/listinfo/cppunit-devel