You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Peter Kahn <ci...@gmail.com> on 2008/10/17 19:08:09 UTC

svn merge fails "Out of memory - terminating application." or Tortoise runtime error

Am I doing something wrong?  Should I break my merge up into chunks?


I am trying to merge some changes from one branch to another.  The two
branches are currently unrelated.  When I try I get the following:

  Out of memory - terminating application.

  This application has requested the Runtime to terminate it in an unusual
way.
  Please contact the application's support team for more information.


svn log -v gives me about 1890 lines of data for the action.  so, it doesn't
seem like much work.   Please let me know if this is a known issue.  Thanks.



-- 
Peter Kahn
citizenkahn@gmail.com
pkahnpie1@AIM
http://citizenkahn.myplaxo.com
Awareness - Intention - Action

Re: svn merge fails "Out of memory - terminating application." or Tortoise runtime error

Posted by Peter Kahn <ci...@gmail.com>.
Same error for command line.  I also tried svn -r X:Y  and  URL@X
URL@Ymerge types with and without the "--igonre-ancestry" option.  all
failed
after the client took 2gb of ram and ran out.

Here's the thing... I imported from MKS with a modified version of the
Polarion importer.  It created my branches by re-adding most of the files.
It looks like the initial branch creation for each branch and tag was doing
by many many adds.  Subsequent modifications were done via svn cp in some
cases.

So, I have branches that are unrelated to the trunk and rather large.  I
figured out a workaround...  Break the merge up by space...

I tried breaking it up by time (using fewere revisions) but since I have
10,000+ files added, the client croaked.  If I stepped two levels down into
the tree and tried merging from that location it worked.  So, I can segment
the merge by directory and it seems to work.

Still, my import is faulty so I'm going to need to remake my repository any
way since we haven't started using it.  It seems that my journey from MKS to
SVN is far more painful than my journey from CVS to SVN.


On Fri, Oct 17, 2008 at 4:50 PM, David Weintraub <qa...@gmail.com> wrote:

> Is this error from Tortoise or Subversion itself?
>
> Can you do the merge from the command line? Do you get the same error?
>
> --
> David Weintraub
> qazwart@gmail.com
>
>
>
> On Fri, Oct 17, 2008 at 3:08 PM, Peter Kahn <ci...@gmail.com> wrote:
> > Am I doing something wrong?  Should I break my merge up into chunks?
> >
> >
> > I am trying to merge some changes from one branch to another.  The two
> > branches are currently unrelated.  When I try I get the following:
> >
> >   Out of memory - terminating application.
> >
> >   This application has requested the Runtime to terminate it in an
> unusual
> > way.
> >   Please contact the application's support team for more information.
> >
> >
> > svn log -v gives me about 1890 lines of data for the action.  so, it
> doesn't
> > seem like much work.   Please let me know if this is a known issue.
>  Thanks.
> >
> >
> >
> > --
> > Peter Kahn
> > citizenkahn@gmail.com
> > pkahnpie1@AIM
> > http://citizenkahn.myplaxo.com
> > Awareness - Intention - Action
> >
>



-- 
Peter Kahn
citizenkahn@gmail.com
pkahnpie1@AIM
http://citizenkahn.myplaxo.com
Awareness - Intention - Action

Re: svn merge fails "Out of memory - terminating application." or Tortoise runtime error

Posted by David Weintraub <qa...@gmail.com>.
Is this error from Tortoise or Subversion itself?

Can you do the merge from the command line? Do you get the same error?

--
David Weintraub
qazwart@gmail.com



