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

Re: SVN Merge

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 19 Sep 2008 13:35:14 +0100

On Thu, 2008-09-18 at 08:50 -0700, james.studdart_at_globaltravelgroup.com
wrote:
> Hi all,

Hi James.

Your question is about using Subversion, so please post it to the
"users" mailing list. See
<http://subversion.tigris.org/mailing-lists.html>.

Thanks.
- Julian

> 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 14:35:52 CEST

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