[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: rolling back my working copy

From: Jill Pelavin <jrenee_at_MIT.EDU>
Date: 2005-03-25 17:50:01 CET

I have read that section. the problem is, I moved so many files around
and deleted other files...a very comprehensive file-reorganization that
I wasn't up to. so I'd have to merge all the files...not sure how to do
that. I just want a few simple commands. (i tried doing svn commands
on the individual files instead of on the directories and that's how I
got into this mess)

thanks for trying, tho

-Jill

On Fri, 25 Mar 2005 11:37:32 -0500, Jill Pelavin <jrenee@mit.edu> wrote:
> 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?
>

Have you read <http://svnbook.red-bean.com/en/1.1/svn-book.html#svn-ch-4-sect-4.2>
? I think it explains what you want to know.

/Johan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
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:53:23 2005

This is an archived mail posted to the Subversion Users mailing list.