subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Becker, Thomas" <Thomas.Bec...@torex.com>
Subject Re: client crash on merge --reintegrate
Date Thu, 13 Jan 2011 14:56:16 GMT
Hello,

 

It seems that the crash is related to improper preconditions for the
reintegration, don't know what SVN wants to tell me there:

 

client 1.6.15 crashes

client 1.6.13 crashes

client 1.6.12 doesn't crash but outputs an error message:

> cd trunk_wc

>svn merge --dry-run --reintegrate https://.../branches/... --accept
postpone

  svn: Reintegrate can only be used if revisions 255131 through 265563
were previously merged from https://.../trunk to the reintegrate source,
but this is not the case:

    .../branches/...

      Missing ranges: /.../trunk:264250-265543

    .../branches/...

      Missing ranges: /.../branches/...:260111-260850

    .../branches/...

      Missing ranges: /.../branches/...:213101-260850

    .../branches/...

      Missing ranges: /.../branches/...:260826-260850

      Missing ranges: /.../trunk/...:260811,260933

    .../branches/...

      Missing ranges: /.../branches/...:260826-260850

      Missing ranges: /.../trunk/...:260805-260811,260933

    .../branches/...

      Missing ranges: /.../branches/...:260826-260850

      Missing ranges: /.../trunk/...:260805-260811,260933

    .../branches/...

      Missing ranges: /.../branches/...:174322-214515

      Missing ranges: /.../trunk/...:103707-174319

      Missing ranges: /.../branches/...:215928-236665

      Missing ranges: /.../branches/...:236669-250022

      Missing ranges: /.../branches/...:250348-260850

      Missing ranges: /.../trunk/...:260933

 

Regards,

  Thomas

 

--

 

Thomas Becker

 

Software Development, Torex

T: +49 (0)30 49901-0 E: thomas.becker@torex.com

 

 

Torex Retail Solutions GmbH, Salzufer 8, D-10587 Berlin

T: +49 (0)30 49901-0  F: +49 (0)30 49901-139  www.torex.de

________________________________

Von: Becker, Thomas 
Gesendet: Mittwoch, 12. Januar 2011 16:58
An: 'users@subversion.apache.org'
Betreff: client crash on merge --reintegrate

 

Hello,

 

When trying to reintegrate a branch into trunk the SVN client (version
1.6.15) crashed. It asked me to send the log file, so here it is.

 

The server had version 1.6.5, upgrading the server to 1.6.15 didn't
help.

 

On the other hand, a client with version 1.6.12 didn't crash.

 

Regards,

  Thomas

 

 

Process info:

Cmd line: svn merge --dry-run --reintegrate
https://localhost:8443/svn/FMCG

Version:  1.6.15 (r1038135), compiled Nov 24 2010, 15:10:31

Platform: Windows OS version 5.1 build 2600 Service Pack 3

 

Exception: ACCESS_VIOLATION

 

Registers:

eax=00000000 ebx=032f1640 ecx=000354ac edx=00000000 esi=0331a048
edi=0331a064

eip=100194c6 esp=0013fc34 ebp=00000000 efl=00210246

cs=001b  ss=0023  ds=0023  es=0023  fs=003b  gs=0000

 

Stacktrace:

#1  0x100194c6 in svn_client_merge_reintegrate ()

 

 

Loaded modules:

0x00400000  C:\Program Files\Dev\Subversion Client\svn.exe
(1.6.15.55095, 155648 bytes)

0x7c900000  C:\WINDOWS\system32\ntdll.dll (5.1.2600.5755, 729088 bytes)

0x7c800000  C:\WINDOWS\system32\kernel32.dll (5.1.2600.5781, 1007616
bytes)

0x6eec0000  C:\Program Files\Dev\Subversion Client\libapr-1.dll
(1.4.2.0, 139264 bytes)

0x77dd0000  C:\WINDOWS\system32\advapi32.dll (5.1.2600.5755, 634880
bytes)

0x77e70000  C:\WINDOWS\system32\rpcrt4.dll (5.1.2600.6022, 602112 bytes)

0x77fe0000  C:\WINDOWS\system32\secur32.dll (5.1.2600.5834, 69632 bytes)

