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

SVN Merge

From: <james.studdart_at_globaltravelgroup.com>
Date: Thu, 18 Sep 2008 08:50:49 -0700 (PDT)

Hi all,

I am having some issues with merging, well, the merging is OK, but I
use CodeSmith to generate the data layer and entities layer of my
sites, and I don't want SVN to merge these projects (folders and
files) when merge branches.
I want to manually copy the newly generate files from the trunk down
the tree.

This is to stop SVN creating conflicts on code I did not write and
therefore would not know which is the correct code to use. As I have
wasted a whole day fighting with this issue.

I know you can exclude files from Commits, but can you exclude
specific files and folders from merging?

Many thanks for your help,

James

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-19 07:47:56 CEST

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