[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-06 00:11:13 CEST

"Robert Koberg" <rob@koberg.com> writes:

> 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.

Subversion, like CVS, simply calls the line-based 'diff' program on
two text files. So if this scenario caused conflicts in CVS, it will
continue to do so in Subversion.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 6 00:13:18 2002

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