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

Re: Bug with restore after commit feature if cancelling commit

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 27 Jun 2013 19:14:04 +0200

On 27.06.2013 16:29, Ben Fritz wrote:
> On Thu, Jun 27, 2013 at 8:25 AM, Adam Conway <Adam.Conway_at_carus.com> wrote:
>>
>> To reproduce
>>
>> 1. Make some changes to a file in a working copy
>> 2. Open commit dialog
>> 3. Right-click file and choose restore after commit
>> 4. Double click file to view changes
>> 5. Choose copy from left block for some of the changes (i.e.
>> revert parts of the file)
>> 6. Save and exit to return to commit dialog
>> 7. Click cancel in commit dialog
>>
>> I think the “original” working copy file should be restored in the same
>> fashion as if I had committed the partially-reverted file, but it
>> isn’t – the partially reverted file is now the working copy version.
>>
>
> I disagree that this should happen automatically, although I see your
> point. I haven't used 1.8 yet, but from what I've read about this
> feature, it would be hard in your case to recover the reverted parts of
> the file. THIS needs to be fixed.
>
> I want to be able to close the commit dialog after marking files to be
> restored, and then make changes outside TortoiseSVN tools (in my text
> editor, or kDiff3, or whatever), and then re-open the commit dialog to
> try again.

You can still edit the files with the editor of your choice. But of
course you have to keep the commit dialog open for this to work.

> Actually, I'd rather have an explicit "shelve" like in TortoiseHg so I
> can restore/remove stuff manually, especially if there is one that
> automatically gets restored when I commit. This would make it much
> easier to restore stuff if I do change my mind about reverting things.

branch/tag with "working copy" as the revision does something like that.

I've opened issue #497 for this:
http://code.google.com/p/tortoisesvn/issues/detail?id=497

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=3059282
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-27 19:14:11 CEST

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.