[svk-devel] 1.99_04 [Multi-]merge bugs

Mark Grimes mark at stateful.net
Wed Dec 6 23:40:31 EST 2006 

Trying some edge cases to see how svk responds...

(mark at entropy ~) svk -v
This is svk, version 1.99_04 (using Subversion bindings 1.4.2)

(mark at entropy /tmp/test/test2) svk merge -C -c11,12 /test/local/test / 
test/mirror/test
multi-merge not yet at /opt/local/lib/perl5/vendor_perl/5.8.8/SVK/ 
Command/Merge.pm line 178.

***********************************************************

Attempting to do a merge of just rev12 causes:

(mark at entropy /tmp/test/test2) svk merge -C -r12 /test/local/test / 
test/mirror/test
Use of uninitialized value in numeric eq (==) at /opt/local/lib/perl5/ 
vendor_perl/5.8.8/SVK/Command/Merge.pm line 188.
Checking locally against mirror source https://stateful.net/svn/test/ 
trunk.
Use of uninitialized value in subroutine entry at /opt/local/lib/ 
perl5/vendor_perl/5.8.8/SVK/Path.pm line 211.
Use of uninitialized value in hash element at /opt/local/lib/perl5/ 
vendor_perl/5.8.8/SVK/Path.pm line 434.
at /opt/local/lib/perl5/vendor_perl/5.8.8/SVK/Path.pm line 116
         SVK::Path::root('SVK::Path=HASH(0x1b8080c)') called at /opt/ 
local/lib/perl5/vendor_perl/5.8.8/SVK/Path.pm line 444
         SVK::Path::_copy_ancestors('SVK::Path=HASH(0x1b7fc48)')  
called at /opt/local/lib/perl5/vendor_perl/5.8.8/SVK/Path.pm line 434
         SVK::Path::copy_ancestors('SVK::Path=HASH(0x1b7fc48)')  
