On 2026-03-23 15:22:55 +0100, Vincent Lefevre wrote:
> 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.
Changes that were done in the past related to these files:
2016-04-18 12:41:23 (rev 88302)
Changed paths:
A /config/host/common-debian/etc/X11/Xsession.d/51gtk3-nocsd-detect
A
/config/host/common-debian/etc/X11/Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD
Note: these files did not have a "source" property.
2016-04-18 12:55:53 (rev 88303)
Changed paths:
M /config/host/ensl.cventin/etc/X11
A /config/host/ensl.cventin/etc/X11/Xsession.d/51gtk3-nocsd-detect (from
/config/host/common-debian/etc/X11/Xsession.d/51gtk3-nocsd-detect:88302)
A
/config/host/ensl.cventin/etc/X11/Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD
(from
/config/host/common-debian/etc/X11/Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD:88302)
Note: the file copy was done with
svn merge '^/config/host/common-debian/etc/X11' etc/X11
svn merge -c -87489 '^/config/host/common-debian/etc/X11' etc/X11
from the /config/host/ensl.cventin directory, but in addition to
that, I added a "source" property to these copies.
(r87489 was an addition of an unrelated file in
"config/host/common-debian/etc/X11/Xsession.d":
I did not want to copy it.)
2016-06-01 08:07:17 (rev 89401)
Changed paths:
A /config/host/common-debian/etc/X11/Xsession.d/01gtk3-nocsd
M /config/host/common-debian/etc/X11/Xsession.d/51gtk3-nocsd-detect
Note: these files did not have a "source" property.
2016-06-02 10:14:14 (rev 89439)
Changed paths:
M /config/host/ensl.cventin/etc/X11
A /config/host/ensl.cventin/etc/X11/Xsession.d/01gtk3-nocsd (from
/config/host/common-debian/etc/X11/Xsession.d/01gtk3-nocsd:89438)
M /config/host/ensl.cventin/etc/X11/Xsession.d/51gtk3-nocsd-detect
Note: with
svn merge '^/config/host/common-debian/etc/X11' etc/X11
2024-09-16 02:11:26 (rev 171912)
Changed paths:
M /config/host/common-debian/etc/X11/Xsession.d/01gtk3-nocsd
M /config/host/common-debian/etc/X11/Xsession.d/51gtk3-nocsd-detect
2024-09-17 12:28:00 (rev 171962)
Changed paths:
M /config/host/ensl.cventin/etc/X11
M /config/host/ensl.cventin/etc/X11/Xsession.d/01gtk3-nocsd
M /config/host/ensl.cventin/etc/X11/Xsession.d/51gtk3-nocsd-detect
Note: with
svn merge '^/config/host/common-debian/etc/X11' etc/X11
2026-03-23 13:07:59 (rev 187530)
Changed paths:
D /config/host/common-debian/etc/X11/Xsession.d/01gtk3-nocsd
D /config/host/common-debian/etc/X11/Xsession.d/51gtk3-nocsd-detect
D
/config/host/common-debian/etc/X11/Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD
A /config/host/common-debian/old-etc
A /config/host/common-debian/old-etc/X11-Xsession.d
A /config/host/common-debian/old-etc/X11-Xsession.d/01gtk3-nocsd (from
/config/host/common-debian/etc/X11/Xsession.d/01gtk3-nocsd:187529)
A /config/host/common-debian/old-etc/X11-Xsession.d/51gtk3-nocsd-detect
(from /config/host/common-debian/etc/X11/Xsession.d/51gtk3-nocsd-detect:187529)
A
/config/host/common-debian/old-etc/X11-Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD
(from
/config/host/common-debian/etc/X11/Xsession.d/70gtk3-nocsd-propagate-LD_PRELOAD:187529)
Note: files *gtk3-nocsd* moved from etc/X11/Xsession.d to
old-etc/X11-Xsession.d with "svn mv".
Then
svn merge \^/config/host/common-debian/etc/X11 \
config/host/ensl.cventin/etc/X11
is what triggers the issues.
--
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)
