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

[TSVN] rollback/undo changes - Update Item to revision or Revert changes from this revision - then commit fails?

From: Charles Doucette <cdoucette_at_cornerstonetech.com>
Date: 2005-05-06 17:10:37 CEST

We committed a bad or premature change.
We were able to roll bit back on the web server;
but, we are unable to commit that change to our SVN repository.
 
let me be specific - the files are called ReviewImport.aspx and
ReviewImport.aspx.vb
 
The last good versions were committed in revision 743.
 
The bad/premature versions were committed in revision 773.
 
The current repository revision is 776.
 
We looked at the Log Dialog for this file and chose Update Item to
revision (we had selected the good revision 743)
I assume this is equivalent to the SVN command line copy.
 
Then - we tried to do a commit - and it failed - perhaps because of the
fine print in the documentation:
 
Update your working copy to the selected revision. Useful if you want to
have your working copy reflect a time in the past. It is best to update
a whole directory in your working copy, not just one file, otherwise
your working copy will be inconsistent and you will be unable to commit
any changes.
 
We also considered using Revert changes from this revision.
I assume that is equivalent to the SVN command line merge?
If I do that - would I choose the bad version instead (ie. revision
773)?
Also, if I do that - can I commit after that?
 
Thanks,
Chuck
 
 
Received on Fri May 6 17:11:44 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.