post-commit hook failed (exit code 1) with output:
Conflict discovered in
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: svn:E00714: Can't read stdin: End of file found
Using SVN through CFEclipse and SubVersion the above error occurred when trying to commit a new template. A newer user pushed up the 'screwed-up-file.cfc', though I am unsure what caused this.
What did NOT work
- Deleting the local project from the workspace and rechecking out the project.
- Google - could not find any help.
What DID work
Deleting the offending file from the local project. Committing the deletion to the SVN repository and then creating the offending file again. In my case I made a copy in Notepad (or someother IDE outside of CFEclipse) before deleting and just recopied the file back. Then I committed the new (same) file back up.
Hopefully this will help you, if you are Googling all over the place for some advice!