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

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

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Mon, 11 Apr 2011 14:48:57 -0700 (PDT)

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.

[1]

SET ROOTDIR=%cd%
SET REPOS=Test20110411T1343
SET REPOS_PATH=file:///%ROOTDIR%/%REPOS%
SET WC=%REPOS%-wc
SET SVN=%ROOTDIR%/svn.exe
SET SVNADMIN=%ROOTDIR%\svnadmin.exe

IF EXIST %REPOS% rmdir /s /q %REPOS%
IF EXIST %WC% rmdir /s /q %WC%

%SVNADMIN% create %REPOS%
%SVN% co %REPOS_PATH% %WC%
cd %WC%
mkdir trunk branches tags
%SVN% add trunk branches tags
%SVN% ci -m "" trunk branches tags
cd trunk
echo > file1.txt
echo > file2.txt
%SVN% add file1.txt file2.txt
%SVN% ci -m "" file1.txt file2.txt
cd ..
%SVN% cp trunk branches/b1
%SVN% ci -m "" branches/b1
%SVN% del branches/b1/file2.txt
%SVN% ci -m "" branches/b1/file2.txt
%SVN% up trunk
%SVN% merge %REPOS_PATH%/branches/b1 trunk
cd ..

[2]
http://old.nabble.com/file/p31374259/CheckForModifications-TreeConflict.png

[3]
http://old.nabble.com/file/p31374259/CheckForModifications-Deleted.png

[4]
http://old.nabble.com/file/p31374259/CheckForModifications-Resolved.png

-- 
View this message in context: http://old.nabble.com/Deleting-a-file-with-status-tree-conflict-and-then-marking-resolved-removes-the-deleted-status-tp31374259p31374259.html
Sent from the tortoisesvn - dev mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2718966
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-11 23:49:05 CEST

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