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

branch merge and visual studio

From: Thomas Zumbrunn <tom_at_dataillusion.com>
Date: 2007-07-14 10:29:53 CEST

Hi,

 

We are working in standard way recommended by SVN with trunks, branches
and tags.

 

We are using Visual studio 2005. When we do a branch for a project we
change parameters within files like the web.config for example that are
only specific to that branch (eg: Database Settings), when Visual Studio
re-compiles the project it's also rewrite its on configuration file of
the solution.

 

The question I have is following, what is the best way in such a
configuration to merge changes from the branch back to the trunk or to
the trunk to the branch. We don't want to have these files merged as
these are specific to the branch and not related to the trunk.

 

Is there any way to ignore some files in the merge process so they don't
get merge over ? In the merge screen its seems there is no way to choose
which files are merge, its an all or nothing solution apparently.

 

Or maybe our process is wrong and there are other ways of handling this
kind scenarios ?

 

Many thanks,

Thomas
Received on Sat Jul 14 10:29:33 2007

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