Fixes in file merging while SVNUpdateEditor17.
Fixes for file properties merging in SVNUpdateEditor17.
Tree conflict wasn't created correctly in the case if an entry was deleted while update.
Multiple fixes in text and properties merging.
Multiple fixes in properties merge.
Insert base from remove base was called incorrectly (localRelPath was not set), fixed.
Some fixes in deletion processing while updating.
Fixed remote status for some cases.
Wrong wcId was passed while not-present entry inserting, fixed.
Fixed update for the case of unversioned file/versioned directory obstruction.
Some improvements in SVNUpdateEditor17.
Added a failing test for svn:eol-stlye and conflicts.
Java 1.5 compatibility fixes.
Delete working parameter wasn't taken into account while update, fixed.
Fixed update for the case if one copied directory replaces another copied directory.
SVNKIT-379: SvnGetInfo didn't obtain file locks if depth=INFINITY, now fixed.
ISVNMergeStrategy marked deprecated.
Huge number of changes related to SVNTreeConflictEditor implementation.
Update of copied remotely file over copied locally file resulted in no conflict, fixed.
Fixed updates that remove properties (before this fix the properties values were set to empty strings).