On Fri, Oct 17, 2008 at 3:08 PM, Peter Kahn <ci...@gmail.com> wrote:
> Am I doing something wrong?  Should I break my merge up into chunks?
>
>
> I am trying to merge some changes from one branch to another.  The two
> branches are currently unrelated.  When I try I get the following:
>
>   Out of memory - terminating application.
>
>   This application has requested the Runtime to terminate it in an unusual
> way.
>   Please contact the application's support team for more information.
>
>
> svn log -v gives me about 1890 lines of data for the action.  so, it doesn't
> seem like much work.   Please let me know if this is a known issue.  Thanks.
>
>
>
> --
> Peter Kahn
> citizenkahn@gmail.com
> pkahnpie1@AIM
> http://citizenkahn.myplaxo.com
> Awareness - Intention - Action
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: svn merge fails "Out of memory - terminating application." or Tortoise runtime error

Posted by we...@tigris.org.
I am also experiencing this problem, in a directory that contained thousands of files with empty mergeinfo properties.  Deleting those empty mergeinfos worked around the issue.

I don't see a relevant bug in the tracker.  Should this be filed as a new bug?


> In short I managed to trace the problem (performing merge sub directory by
> sub directory) to a directory of approx 1200 files that had a svn:mergeinfo
> property which was blank.
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1304156

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: svn merge fails "Out of memory - terminating application." or Tortoise runtime error

