From: Eric Niebler (eric_at_[hidden])
Date: 2008-08-05 11:26:30
John Maddock wrote:
> Eric Niebler wrote:
>> All I'm trying to do is merge from trunk. I shouldn't have to edit
>> files by hand, IMO.
> Sure, but somehow you've ended up with mixed \n and \r\n line
> endings, and that's really not something you should be checking in
Sure, but this is not a file I've edited locally. And I can't imagine my
svn client would do that to line endings.
> As for why the file ended up that way, that's a whole other issue...
-- Eric Niebler BoostPro Computing http://www.boostpro.com
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk