Ahh, it looks like your version had the changes in a different location in the file. The resulting merge left both your changes and mine in the file, so the diff still looked the same. Sorry about that!
Dave Arundhati Bhowmick <[EMAIL PROTECTED]> on 02/09/2000 04:26:13 PM Please respond to [EMAIL PROTECTED] To: [EMAIL PROTECTED] cc: (bcc: David N Bertoni/CAM/Lotus) Subject: Re: XercesLib.dsp problem? I did that yesterday evening. Do you still see that problem after updating all the project files? Arundhati David_N_Bertoni@lotus.com wrote: > These changes have still not been checked in. as far is I can tell. Should > I commit them myself? > > Dave Bertoni > > [EMAIL PROTECTED] on 02/08/2000 02:02:28 PM > > Please respond to [EMAIL PROTECTED] > > To: [EMAIL PROTECTED] > cc: (bcc: David N Bertoni/CAM/Lotus) > > Subject: Re: XercesLib.dsp problem? > > There were probably just a little slower to get in, and you got there too > fast. I think that they are there now, so give it another try and it should > work now. Sorry about that. > > ---------------------------------------- > Dean Roddey > Software Weenie > IBM Center for Java Technology - Silicon Valley > [EMAIL PROTECTED] > > David_N_Bertoni@lotus.com on 02/08/2000 10:41:28 AM > > Please respond to [EMAIL PROTECTED] > > To: [EMAIL PROTECTED] > cc: > Subject: XercesLib.dsp problem? > > Perhaps the changes to XercesLib.dsp were not checked in? I'm getting a > link error because these files are not included as sources: > > util\XMLIBM1047Transcoder.cpp > util\XMLIBM1047Transcoder.hpp > > Here's the CVS diff: > > diff -r1.11 XercesLib.dsp > 111a112,119 > > # Begin Source File > > > > SOURCE=..\..\..\..\..\src\util\XMLIBM1047Transcoder.cpp > > # End Source File > > # Begin Source File > > > > SOURCE=..\..\..\..\..\src\util\XMLIBM1047Transcoder.hpp > > # End Source File
