[fpc-devel] Need advice for refactoring

Florian Klaempfl florian at freepascal.org
Mon Jul 19 11:16:10 CEST 2010

Micha Nelissen schrieb:
> Florian Klaempfl wrote:
>> Micha Nelissen schrieb:
>>> In a distributed environment this is more common, like: person B
>>> partially pulls (some commits) from person A, and person C pulls from
>>> both A and B. Or a diamond where B and C pull from A, and D pulls from B
>>> and C.
>> Yes, but those are merges of regular commits?
> True, but the point is that in both cases it's possible that someone
> merges a specific commit twice. Maybe subversion also handles this case
> well; I have never tried.

If merge tracking doesn't prevent the merge, subversion ignores changes
being already in a certain file, at least to all of my experience. I
think Graeme simply misunderstood Vincent's concerns, see my other mail.

More information about the fpc-devel mailing list