On Wed, Feb 22, 2012 at 6:28 AM, Oliver Sims <[email protected]> wrote: > Having just done an update on the the exercises, I tried to commit a changed > Chapter 5. > I got a "Commit Failed" error. The log was as follows: > > Command: Commit > Modified: D:\Development\oodUserGuide\SVNCopy-Chapters\Chapter05.xml > Sending content: D:\Development\oodUserGuide\SVNCopy-Chapters\Chapter05.xml > Error: Commit failed (details follow): > Error: While preparing > 'D:\Development\oodUserGuide\SVNCopy-Chapters\Chapter05.xml' > Error: for commit > Error: Inconsistent line ending style > Completed!: > I checked the properties for this file, and they are: > svn:eol-style native > > I then tried doing an Update on my Chapters folder. The Update apparently > worked fine, but the changed chapter05 was not over-written by the update! > > Any thoughts?
Whatever you are using to edit your files, or maybe the process you use, is introducing mixed line endings in your files. That is, some lines have DOS line endings 0x0d0a and some have Unix line endings 0x0a. You need to resave your file in a way that replaces all line endings with DOS line endings. How you do that is ... Depends on what tools you have access to. The editor I use has a 'save as' feature that allows you specify the line ending style. That's what I used for the User Guide example files where I first discovered this. If you have access to a Linux machine, you could use dos2unix on the file. Or try googling for a Windows dos2unix. As a last resort, you could delete you file and then do a checkout. This will pull in a fresh copy from the repository. Of course then you would have to redo your changes. You also need to figure out why you are getting these mixed line ending in the files you are editing in the first place. -- Mark Miesfeld ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Oorexx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/oorexx-devel
