On Mon, Jul 27, 2009 at 06:12, albert kong<albertkong_at_tom.com> wrote:
> TortoiseSVN version:
> TortoiseSVN 1.6.1, Build 16129 - 32 Bit , 2009/04/10 08:14:05
> Subversion 1.6.1,
> My workcopy and repository are both new, let say it's r100, then I made changes and commit,
>
> so the repository and workcopy is r101. then I made changes and commit upon r101, so the
>
> repository and workcopy is r102. Now I found the modifications in r101 and r102 are wrong, I
>
> need to work on r100 to go on.
> My tsvn operation:
> 1、I use "Switch" in the menu and choose r100, to switch to r100, and go on to make changes.
> 2、"Commit", then tsvn complain, "file1.cpp" is not up to date, you need to update.
> Then 3、I use "Update to revision...", to update to r100, but it's not work too.
You don't want to use switch or revert. Use a reverse merge to undo
changes. See http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2375823
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-27 12:58:57 CEST