[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Versioning of tool generated xml files

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-09-05 23:32:54 CEST

Arne Christian Hårseth <arnechaa@online.no> writes:

> The department I am working for is having problems with versioning of tool
> generated xml-files in CVS. Since this file is generated from a graphical
> tool it tends to change a lot causing a lot of conflicts. This can be partly
> solved by locking the file when changing it but this is taking away the
> "concurrent" part of CVS not making it possible for several people to change
> the same file simultaniously. I belive file locking is what MS VSS uses
> inherently to avoid conflicts too.
>
> Does subversion have any improvements to help reducing such problems?

Not yet. The subversion working-copy library performs a contextual
merge if it believes the file is text, or just places files
side-by-side if it thinks the file is binary.

We have plans (someday) to have the client launch 3rd-party merge
tools. So if you mark a file with some metadata property that
indicates it's xml, some kind of xml-merge tool can be launched to
resolve the conflict. It won't be too hard to make the client launch
merge tools; but we're not going to be writing them. :-)

> Does it support file locking?

Not yet. We're still discussing designs for that.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 5 23:34:51 2002

This is an archived mail posted to the Subversion Dev mailing list.