View Revisions: Issue #689

Summary 0000689: svn 1.7.21 update traps when requiring input (e.g., conflict resolution)
Revision 2019-05-16 00:12 by LewisR
Additional Information This 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.
Revision 2019-05-16 00:09 by LewisR
Additional Information This 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.