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

[TSVN] Problem when attempting to commit twice (additional changes)

From: daniel <smurge_at_web.de>
Date: 2004-09-02 12:01:05 CEST

Hello everybody.

I'm not sure if this is really a problem with tortoise or rather with
subversion itself.

Scenario:
- I have the latest version of a file on my local PC.
- This file I change.
- The commit finished without problems, the revision number is increased
(here: to 17).
- An update request confirms that nobody has made changes in the
meantime and that I still have the latest version.
- I notice that I have to make some more changes, so I edit the file again.
- The second commit fails, subversion complains that my file is
"probably out-of-date".
- Neither the suggested update, nor another attempt to commit my changes
help.

What could be the problem:
- After the first commit, the revision number has changed to 17.
- After the following, additional changes, it is STILL 17.
- Apperently, either tortoise or subversion attempt to store the file
with the ADDITIONAL changes under the same revision number.

Current workaround:
- With my second commit, I have to wait until somebody else makes
changes to the file after my first commit.
- Thereby, the version number gets to 18, and the author of the file
changes.
- I perform an update to get revision 18.
- I make my changes to revision 18 and can now commit. (But only once.)

As you can imagine, this procedure is quite a hassle, especially in a
team where others don't each other's files very frequently. What can I do?

Version information:
- The server is running Suse 9.1 with Subversion 1.0.0
- On the desktop PC's we're using XP with Tortoise 1.0.8, build 1430
- A test with Windows 2003 Sv.Ed. ended with the same results.

Thanks.

Daniel

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Sep 2 14:00:29 2004

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