Re: Reverting to an earlier revision

On 11/11/05, Jonathan Chum <jchum@aismedia.com> wrote:

> One of the designers ran into an issue this morning where he committed a
> file that conflicted with the version in the repository. As a result, he
> marked the "conflicts" as resolved and committed it. The file is foobar.
> What I was trying to figure out is how to revert to revision before the last
> commit. I read the help guide and invoked the Revision Log Dialog, selected
> the revision I wanted, and I thought the command I want to use is "Update
> Item to Revision". However, it's still marked as there is in sync with what
> on the server and would not let me re-commit the file as a new version.

http://tortoisesvn.sourceforge.net/docs/release/TortoiseSVN_en/apbs04.html

> So what I did to get around it was check'd out the file to
> foobar.htm-r12345, copied the source, pasted it into file with the
> conflicts, and then I was able to commit. All I want to do update the latest
> "commit" copy to a previous version.
>
> Is this the right way to solve this problem using TSVN for future reference?

http://tortoisesvn.sourceforge.net/docs/release/TortoiseSVN_en/ch05s06.html

Basically: in TortoiseMerge, choose which version of the file you want
to keep (your's, theirs or base), right-click and choose "use their
file", "use my file", ...

Stefan

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