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

Re: Deleting a file with status tree conflict and then marking resolved removes the deleted status

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 13 Apr 2011 21:08:10 +0200

On 11.04.2011 23:48, Ryan J Ollos wrote:
> When there is a tree conflict, deleting the file and then marking it resolved
> from any of the Commit, Modifications or Resolved dialogs leaves the file
> without deleted status.
>
> To reproduce:
> 1. Run the batch file [1] to generate a tree conflict.
> 2. Right click on trunk in the working copy and open the TortoiseSVN ->
> Resolved dialog [2].
> 3. Delete the file with Tree Conflict status [3].
> 4. Mark the conflict as resolved [4]. The file is no longer scheduled for
> deletion.

Thanks a lot for the script!
Fixed in r21148.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2719554
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-13 21:08:27 CEST

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