[Owasp-esapi-c++] SVN and Merging Changes

[Jeffrey Walton]

Hi All,

Your mileage may vary....

In the past, I've noticed SVN has a difficult time merging edits if
the source file has undergone a lot of modifications. I'm not claiming
any other source control tool is better - its just an observation from
SVN.

Don't be surprised if you get something that won't compile after a
merge. I call it 'frankensein-ian patching'. For example, you might
have deleted functions partially encompassing a new function like
Brundle-fly.

Jeff