short: I used svn checkout to checkout an older version of my code into
a new directory. when I modify the code and try to check it back in, I
get the following error:
>>>>>>>>>>>>>>>>>>
[jill@thyme src]$ svn commit Sending src/AW.java
svn: Commit failed (details follow):
svn: Your file or directory 'AW.java' 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: Your commit message was left in a temporary file:
svn: '/home/jill/code/as/wfdb-merged/svn-commit.tmp'
>>>>>>>>>>>>>>>
how do I successfully roll it back?
background:
I inherited my codebase, and so there are 145 or so files in one
directory, so I tried to package it and move things around using
subversion. I had trouble with this (that's a whole other question).
so I decided to abandon that for now, and tried to roll it back and
revert files; and when I got the above error and typed "svn up" I
inherited all the changes from the most recent version that I _didn't_
want.
(then I did the new checkout of the older, correct version and kept
getting the problem. hence my email)
I looked all over the faqs and the web. please help
thank you
-Jill
<rant>
ps- never try to start a new job and plan a wedding/get married all
within 2 months. it's very stressful (not my choice...I'd been
unemployed for a while) and they haven't paid me yet!! icky pay cycles
</rant>
ok, I feel a little better now. looking forward to the helpful
responses ;)
--------------------
Jill R. Pelavin
jrenee@mit.edu
E25-505
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 25 17:40:28 2005