[fpc-devel] Need advice for refactoring

[Jonas Maebe]

On 19 Jul 2010, at 01:41, Graeme Geldenhuys wrote:

> This was told to me by Vincent and Jonas a little while back, where I
> wanted to change the code in cpstrnew branch to match that of Trunk -
> but without using svnmerge. Even though the code would end up being
> identical, subversion raises a conflict.

That's incorrect. The problem was that while your changes were functionally identical to the changes in trunk, they were not syntactically identical. I don't know of any vcs that can analyse patches and conclude that even though they are textually different, they actually have the same effect on the program flow.

As Florian mentioned, if the changes are textually identical, then svn will not have any problems merging later on.

> In the end Jonas had to revert my commit, and resync the cpstrnew
> branch with Trunk - which now doesn't compile any more for me under
> Linux.

What is the error?


Jonas