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

Re: branch merge and visual studio

From: Jon Daley <tortoise_at_jon.limedaley.com>
Date: 2007-07-14 14:55:56 CEST

         We have a similar issue, where it is hard to tell in VS2005 which
branch you are in, and we have developers switching all the time, and
sometimes losing track. Since there isn't a way to name the project,
other than the name of the .sln file, I have been wondering whether we
should have a different .sln for each branch, and then manually make
changes in each branch, if we ever needed a real change in the .sln file.

         I haven't done that yet, anyone have any other ideas of how to
tell the difference between the branch and the trunk, other than hitting
"save as" and hoping it is defaulting to the right directory (only helps
those developers who aren't using `svn switch`.

On Sat, 14 Jul 2007, Lasse Vgsther Karlsen wrote:

> Can't you simply commit the change to the config file as a separate commit
> and not merge that particular change back to the trunk ?
>
> On 7/14/07, Thomas Zumbrunn <tom@dataillusion.com> wrote:
>>
>> 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
>>
>
>
>
> --
> Lasse Vgsther Karlsen
> mailto:lasse@vkarlsen.no
>

-- 
Jon Daley
http://jon.limedaley.com/
Common sense is the collection of prejudices acquired by age 18.
-- Albert Einstein

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sat Jul 14 14:55:17 2007

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