[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: Robert North <aqh4uyrs3e02_at_sneakemail.com>
Date: 2003-01-10 14:04:54 CET

Brandon Ehle azverkan-at-yahoo.com |Subversion list| wrote:

> Just wanted to post a success story in my attempt to merge a 1.2GB and
> a 2.5GB pair of vendor branches. Although the svn merge command is
> very buggy, if you attempt to svn merge enough times, it'll eventually
> be able to finish using less than 2GB of RAM and from there on out svn
> was able to commit flawlessly.
> One thing of note is the syscalls times for my commit.

Interesting.
My experiences on Suse Linux 8.0:
I recently attempted a large merge, which died due to lack of memory
(swap+ram=1GB).
I managed to complete it by re-running, but considered the wc to be in a
dubious state, so just threw it away.
(Turned out I didn't need the merge at all... the root of the branch was
the same version as in the wc! => use deletes & copies on repository.)

My real question is why did you attempt to merge multiple times?
a. Because of running out of memory
b. Because of other errors killing subversion.
c. Because of something else.
(Oops, sorry, that looks too much like an exam question! ;-)

Oh, could you be certain that what you commited was a truly valid merge?
I couldn't convince myself, so I threw my wc away, and went down a
non-merge route.

Bye
    -Rob.

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

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