Re: Newbie needs help with rolling back to older revision, then commiting that revision

On Tue, Jun 17, 2008 at 1:30 PM, croceldon <croceldon_at_gmail.com> wrote:
> Please keep in mind I'm very new with Tortoise and SVN in general.
>
> I rolled back to a previous revision (5), then made some changes.
> Then, when I try to do a Commit, I get the following message:
>
> Error: Commit failed (details follow):
> Error: Your file or directory 'sCompile.dfm' is probably out-of-date
> Error: 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).
>
>
> How can I resolve this? When I do a SVN Update, it puts my working
> copy back up to revision (7), which I want to discard.

You don't want to update your WC to revision 5 - you want to undo (in
the repository) revisions 6 and 7.

http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-howto-rollback.html

http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-17 19:38:11 CEST