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

Adds/deletes on merge to reintegrate

From: Gilbert, Quentin <qgilbert_at_att.com>
Date: Tue, 26 Aug 2008 13:27:18 -0400

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\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?



Quentin Gilbert

AT&T Government Solutions



281/664-4337 fax

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

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.