Randy Kobes wrote: >On Thu, 22 Jan 2004, Stas Bekman wrote: > > > >>Steve Hay wrote: >> >> >>>The attached patch fixes these errors on Win32: >>> >>> >>Thanks Steve. I've committed all 3 patches for: >> >>t/response/TestVhost/config.pm >>t/response/TestCompat/apache.pm >>t/response/TestAPI/server_util.pm >> >>As I mentioned before I can't apply your patches as is, >>because the path is in windows-style. >> >>--- t\response\TestAPI\server_util.pm.orig ... >>+++ t\response\TestAPI\server_util.pm ... >> >>I think if you work with cvs, instead of copying the >>original file and running diff against it: >> >> cvs diff t\response\TestAPI\server_util.pm >> >>it'll give you the unix path in the diff. >> >>I can't find an option to accept windows style path in the >>patch(1) manpage :( >> >> > >That's a good suggestion to use cvs on Windows to generate >the diffs, but unfortunately, at least for me, > cvs diff -u t\response\TestAPI\server_util.pm >will give Windows-style paths in the diff file. However, > cvs diff -u t/response/TestAPI/server_util.pm >will work. > > I've never used cvs very much. After logging in, how do I specify the modperl-2.0 "module"?
If I set CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic and then type "cvs login" then I can login OK, but neither of the "cvs diff" commands above work: C:\Temp>cvs diff t\response\TestAPI\server_util.pm cvs diff: cannot open CVS/Entries for reading: No such file or directory cvs [diff aborted]: no repository C:\Temp>cvs diff t/response/TestAPI/server_util.pm cvs [diff aborted]: no such directory `t/response/TestAPI' Obviously my cvs diff setup (from Cygwin) doesn't like Windows style slashes, but the second command there looks more hopeful. Adding "modperl-2.0/" to the start of the path works fine: C:\Temp>cvs diff modperl-2.0/t/response/TestAPI/server_util.pm but presumably you would rather have the diff starting from within the modperl-2.0 directory. I had a quick read of the CVS Howto at http://perl.apache.org/contribute/cvs_howto.html, but didn't find the answer. If I'm missing something obvious, perhaps that document could be updated? - Steve ------------------------------------------------ Radan Computational Ltd. The information contained in this message and any files transmitted with it are confidential and intended for the addressee(s) only. If you have received this message in error or there are any problems, please notify the sender immediately. The unauthorized use, disclosure, copying or alteration of this message is strictly forbidden. Note that any views or opinions presented in this email are solely those of the author and do not necessarily represent those of Radan Computational Ltd. The recipient(s) of this message should check it and any attached files for viruses: Radan Computational will accept no liability for any damage caused by any virus transmitted by this email. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