Posted by Paul Burba <pt...@gmail.com>.
On Wed, Apr 8, 2009 at 12:52 PM, Paul Burba <pt...@gmail.com> wrote:
> On Wed, Mar 4, 2009 at 12:54 PM, Nick Lockwood <nm...@i4free.co.nz> wrote:
>> Do not know if this thread is still alive but hopefull will help somone else
>> as spent ages trying to sort out same error.
>>
>> In short I managed to trace the problem (performing merge sub directory by
>> sub directory) to a directory of approx 1200 files that had a svn:mergeinfo
>> property which was blank.
>
> Nick,
>
> Counting the 1200 files in that one directory, what were the *total*
> number of subtrees with mergeinfo in your merge target (i.e. how many
> paths under the merge target had the svn:mergeinfo property set on
> them, regardless of what the property's value is)?
>
>> seen by running
>> svn propget svn:mergeinfo --recursive --xml > mergeinfo.xml
>>
>> once removed (hope someone is not going to tell me off for sugesting the
>> wrong thing here) with
>> svn propdel --recursive svn:mergeinfo ./*
>
> Most empty mergeinfo (what you referred to as "blank" above) is caused
> by working copy to working copy copies/moves where the source item has
> no explicit mergeinfo.  Since 1.5.5 these WC-to-WC copies no longer
> create empty mergeinfo on the destination.  There are of course other
> ways to produce empty mergeinfo, but this has been the most common
> AFAICT.  Peter Kahn mentioned the Polarion importer; I don't know much
> about that, but it is quite possible that some import tools create a
> lot of subtree mergeinfo too.
>
>> I was able to start performing branch to trunk working copy merges
>> successfully after that.
>>
>> My theory (I am not an svn expert so take it with a grain of salt). I had
>> picked up all these mergeinfo properties (probably from an earlier svn move
>> (rename) restructuring exercise),
>
> Ok, looks like the usual culprit of empty mergeinfo.  So what you did
> in deleting this empty mergeifo is probably quite alright.  If the
> subtree mergeinfo had been created because you were doing subtree
> merges then you might have problems (by subtree merge I mean merges
> where the WC target is not the root of your branch/copy).
>
>> but when a merge was being performed there
>> were so many that examining all these caused memory usage to go through the
>> roof (2+ GB) which eventually caused abnormal termination. Either that or
>> there might be a bug (memory leak?) handling empty merge info properties.
>
> Experimenting with a merge target with 1500 subtrees with empty
> mergeinfo I see memory usage peaking around 1.2 GB.  But this doesn't
> happen until after the merge is complete, most of the time it is
> around 200-400MB.  Debugging now to see if the spike occurs
> post-merge, when the code sets mergeinfo to record the merge.  More
> soon...

Created issue #3393 to track this problem, but I shouldn't have
bothered.  It turned out to be quite simple: We were not clearing an
iterpool when looping over each subtree with mergeinfo to set
mergeinfo describing the merge.  Fixed in r37119 and nominated for
backport to 1.5.x and 1.6.x.

Paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1601194


Re: svn merge fails "Out of memory - terminating application." or Tortoise runtime error

Posted by Paul Burba <pt...@gmail.com>.
On Wed, Mar 4, 2009 at 12:54 PM, Nick Lockwood <nm...@i4free.co.nz> wrote:
> Do not know if this thread is still alive but hopefull will help somone else
> as spent ages trying to sort out same error.
>
> In short I managed to trace the problem (performing merge sub directory by
> sub directory) to a directory of approx 1200 files that had a svn:mergeinfo
> property which was blank.

Nick,

Counting the 1200 files in that one directory, what were the *total*
number of subtrees with mergeinfo in your merge target (i.e. how many
paths under the merge target had the svn:mergeinfo property set on
them, regardless of what the property's value is)?

> seen by running
> svn propget svn:mergeinfo --recursive --xml > mergeinfo.xml
>
> once removed (hope someone is not going to tell me off for sugesting the
> wrong thing here) with
> svn propdel --recursive svn:mergeinfo ./*

Most empty mergeinfo (what you referred to as "blank" above) is caused
by working copy to working copy copies/moves where the source item has
no explicit mergeinfo.  Since 1.5.5 these WC-to-WC copies no longer
create empty mergeinfo on the destination.  There are of course other
ways to produce empty mergeinfo, but this has been the most common
AFAICT.  Peter Kahn mentioned the Polarion importer; I don't know much
about that, but it is quite possible that some import tools create a
lot of subtree mergeinfo too.

> I was able to start performing branch to trunk working copy merges
> successfully after that.
>
> My theory (I am not an svn expert so take it with a grain of salt). I had
> picked up all these mergeinfo properties (probably from an earlier svn move
> (rename) restructuring exercise),

Ok, looks like the usual culprit of empty mergeinfo.  So what you did
in deleting this empty mergeifo is probably quite alright.  If the
subtree mergeinfo had been created because you were doing subtree
merges then you might have problems (by subtree merge I mean merges
where the WC target is not the root of your branch/copy).

> but when a merge was being performed there
> were so many that examining all these caused memory usage to go through the
> roof (2+ GB) which eventually caused abnormal termination. Either that or
> there might be a bug (memory leak?) handling empty merge info properties.

Experimenting with a merge target with 1500 subtrees with empty
mergeinfo I see memory usage peaking around 1.2 GB.  But this doesn't
happen until after the merge is complete, most of the time it is
around 200-400MB.  Debugging now to see if the spike occurs
post-merge, when the code sets mergeinfo to record the merge.  More
soon...

Paul

P.S. Moving this to the dev list too.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1599139

Re: svn merge fails "Out of memory - terminating application." or Tortoise runtime error

Posted by Nick Lockwood <nm...@i4free.co.nz>.
Do not know if this thread is still alive but hopefull will help somone else
as spent ages trying to sort out same error.

In short I managed to trace the problem (performing merge sub directory by
sub directory) to a directory of approx 1200 files that had a svn:mergeinfo
property which was blank.

seen by running
svn propget svn:mergeinfo --recursive --xml > mergeinfo.xml

once removed (hope someone is not going to tell me off for sugesting the
wrong thing here) with
svn propdel --recursive svn:mergeinfo ./*

I was able to start performing branch to trunk working copy merges
successfully after that.

My theory (I am not an svn expert so take it with a grain of salt). I had
picked up all these mergeinfo properties (probably from an earlier svn move
(rename) restructuring exercise), but when a merge was being performed there
were so many that examining all these caused memory usage to go through the
roof (2+ GB) which eventually caused abnormal termination. Either that or
there might be a bug (memory leak?) handling empty merge info properties.

Hope that helps
-- 
View this message in context: http://www.nabble.com/svn-merge-fails-%22Out-of-memory---terminating-application.%22-or-Tortoise-runtime-error-tp20039314p22334236.html
Sent from the Subversion Users mailing list archive at Nabble.com.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1267597

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].