WinXP TortoiseSVN 1.6.10 and SlikSVN 1.6.11 runtime error on ancestry respecting merge

["Salo, Juho (ADP DSI)" <Ju...@adp.com>]

 

Hi,

 

TortoiseSVN and  SlikSVN both crash with runtime error on a Merge
respecting ancestry.

Ingore ancestry merge for the same folder\revision works.

 

We started using SVN about 3 months ago. For the first two months
everything went fine and we were _very_ happy coming from an overblown
VSS.

But now the problem is we are getting a runtime error on ancestry
respecting merges.

In this example we are merging a revision of trunk to delivery to get
the fix for the customer immediately.

Steps:

1) Right click on branches\delivery\SUBPRODUCT1 choose Merge

2) Merge a range of revisions

3) Choose trunk\SUBPRODUCT1 and enter revision number of the revision
that contains the fix to library_file1.apl

4) Default settings (Merge depth: working copy, all checkboxes unticked,
compare whitespaces

5) Click Merge

6) Status window opens: "Merging revisions ....."

7) TortoiseProcs.exe process memory usage increases rapidly (20 MB/s on
my machine)

8) Memory raises to 1.8 GB and then goes back to 300 MB

9) Error message:

Microsoft Visual C++ Runtime Libary 

Runtime Error! 

Program C:\Program Files\TortoiseSVN\bin\TortoiseProc.exe

10) Click OK

11) Error message:

TortoiseProc.exe - Application Error

The exception unknown software expection (0x40000015) occurred in the
application at location 0x6eec26a7

 

System information:

WinXP SP3 32bit

4GB memory

Core2Duo T9300 (2.5 GHz)

 

TortoiseSVN 1.6.10, Build 19898 - 32 Bit , 2010/07/16 15:46:08

Subversion 1.6.12, 

apr 1.3.8

apr-utils 1.3.9

neon 0.29.3

OpenSSL 0.9.8o 01 Jun 2010

zlib 1.2.3

 

SlikSVN

1.6.11.16982

1.6.11-SlikSvn-tag-1.6.11@935059-WIN32

 

Repository structure:

root

|--product1

|  |--trunk

|  |  |--SUBPRODUCT1

|  |  |  |--Libraries

|  |  |  |  |--libary_file1.apl

|  |  |  |--...

|  |  |--SUBPRODUCT2

|  |--branches

|  |  |--delivery

|  |  |  |--SUBPRODUCT1

|  |  |  |  |--Libraries

|  |  |  |  |  |--library_file1.apl

|  |  |  |  |--...

|  |  |  |--SUBPRODUCT2

|  |  |--feature-freeze

|  |--tags

|--product2

Trunk is where the development is done. Every month trunk is copied
(branched) to feature-freeze (old feature-freeze is deleted).

After two weeks of testing the feature-freeze is then copied (branched)
to delivery (old delivery is archived to tags and deleted). 

 

Folder sizes:

trunk - 18327 files, 1,28 GB

SUBPRODUCT1 - 10935 files, 0,9 GB

libraries - 2072 files, 0,23 GB

library_file1 - example is a big one, 2 MB

 

SVN LOG:

Current HEAD revision number: 2950

1260 revisions containing changes to files in trunk

781 revisions containing changes to files in trunk\SUBPRODUCT1

 

 

I can try to provide more information if necessary.

 

Best Regards

Juho

 

Juho Salo

Software Designer

ADP Dealer Services International
  

juho_salo@adp.com <ma...@adp.com>  

www.adpdsi.com <http://www.adpdsi.com/>  

 



This message and any attachments are intended only for the use of the addressee and may contain information that is privileged and confidential. If the reader of the message is not the intended recipient or an authorized representative of the intended recipient, you are hereby notified that any dissemination of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by e-mail and delete the message and any attachments from your system.