Adds/deletes on merge to reintegrate

Hi -

A recent dry-run of a merge to reintegrate a Branch, using TortoiseSVN
1.5.2/SVN 1.5.1 presents these results:
   Added:
C:\InsightSVN\trunk\Website\CustomApplications\Images\print.gif
   Added:
C:\InsightSVN\trunk\Website\CustomApplications\Images\ATTlogo.gif
   Added: C:\InsightSVN\trunk\Shared Assemblies\RadAjax.xml
   Added: C:\InsightSVN\trunk\Shared Assemblies\RadAjax.dll

However, these files already exist in the trunk and should not be added.
Similar issues occur with the merge trying to delete files that were
removed from the branch and modified in the trunk.

Is there something that explains what is happening here? The
TortoiseSVN folks are referring to SVN. Would you be able to help?

Thanks,

Quentin Gilbert

AT&T Government Solutions

QGilbert_at_Att.com

703/506-5670

281/664-4337 fax

 
Received on 2008-08-27 05:20:01 CEST