View Issue Details

IDProjectCategoryView StatusLast Update
0000689Subversion for OS/2 & eCSBugpublic2019-06-04 19:03
ReporterLewisRAssigned ToSteven Levine 
PrioritynormalSeverityminorReproducibilityalways
Status assignedResolutionopen 
Summary0000689: svn 1.7.21 update traps when requiring input (e.g., conflict resolution)
DescriptionTesting with 20190420 build, when encountering a conflicting file during update, we trap when requesting user input.
Steps To ReproduceRun an update where a local file conflicts with the repository.
Additional InformationThis was performed under 4OS2, with the following result on-screen (.TRP, attached):

[...]
Conflict discovered in 'D:/devel/arcaos/trunk/preboot/en/memboot.bin'.
Select: (p) postpone,
        (mf) mine-full, (tf) theirs-full,
        (s) show all options: Creating 0053_01.TRP

Killed by SIGSEGV
pid=0x0053 ppid=0x0052 tid=0x0001 slot=0x0016 pri=0x0200 mc=0x0001 ps=0x0010
C:\USR\LOCAL\BIN\SVN.EXE
DOSCALL1 1:0000250c
cs:eip=005b:1ffc250c ss:esp=0053:005defd0 ebp=005defd8
 ds=0053 es=0053 fs=150b gs=0000 efl=00010206
eax=62373636 ebx=02000000 ecx=005df054 edx=5ce6c000 edi=62373636 esi=36656430
Process dumping was disabled, use DUMPPROC / PROCDUMP to enable it.

Possible regression from 0000682.
TagsNo tags attached.

Relationships

related to 0000682 resolvedpsmedley svn cat traps for version 1.7.21 
related to 0000690 feedbackSteven Levine svn, version 1.7.21 (r1692801) compiled Apr 12 2019, 19:07:53 can trap when svn up detects conflicts. 

Activities

LewisR

2019-05-16 00:09

developer  

0053_01.TRP (64,801 bytes)

Steven Levine

2019-06-04 10:17

manager   ~0003292

This is very likely the same trap as reported in 0000690. The final trap differs, but it is passing through the same apr_file_getc() code that depends on the apr_file_t instance being properly initialized.

psmedley

2019-06-04 19:03

administrator   ~0003296

http://smedley.id.au/tmp/svn-20190604.zip contains the fix from 0000690

Issue History

Date Modified Username Field Change
2019-05-16 00:09 LewisR New Issue
2019-05-16 00:09 LewisR File Added: 0053_01.TRP
2019-05-16 00:09 LewisR Relationship added related to 0000682
2019-05-16 00:10 LewisR Summary svn update traps when requiring input (e.g., ocnflict resolution) => svn 1.7.21 update traps when requiring input (e.g., conflict resolution)
2019-05-16 00:12 LewisR Additional Information Updated View Revisions
2019-06-03 10:27 Steven Levine Relationship added related to 0000690
2019-06-04 10:17 Steven Levine Note Added: 0003292
2019-06-04 10:17 Steven Levine Assigned To => Steven Levine
2019-06-04 10:17 Steven Levine Status new => assigned
2019-06-04 19:03 psmedley Note Added: 0003296