[josm-dev] Deletion conflicts

[Marko Mäkelä]

On Tue, Apr 28, 2009 at 11:32:51AM +0200, Rolf Bode-Meyer wrote:
> 2009/4/27 Frederik Ramm <frederik at remote.org>:
> > (Incidentally - how can a node have only one version and this is
> > deleted? Would one not have to first create the node, making v1, then
> > delete it, making v2?)
> 
> Why? Deleting doesn't create a version of the deleted element. I don't
> think CVS does either.

CVS (and RCS, I think) do in a sense create a version of the deleted
element, by moving the ,v file to an "Attic" directory in the repository.

I think that the revision-per-tree approach of Subversion makes much more
sense than the revision-per-file approach of CVS and RCS.  The Subversion
model could be impractical for OSM, though.  There are so many objects
being edited concurrently, all over the world.  While someone is working
on a small local change, the global revision count could easily grow by
hundreds or thousands.

How do distributed revision control systems solve this problem?

	Marko