[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: daniel <smurge_at_web.de>
Date: 2004-09-02 13:45:42 CEST

Hello Stefan,

thank you very much for the fast reply.

I've followed your instructions but keep getting the same error message.
What I did now was:

- edited my file "recherche.tex" in the project folder
- first commit (successful, because somebody else changed it in the
meantime, as explained)
- inserted a dummy line in "recherche.tex"
- performed "check for updates" on main folder; my file "recherche.tex"
gets listed with "text status: modified" and all the other columns
empty, nothing else is listed as changed.
- Nevertheless, I perform an update on the main folder (works, window
empty except for "completed / at revision: 21") - sorry, I hadn't read
your email at this time!
- tried to make a second commit (again, the window contains only one
line: "modified / full-path-to-recherche.txt"); fails, full message:
"Commit failed (details follow): Your file or directory 'recherche.tex'
is probably out-of-date. The version resource does not correspond to the
resource within the transaction. Either the requested version resource
is out of date (needs to be updated), or the requested version resource
is newer than the transaction root (restart the commit)."
- Then, after receiving your mail, I tried the procedure without the
update of the main folder, but it doesn't seem to help.
- I even reverted the entire local main folder to the latest state of
the ropository and tried inserting the dummy line again. Keeps failing.

Sorry for troubling you with this!

Daniel

Stefan Küng wrote:

> 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:50:32 2004

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