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

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

From: Stefan Küng <stefan.kueng_at_wagner-group.ch>
Date: 2004-09-02 13:21:24 CEST

daniel wrote:

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

What do you mean by "update request"? You must not use "update" to see
if someone else changed the file. You should use "check for updates"
instead. This is Subversion, not CVS.

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

An update _will_ help here. But you must update the parent folder, not
just the file. If someone else made changes to other files, then the
revision of the repository changed, but not the revision of your local
file (the "last committed rev").

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

Sure! You haven't committed the file yet, so the revision stays the same.

Stefan

---------------------------------------------------------------------
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:20:36 2004

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