Re: RE: Re: branch merge and visual studio

With svnmerge you can mark certain revisions as being blocked which means they won't be included in the merge:

 http://www.orcaware.com/svn/wiki/Svnmerge.py

svnmerge also does a good job at perserving commit messages when merging.

----- Original Message ----
From: Thomas Zumbrunn <tom@dataillusion.com>
To: users@tortoisesvn.tigris.org
Sent: Saturday, July 14, 2007 11:11:06 AM
Subject: RE: RE: Re: branch merge and visual studio

Hi Jon,

Thanks for the quick answer answer will try this out. I still wonder if it would make sense or if it would be possible to have some kind of "Ignore for merge" functionality to be build into Tortoise, would probably be nice to have

Thanks,
Thomas

-----Message d'origine-----
De : Jon Daley [mailto:tortoise@jon.limedaley.com]
Envoyé : Saturday, July 14, 2007 4:50 PM
À : users@tortoisesvn.tigris.org
Objet : RE: Re: branch merge and visual studio

     He means that when you merge, you manually look through the list, or type "DONT MERGE" at the beginning of your commit message for web.config, and then when you merge, you look through the log, and instead of committing all revisions since the last merge, you skip any revisions that contain changes to that file, so then there won't ever be changes in web.config that get merged from branch to branch/trunk.

On Sat, 14 Jul 2007, Thomas Zumbrunn wrote:

> Hi,
>
>
>
> Thatÿÿs what we want to do but when I commit the file and then choose merge the files appears in the merge list and we donÿÿt know how to remove it from the merge process ? Maybe we just missed something, coud you give us more details on how you would do it please ?
>
>
>
> Many thanks,
>
> Thomas
>
>
>
> De : lassevk@gmail.com [mailto:lassevk@gmail.com] De la part de Lasse
> Vågsæther Karlsen Envoyé : Saturday, July 14, 2007 2:52 PM À :
> users@tortoisesvn.tigris.org Objet : Re: branch merge and visual
> studio
>
>
>
> 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 Vågsæther Karlsen
> mailto:lasse@vkarlsen.no
>
>

--
Jon Daley
http://jon.limedaley.com/
Remember, the greatest gift is not found in a store nor under a tree, but in the hearts of true friends.
-- Cindy Lew
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org