Re: Bug with restore after commit feature

On 29.01.2014 13:57, Baruch Burstein wrote:
> I found a bug in the restore after commit feature.
> Consider the following scenario:
>
> I have a file 'foo.c' that I want to commit only part of.
> I mark it for restoration after commit, which saves a copy of it aside,
> and then edit it
> I try to commit, but get an error that some of the files in my commit
> are outdated, including 'foo.c', and a dialog to select update working
> copy or cancel (I don't remember the exact messages)
> I click 'Update', and tortoisesvn updates my working copy, including
> `foo.c`, merging it *with my temporary version*
> I get the commit dialog back, and perform the commit
> HERE IS THE PROBLEM: After the commit, 'foo.c' is restored from it's
> copy that was put aside, which is it's old version before the update. I
> am now left with an updated working copy, but an old 'foo.c'

Now show the diff of that file against BASE, and you can revert the
changes that got updated.

Stefan

-- 
        ___
   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=3072278
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].