[Svnmerge] deleted files not really deleted?

[Ring_Nolan at emc.com]

All,

This is an issue that we've seen four different times now and it's
having lousy consequences for us in terms of build reliability.

What we're seeing is the following:

1) Files are added in a branch
2) Some revs later the same files are deleted, unmodified, from the
branch
3) Branch is merged to its parent (in this case, the trunk) using
svnmerge.py (output attached)
	Files have been added in rev 4577, deleted in rev 4897

------------------------------------------------------------------------
r4577 | tetreb | 2008-07-02 16:39:24 -0400 (Wed, 02 Jul 2008) | 1 line
Changed paths:


   A /branches/tb/hostservice/osls/HostManagementService/src/Session.cpp
   A
/branches/tb/hostservice/osls/HostManagementService/src/SessionConfig.cp
p
   A
/branches/tb/hostservice/osls/HostManagementService/src/SessionManager.c
pp


------------------------------------------------------------------------
r4897 | tb | 2008-07-15 10:20:43 -0400 (Tue, 15 Jul 2008) | 1 line
Changed paths:
   D /branches/tb/hostservice/osls/HostManagementService/src/Session.cpp
   D
/branches/tb/hostservice/osls/HostManagementService/src/SessionConfig.cp
p
   D
/branches/tb/hostservice/osls/HostManagementService/src/SessionManager.c
pp

[wiki1966] Removing Session* files from svn, these are generated
automatically now
------------------------------------------------------------------------

4) Files appear to have been deleted but still exist in svn and in a
bizarre state

>From the working copy within which I performed the merge (hostservice
branch -> trunk)

ringn at legolas:~/svn_wc/re_builds/trunk> svn ls -v
components/providers/osls/HostManagementService/src
   4659 tetreb          12035 Jul 08 17:49 C4CB_Host.cpp
   4920 ringn           15794 Jul 29 16:32
C4CB_HostManagementServicePluginService.cpp
   4920 ringn           81057 Jul 29 16:32 C4CB_HostService.cpp
   4920 ringn           15117 Jul 29 16:32 C4CB_HostSystem.cpp
   4920 ringn            8822 Jul 29 16:32
C4CB_HostedAccessPoint_H_IP.cpp
   4920 ringn            8841 Jul 29 16:32
C4CB_HostedCollection_H_SSC.cpp
   4920 ringn           14217 Jul 29 16:32 C4CB_IPProtocolEndpoint.cpp
   4920 ringn            8732 Jul 29 16:32
C4CB_MemberOfCollection_SSC_SHID.cpp
   4920 ringn           13982 Jul 29 16:32 C4CB_StorageHardwareID.cpp
   4920 ringn           12945 Jul 29 16:32
C4CB_SystemSpecificCollection.cpp
   4577 tetreb           7256 Jul 02 16:39 Session.cpp
   4577 tetreb           1593 Jul 02 16:39 SessionConfig.cpp
   4577 tetreb           2488 Jul 02 16:39 SessionManager.cpp
   4920 ringn                 Jul 29 16:32 mak/

ringn at legolas:~/svn_wc/re_builds/trunk> ls -l
components/providers/osls/HostManagementService/src
total 216
-rw-r--r-- 1 ringn sspg  8822 2008-07-29 16:25
C4CB_HostedAccessPoint_H_IP.cpp
-rw-r--r-- 1 ringn sspg  8841 2008-07-29 16:25
C4CB_HostedCollection_H_SSC.cpp
-rw-r--r-- 1 ringn sspg 15794 2008-07-29 16:24
C4CB_HostManagementServicePluginService.cpp
-rw-r--r-- 1 ringn sspg 81057 2008-07-29 16:25 C4CB_HostService.cpp
-rw-r--r-- 1 ringn sspg 15117 2008-07-29 16:25 C4CB_HostSystem.cpp
-rw-r--r-- 1 ringn sspg 14217 2008-07-29 16:25
C4CB_IPProtocolEndpoint.cpp
-rw-r--r-- 1 ringn sspg  8732 2008-07-29 16:24
C4CB_MemberOfCollection_SSC_SHID.cpp
-rw-r--r-- 1 ringn sspg 13982 2008-07-29 16:24
C4CB_StorageHardwareID.cpp
-rw-r--r-- 1 ringn sspg 12945 2008-07-29 16:25
C4CB_SystemSpecificCollection.cpp
drwxr-xr-x 3 ringn sspg  1024 2008-07-29 16:24 mak

ringn at legolas:~/svn_wc/re_builds/trunk> svn info
components/providers/osls/HostManagementService/src/Session.cpp
components/providers/osls/HostManagementService/src/Session.cpp:  (Not a
versioned resource)

Has anyone seen this before?

Nolan Ring