0x71ab0000  C:\WINDOWS\system32\ws2_32.dll (5.1.2600.5512, 94208 bytes)

0x77c10000  C:\WINDOWS\system32\msvcrt.dll (7.0.2600.5512, 360448 bytes)

0x71aa0000  C:\WINDOWS\system32\ws2help.dll (5.1.2600.5512, 32768 bytes)

0x71a50000  C:\WINDOWS\system32\mswsock.dll (5.1.2600.5625, 258048
bytes)

0x7c9c0000  C:\WINDOWS\system32\shell32.dll (6.0.2900.6018, 8482816
bytes)

0x77f10000  C:\WINDOWS\system32\gdi32.dll (5.1.2600.5698, 299008 bytes)

0x7e410000  C:\WINDOWS\system32\user32.dll (5.1.2600.5512, 593920 bytes)

0x77f60000  C:\WINDOWS\system32\shlwapi.dll (6.0.2900.5912, 483328
bytes)

0x10000000  C:\Program Files\Dev\Subversion Client\libsvn_client-1.dll
(1.6.15.55095, 204800 bytes)

0x6ee60000  C:\Program Files\Dev\Subversion Client\libaprutil-1.dll
(1.3.9.0, 192512 bytes)

0x6ee50000  C:\Program Files\Dev\Subversion Client\libapriconv-1.dll
(1.2.1.0, 36864 bytes)

0x00340000  C:\Program Files\Dev\Subversion Client\libsvn_delta-1.dll
(1.6.15.55095, 90112 bytes)

0x00430000  C:\Program Files\Dev\Subversion Client\libsvn_subr-1.dll
(1.6.15.55095, 716800 bytes)

0x76780000  C:\WINDOWS\system32\shfolder.dll (6.0.2900.5512, 36864
bytes)

0x774e0000  C:\WINDOWS\system32\ole32.dll (5.1.2600.6010, 1302528 bytes)

0x77a80000  C:\WINDOWS\system32\crypt32.dll (5.131.2600.5512, 610304
bytes)

0x77b20000  C:\WINDOWS\system32\msasn1.dll (5.1.2600.5875, 73728 bytes)

0x00360000  C:\Program Files\Dev\Subversion Client\libsvn_diff-1.dll
(1.6.15.55095, 53248 bytes)

0x00370000  C:\Program Files\Dev\Subversion Client\libsvn_ra-1.dll
(1.6.15.55095, 520192 bytes)

0x004e0000  C:\Program Files\Dev\Subversion Client\libsvn_repos-1.dll
(1.6.15.55095, 139264 bytes)

0x00510000  C:\Program Files\Dev\Subversion Client\libsvn_fs-1.dll
(1.6.15.55095, 135168 bytes)

0x00540000  C:\Program Files\Dev\Subversion Client\libeay32.dll
(1.0.0.2, 1286144 bytes)

0x00680000  C:\Program Files\Dev\Subversion Client\ssleay32.dll
(1.0.0.2, 245760 bytes)

0x006c0000  C:\Program Files\Dev\Subversion Client\libsasl.dll
(2.1.23.0, 77824 bytes)

0x006e0000  C:\Program Files\Dev\Subversion Client\libsvn_wc-1.dll
(1.6.15.55095, 217088 bytes)

0x76390000  C:\WINDOWS\system32\imm32.dll (5.1.2600.5512, 118784 bytes)

0x773d0000
C:\WINDOWS\WinSxS\x86_Microsoft.Windows.Common-Controls_6595b64144ccf1df
_6.0.2600.6028_x-ww_61e65202\comctl32.dll (6.0.2900.6028, 1060864 bytes)

0x5d090000  C:\WINDOWS\system32\comctl32.dll (5.82.2900.6028, 630784
bytes)

0x5ad70000  C:\WINDOWS\system32\uxtheme.dll (6.0.2900.5512, 229376
bytes)

0x74720000  C:\WINDOWS\system32\MSCTF.dll (5.1.2600.5512, 311296 bytes)

0x71f80000  C:\WINDOWS\system32\security.dll (5.1.2600.5512, 16384
bytes)

0x77c70000  C:\WINDOWS\system32\msv1_0.dll (5.1.2600.5876, 151552 bytes)

