[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: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Mon, 4 Apr 2011 17:10:08 +0100

On 4 April 2011 17:03, (:Dedalus) <ulysse_at_email.it> wrote:
> On 04/04/2011 12:52, Simon Large wrote:
>> I just tried what you describe and it works for me.
>>
>> Simon
>
> Here don't work.
>
> I have the file locked.
>
> Add this line of comment
>
> 'commit #1 to unpatch
>
> and commit to revision x
>
> add this other line of comment
>
> 'commit #2
>
> and commit to revision (x+1)
>
> Using "show log" to revert the changes in revision x
> prompt me a window for edit conflicts!
>
> Could be depends from the locking?

I doubt it, but why do you need locking? Is it because the files are
not text files and cannot be merged automatically by Subversion? If so
then SVN will not attempt to reverse merge the change but simply flag
a conflict. In that case there is nothing else we can do without using
magic.

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

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