You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by SUMNER Andrew <An...@customs.govt.nz> on 2011/01/12 21:22:48 UTC
Merge Failing
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
The information contained in this e-mail may be privileged and/or sensitive. It is intended for the addressee only and is not necessarily the official view or communication of the New Zealand Customs Service. If you are not the intended recipient you are asked to not disclose, copy, or make use of its contents. If received in error you are asked to destroy this e-mail and contact the sender immediately. Your assistance is appreciated.
RE: Merge Failing
Posted by SUMNER Andrew <An...@customs.govt.nz>.
I tried version 1.6.12 and 1.6.13 but got the same thing. Looking at Windows Task Manager I can see the Page File Usage gradually building until the crash occurs.
The command I am using is:
"C:\program files\sliksvn\bin\svn.exe" merge https://xxx.xxx.xxx.xxx:000/svn/PowerBuilder/CusMod/trunk
Where do I find the crash dump/log file?
Windows Event Log:
==================
Event Type: Error
Event Source: Application Error
Event Category: None
Event ID: 1000
Date: 14/01/2011
Time: 9:31:21
User: N/A
Computer: WHOS786
Description:
Faulting application svn.exe, version 1.6.12.38263, faulting module sliksvn-libapr-1.dll, version 1.3.12.0, fault address 0x00006b66.
-----Original Message-----
From: Johan Corveleyn [mailto:jcorvel@gmail.com]
Sent: Thursday, 13 January 2011 23:10
To: SUMNER Andrew
Cc: users@subversion.apache.org
Subject: Re: Merge Failing
On Wed, Jan 12, 2011 at 9:22 PM, SUMNER Andrew
<An...@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
The information contained in this e-mail may be privileged and/or sensitive. It is intended for the addressee only and is not necessarily the official view or communication of the New Zealand Customs Service. If you are not the intended recipient you are asked to not disclose, copy, or make use of its contents. If received in error you are asked to destroy this e-mail and contact the sender immediately. Your assistance is appreciated.
RE: Merge Failing
Posted by SUMNER Andrew <An...@customs.govt.nz>.
Solved!
It turned out to be the way I created the branch. I had taken a copy of
the trunk folder in windows explorer and in the copy done a branch and
switch. It was in this copy that that merge was failing.
I created a brand new folder and did a svn checkout on the branch.
Merge worked beautifully after that.
Thanks
Andrew
The information contained in this e-mail may be privileged and/or sensitive. It is intended for the addressee only and is not necessarily the official view or communication of the New Zealand Customs Service. If you are not the intended recipient you are asked to not disclose, copy, or make use of its contents. If received in error you are asked to destroy this e-mail and contact the sender immediately. Your assistance is appreciated.
Re: Merge Failing
Posted by Johan Corveleyn <jc...@gmail.com>.
On Wed, Jan 12, 2011 at 9:22 PM, SUMNER Andrew
<An...@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