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

Merge Confusion and Exclusions

From: Qumulus <Qumulus_at_gmail.com>
Date: Wed, 20 Aug 2008 11:35:05 -0700 (PDT)

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 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? Are these bugs?

Of course, this is a dry-run and "Added" should say "Added(expected)"
or "Will Add" - another minor enhancement.

Also, we'd like to simply exclude files/folders from merge. This
seems like a relatively minor effort and we believe this should take
priority (I'm not the first to request this). I thought that "Ignore
File/Folder" would help but this seems to be unavailable in this
version.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-20 20:41:19 CEST

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