My coworker Steve Elesmore found a segfault when using the '(m) merge' internal
text conflict merge tool with 1.8.0-RC2.
C:\SVN\src-trunk-2>svn st -u
C:\SVN\src-branch-1.8.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_tests-137
M * 11
C:\SVN\src-branch-1.8.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_tests-137\A\C\Test
Project\nu
Status against revision: 12
C:\SVN\src-trunk-2>svn update
C:\SVN\src-branch-1.8.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_tests-137
Updating
'C:\SVN\src-branch-1.8.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_tests-137':
C
C:\SVN\src-branch-1.8.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_tests-137\A\C\Test
Project\nu
Updated to revision 12.
Summary of conflicts:
Text conflicts: 1
Conflict discovered in file
'C:\SVN\src-branch-1.8.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_tests-137\A\C\Test
Project\nu'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: m
This application has halted due to an unexpected error.
A crash report and minidump file were saved to disk, you can find them here:
C:\Users\pburba\AppData\Local\Temp\svn-crash-log20130531104250.log
C:\Users\pburba\AppData\Local\Temp\svn-crash-log20130531104250.dmp
Please send the log file to users@subversion.apache.org to help us analyze
and solve this problem.
NOTE: The crash report and minidump files can contain some sensitive information
(filenames, partial file content, usernames and passwords etc.)
C:\SVN\src-trunk-2>type
C:\Users\pburba\AppData\Local\Temp\svn-crash-log20130531104250.log
Process info:
Cmd line: svn update
C:\SVN\src-branch-1.8.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\merge_tests-137
Working Dir: C:\SVN\src-trunk-2
Version: 1.9.0-dev (under development), compiled May 28 2013, 09:21:32
Platform: Windows OS version 6.1 build 7601 Service Pack 1
Exception: ACCESS_VIOLATION
Registers:
eax=00000000 ebx=7efde000 ecx=00000000 edx=0256e67b esi=0023ecc8 edi=0023ec98
eip=00bb26d7 esp=0023eb9c ebp=0023eba4 efl=00010212
cs=0023 ss=002b ds=002b es=002b fs=0053 gs=002b
Stacktrace:
#1 0x00bb26d7 in svn_dirent_local_style(dirent=0x00000000 "(null)",
pool=(apr_pool_t *) 0x02579c48) at
c:\svn\src-trunk-2\subversion\libsvn_subr\dirent_uri.c:884
dirent = 0x00000000 "(null)"
pool = (apr_pool_t *) 0x02579c48
#2 0x00aab847 in svn_cl__merge_file(base_path=0x0256e6e8
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu.r
11", their_path=0x0256e7e8
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu.r12", my_path=0x0256e768 "C:/SVN
/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu.mine", merged_path=0x0256e868 "C:/SVN/src-branch-1.8.x/Debug/subve
rsion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu", wc_path=0x0256e670
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/work
ing_copies/merge_tests-137/A/C/Test Project/nu", path_prefix=0x024f6ac8
"C:/SVN/src-trunk-2", editor_cmd=0x00000000 "(null)", config=(apr_hash_t *)
0x024f54e8, remains_in_conflict=
0x0023ecf0, scratch_pool=(apr_pool_t *) 0x02579c48) at
c:\svn\src-trunk-2\subversion\svn\file-merge.c:862
svn_err__temp = (svn_error_t *) 0xcccccccc
base_path = 0x0256e6e8
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu.r11"
their_path = 0x0256e7e8
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu.r12"
my_path = 0x0256e768
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu.mine"
merged_path = 0x0256e868
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
wc_path = 0x0256e670
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
path_prefix = 0x024f6ac8 "C:/SVN/src-trunk-2"
editor_cmd = 0x00000000 "(null)"
config = (apr_hash_t *) 0x024f54e8
remains_in_conflict = 0x0023ecf0
scratch_pool = (apr_pool_t *) 0x02579c48
diff = (svn_diff_t *) 0xcccccccc
diff_options = (svn_diff_file_options_t *) 0xcccccccc
original_file = (apr_file_t *) 0xcccccccc
latest_file = (apr_file_t *) 0xcccccccc
modified_file = (apr_file_t *) 0xcccccccc
executable = -858993460
merged_file = (apr_file_t *) 0xcccccccc
#3 0x00aa6eba in handle_text_conflict(result=(svn_wc_conflict_result_t *)
0x025824a8, desc=(svn_wc_conflict_description2_t *) 0x0256e630,
b=(svn_cl__interactive_conflict_baton_t *
) 0x024f6a48, scratch_pool=(apr_pool_t *) 0x02582468) at
c:\svn\src-trunk-2\subversion\svn\conflict-callbacks.c:884
svn_err__temp = (svn_error_t *) 0xcccccccc
remains_in_conflict = -858993460
next_option = 0x0023ed50
options = [unhandled tag: 15]
opt = (resolver_option_t *) 0x00e649e0
result = (svn_wc_conflict_result_t *) 0x025824a8
desc = (svn_wc_conflict_description2_t *) 0x0256e630
b = (svn_cl__interactive_conflict_baton_t *) 0x024f6a48
scratch_pool = (apr_pool_t *) 0x02582468
performed_edit = 0
iterpool = (apr_pool_t *) 0x02579c48
diff_allowed = 1
knows_something = 0
#4 0x00aa80d9 in conflict_func_interactive(result=(svn_wc_conflict_result_t **)
0x0023ee68, desc=(svn_wc_conflict_description2_t *) 0x0256e630,
baton=0x024f6a48, result_pool=(apr_
pool_t *) 0x02582468, scratch_pool=(apr_pool_t *) 0x02582468) at
c:\svn\src-trunk-2\subversion\svn\conflict-callbacks.c:1318
svn_err__temp = (svn_error_t *) 0xcccccccc
result = (svn_wc_conflict_result_t **) 0x0023ee68
desc = (svn_wc_conflict_description2_t *) 0x0256e630
baton = 0x024f6a48
result_pool = (apr_pool_t *) 0x02582468
scratch_pool = (apr_pool_t *) 0x02582468
err = (svn_error_t *) 0xcccccccc
b = (svn_cl__interactive_conflict_baton_t *) 0x024f6a48
#5 0x00aa55ca in
svn_cl__conflict_func_interactive(result=(svn_wc_conflict_result_t **)
0x0023ee68, desc=(svn_wc_conflict_description2_t *) 0x0256e630,
baton=0x024f6a48, result_po
ol=(apr_pool_t *) 0x02582468, scratch_pool=(apr_pool_t *) 0x02582468) at
c:\svn\src-trunk-2\subversion\svn\conflict-callbacks.c:1365
svn_err__temp = (svn_error_t *) 0xcccccccc
result = (svn_wc_conflict_result_t **) 0x0023ee68
desc = (svn_wc_conflict_description2_t *) 0x0256e630
baton = 0x024f6a48
result_pool = (apr_pool_t *) 0x02582468
scratch_pool = (apr_pool_t *) 0x02582468
b = (svn_cl__interactive_conflict_baton_t *) 0x024f6a48
#6 0x00c7c065 in conflict_status_walker(baton=0x0023f124,
local_abspath=0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests
-137/A/C/Test Project/nu", status=(svn_wc_status3_t *) 0x0256e318,
scratch_pool=(apr_pool_t *) 0x0256d018) at
c:\svn\src-trunk-2\subversion\libsvn_wc\conflicts.c:2951
svn_err__temp = (svn_error_t *) 0xcccccccc
result = (svn_wc_conflict_result_t *) 0x025824a8
my_choice = 7
cd = (svn_wc_conflict_description2_t *) 0x0256e630
did_resolve = -858993460
merged_file = 0x00000000 "(null)"
baton = 0x0023f124
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
status = (svn_wc_status3_t *) 0x0256e318
scratch_pool = (apr_pool_t *) 0x0256d018
cswb = (conflict_status_walker_baton *) 0x0023f124
resolved = 0
conflicts = (apr_array_header_t *) 0x0256e608
iterpool = (apr_pool_t *) 0x02582468
i = 0
db = (svn_wc__db_t *) 0x024f63a8
#7 0x00c8e6b4 in send_status_structure(wb=(walk_status_baton *) 0x0023f084,
local_abspath=0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_
copies/merge_tests-137/A/C/Test Project/nu", parent_repos_root_url=0x0256da08
"file:///C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/merge_tests
-137", parent_repos_relpath=0x0256d9f0 "A/C/Test Project",
parent_repos_uuid=0x0256da78 "d53bf8cc-adc6-524a-ba8a-b2fd7ba7906b",
info=(svn_wc__db_info_t *) 0x0256d308, dirent=(svn_i
o_dirent2_t *) 0x0256d7e8, get_all=0, status_func=0x00c7bf20,
status_baton=0x0023f124, scratch_pool=(apr_pool_t *) 0x0256d018) at
c:\svn\src-trunk-2\subversion\libsvn_wc\status.c:9
31
wb = (walk_status_baton *) 0x0023f084
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
parent_repos_root_url = 0x0256da08
"file:///C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-137"
parent_repos_relpath = 0x0256d9f0 "A/C/Test Project"
parent_repos_uuid = 0x0256da78 "d53bf8cc-adc6-524a-ba8a-b2fd7ba7906b"
info = (svn_wc__db_info_t *) 0x0256d308
dirent = (svn_io_dirent2_t *) 0x0256d7e8
get_all = 0
status_func = 0x00c7bf20
status_baton = 0x0023f124
scratch_pool = (apr_pool_t *) 0x0256d018
repos_lock = (svn_lock_t *) 0x00000000
statstruct = (svn_wc_status3_t *) 0x0256e318
#8 0x00c8f3e4 in one_child_status(wb=(walk_status_baton *) 0x0023f084,
local_abspath=0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copie
s/merge_tests-137/A/C/Test Project/nu", parent_abspath=0x0256d800
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Proj
ect", info=(svn_wc__db_info_t *) 0x0256d308, dirent=(svn_io_dirent2_t *)
0x0256d7e8, dir_repos_root_url=0x0256da08
"file:///C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/s
vn-test-work/repositories/merge_tests-137", dir_repos_relpath=0x0256d9f0
"A/C/Test Project", dir_repos_uuid=0x0256da78
"d53bf8cc-adc6-524a-ba8a-b2fd7ba7906b", unversioned_tree_conf
licted=0, collected_ignore_patterns=(apr_array_header_t **) 0x0023efcc,
ignore_patterns=(apr_array_header_t *) 0x0256d1c8, depth=0, get_all=0,
no_ignore=1, status_func=0x00c7bf20,
status_baton=0x0023f124, cancel_func=0x00aa10e6, cancel_baton=0x00000000,
result_pool=(apr_pool_t *) 0x0256d018, scratch_pool=(apr_pool_t *) 0x0256d018)
at c:\svn\src-trunk-2\subve
rsion\libsvn_wc\status.c:1212
svn_err__temp = (svn_error_t *) 0xcccccccc
wb = (walk_status_baton *) 0x0023f084
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
parent_abspath = 0x0256d800
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project"
info = (svn_wc__db_info_t *) 0x0256d308
dirent = (svn_io_dirent2_t *) 0x0256d7e8
dir_repos_root_url = 0x0256da08
"file:///C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-137"
dir_repos_relpath = 0x0256d9f0 "A/C/Test Project"
dir_repos_uuid = 0x0256da78 "d53bf8cc-adc6-524a-ba8a-b2fd7ba7906b"
unversioned_tree_conflicted = 0
collected_ignore_patterns = (apr_array_header_t **) 0x0023efcc
ignore_patterns = (apr_array_header_t *) 0x0256d1c8
depth = 0
get_all = 0
no_ignore = 1
status_func = 0x00c7bf20
status_baton = 0x0023f124
cancel_func = 0x00aa10e6
cancel_baton = 0x00000000
result_pool = (apr_pool_t *) 0x0256d018
scratch_pool = (apr_pool_t *) 0x0256d018
conflicted = 1
#9 0x00c8f70b in get_child_status(wb=(walk_status_baton *) 0x0023f084,
local_abspath=0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copie
s/merge_tests-137/A/C/Test Project/nu", info=(svn_wc__db_info_t *) 0x0256d308,
dirent=(svn_io_dirent2_t *) 0x0256d7e8, ignore_patterns=(apr_array_header_t *)
0x0256d1c8, get_all=0,
status_func=0x00c7bf20, status_baton=0x0023f124, cancel_func=0x00aa10e6,
cancel_baton=0x00000000, scratch_pool=(apr_pool_t *) 0x0256d018) at
c:\svn\src-trunk-2\subversion\libsvn_w
c\status.c:1542
svn_err__temp = (svn_error_t *) 0xcccccccc
wb = (walk_status_baton *) 0x0023f084
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
info = (svn_wc__db_info_t *) 0x0256d308
dirent = (svn_io_dirent2_t *) 0x0256d7e8
ignore_patterns = (apr_array_header_t *) 0x0256d1c8
get_all = 0
status_func = 0x00c7bf20
status_baton = 0x0023f124
cancel_func = 0x00aa10e6
cancel_baton = 0x00000000
scratch_pool = (apr_pool_t *) 0x0256d018
dir_repos_relpath = 0x0256d9f0 "A/C/Test Project"
parent_abspath = 0x0256d800
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project"
dir_repos_root_url = 0x0256da08
"file:///C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-137"
dir_repos_uuid = 0x0256da78 "d53bf8cc-adc6-524a-ba8a-b2fd7ba7906b"
dir_info = (svn_wc__db_info_t *) 0x0256d878
collected_ignore_patterns = (apr_array_header_t *) 0x00000000
#10 0x00c8cd2d in svn_wc__internal_walk_status(db=(svn_wc__db_t *) 0x024f63a8,
local_abspath=0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/worki
ng_copies/merge_tests-137/A/C/Test Project/nu", depth=0, get_all=0, no_ignore=0,
ignore_text_mods=1, ignore_patterns=(apr_array_header_t *) 0x0256d1c8,
status_func=0x00c7bf20, stat
us_baton=0x0023f124, cancel_func=0x00aa10e6, cancel_baton=0x00000000,
scratch_pool=(apr_pool_t *) 0x0256d018) at
c:\svn\src-trunk-2\subversion\libsvn_wc\status.c:2773
db = (svn_wc__db_t *) 0x024f63a8
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
depth = 0
get_all = 0
no_ignore = 0
ignore_text_mods = 1
ignore_patterns = (apr_array_header_t *) 0x0256d1c8
status_func = 0x00c7bf20
status_baton = 0x0023f124
cancel_func = 0x00aa10e6
cancel_baton = 0x00000000
scratch_pool = (apr_pool_t *) 0x0256d018
info = (svn_wc__db_info_t *) 0x0256d308
err = (svn_error_t *) 0x00000000
wb = (walk_status_baton) 0x0023f084
dirent = (svn_io_dirent2_t *) 0x0256d7e8
#11 0x00c8c3ba in svn_wc_walk_status(wc_ctx=(svn_wc_context_t *) 0x024f6398,
local_abspath=0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working
_copies/merge_tests-137/A/C/Test Project/nu", depth=0, get_all=0, no_ignore=0,
ignore_text_mods=1, ignore_patterns=(apr_array_header_t *) 0x00000000,
status_func=0x00c7bf20, status
_baton=0x0023f124, cancel_func=0x00aa10e6, cancel_baton=0x00000000,
scratch_pool=(apr_pool_t *) 0x0256d018) at
c:\svn\src-trunk-2\subversion\libsvn_wc\status.c:2817
wc_ctx = (svn_wc_context_t *) 0x024f6398
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
depth = 0
get_all = 0
no_ignore = 0
ignore_text_mods = 1
ignore_patterns = (apr_array_header_t *) 0x00000000
status_func = 0x00c7bf20
status_baton = 0x0023f124
cancel_func = 0x00aa10e6
cancel_baton = 0x00000000
scratch_pool = (apr_pool_t *) 0x0256d018
#12 0x00c7553c in svn_wc__resolve_conflicts(wc_ctx=(svn_wc_context_t *)
0x024f6398, local_abspath=0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/
working_copies/merge_tests-137/A/C/Test Project/nu", depth=0, resolve_text=1,
resolve_prop=0x00fd3bc6 "", resolve_tree=1, conflict_choice=7,
conflict_func=0x00aa1050, conflict_bato
n=0x024f6a48, cancel_func=0x00aa10e6, cancel_baton=0x00000000,
notify_func=0x00aa117c, notify_baton=0x0023f364, scratch_pool=(apr_pool_t *)
0x0256d018) at c:\svn\src-trunk-2\subver
sion\libsvn_wc\conflicts.c:3114
svn_err__temp = (svn_error_t *) 0xcccccccc
wc_ctx = (svn_wc_context_t *) 0x024f6398
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
depth = 0
resolve_text = 1
resolve_prop = 0x00fd3bc6 ""
resolve_tree = 1
conflict_choice = 7
conflict_func = 0x00aa1050
conflict_baton = 0x024f6a48
cancel_func = 0x00aa10e6
cancel_baton = 0x00000000
notify_func = 0x00aa117c
notify_baton = 0x0023f364
scratch_pool = (apr_pool_t *) 0x0256d018
cswb = (conflict_status_walker_baton) 0x0023f124
conflicted = 1
kind = 1
#13 0x00b132da in svn_client__resolve_conflicts(conflicts_remain=0x00000000,
conflicted_paths=(apr_hash_t *) 0x02521048, ctx=(svn_client_ctx_t *) 0x024f6338,
scratch_pool=(apr_poo
l_t *) 0x02520e60) at c:\svn\src-trunk-2\subversion\libsvn_client\resolved.c:80
svn_err__temp = (svn_error_t *) 0xcccccccc
local_abspath = 0x02523940
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137/A/C/Test
Project/nu"
conflicts_remain = 0x00000000
conflicted_paths = (apr_hash_t *) 0x02521048
ctx = (svn_client_ctx_t *) 0x024f6338
scratch_pool = (apr_pool_t *) 0x02520e60
iterpool = (apr_pool_t *) 0x0256d018
array = (apr_array_header_t *) 0x02523d48
i = 0
#14 0x00b16ea3 in svn_client__update_internal(result_rev=0x0023f2d8,
local_abspath=0x02520fe0
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/
merge_tests-137", revision=(svn_opt_revision_t *) 0x0023f600, depth=-2,
depth_is_sticky=0, ignore_externals=0, allow_unver_obstructions=0,
adds_as_modification=1, make_parents=0, i
nnerupdate=0, timestamp_sleep=0x0023f2e8, ctx=(svn_client_ctx_t *) 0x024f6338,
pool=(apr_pool_t *) 0x02520e60) at
c:\svn\src-trunk-2\subversion\libsvn_client\update.c:606
result_rev = 0x0023f2d8
local_abspath = 0x02520fe0
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137"
revision = (svn_opt_revision_t *) 0x0023f600
depth = -2
depth_is_sticky = 0
ignore_externals = 0
allow_unver_obstructions = 0
adds_as_modification = 1
make_parents = 0
innerupdate = 0
timestamp_sleep = 0x0023f2e8
ctx = (svn_client_ctx_t *) 0x024f6338
pool = (apr_pool_t *) 0x02520e60
err = (svn_error_t *) 0x00000000
peg_revision = (svn_opt_revision_t) 0x0023f250
conflicted_paths = (apr_hash_t *) 0x02521048
anchor_abspath = 0x025211b0
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137"
lockroot_abspath = 0x025211b0
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137"
#15 0x00b169ef in svn_client_update4(result_revs=(apr_array_header_t **)
0x0023f358, paths=(apr_array_header_t *) 0x0251f130,
revision=(svn_opt_revision_t *) 0x0023f600, depth=-2,
depth_is_sticky=0, ignore_externals=0, allow_unver_obstructions=0,
adds_as_modification=1, make_parents=0, ctx=(svn_client_ctx_t *) 0x024f6338,
pool=(apr_pool_t *) 0x024f4c80) at
c:\svn\src-trunk-2\subversion\libsvn_client\update.c:675
result_rev = 0x0000000c
local_abspath = 0x02520fe0
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137"
result_revs = (apr_array_header_t **) 0x0023f358
paths = (apr_array_header_t *) 0x0251f130
revision = (svn_opt_revision_t *) 0x0023f600
depth = -2
depth_is_sticky = 0
ignore_externals = 0
allow_unver_obstructions = 0
adds_as_modification = 1
make_parents = 0
ctx = (svn_client_ctx_t *) 0x024f6338
pool = (apr_pool_t *) 0x024f4c80
sleep = 1
iterpool = (apr_pool_t *) 0x02520e60
path = 0x0251f0c8
"C:/SVN/src-branch-1.8.x/Debug/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-137"
err = (svn_error_t *) 0x00000000
i = 0
#16 0x00ac8b8d in svn_cl__update(os=(apr_getopt_t *) 0x024f4fa0,
baton=0x0023f5cc, scratch_pool=(apr_pool_t *) 0x024f4c80) at
c:\svn\src-trunk-2\subversion\svn\update-cmd.c:172
svn_err__temp = (svn_error_t *) 0xcccccccc
os = (apr_getopt_t *) 0x024f4fa0
baton = 0x0023f5cc
scratch_pool = (apr_pool_t *) 0x024f4c80
targets = (apr_array_header_t *) 0x0251f130
depth = -2
err = (svn_error_t *) 0x00000000
externals_err = (svn_error_t *) 0x00000000
nwb = (svn_cl__check_externals_failed_notify_baton) 0x0023f364
result_revs = (apr_array_header_t *) 0x0251f150
ctx = (svn_client_ctx_t *) 0x024f6338
depth_is_sticky = 0
opt_state = (svn_cl__opt_state_t *) 0x0023f5f8
#17 0x00ac6bbe in sub_main(argc=3, argv=0x00271258, pool=(apr_pool_t *)
0x024f4c80) at c:\svn\src-trunk-2\subversion\svn\svn.c:2889
argc = 3
argv = 0x00271258
pool = (apr_pool_t *) 0x024f4c80
os = (apr_getopt_t *) 0x024f4fa0
err = (svn_error_t *) 0x00000000
cfg_config = (svn_config_t *) 0x024f5d60
conflict_stats = (svn_cl__conflict_stats_t *) 0x024f4cc0
descend = 1
cfg_hash = (apr_hash_t *) 0x024f54e8
use_notifier = 1
ctx = (svn_client_ctx_t *) 0x024f6338
force_interactive = 0
subcommand = (svn_opt_subcommand_desc2_t *) 0x00e6a370
ab = (svn_auth_baton_t *) 0x024f6730
opt_id = -858993460
i = 0
dash_F_arg = 0x00000000 "(null)"
changelists = (apr_hash_t *) 0x024f4f10
received_opts = (apr_array_header_t *) 0x024f4e30
command_baton = (svn_cl__cmd_baton_t) 0x0023f5cc
interactive_conflicts = 1
reading_file_from_stdin = 0
opt_state = (svn_cl__opt_state_t) 0x0023f5f8
#18 0x00ac72a4 in main(argc=3, argv=0x00271258) at
c:\svn\src-trunk-2\subversion\svn\svn.c:2980
argc = 3
argv = 0x00271258
pool = (apr_pool_t *) 0x024f4c80
exit_code = -858993460
#19 0x00d13669 in __tmainCRTStartup() at
f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:536
lock_free = 0x00000000
fiberid = 0x00240000
nested = 0
#20 0x00d137ad in mainCRTStartup() at
f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:377
#21 0x75c633aa in BaseThreadInitThunk()
#22 0x77429ef2 in RtlInitializeExceptionChain()
#23 0x77429ec5 in RtlInitializeExceptionChain()
Loaded modules:
0x00aa0000 C:\SVN\src-trunk-2\Debug\subversion\svn\svn.exe (1.9.0.0, 5640192 bytes)
0x773f0000 C:\Windows\SysWOW64\ntdll.dll (6.1.7601.17725, 1572864 bytes)
0x75c50000 C:\Windows\SysWOW64\kernel32.dll (6.1.7601.18015, 1114112 bytes)
0x750f0000 C:\Windows\SysWOW64\KERNELBASE.dll (6.1.7601.18015, 290816 bytes)
0x6eec0000 C:\SVN\httpd-2.2.22\srclib\apr\Debug\libapr-1.dll (1.4.6.0, 208896
bytes)
0x75aa0000 C:\Windows\SysWOW64\ws2_32.dll (6.1.7601.17514, 217088 bytes)
0x75d60000 C:\Windows\SysWOW64\msvcrt.dll (7.0.7601.17744, 704512 bytes)
0x762b0000 C:\Windows\SysWOW64\rpcrt4.dll (6.1.7601.17514, 983040 bytes)
0x74e50000 C:\Windows\SysWOW64\sspicli.dll (6.1.7601.17940, 393216 bytes)
0x74e40000 C:\Windows\SysWOW64\CRYPTBASE.dll (6.1.7600.16385, 49152 bytes)
0x761f0000 C:\Windows\SysWOW64\sechost.dll (6.1.7600.16385, 102400 bytes)
0x75c40000 C:\Windows\SysWOW64\nsi.dll (6.1.7600.16385, 24576 bytes)
0x726b0000 C:\Windows\System32\mswsock.dll (6.1.7601.17514, 245760 bytes)
0x757a0000 C:\Windows\SysWOW64\user32.dll (6.1.7601.17514, 1048576 bytes)
0x75570000 C:\Windows\SysWOW64\gdi32.dll (6.1.7601.17514, 589824 bytes)
0x75140000 C:\Windows\SysWOW64\lpk.dll (6.1.7600.16385, 40960 bytes)
0x75310000 C:\Windows\SysWOW64\usp10.dll (1.626.7601.18009, 643072 bytes)
0x76210000 C:\Windows\SysWOW64\advapi32.dll (6.1.7601.17514, 655360 bytes)
0x763a0000 C:\Windows\SysWOW64\shell32.dll (6.1.7601.18103, 12886016 bytes)
0x75150000 C:\Windows\SysWOW64\shlwapi.dll (6.1.7601.17514, 356352 bytes)
0x59260000
C:\Windows\winsxs\x86_microsoft.vc90.debugcrt_1fc8b3b9a1e18e3b_9.0.30729.6161_none_2a4f639a55563668\msvcr90d.dll
(9.0.30729.6161, 1191936 bytes)
0x0f460000 C:\Windows\System32\MSVCR110D.dll (11.0.51106.1, 1708032 bytes)
0x6ee60000 C:\SVN\httpd-2.2.22\srclib\apr-util\Debug\libaprutil-1.dll (1.4.1.0,
290816 bytes)
0x6ee50000 C:\SVN\httpd-2.2.22\srclib\apr-iconv\Debug\libapriconv-1.dll
(1.2.1.0, 45056 bytes)
0x6ac10000 C:\Windows\System32\shfolder.dll (6.1.7600.16385, 20480 bytes)
0x751b0000 C:\Windows\SysWOW64\ole32.dll (6.1.7601.17514, 1425408 bytes)
0x74fa0000 C:\Windows\SysWOW64\crypt32.dll (6.1.7601.17856, 1171456 bytes)
0x74f40000 C:\Windows\SysWOW64\msasn1.dll (6.1.7601.17514, 49152 bytes)
0x74c10000 C:\Windows\System32\version.dll (6.1.7600.16385, 36864 bytes)
0x75660000 C:\Windows\SysWOW64\psapi.dll (6.1.7600.16385, 20480 bytes)
0x10000000 C:\SVN\openssl\out32dll\libeay32.dll (0.9.8.17, 1044480 bytes)
0x74c00000 C:\Windows\System32\wsock32.dll (6.1.7600.16385, 28672 bytes)
0x72720000
C:\Windows\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.6161_none_50934f2ebcb7eb57\msvcr90.dll
(9.0.30729.6161, 667648 bytes)
0x003e0000 C:\SVN\openssl\out32dll\ssleay32.dll (0.9.8.17, 221184 bytes)
0x6f8d0000 C:\Windows\System32\secur32.dll (6.1.7601.17940, 32768 bytes)
0x00430000 C:\SVN\bdb\bin\libdb48d.dll (4.0.8.30, 1904640 bytes)
0x59180000
C:\Windows\winsxs\x86_microsoft.vc90.debugcrt_1fc8b3b9a1e18e3b_9.0.30729.6161_none_2a4f639a55563668\msvcp90d.dll
(9.0.30729.6161, 880640 bytes)
0x74eb0000 C:\Windows\System32\imm32.dll (6.1.7601.17514, 393216 bytes)
0x75ae0000 C:\Windows\SysWOW64\msctf.dll (6.1.7600.16385, 835584 bytes)
0x74920000 C:\Windows\System32\profapi.dll (6.1.7600.16385, 45056 bytes)
0x74a60000 C:\Windows\System32\dbghelp.dll (6.1.7601.17514, 962560 bytes)
0x74a30000 C:\Windows\System32\powrprof.dll (6.1.7600.16385, 151552 bytes)
0x76050000 C:\Windows\SysWOW64\setupapi.dll (6.1.7601.17514, 1691648 bytes)
0x74f70000 C:\Windows\SysWOW64\cfgmgr32.dll (6.1.7601.17621, 159744 bytes)
0x75bb0000 C:\Windows\SysWOW64\oleaut32.dll (6.1.7601.17676, 585728 bytes)
0x74f50000 C:\Windows\SysWOW64\devobj.dll (6.1.7601.17621, 73728 bytes)
C:\SVN\src-trunk-2>
Critical