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

how do I loose last changes made ?

From: Tim Alsop <Tim.Alsop_at_CyberSafe.Ltd.UK>
Date: 2005-01-26 11:47:45 CET

I have a quick 'how to' question, which I am sure somebody who uses svn
more than me will be able to answer quickly ?
 
Heres what I am doing :
 
1. make changes to wc files
2. commit changes using 'svn ci'
3. make changes to wc files
4. commit changes using 'svn ci'
etc.
 
The latest revision in repository is X (made by commit at step 4), but
this commit involved many files changed in error. I therefore want to
effectively ignore revision X and go back to revision X-1, make changes
to this and commit as revision X+1. Heres what I tried :
 
5. in fresh local directory, I checked out revision X-1
6. I made changes in wc to fix my compile issues.
 
Now, I am stuck. How do I make the code in my new wc directory get used
as the latest revision, instead of X. I tried to commit the files, but I
get the following message :
 
/home/source> svn ci . -m"fix aix compile issues"

Sending common/config/Imake.tmpl

svn: Commit failed (details follow):

svn: Your file or directory 'common/config/Imake.tmpl' 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 da
te (needs to be updated), or the requested version resource is newer
than the transaction root (restart the commit).
 

/home/source>
 
What does this mean ?
Received on Wed Jan 26 11:50:36 2005

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