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

Charles Doucette wrote:
> 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.

No, it is equivalent to svn update -r743

> We also considered using Revert changes from this revision.
> I assume that is equivalent to the SVN command line merge?

Exactly right. But before you can do anything useful you need to update
your working copy again. Your current WC has these files at an earlier
revision, so you can't commit them. You can only commit files at HEAD.

> If I do that - would I choose the bad version instead (ie. revision
> 773)?

I am assuming that if you do a show log for this file it shows:
773 Committed some bad changes
743 Committed a known working version

and no changes in between?

If that is the case, just select r773 and do 'revert changes from this
revision'. That will effectively merge that change back out again,
equivalent to
svn merge -r773:772 MyFile

The changes are only in your WC, so you then need to commit.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org