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

Re: exclude folder during merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 22 Apr 2008 17:49:17 +0200

ike wrote:
> Hello,
>
> I started working with subversion and branches.
> My project tree looks like this
>
> trunk\folder1
> trunk\folder2
> trunk\references
> branches\branch1\folder1
> branches\branch1\folder2
> branches\branch1\references
> branches\branch2\folder1
> branches\branch2\folder1
> branches\branch2\references
>
> When I branch, I copy the entire trunk into the branch.
> So far so good.
>
> The references folder keeps all assemblies (third-party and my
> assemblies aswell).
> We use cc.net to update the references folder. However this is only
> the trunk.
>
> Every day we merge the changes in the trunk to the branches. This
> works fine, but always takes some time with the references-folder. I
> would actually want to exclude this folder during the merge, but don't
> know how to do this.

You can't exclude paths from a merge. All you can do is to merge all
folders you *want* to merge separately and leaveing the one you don't
want out from the merge.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-04-22 17:49:35 CEST

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