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

RE: Merge: poor performance / slowness; out of memory error

From: McHenry, Matt <mmchenry_at_carnegielearning.com>
Date: Thu, 4 Sep 2008 12:18:46 -0400

> 1) Use sparse working copies:
> a) To block revisions, 'svn co --depth=empty trunk' and then run
> the necessary 'svn merge --record-only' commands in that working copy.
> b) For the actual merge, construct a working copy with --
> depth=infinite for /trunk/foo and /trunk/bar and --depth=empty for
> /baz, and run the merge in it.

        It looks like subversion is too smart for me here. :) (1)(a)
produces svn:mergeinfo with '*' appended to all the blocked revision #s,
which means that mergeinfo isn't inheritable. So when I do (1)(b) the
changes still get merged into the files down in foo/, which isn't what I
want. So I guess I'd have to manually edit svn:mergeinfo to strip out
the '*'s. That still seems a bit safer than trying to construct the
svn:mergeinfo entirely manually, though, yeah?

Matt McHenry
412-690-2442 x150
Software Developer
Carnegie Learning, Inc.
Learning By Doing (r)
Helping over 500,000 students in 2,600 schools to succeed in math.

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-04 18:19:01 CEST

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.