What could lead to incorrect merging of the SVN update?

Question

I received an email a few days ago from someone who had a problem creating the Delphi project that I have on Google Code. The project file and one of the DFM files were muffled after it updated some changes that I checked. We chatted a bit and tracked him to the point that he said that SVN was throwing extra stuff. He deleted the files and performed the update again, and it worked fine.

I have never seen this problem before, and I could not reproduce or test it at the end. There were no update conflicts with other users, as I am the only one who has write access to the repository. Therefore, I wonder what might cause this. Is this a known issue for SVN? Is there any way to avoid this?

Answer 1

DFM Subversion , , , . , , Subversion , , , <<<<<<< .mine, , , Delphi. , Subversion , , DFM.

, , , , , , . BASE, .

: , Subversion, svn: mime-type , , . . , , Subversion , :)

Answer 2

, .

, . , , , gee... !

Entia non sunt multipicanda praeter needitatem.

, , svn, , , .

Answer 3

"munged" "" "" ?

, , , , .

, , , "" , SVN ( ) "" , / .

"" - , , , , , , . "", , " " , "" "" .

Answer 4

Delphi? Delphi , DFM .

, , .

-

Answer 5

Do you work on multiple platforms? Do you use editors that suggest Unix Linux (for example, some cygwin tools?)

If yes, check if you have configured the eol style property correctly.

Answer 6

I was updating SVN and SVN was deleting DFM files using <<<<<<<<<<<<<<<<<<<<<I had to manually delete these changes before Delphi allowed me to open the project.