0x76790000  C:\WINDOWS\system32\cryptdll.dll (5.1.2600.5512, 49152
bytes)

0x76d60000  C:\WINDOWS\system32\iphlpapi.dll (5.1.2600.5512, 102400
bytes)

0x68000000  C:\WINDOWS\system32\rsaenh.dll (5.1.2600.5507, 221184 bytes)

0x754d0000  C:\WINDOWS\system32\cryptui.dll (5.131.2600.5512, 524288
bytes)

0x5b860000  C:\WINDOWS\system32\netapi32.dll (5.1.2600.5694, 348160
bytes)

0x77120000  C:\WINDOWS\system32\oleaut32.dll (5.1.2600.5512, 569344
bytes)

0x77c00000  C:\WINDOWS\system32\version.dll (5.1.2600.5512, 32768 bytes)

0x3d930000  C:\WINDOWS\system32\wininet.dll (7.0.6000.17091, 856064
bytes)

0x01170000  C:\WINDOWS\system32\normaliz.dll (6.0.5441.0, 36864 bytes)

0x3dfd0000  C:\WINDOWS\system32\iertutil.dll (7.0.6000.17091, 282624
bytes)

0x76c30000  C:\WINDOWS\system32\wintrust.dll (5.131.2600.5922, 188416
bytes)

0x76c90000  C:\WINDOWS\system32\imagehlp.dll (5.1.2600.5512, 163840
bytes)

0x76f60000  C:\WINDOWS\system32\wldap32.dll (5.1.2600.5512, 180224
bytes)

0x76f20000  C:\WINDOWS\system32\dnsapi.dll (5.1.2600.5625, 159744 bytes)

0x76fb0000  C:\WINDOWS\system32\winrnr.dll (5.1.2600.5512, 32768 bytes)

0x76fc0000  C:\WINDOWS\system32\rasadhlp.dll (5.1.2600.5512, 24576
bytes)

0x662b0000  C:\WINDOWS\system32\hnetcfg.dll (5.1.2600.5512, 360448
bytes)

0x71a90000  C:\WINDOWS\system32\wshtcpip.dll (5.1.2600.5512, 32768
bytes)

0x769c0000  C:\WINDOWS\system32\userenv.dll (5.1.2600.5512, 737280
bytes)

0x022d0000  C:\WINDOWS\system32\xpsp2res.dll (5.1.2600.5512, 2904064
bytes)

0x75e60000  C:\WINDOWS\system32\cryptnet.dll (5.131.2600.5512, 77824
bytes)

0x76bf0000  C:\WINDOWS\system32\psapi.dll (5.1.2600.5512, 45056 bytes)

0x722b0000  C:\WINDOWS\system32\sensapi.dll (5.1.2600.5512, 20480 bytes)

0x4d4f0000  C:\WINDOWS\system32\winhttp.dll (5.1.2600.5868, 364544
bytes)

0x75150000  C:\WINDOWS\system32\cabinet.dll (5.1.2600.5512, 77824 bytes)

0x59a60000  C:\WINDOWS\system32\dbghelp.dll (5.1.2600.5512, 659456
bytes)

 

--

 

Thomas Becker

 

Software Development, Torex

T: +49 (0)30 49901-0 E: thomas.becker@torex.com

 

 

Torex Retail Solutions GmbH, Salzufer 8, D-10587 Berlin

T: +49 (0)30 49901-0  F: +49 (0)30 49901-139  www.torex.de

 



 

This email and its attachments may be confidential and are intended solely for 
the use of the individual to whom it is addressed. Any views or opinions expressed 
are solely those of the author and do not necessarily represent those of Torex 
(Torex Group of Companies). If you are not the intended recipient of this email 
and its attachments, you must take no action based upon them, nor must you copy 
or show them to anyone.  Please contact the sender if you believe you have received 
this email in error.

Torex Retail Solutions GmbH
Sitz der Gesellschaft: Berlin. HRB 102273B Amtsgericht Berlin Charlottenburg.
UST.-ID: DE170817515. Steuer-Nr. 27/448/07028. WEEE-Reg.-Nr. DE 30664749.
Geschaftsfuhrer: Stephen Callaghan, Martin Timmann.


.


Mime
View raw message