Files that were deleted from trunk and re-added later, disappear during merge+commit into branch.

Hi ,

We have a strange issue with our svn setup.
We have server running on Windows 2008 (svn version 1.5.6).
The client is TortoiseSVN 1.5.6 as well running mostly on Vista machines.
The usual workflow involves mostly branching from the trunk and merging on a later point.

While performing merge and then commit the following occurs :
1. On first attempt to commit "Commit failed" message appears. Reason: "Working copy is not updated"
2. Then working copy update was attempted.
3. As a result some files that were deleted from trunk and deleted in the meantime (after branch was done) also got deleted from trunk.

Is this a known issue?
I have attempted googling and searching this mailing list but failed to find anything that looks similar.

-- 
Best regards,
Michael Liberman 
 
 IT Consultant
 TigerSoft LTD.
 Office: +972 (0)8 942 7052
 Fax:    +972 (0)8 942 0447
 Mobile: +972 (0)54 441 3995
 E-mail: Michael_at_Tigersoft.co.il
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2357330
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].