Dear Experts,
I'm getting an error message that I don't understand, and I'm not sure
how to recover.
I tried to commit a change to a Makefile:
$ svn commit -m"Don't compile libpbe with recode" daemon/Makefile
Sending daemon/Makefile
svn: Commit failed (details follow):
svn: Your file or directory 'Makefile' is probably out-of-date
svn: 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).
First a comment about the error message, it says "either ... or ...";
why can't it work out which of those is the problem for me?
So I tried the first suggestion and tried to update; I didn't think
there would be any commits from other working copies and indeed there weren't:
phil_at_japan:/project/anyterm/release$ svn update daemon/Makefile
At revision 3670.
Trying to commit again after that gives the same error message.
So it looks like I need to "restart the commit". But how do I do
that? I've no idea.
I did have a problem like this once before; it was more complicated
because there were more files involved. It's archived here:
http://article.gmane.org/gmane.comp.version-control.subversion.user/66119
; the initial error message was different that time, but the subsequent
message was the same. The solution in that case was some unintuitive
combination of moving, updating and reverting. I've tried the same
sort of thing again:
$ cd daemon/
$ svn status -u Makefile
M 3670 Makefile
Status against revision: 3670
$ svn commit -m"Don't compile libpbe with recode" Makefile
Sending Makefile
svn: Commit failed (details follow):
svn: Your file or directory 'Makefile' is probably out-of-date
svn: 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).
$ mv Makefile Makefile.ok
$ svn update Makefile
Restored 'Makefile'
At revision 3670.
$ mv Makefile.ok Makefile
$ svn commit -m"Don't compile libpbe with recode" Makefile
Sending Makefile
svn: Commit failed (details follow):
svn: Your file or directory 'Makefile' is probably out-of-date
svn: 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).
$ svn revert Makefile
Reverted 'Makefile'
$ svn update Makefile
At revision 3670.
$ cp Makefile.ok Makefile
$ svn commit -m"Don't compile libpbe with recode" Makefile
Sending Makefile
svn: Commit failed (details follow):
svn: Your file or directory 'Makefile' is probably out-of-date
svn: 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).
So I haven't found the magic spell that will fix it yet.
Can anyone help?
Thanks, Phil.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-07 20:38:23 CET