Re[2]: Problem when hacking xap_Win32FrameImpl.cpp

From: Kenneth J. Davis (jeremyd@computer.org)
Date: Wed Nov 05 2003 - 13:04:03 EST

  • Next message: Kenneth J. Davis: "Re[3]: Problem when hacking xap_Win32FrameImpl.cpp"

    Is this Head or Stable2 branch? The stable2 branch still has the file
    messed up (\r\r\n end of line on cvs co with a client that does \n ->
    \r\n), but head it is as expected (\n -> \r\n).

    I have no problems making changes and cvs diff only seeing the changed
    part (after deleting and cvs updating to get the file asis in cvs).

    Have you looked at your local copy via a hex editor after changing to
    see what EOF you have?

    Are you using cygwin's cvs client? If so and you have your cygwin
    environment setup to use UNIX EOL conventions, then you will need to
    manually do a dos2unix on your files before commiting if your editor
    saves with DOS EOL conventions -- most programs will read Unix EOLs
    but save with DOS EOLs.

    Please look with a hex editor at the file right after a cvs checkout
    and then after you edit it and see if the line endings are the same.

    I use a native win32 cvs client which does \n -> \r\n conversion on
    co and \r\n -> \n on commit; I originally used cygwin's cvs and ran
    into the problems you are seeing (as I had it set up for Unix EOLs).

    Jeremy

    On Wed, 05 Nov 2003 18:40:04 +0100 Jordi Mas <jmas@softcatala.org> wrote:

    JM> En/na tomasfrydrych@yahoo.co.uk ha escrit:
    JM>
    JM> > Jordi,
    JM> >
    JM> >
    JM> >>It's the first file ever that I have found with this problem. Why we
    JM> >>cannot converted it? Are there more LF files? The XP ones that I have
    JM> >>seen are CR/LF.
    JM> >
    JM> >
    JM> > All the files in CVS are (or should be) LF-only; I take Hub's
    JM> earlier
    JM> > email to mean that this file is LF-only in the CVS, so your problem
    JM> > would seem to be that your local copy is based on an earlier CR/LF
    JM> > version (and probably contains CR/CR/LF as eofs). You need to fix
    JM> > your local version of the file.
    JM>
    JM> First, I not complaining, I have just found a problem and I need some
    JM> help to
    JM> fix it!.
    JM>
    JM> I follow these steps:
    JM>
    JM> 1. I have deleted xap_Win32FrameImpl.cpp from my local hard drive
    JM> 2. I have done a cvs update -d -P
    JM> 3. It looks like in the picture attached
    JM> 4. Modifying a single file make cvs diff-u going made
    JM>
    JM> As you can see in the file there are CR/LF and the file looks sane to
    JM> me.
    JM> This think is driving me mad. Can you guys modify
    JM> xap_Win32FrameImpl.cpp and
    JM> then do and diff -u without getting all the file as new?
    JM>
    JM> I stronly think that there is a problem on how this file is stored on
    JM> our CVS.
    JM> I'm also contributing in Mono and they use LF files and I never had a
    JM> problem.
    JM>
    JM> Any help will be really appreciated. I have done a bug fix and I would
    JM> like to
    JM> commit it
    JM>
    JM> Thanks!
    JM>

    This archive was generated by hypermail 2.1.4 : Wed Nov 05 2003 - 13:02:34 EST