John Maddock wrote:
Eric Niebler wrote:
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?
If it's listed as a text file, but the line endings don't match the platform convension then you will get that error: typically if you edit under Windows and then try and commit under Linux or something. Try using your favourite editor or dos2unix or similar to clean up the line ending so they match the platform convention, and then try to commit again.
All I'm trying to do is merge from trunk. I shouldn't have to edit files by hand, IMO. I worked around this a different way. I copied the file from trunk and checked it into my branch. Then I used the -M switch to tell svnmerge.py not to merge any of the changes to this file. After that, I was able to do a regular svnmerge.py. -- Eric Niebler BoostPro Computing http://www.boostpro.com