called at /opt/local/lib/perl5/vendor_perl/5.8.8/SVK/Merge.pm line 317
         SVK::Merge::copy_ancestors('SVK::Merge=HASH(0x1b0264c)',  
'SVK::Path=HASH(0x1b774f4)') called at /opt/local/lib/perl5/ 
vendor_perl/5.8.8/SVK/Merge.pm line 304
         SVK::Merge::merge_info_with_copy('SVK::Merge=HASH 
(0x1b0264c)', 'SVK::Path=HASH(0x1b774f4)') called at /opt/local/lib/ 
perl5/vendor_perl/5.8.8/SVK/Merge.pm line 549
         SVK::Merge::run('SVK::Merge=HASH(0x1b0264c)',  
'SVN::Delta::Editor=HASH(0x1ab09c4)', 'inspector',  
'SVK::Inspector::Root=HASH(0x1b60964)', 'mirror', 'SVK::Mirror=HASH 
(0x1b60928)', 'cb_rev', 'CODE(0x1ab121c)') called at /opt/local/lib/ 
perl5/vendor_perl/5.8.8/SVK/Command/Merge.pm line 239
         SVK::Command::Merge::run('SVK::Command::Merge=HASH 
(0x1aaedfc)', 'SVK::Path=HASH(0x1aaf378)', 'SVK::Path=HASH 
(0x1ab04cc)') called at /opt/local/lib/perl5/vendor_perl/5.8.8/SVK/ 
Command.pm line 221
         eval {...} called at /opt/local/lib/perl5/vendor_perl/5.8.8/ 
SVK/Command.pm line 219
         eval {...} called at /opt/local/lib/perl5/vendor_perl/5.8.8/ 
SVK/Command.pm line 199
         SVK::Command::run_command('SVK::Command::Merge=HASH 
(0x1aaedfc)', '/test/local/test', '/test/mirror/test') called at /opt/ 
local/lib/perl5/vendor_perl/5.8.8/App/CLI.pm line 80
         App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH 
(0x18dd51c)', 'output', 'undef') called at /opt/local/lib/perl5/ 
vendor_perl/5.8.8/SVK/Command.pm line 163
         eval {...} called at /opt/local/lib/perl5/vendor_perl/5.8.8/ 
SVK/Command.pm line 163
         SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH 
(0x18dd51c)', 'merge', 'undef', '-C', '-r12', '/test/local/test', '/ 
test/mirror/test') called at /opt/local/bin/svk line 142
Use of uninitialized value in subroutine entry at /opt/local/lib/ 
perl5/vendor_perl/5.8.8/SVK/Path.pm line 117.
Filesystem has no item: File not found: revision 0, path '/local/test'

***********************************************************

And the cmerge completely blows up causing perl to give up the ghost.

(mark at entropy /tmp/test/test2) svk cmerge -C -c11,12 /test/local/ 
test /test/mirror/test
/opt/local/bin/svk cmerge is deprecated, pending improvements to the  
Subversion API
'Use /opt/local/bin/svk merge -c' to obtain similar functionality.
Merging with base /local/test 7: applying /local/test 10:11.
A   test2
Merging with base /local/test 7: applying /local/test 11:12.
     test2 - skipped
Empty merge.
1 file skipped, you might want to rerun merge with --track-rename.
Can't locate object method "new" via package  
"SVN::Simple::Edit" (perhaps you forgot to load "SVN::Simple::Edit"?)  
at /opt/local/lib/perl5/vendor_perl/5.8.8/SVK/Editor/Combine.pm line 86.
perl(22234) malloc: ***  Deallocation of a pointer not malloced:  
0x1c37200; This could be a double free(), or free() called with the  
middle of an allocated block; Try setting environment variable  
MallocHelp to see tools to help debug
perl(22234) malloc: ***  Deallocation of a pointer not malloced:  
0x7c597b; This could be a double free(), or free() called with the  
middle of an allocated block; Try setting environment variable  
MallocHelp to see tools to help debug
perl(22234) malloc: ***  Deallocation of a pointer not malloced:  
0x546910; This could be a double free(), or free() called with the  
middle of an allocated block; Try setting environment variable  
MallocHelp to see tools to help debug
perl(22234) malloc: ***  Deallocation of a pointer not malloced:  
0x12958; This could be a double free(), or free() called with the  
middle of an allocated block; Try setting environment variable  
MallocHelp to see tools to help debug

zsh: segmentation fault  svk cmerge -C -c11,12 /test/local/test /test/ 
mirror/test

CrashReporter Log

Date/Time:      2006-12-06 11:32:20.982 -0800
OS Version:     10.4.8 (Build 8L127)
Report Version: 4

Command: perl
Path:    /opt/local/bin/perl
Parent:  zsh [13418]

Version: ??? (???)

PID:    22234
Thread: 0

Exception:  EXC_BAD_ACCESS (0x0001)
Codes:      KERN_INVALID_ADDRESS (0x0001) at 0xb01e0010

Thread 0 Crashed:
0   libapr-1.0.dylib 	0x001520e0 apr_allocator_destroy + 48  
(apr_pools.c:110)
1   libapr-1.0.dylib 	0x00153308 apr_pool_terminate + 72 (apr_pools.c: 
571)
2   _Core.bundle     	0x0030dc14 _wrap_apr_terminate + 148 (core.c:3755)
3   perl             	0x0005e9bc Perl_pp_entersub + 1788
4   perl             	0x000bb9f4 Perl_runops_standard + 84
5   perl             	0x0001b934 Perl_call_sv + 1604
6   perl             	0x0001be18 Perl_call_list + 472
7   perl             	0x0001c82c perl_destruct + 172
8   perl             	0x00003008 main + 232
9   perl             	0x00002b3c _start + 760
10  perl             	0x00002840 start + 48

Thread 0 crashed with PPC Thread State 64:
   srr0: 0x00000000001520e0 srr1:  
0x000000000000d030                        vrsave: 0x0000000000000000
     cr: 0x42000428          xer: 0x0000000020000002   lr:  
0x00000000001520ec  ctr: 0x00000000900143a0
     r0: 0x00000000001520ec   r1: 0x00000000bfffe920   r2:  
0x0000000000000000   r3: 0x00000000b01e0010
     r4: 0x0000000000000000   r5: 0x0000000000000014   r6:  
0x00000000fffffff9   r7: 0x0000000000000003
     r8: 0x0000000039353800   r9: 0x00000000bfffe7ec  r10:  
0x0000000000000001  r11: 0x0000000042000422
    r12: 0x00000000900143a0  r13: 0x0000000000000000  r14:  
0x0000000000000000  r15: 0x0000000000000000
    r16: 0x0000000000000000  r17: 0x0000000000000000  r18:  
0x0000000000000000  r19: 0x0000000000000000
    r20: 0x0000000000000000  r21: 0x000000000010e2cc  r22:  
0x0000000000000000  r23: 0x0000000000000000
    r24: 0x00000000017fc004  r25: 0x0000000000000001  r26:  
0x000000000010e2cc  r27: 0x000000000049f260
    r28: 0x000000000049f274  r29: 0x0000000000000004  r30:  
0x000000000049f278  r31: 0x00000000001532cc

Binary Images Description:
     0x1000 -   0x10dfff perl 	/opt/local/bin/perl
   0x140000 -   0x143fff Util.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/List/Util/Util.bundle
   0x146000 -   0x162fff libapr-1.0.dylib 	/opt/local/lib/ 
libapr-1.0.dylib
   0x1c3000 -   0x1cafff libsvn_delta-1.0.dylib 	/opt/local/lib/ 
libsvn_delta-1.0.dylib
   0x1e5000 -   0x1e7fff libsvn_fs-1.0.dylib 	/opt/local/lib/ 
libsvn_fs-1.0.dylib
   0x1f5000 -   0x1f6fff libsvn_ra-1.0.dylib 	/opt/local/lib/ 
libsvn_ra-1.0.dylib
   0x305000 -   0x34bfff _Core.bundle 	/opt/local/lib/perl5/ 
vendor_perl/5.8.8/darwin-2level/auto/SVN/_Core/_Core.bundle
   0x3cc000 -   0x3d1fff libsvn_diff-1.0.dylib 	/opt/local/lib/ 
libsvn_diff-1.0.dylib
   0x3e5000 -   0x3eafff libsvn_swig_perl-1.0.dylib 	/opt/local/lib/ 
libsvn_swig_perl-1.0.dylib
   0x3fb000 -   0x3fdfff IO.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/IO/IO.bundle
   0x505000 -   0x523fff libsvn_client-1.0.dylib 	/opt/local/lib/ 
libsvn_client-1.0.dylib
   0x59b000 -   0x5b4fff libsvn_repos-1.0.dylib 	/opt/local/lib/ 
libsvn_repos-1.0.dylib
   0x5f0000 -   0x616fff libsvn_wc-1.0.dylib 	/opt/local/lib/ 
libsvn_wc-1.0.dylib
   0x682000 -   0x6a8fff libsvn_subr-1.0.dylib 	/opt/local/lib/ 
libsvn_subr-1.0.dylib
   0x70b000 -   0x71dfff libz.1.dylib 	/opt/local/lib/libz.1.dylib
   0x721000 -   0x724fff libsvn_ra_local-1.0.dylib 	/opt/local/lib/ 
libsvn_ra_local-1.0.dylib
   0x734000 -   0x748fff libsvn_fs_fs-1.0.dylib 	/opt/local/lib/ 
libsvn_fs_fs-1.0.dylib
   0x787000 -   0x795fff libsvn_ra_svn-1.0.dylib 	/opt/local/lib/ 
libsvn_ra_svn-1.0.dylib
   0x7c2000 -   0x7cafff libintl.8.dylib 	/opt/local/lib/libintl.8.dylib
   0x7e7000 -   0x7eafff HiRes.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Time/HiRes/HiRes.bundle
   0x7ed000 -   0x7edfff Hostname.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Sys/Hostname/Hostname.bundle
   0x7f0000 -   0x7f2fff Glob.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/File/Glob/Glob.bundle
   0x7f5000 -   0x7f6fff Cwd.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Cwd/Cwd.bundle
   0x7f9000 -   0x7fbfff Fcntl.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Fcntl/Fcntl.bundle
0x1008000 -  0x1027fff libsvn_fs_base-1.0.dylib 	/opt/local/lib/ 
libsvn_fs_base-1.0.dylib
0x1101000 -  0x1114fff libsvn_ra_dav-1.0.dylib 	/opt/local/lib/ 
libsvn_ra_dav-1.0.dylib
0x1153000 -  0x116bfff libneon.26.dylib 	/opt/local/lib/libneon.26.dylib
0x11b7000 -  0x11f1fff libssl.0.9.8.dylib 	/opt/local/lib/libssl. 
0.9.8.dylib
0x1207000 -  0x1308fff libcrypto.0.9.8.dylib 	/opt/local/lib/ 
libcrypto.0.9.8.dylib
0x1374000 -  0x1386fff libaprutil-1.0.dylib 	/opt/local/lib/ 
libaprutil-1.0.dylib
0x13c8000 -  0x1498fff libdb-4.4.dylib 	/opt/local/lib/db44/ 
libdb-4.4.dylib
0x14b5000 -  0x14d3fff libexpat.1.dylib 	/opt/local/lib/libexpat.1.dylib
0x1508000 -  0x15e5fff libiconv.2.dylib 	/opt/local/lib/libiconv.2.dylib
0x1627000 -  0x1634fff Storable.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Storable/Storable.bundle
0x1638000 -  0x164bfff _Delta.bundle 	/opt/local/lib/perl5/ 
vendor_perl/5.8.8/darwin-2level/auto/SVN/_Delta/_Delta.bundle
0x1675000 -  0x1679fff Dumper.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Data/Dumper/Dumper.bundle
0x167c000 -  0x16a1fff _Ra.bundle 	/opt/local/lib/perl5/vendor_perl/ 
5.8.8/darwin-2level/auto/SVN/_Ra/_Ra.bundle
0x16f4000 -  0x1737fff _Wc.bundle 	/opt/local/lib/perl5/vendor_perl/ 
5.8.8/darwin-2level/auto/SVN/_Wc/_Wc.bundle
0x17ae000 -  0x17c3fff POSIX.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/POSIX/POSIX.bundle
0x17c8000 -  0x17ccfff Socket.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Socket/Socket.bundle
0x17cf000 -  0x17d2fff eol.bundle 	/opt/local/lib/perl5/vendor_perl/ 
5.8.8/darwin-2level/auto/PerlIO/eol/eol.bundle
0x17d5000 -  0x17eefff Syck.bundle 	/opt/local/lib/perl5/vendor_perl/ 
5.8.8/darwin-2level/auto/YAML/Syck/Syck.bundle
0x17f3000 -  0x17f8fff Encode.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Encode/Encode.bundle
0x2008000 -  0x2040fff _Client.bundle 	/opt/local/lib/perl5/ 
vendor_perl/5.8.8/darwin-2level/auto/SVN/_Client/_Client.bundle
0x20a8000 -  0x20befff _Fs.bundle 	/opt/local/lib/perl5/vendor_perl/ 
5.8.8/darwin-2level/auto/SVN/_Fs/_Fs.bundle
0x20f0000 -  0x20f2fff MD5.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/Digest/MD5/MD5.bundle
0x20f5000 -  0x20f6fff Langinfo.bundle 	/opt/local/lib/perl5/5.8.8/ 
darwin-2level/auto/I18N/Langinfo/Langinfo.bundle
0x2205000 -  0x2226fff _Repos.bundle 	/opt/local/lib/perl5/ 
vendor_perl/5.8.8/darwin-2level/auto/SVN/_Repos/_Repos.bundle
0x8fe00000 - 0x8fe51fff dyld 45.3	/usr/lib/dyld
0x90000000 - 0x901bcfff libSystem.B.dylib 	/usr/lib/libSystem.B.dylib
0x90214000 - 0x90219fff libmathCommon.A.dylib 	/usr/lib/system/ 
libmathCommon.A.dylib
0x907ba000 - 0x90893fff com.apple.CoreFoundation 6.4.6 (368.27)	/ 
System/Library/Frameworks/CoreFoundation.framework/Versions/A/ 
CoreFoundation
0x908dc000 - 0x908dcfff com.apple.CoreServices 10.4 (???)	/System/ 
Library/Frameworks/CoreServices.framework/Versions/A/CoreServices
0x908de000 - 0x909e0fff libicucore.A.dylib 	/usr/lib/libicucore.A.dylib
0x90a3a000 - 0x90abefff libobjc.A.dylib 	/usr/lib/libobjc.A.dylib
0x90ae8000 - 0x90b58fff com.apple.framework.IOKit 1.4 (???)	/System/ 
Library/Frameworks/IOKit.framework/Versions/A/IOKit
0x90b6e000 - 0x90b80fff libauto.dylib 	/usr/lib/libauto.dylib
0x90b87000 - 0x90e5efff com.apple.CoreServices.CarbonCore 681.7	/ 
System/Library/Frameworks/CoreServices.framework/Versions/A/ 
Frameworks/CarbonCore.framework/Versions/A/CarbonCore
0x90ec4000 - 0x90f44fff com.apple.CoreServices.OSServices 4.1	/System/ 
Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/ 
OSServices.framework/Versions/A/OSServices
0x90f8e000 - 0x90fcffff com.apple.CFNetwork 4.0 (129.19)	/System/ 
Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/ 
CFNetwork.framework/Versions/A/CFNetwork
0x90fe4000 - 0x90ffcfff com.apple.WebServices 1.1.2 (1.1.0)	/System/ 
Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/ 
WebServicesCore.framework/Versions/A/WebServicesCore
0x9100c000 - 0x9108dfff com.apple.SearchKit 1.0.5	/System/Library/ 
Frameworks/CoreServices.framework/Versions/A/Frameworks/ 
SearchKit.framework/Versions/A/SearchKit
0x910d3000 - 0x910fdfff com.apple.Metadata 10.4.4 (121.36)	/System/ 
Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/ 
Metadata.framework/Versions/A/Metadata
0x9110e000 - 0x9111cfff libz.1.dylib 	/usr/lib/libz.1.dylib
0x9111f000 - 0x912dafff com.apple.security 4.6 (29770)	/System/ 
Library/Frameworks/Security.framework/Versions/A/Security
0x913d9000 - 0x913e2fff com.apple.DiskArbitration 2.1	/System/Library/ 
Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration
0x913e9000 - 0x91411fff com.apple.SystemConfiguration 1.8.3	/System/ 
Library/Frameworks/SystemConfiguration.framework/Versions/A/ 
SystemConfiguration
0x91424000 - 0x9142ffff libgcc_s.1.dylib 	/usr/lib/libgcc_s.1.dylib
0x944ac000 - 0x944e9fff libsqlite3.0.dylib 	/usr/lib/libsqlite3.0.dylib
0x94bee000 - 0x94c0efff libmx.A.dylib 	/usr/lib/libmx.A.dylib
0x94f76000 - 0x94f93fff libresolv.9.dylib 	/usr/lib/libresolv.9.dylib
0x95498000 - 0x955c6fff edu.mit.Kerberos 5.5.23	/System/Library/ 
Frameworks/Kerberos.framework/Versions/A/Kerberos




-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
Url : http://lists.bestpractical.com/pipermail/svk-devel/attachments/20061206/75da2ef2/PGP.pgp

More information about the svk-devel mailing list