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

Re: Accidentally Updating the Working Copy

From: Andy Levy <andy.levy_at_gmail.com>
Date: Wed, 29 Feb 2012 10:54:33 -0500

On Wed, Feb 29, 2012 at 10:38, Don S Thompson <dsthompson_at_gmail.com> wrote:
> I have been Tortoise only for a short time and only for the basic functions of checkout, commit and update.
> I find myself occasionally choosing Update when I intended to choose commit. As a result, all my changes are overlayed and apparently lost.

"Apparently" lost? Have you verified that they are or not?

If you have changes which conflict with incoming changes that are
pulled by an Update, they will not be "lost". They will be flagged as
a Conflict and you'll be given an opportunity to resolve those
conflicts yourself (and required to do so, before you can commit). If
your changes do not conflict with the incoming changes, they will be
merged automatically.

> What is the correct recovery procedure after doing this and/or is there a way to tag a folder as the working copy and prevent it from being updated without at least a message asking if you not a)drunk, b)distracted and C) are you sure you want to do this?

If I had to confirm "yes, I really do want to update" every time I use
Update, I'd probably stop using whatever client was doing that and
switch to a less bothersome one.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-29 16:55:21 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.