Recently, I’ve noticed strange behavior by Subversion. Occasionally, and seemingly randomly, the “svn up” command will wreak havoc on my CSS files. 99% of the time it works fine, but when it goes bad, it’s pretty damn terrible.
Instead of noting a conflict as it should, Subversion appears to be trashing all incoming conflict lines and reporting a successful merge. This results in massively inconvenient manual merges because the incoming changes effectively disappear unless they’re manually placed back into the file.
I would have believed this was a case of user error, but I just watched it happen. We have two designers that frequently work on the same CSS files, but both are familiar and proficient with conflict resolution.
As near as can figure, this happens when both designers have a large number of changes to check in and one beats the other to the punch. Is it possible that this is somehow confusing SVN’s merging algorithm?
Any experience or helpful anecdotes dealing with this type of behavior from SVN are welcome.
If you can find a diff/merge program that’s better at detecting the minimal changes in files of this structure, use the
-diff-cmdoption tosvn updateto invoke it.