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

diff problems

From: Szymon Guz <alpha_at_skynet.org.pl>
Date: 2004-09-16 13:17:03 CEST

Hi,
I have a problem with two working copies. The problem is that there is a
file in the repository that looks like this:

r.20
-------------------------
aaaaaaaaaaaaaaaaaaaaaa
bbbbbbbbbbbbbbbbbbb
cccccccccccccccccccccc
-------------------------

this is being checked out by two users and the first one made some
changes and uploaded the file to the repository, and the next version
looks like this:

r.21
-------------------------
aaaaaaaaaaaaaaaaaaaaaa
cccccccccccccccccccccc
-------------------------

so the second line is missing. Now the second user changes the file and
tries to commit a file that looks like this:

-------------------------
aaaaaaaaaaaaaaaaaaaaaa
bbbbbbbbbbbbbbbbbbb
cc
-------------------------

he gets error while commiting so makes 'update' to generate the conflict
files. The problem is that no files are generated. Instead the file in
the working copy is marked as 'modified' and the revision number changed
to 21 and now it looks like this:

-------------------------
aaaaaaaaaaaaaaaaaaaaaa
cc
-------------------------

My question is: shouldn't there be any information about the conflict
that occured or if not: how can I 'switch it off' to be informed in such
case that sth changed ?

Szymon Guz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 16 13:17:52 2004

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