Daniel & others-
thanks for all your help. your instructions were great :)
I just didn't find the merge -r an intuitive way to roll back to an
earlier version. (I thought revert did that)
all fixed now. phew...now just need to deal with the upcoming
wedding....
-Jill
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Try this:
1. Delete all working copies of your project.
2. Make a directory called "test". (or whatever)
3. Checkout the good revsion before you screwed up into test/copyXXX, where
XXX is the revision number.
4. Checkout the head of the tree into test/copyYYY, where YYY is the revision
number.
5. In test/copyYYY, run "svn merge -r YYY:XXX". That should recursively
over-write your working copy with revision XXX. You might have to give the
URL too, but I don't think so.
6. Compare copyXXX to copyYYY.
7. Commit. This is revision ZZZ. ZZZ and XXX should now be identical.
Next question - do you have administrative rights on the repository? It is
possible using "svnadmin dump" and "svnadmin load" to eliminate your
"experiments" from the repository completely. This is somewhat drastic.
Another thing you may want to try is creating a temporary repository and
playing with it until you get your change right. Then do it "for real" in
the main repository. You just need "svnadmin" in your path.
Daniel
Quoting Jill Pelavin <jrenee@MIT.EDU>:
> 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
>
>
------- End of Forwarded Message
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 25 22:09:18 2005