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

Re: Merge Failing

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Thu, 13 Jan 2011 11:10:24 +0100

On Wed, Jan 12, 2011 at 9:22 PM, SUMNER Andrew
<Andrew.SUMNER_at_customs.govt.nz> wrote:
> Sorry if anyone gets this twice – I originally mailed to users at subversion
> dot tigris dot org on the advice of somebody, but when I actually went to
> the site it suggested this mailing list.
>
>
>
> I am attempting to merge the project trunk into a branch but after nearly 10
> minutes it fails with the error message:
>
>
>
> Runtime Error!
>
> Program C:\Program Files\TortoiseSVN\bin\TortoiseProc.exe
>
> This application has requested the Runtime to terminate in an unusual way.
>
>
>
> I have also had at times some errors about running out of memory and the
> Task Manager backs this up as I can see the memory usage climbing and the
> computer grinds to a crawl until the merge crashes.
>
>
>
> I have now tried:
>
> 1.                      Merging using TortoiseSVN windows interface
>
> 2.                      Merging via command line using both VisualSVN and
> SilkSVN.  All fail with the same error - out of memory.  This would indicate
> to me that there is a problem with svn itself.
>
> 3.                      Merging a single revision to attempt to minimize the
> number of changes but it still fails.
>
> 4.                      Merging a single folder containing less than 100
> items – it worked!  Problem is that I have 150 or so folders and around
> 5,000 objects so I can’t manually merge each one.
>
>
>
> Thanks in advance
>
>   Andrew
>
>
>
> Version Information
>
> Window XP Professional SP3
>
> Visual SVN Server running on Windows Server 2003 SP2
>
>
>
> TortoiseSVN 1.6.12, Build 20536 - 32 Bit , 2010/11/24 20:59:01
>
> Subversion 1.6.15,
>
> apr 1.3.8
>
> apr-utils 1.3.9
>
> neon 0.29.5
>
> OpenSSL 0.9.8p 16 Nov 2010
>
> zlib 1.2.3

Just before yours, there was another report of a crash during merge
(with --reintegrate, but perhaps that's unrelated):
http://svn.haxx.se/users/archive-2011-01/0226.shtml.

That user reported that it worked with an older version of the client
(in his case, it worked with 1.6.12). Can you try with an older client
as well (try 1.6.13 perhaps, that's the release just before 1.6.15
(1.6.14 was never released)).

If that works, that could be a good workaround for you, and very
useful information for the developers as to where to look ...

Other useful information to help investigate the problem:
- The crash dump/log file.
- The exact commands you used when reproducing this from the command
line (feel free to obfuscate names/paths/files).

Thanks,

-- 
Johan
Received on 2011-01-13 11:11:23 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.