Thanks Woktek, changes came through just fine this time so it does look like your mail client is trying to be "clever", using zip defeats and everything merged without problems. Changes now checked into svn/trunk.
On Fri, Oct 1, 2010 at 5:44 PM, Wojciech Lewandowski <[email protected]> wrote: > Lets assume its email client problem and Zipping the files will help. If its > not then it probably means TortoiseSVN does something strange when > updating... > When I compare the code with white spaces and line endings I do not see any > difference except paragraphs I changed. > If zipping does not help can you send me a screenshot how these file look in > your editor ? > > Wojtek > > -------------------------------------------------- > From: "Robert Osfield" <[email protected]> > Sent: Friday, October 01, 2010 5:26 PM > To: "OpenSceneGraph Submissions" <[email protected]> > Subject: Re: [osg-submissions] Swap Method > >> HI Wojtek, >> >> The file is still screwed up and not merge-able as is. >> >> Robert. >> >> On Thu, Sep 30, 2010 at 6:14 PM, Wojciech Lewandowski >> <[email protected]> wrote: >>> >>> Hi Robert, >>> >>> Does it look better now ?I have installed WinMerge recently maybe it does >>> some implicit line ending conversion. >>> >>> I have just modified the code to use DisplaySettings::SwapMethod. >>> >>> Wojtek >>> >>> -------------------------------------------------- >>> From: "Robert Osfield" <[email protected]> >>> Sent: Thursday, September 30, 2010 4:31 PM >>> To: "OpenSceneGraph Submissions" >>> <[email protected]> >>> Subject: Re: [osg-submissions] Swap Method >>> >>>> Hi Wojtek, >>>> >>>> I've now merged DisplaySettings::SwapMethod into >>>> DisplaySettings/GraphicsContext. I have now checked this in. >>>> >>>> I didn't merge your changes to GraphicsWindowWin32.cpp as somehow your >>>> editor has completed messed up the line endings/indentation of a vast >>>> number of lines in the file making it too difficult for me to discern >>>> what lines you've changed intentionally and what lines were screwed up >>>> unintentionally. Kinda looks like the editor has tried to clamp the >>>> line size below a specified value. >>>> >>>> This happened for the DisplaySettings and GraphicsContext files, but >>>> since I know these files inside out it was much easier for me to spot >>>> the real changes, I also had to modify the code by hand as well to >>>> simplify the enum usage again making it easy for me to workaround the >>>> editor nonesenes. >>>> >>>> Could you do an svn update and re-apply your changes to >>>> GraphicsWindowWin32.cpp and do so without the editor reformating >>>> everything. >>>> >>>> Thanks, >>>> Robert. >>>> _______________________________________________ >>>> osg-submissions mailing list >>>> [email protected] >>>> >>>> >>>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >>> >>> _______________________________________________ >>> osg-submissions mailing list >>> [email protected] >>> >>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >>> >>> >> _______________________________________________ >> osg-submissions mailing list >> [email protected] >> >> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
