Same error for command line. I also tried svn -r X:Y and URL_at_X
URL_at_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 <qazwart_at_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_at_gmail.com
>
>
>
> On Fri, Oct 17, 2008 at 3:08 PM, Peter Kahn <citizenkahn_at_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_at_gmail.com
> > pkahnpie1_at_AIM
> > http://citizenkahn.myplaxo.com
> > Awareness - Intention - Action
> >
>
--
Peter Kahn
citizenkahn_at_gmail.com
pkahnpie1_at_AIM
http://citizenkahn.myplaxo.com
Awareness - Intention - Action
Received on 2008-10-17 23:42:43 CEST