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

Modifications lost

From: Andrew Phillips <aphillips_at_wilcom.com.au>
Date: 2006-07-07 07:17:39 CEST

I and another developer (on the other side of the globe) have been
making changes to the same source file. Several times it has happened
that when he commits his changes my recent changes are lost.

For example, 2 days ago he committed the file (revision 117). I
committed the file twice yesterday (118 and 119). Last night he made
changes and committed 120. This contained his recent changes but
reversed my changes made in 118 and 119. However, after he updated and
committed he created a new .EXE which does include my changes.

He says that he did not intentionally (or unintentionally) remove my
changes, and that he (or another entity) is *not* copying old versions
of files into his working copy. He also insists that he is updating and
committing correctly, although he did get a "checksum" error recently
while updating the file.

Could this be an SVN bug? It sounds like a "diff" between 119 and 120
is being generated on his machine and sent to the server, but the server
is applying it to revision 117 instead of 119. I have done tests and
cannot reproduce what he says is happening. I can't personally check
what he is doing as he is in Europe and I am in Australia, but he
insists that he is doing nothing wrong.

The SVN server is running locally here on a Windows 2003 server. He
connects via VPN over the internet. We are using TSVN but I don't think
that is related to the problem.

apache_2.0.55-win32-x86-no_ssl
svn-1.3.0

Thanks for any advice, Andrew.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 7 07:22:18 2006

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