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

Re: Backout a patch

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 04 Apr 2011 18:27:57 +0200

On 04.04.2011 12:09, (:Dedalus) wrote:
> On 04/04/2011 11:27, Simon Large wrote:
>> Show log
>> Right click on patch revision
>> Revert changes from this revision
>
> Yhanks Simon, but it seems inaccurate:
>
> 1. I have a code file (called for example A);
> 2. in A I have a routine called B;
> 3. in B I put a comment line _//test commit 1_ and commit to revision x;
> 4. in B I put a comment line _//test commit 1_ and commit to revision x + 1;
> 5. Show log: right click on patch revision and then Revert changes from
> this revision: but this create a conflict and I do to manual edit the
> conflict (but this is possible if I remember all the lines of the patch)
>
> I'm wrong?

Your example requires that *both* revisions x and x+1 have to be
reverted. Reverting just one results in a conflict as you have seen:
because x and x+1 both modify the same line - it's not possible to just
revert the one revision without a conflict.

Use the command "revert to this revision" instead of "revert changes
from this revision".

Stefan

-- 
        ___
   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=2716902
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-04 18:28:10 CEST

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