Details
-
Bug
-
Status: Closed
-
Blocker
-
Resolution: Invalid
-
1.5.x
-
None
Description
I've modified 4 files. When I try to commit these changes I get an error from
subversion. Here is the command out put and error message:
commit -m ""
C:/dean/ihs/projects/enerdeq/trunk/server/apps/thin/src/com/ihsenergy/thin/userpreferences/UserPreferencesAction.java
C:/dean/ihs/projects/enerdeq/trunk/server/apps/thin/src/com/ihsenergy/thin/userpreferences/UserPreferencesUtil.java
Sending
ihs/projects/enerdeq/trunk/server/apps/thin/src/com/ihsenergy/thin/userpreferences/UserPreferencesAction.java
Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory 'UserPreferencesAction.java' is out of date; try updating
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).
This is from subclipse, but I get the same thing from Tortoise.
This is the third time I've had this problem. The first two times I was able to
finally commit my changes by either replacing the modified files with the latest
from the repository and overwriting with my changes, or just moving the modified
files, updating, and overwriting the files.
This time, neither of these works. Subversion always refuses to commit my changes.
I'm using a 1.5 client against an older subversion server. I don't know which
server version because I don't have access to the host.
I never had this issue with a 1.4 client. This looks like something new in 1.5.
It makes svn completely unusable.
Original issue reported by dwschulze