When trying to merge from our trunk to a branch I was getting these errors:

svn: File ‘/tmp/svnkitmerge42139.tmp/.diff.192.tmp’ has inconsistent newlines
svn: File ‘/tmp/svnkitmerge42139.tmp/.diff.192.tmp’ has inconsistent newlines


svn: File ‘/tmp/tmp’ has inconsistent newlines svn: Inconsistent line ending style
svn: Error reading spooled REPORT request response

svn: Generic IO error
svn: Generic IO error

Here are the steps I did to get around this and still merge from trunk to the branch:

  1. Check out a fresh copy of the branch.
  2. Merge the branch to the latest, skipping over the revision that did the newline changes (5893 in my case). You might have to do two merges for this: previous merge point to 5892, then one from 5894 to HEAD.
  3. Run the fix_newlines.sh script.
  4. Commit the branch.

Note: If you have changes on another checked out copy, an “svn update” won’t work on that one. You will have to apply a patch of the changes to the freshly checked out/merged copy.

This is in the openmrs category tagged as , ,

Add a comment »

Leave a Comment

Your comment

Please note: Comment moderation is enabled and may delay your comment. There is no need to resubmit your comment.