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

Re: Rejoice the merge is done

From: Brandon Ehle <azverkan_at_yahoo.com>
Date: 2003-01-10 18:30:46 CET

> My real question is why did you attempt to merge multiple times?
> a. Because of running out of memory

This is the culprit, the operation would have probably finished if I'd
set the max files open limit to around 8,000 and the max amount of
memory available to the process to around 6GB. Unfortunately I don't
know how to give a process more than 2GB of process space, I think you
must recompile the kernel with highmem or something, so I just reran the
operation about 8-12 times until it succeeded.

> Oh, could you be certain that what you commited was a truly valid merge?

Yep, it was perfectly fine. I diffed it versus the new vendor branch
before committing (as there shouldn't be anycode in the trunk besides
that and some small fixes from me.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 10 15:24:15 2003

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