[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: Robert Koberg <rob_at_koberg.com>
Date: 2002-09-05 23:51:15 CEST

Hi,

I have a similar problem that I believe occurs because the webapp spits out XML
that is all on one line. Dev-types do not use the tool much rather they
pretty-print it and work on manually.

The original had one line and the dev has brought it into several lines. If
someone edits the XML in the tool before the dev commits then there will always
be a conflict.

Would this type of thing cause a conflict in svn? I have only dipped into
subversion and I don't currently have a running version, but this thread
triggered my response/question.

best,
-Rob

> -----Original Message-----
> From: Karl Fogel [mailto:kfogel@newton.ch.collab.net]
> Sent: Thursday, September 05, 2002 2:20 PM
> To: Arne Christian Hårseth
> Cc: dev@subversion.tigris.org
> Subject: Re: Versioning of tool generated xml files
>
>
> 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?
> > Does it support file locking?
>
> Not yet, though locking or something equivalent will happen post 1.0.
>
> For xml files, I'd think a custom merge-tool hook would be more
> helpful than locking... (?)
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

---------------------------------------------------------------------
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:53:58 2002

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