On 29 February 2012 15:54, Andy Levy <andy.levy_at_gmail.com> wrote:
> 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.
Like Jean-Marc I am intrigued as to how your changes could possibly
have been lost without generating a conflict. Or did you update and
then re-save your original version, overwriting the changes from
others? If you did that then a diff in your working copy would show
lots of changes which are in fact you undoing your colleagues work.
If you really feel that Update is too dangerous then remove it from
the context menu and use Update-to-revision instead.
But it won't help at all. If someone else has changed the file then
you cannot commit before updating anyway, as Felix says.
: oo // \\ "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 2012-02-29 18:49:02 CET