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

how to --ignore-externals when merging?

From: Cory Riddell <cory_at_codeware.com>
Date: Wed, 08 Dec 2010 22:37:00 -0600

Our project has several sub-trees that are included via the externals
mechanism. When I'm working in a branch and try to merge from the trunk,
it takes about 15 minutes and brings my machine to its knees because all
of my RAM (4GB) is used and it starts swapping heavily. In the end,
every single file gets a merge-info property added to it.

If my working copy was checked out without the externals, the merge
completes in about 30 seconds and only the root directory has a
mergeinfo property.

Is there some way to tell subversion to merge but ignore externals?

My client and server are both running 1.6.13.

Received on 2010-12-09 05:37:44 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.