[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 (issue on locking files)

From: :Dedalus <ulysse_at_email.it>
Date: Tue, 05 Apr 2011 09:17:28 +0200

On 04/04/2011 18:27, Stefan Küng wrote:
> 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
>

I can confirm that my problem is raised only when locking is enabled.
If I run my testcase with VB6 *.bas file unlocked I haven't problems and
I can blackout the patch: if you want I can attach my simple testcase
file here for your analysis.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2717028

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-05 09:18:31 CEST

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