Boost :

Date view	Thread view	Subject view	Author view

From: Eric Niebler (eric_at_[hidden])
Date: 2008-08-04 19:15:57

Next message: Steven Watanabe: "Re: [boost] variant invariant"
Previous message: Peter Dimov: "Re: [boost] variant invariant"
Next in thread: John Maddock: "Re: [boost] svnmerge woes"
Reply: John Maddock: "Re: [boost] svnmerge woes"

I'm trying to merge from trunk to my private branch (branches/proto/v4)
using svnmerge.py, and it's failing with the following error:

svn: File 'libs\wave\samples\waveidl\idllexer\idl.re' has inconsistent
newlines
svn: Inconsistent line ending style

Does anybody know how I can work around this?

-- 
Eric Niebler
BoostPro Computing
http://www.boostpro.com

Next message: Steven Watanabe: "Re: [boost] variant invariant"
Previous message: Peter Dimov: "Re: [boost] variant invariant"
Next in thread: John Maddock: "Re: [boost] svnmerge woes"
Reply: John Maddock: "Re: [boost] svnmerge woes"

Date view	Thread view	Subject view	Author view

Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk