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

Re: How to abandon changes after locks have been stolen

From: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Fri, 28 May 2010 12:55:47 +0200


On 28 May 2010 12:43, davidd31415 <davidd31415_at_yahoo.com> wrote:
> If I lock a file on computer A, make changes, and then later steal the locks
> to that file on computer B and comit the computer B changes to the
> repository, how can I abandon the changes on computer A?

You should be able to update on computer A, and then revert the
remaining local modifications on the file.

If the update results in a conflict, resolve it using 'their' file entirely.

The stolen lock (AFAIK) has no relevance here.

> I thought I would be able to perform and update on computer A and bring the
> repository current but that didn't work for me.  I ended up deleting the
> repository and the downloading the entire thing again.

I suppose you mean 'delete the working copy'.

.       ___
.  @@  // \\      "De Chelonian Mobile"
. (_,\/ \_/ \     TortoiseSVN
.   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
.   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-28 12:55:54 CEST

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