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

Re: what's the best practice to revert merge some of files?

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Thu, 17 Dec 2009 15:52:12 +0000

2009/12/17 Bob Archer <bob.archer_at_amsi.com>:
>> Like my work copy directory are math, util.
>> In math directory I commit 10 files to add a feature, and now r100,
>> then I found in the commit 3 files were
>> totally wrong, I should revert changes of these 3 files, What's the
>> best practice?
>
> Well, you can't really do a reverse merge since that will reverse everything.
>
> (quick terminology note, "revert" in svn speak means removing changes that are in your local working copy.)
>
> Two options...
>
> 1. Do a reverse merge and then revert all the files except the 3 in question and the commit.
>
> 2. Do an Update to revision 99. (the revisions before your commit). Copy the 3 files to a temp folder. Update your working copy. Put the 3 files from rev99 back into your working copy. Then commit.

Show log for the folder and select r100. The bottom pane shows all
files changed in that revision.
Right click on any file and select "Revert changes from this revision".
Do the same for the other files.
Do any more editing to make it all work.
Commit.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431229
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-17 16:52:20 CET

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