Git-svn commit issue with svn:log line endings

Development
1

I was trying to commit @Fernando’s pull request but I’m getting this weird error on both linux and mac, even with a fresh checkout.

Does anyone know what causes this and how to fix it?

$ git svn dcommit --add-author-from
Committing to http://svn.slicer.org/Slicer4/trunk ...
ERROR from SVN:
Wrong or unexpected property value: Cannot accept non-LF line endings in 'svn:log' property
W: b93e822eca6301b93fbfebd304b1e99108221439 and refs/remotes/git-svn differ, using rebase:
:040000 040000 6f1b934ec1c536468148dd1dbe5c51bb6ebc5808 fa4599719cd15b1427e9f0b8e09bfa696202de7b M Modules
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.
2

Maybe the file has windows line endings?

3

But which file? The pull request has just a couple of line changes and I don’t see any windows line endings in there. The error message refers to “‘svn:log’ property” but I’m not sure where that is and how it would have been modified…

4

Maybe someone else can try merging that pull request to see if they run into the same issue.

5

All set. I tweaked the commit message and integrated in r27344

May be editing the commit message was sufficient to prevent the error you experienced.

2 Likes