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

exclude folder during merge

From: ike <Ike.Casteleyn_at_gmail.com>
Date: Mon, 21 Apr 2008 05:07:23 -0700 (PDT)

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.

Any ideas?

Thanks,
Ike

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-04-22 08:54:49 CEST

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