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.
One may get the same problem when merging two-way which is necessary
with long-lived branches (the branch merges commits from trunk, and
later the complete branch is merged back into trunk). Or those branches
have to 're-based' (not a real subversion action is it?) but then you
can't merge from them anymore.
Micha
_______________________________________________
fpc-devel maillist - fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel
