[fpc-devel] Need advice for refactoring

[Florian Klaempfl]

Graeme Geldenhuys schrieb:
> On 19 July 2010 08:42, Florian Klaempfl <florian at freepascal.org> wrote:
>> I never encountered this and doubt it :) because svn recognizes also
> 
> Then some core team members should retrain themselves with SubVersion
> so they know what it can and cannot do.

See below.

> 
> 
>> Anyways, why do you want to do the same change  twice? Just make it once
>> and merge.
> 
> I was trying to compile the cpstrnew branch with a much newer Trunk
> compiler, to finally submit some of my local changes. The compiler
> complained about certain language changes and code syntax. I don't
> track trunk changes, so simply fixed the cpstrnew branch to compile
> again - without looking at trunk for answers. Vincent raise the issue
> that my changes might cause merge conflicts and pointed me to the
> Trunk code changes. 

If you adapted the code without looking at trunk it is *very* likely
that you didn't create exactly the same code as in trunk so Vincent is
right: this is very prone to conflicts. One space less and it is a
conflict for all vcs in the world (hopefully).