On 2026-03-23 14:45:17 +0100, Vincent Lefevre wrote:
> Unfortunately, I cannot reproduce the crash with the same command after
> a revert.
I can actually reproduce the crash. This is because it modifies
an independent file (this is WRONG!), and I had to clean up that
to reproduce the crash:
cventin:~/wd/config> svn st
cventin:~/wd/config> ( cd host/ensl.cventin && svn merge
\^/config/host/common-debian/etc/X11 etc/X11; )
--- Merging r182259 through r187531 into 'etc/X11':
C etc/X11/Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD
C etc/X11/Xsession.d/51gtk3-nocsd-detect
C etc/X11/Xsession.d/01gtk3-nocsd
--- Recording mergeinfo for merge of r182259 through r187531 into 'etc/X11':
U etc/X11
Summary of conflicts:
Tree conflicts: 3
Searching tree conflict details for 'etc/X11/Xsession.d/01gtk3-nocsd' in
repository:
Checking r187530... done
Tree conflict on 'etc/X11/Xsession.d/01gtk3-nocsd':
File merged from
'^/config/host/common-debian/etc/X11/Xsession.d/01gtk3-nocsd@182258'
to
'^/config/host/common-debian/etc/X11/Xsession.d/01gtk3-nocsd@187531'
was moved to '^/config/host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd'
by vinc17/cventin in r187530.
A file which differs from the corresponding file on the merge source branch was
found in the working copy.
Applying recommended resolution 'Move and merge':
zsh: segmentation fault (core dumped) ( cd host/ensl.cventin && svn merge
\^/config/host/common-debian/etc/X11 ; )
cventin:~/wd/config[SEGV]> svn cleanup
cventin:~/wd/config> svn st
R + host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd
> moved from host/ensl.cventin/etc/X11/Xsession.d/01gtk3-nocsd
? host/ensl.cventin/core.4092794
M host/ensl.cventin/etc/X11
D host/ensl.cventin/etc/X11/Xsession.d/01gtk3-nocsd
> moved to host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd
C host/ensl.cventin/etc/X11/Xsession.d/51gtk3-nocsd-detect
> local file edit, incoming file delete or move upon merge
C host/ensl.cventin/etc/X11/Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD
> local file edit, incoming file delete or move upon merge
Summary of conflicts:
Tree conflicts: 2
cventin:~/wd/config> svn diff
host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd
Index: host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd
===================================================================
--- host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd (revision
187531)
+++ host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd (working copy)
Property changes on: host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd
___________________________________________________________________
Added: source
## -0,0 +1 ##
+cventin:/etc/X11/Xsession.d/01gtk3-nocsd
\ No newline at end of property
As you can see, host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd
is modified while it isn't in the merge target.
So there are 2 major issues:
* this unexpected change;
* the segmentation fault.
--
Vincent Lefèvre <[email protected]> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / Pascaline project (LIP, ENS-Lyon)
