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

Re: Tortoise crash while merging.

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: Mon, 22 Mar 2010 14:07:39 +0100

On Monday 22 March 2010, RoboJ1M wrote:
>[Out of memory during merge operation]
[...]
> If anybody from here could offer some assistance that would be great.
> This is our new, live SVN service. We've migrated from CVSNT and a
> critical failure like this would be disastrous! :(

The OOM is probably triggered by the sheer amount of changes it has to merge,
IIUC correctly you are trying to merge a branch back to trunk. If you could
merge those changes in smaller steps, each individual step would require less
memory. For that I would try to first to only merge revisions. If there is
such a revision that has so many changes to so many and large files that it
already triggers the bug, you could also switch to merging single files or
directories or maybe even merge manually and only mark the revision as
merged.

I've been using branching and merging regularly, and I've never encountered
this problem. I'm wondering if it's not some other kind of bug you encounter,
like e.g. an endless recursion or something like that. This could also
manifest as OOM, but no amount of memory would fix it.

> As a possible workaround, what would be the feasibility of this:
>
> 1) Perform the merge to a working copy local on the SVN server (ubuntu
> 8.04)
> 2) Copy it off there and perform the rest of the merge (testing,
> conflict resolution)
> 3) Commit it back.
>
> Line ending spring immediately to mind (LR not CRLF?)

You could move the line ending issue by moving it back to the Ubuntu machine
after testing it elsewhere.

Good luck!

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2463195
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-22 14:07:42 CET

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