I've run git mergetool after a range cherry-pick, solved conflicts and saved which triggered a crash. It's not the first time this kind of crashes happen to me with kdiff3, even on x86_64. niko@talos2 ~/devel/mikro-orm $ git mergetool Merging: packages/core/src/entity/Collection.ts Normal merge conflict for 'packages/core/src/entity/Collection.ts': {local}: modified file {remote}: modified file /usr/libexec/git-core/mergetools/kdiff3: line 11: 1130169 Segmentation fault (core dumped) "$merge_tool_path" --auto --L1 "$MERGED (Base)" --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1 merge of packages/core/src/entity/Collection.ts failed talos2 ~ # coredumpctl gdb 1130169 PID: 1130169 (kdiff3) UID: 1000 (niko) GID: 1000 (niko) Signal: 11 (SEGV) Timestamp: Wed 2023-08-23 17:14:46 CEST (43s ago) Command Line: /usr/bin/kdiff3 --auto --L1 $'packages/core/src/entity/Collection.ts (Base)' --L2 $'packages/core/src/entity/Collection.ts (Local)' --L3 $'packages/core/src/entity/Collection.ts (Remote)' -o packages/core/src/entity/Collection.ts ./packages/core/src/entity/Collection_BASE_1130091.ts ./packages/core/src/entity/Collection_LOCAL_1130091.ts ./packages/core/src/entity/Collection_REMOTE_1130091.ts Executable: /usr/bin/kdiff3 Control Group: /user.slice/user-1000.slice/user@1000.service/session.slice/vte-spawn-8a27af19-0484-49a4-ac04-5b6144be93dd.scope Unit: user@1000.service User Unit: vte-spawn-8a27af19-0484-49a4-ac04-5b6144be93dd.scope Slice: user-1000.slice Owner UID: 1000 (niko) Boot ID: b3814c7017e34a8f92ebf9e289f8138d Machine ID: b3e834569b8ff461391f5ac061feb773 Hostname: talos2 Storage: /var/lib/systemd/coredump/core.kdiff3.1000.b3814c7017e34a8f92ebf9e289f8138d.1130169.1692803686000000.zst (present) Size on Disk: 3.7M Message: Process 1130169 (kdiff3) of user 1000 dumped core. GNU gdb (Gentoo 13.2 vanilla) 13.2 Copyright (C) 2023 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "powerpc64le-unknown-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://bugs.gentoo.org/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/bin/kdiff3... [New LWP 1130169] [New LWP 1130172] [New LWP 1130173] [New LWP 1130174] [Thread debugging using libthread_db enabled] Using host libthread_db library "/usr/lib64/libthread_db.so.1". Core was generated by `/usr/bin/kdiff3 --auto --L1 packages/core/src/entity/Collection.ts (Base) --L2 '. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00003fffae4dc790 in QWidget::isActiveWindow() const () from /usr/lib64/libQt5Widgets.so.5 [Current thread is 1 (Thread 0x3fffaf5348a0 (LWP 1130169))] (gdb) backtrace #0 0x00003fffae4dc790 in QWidget::isActiveWindow() const () at /usr/lib64/libQt5Widgets.so.5 #1 0x00003fffae7849a4 in QDialog::setVisible(bool) () at /usr/lib64/libQt5Widgets.so.5 #2 0x00003fffae4dcddc in QWidget::hide() () at /usr/lib64/libQt5Widgets.so.5 #3 0x00003fffae781174 in QDialog::~QDialog() () at /usr/lib64/libQt5Widgets.so.5 #4 0x0000000137c3ffe8 in ProgressDialog::~ProgressDialog() (this=0x138a0fcd0, __in_chrg=<optimized out>) at /var/tmp/portage/kde-misc/kdiff3-1.10.5/work/kdiff3-1.10.5_build/src/kdiff3_autogen/EWIEGA46WW/../../../../kdiff3-1.10.5/src/progress.h:30 #5 0x0000000137c5c728 in std::_Destroy<ProgressDialog>(ProgressDialog*) (__pointer=<optimized out>) at /usr/lib/gcc/powerpc64le-unknown-linux-gnu/12/include/g++-v12/bits/stl_construct.h:151 #6 std::allocator_traits<std::allocator<void> >::destroy<ProgressDialog>(std::allocator<void>&, ProgressDialog*) (__p=<optimized out>) at /usr/lib/gcc/powerpc64le-unknown-linux-gnu/12/include/g++-v12/bits/alloc_traits.h:648 #7 std::_Sp_counted_ptr_inplace<ProgressDialog, std::allocator<void>, (__gnu_cxx::_Lock_policy)2>::_M_dispose() (this=<error reading variable: value has been optimized out>) at /usr/lib/gcc/powerpc64le-unknown-linux-gnu/12/include/g++-v12/bits/shared_ptr_base.h:613 #8 0x0000000137d2b664 in std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release() (this=0x138a0fcc0) at /usr/lib/gcc/powerpc64le-unknown-linux-gnu/12/include/g++-v12/bits/shared_ptr_base.h:346 #9 std::__shared_count<(__gnu_cxx::_Lock_policy)2>::~__shared_count() (this=<optimized out>, __in_chrg=<optimized out>) at /usr/lib/gcc/powerpc64le-unknown-linux-gnu/12/include/g++-v12/bits/shared_ptr_base.h:1071 #10 std::__shared_ptr<ProgressDialog, (__gnu_cxx::_Lock_policy)2>::~__shared_ptr() (this=<optimized out>, __in_chrg=<optimized out>) at /usr/lib/gcc/powerpc64le-unknown-linux-gnu/12/include/g++-v12/bits/shared_ptr_base.h:1524 #11 std::shared_ptr<ProgressDialog>::~shared_ptr() (this=<optimized out>, __in_chrg=<optimized out>) at /usr/lib/gcc/powerpc64le-unknown-linux-gnu/12/include/g++-v12/bits/shared_ptr.h:175 #12 0x00003fffacde805c in () at /usr/lib64/libc.so.6 #13 0x00003fffacde8208 in exit () at /usr/lib64/libc.so.6 #14 0x00003fffacdc4b38 in () at /usr/lib64/libc.so.6 #15 0x00003fffacdc4d6c in __libc_start_main () at /usr/lib64/libc.so.6 #16 0x0000000000000000 in () (gdb) info threads Id Target Id Frame * 1 Thread 0x3fffaf5348a0 (LWP 1130169) 0x00003fffae4dc790 in QWidget::isActiveWindow() const () from /usr/lib64/libQt5Widgets.so.5 2 Thread 0x3fffa49bef60 (LWP 1130172) 0x00003fffacee9ca0 in syscall () from /usr/lib64/libc.so.6 3 Thread 0x3fff9fffef60 (LWP 1130173) 0x00003fffacee0484 in poll () from /usr/lib64/libc.so.6 4 Thread 0x3fff9f7fdf60 (LWP 1130174) 0x00003fffacee0484 in poll () from /usr/lib64/libc.so.6
talos2 ~ # emerge --info Portage 3.0.49 (python 3.11.4-final-0, default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr, gcc-12, glibc-2.37-r3, 6.4.11-gentoo-dist ppc64le) ================================================================= System uname: Linux-6.4.11-gentoo-dist-ppc64le-POWER9,_altivec_supported-with-glibc2.37 KiB Mem: 65402456 total, 18279496 free KiB Swap: 16777212 total, 16676764 free Timestamp of repository bobwya: Wed, 23 Aug 2023 07:46:58 +0000 Head commit of repository bobwya: 107b0cb81507e3b82d3b85d0525a43e8cc493d0b Timestamp of repository gentoo: Wed, 23 Aug 2023 14:31:41 +0000 Head commit of repository gentoo: 7569248beddaee50d300c73ccc837162beb46584 Timestamp of repository guru: Wed, 23 Aug 2023 07:46:49 +0000 Head commit of repository guru: 4a75be8c14a813aeb7233a0f49c5981f230972b5 Timestamp of repository pf4public: Wed, 23 Aug 2023 11:16:26 +0000 Head commit of repository pf4public: 693f30155a2ce434fe0d1d3d8cb82839c01efe7a sh bash 5.1_p16-r6 ld GNU ld (Gentoo 2.40 p5) 2.40.0 ccache version 4.8.2 [disabled] app-misc/pax-utils: 1.3.7::gentoo app-shells/bash: 5.1_p16-r6::gentoo dev-java/java-config: 2.3.1-r1::gentoo dev-lang/perl: 5.36.1-r3::gentoo dev-lang/python: 3.10.12::gentoo, 3.11.4::gentoo dev-lang/rust: 1.69.0-r1::gentoo dev-util/ccache: 4.8.2::gentoo dev-util/cmake: 3.26.5-r2::gentoo dev-util/meson: 1.1.1::gentoo sys-apps/baselayout: 2.14::gentoo sys-apps/sandbox: 2.37::gentoo sys-apps/systemd: 253.6::gentoo sys-devel/autoconf: 2.13-r7::gentoo, 2.71-r6::gentoo sys-devel/automake: 1.16.5::gentoo sys-devel/binutils: 2.40-r5::gentoo sys-devel/binutils-config: 5.5::gentoo sys-devel/clang: 15.0.7-r3::gentoo, 16.0.6::gentoo sys-devel/gcc: 12.3.1_p20230526::gentoo sys-devel/gcc-config: 2.11::gentoo sys-devel/libtool: 2.4.7-r1::gentoo sys-devel/lld: 16.0.6::gentoo sys-devel/llvm: 15.0.7-r3::gentoo, 16.0.6::gentoo sys-devel/make: 4.4.1-r1::gentoo sys-kernel/linux-headers: 6.1::gentoo (virtual/os-headers) sys-libs/glibc: 2.37-r3::gentoo Repositories: bobwya location: /var/db/repos/bobwya sync-type: git sync-uri: https://github.com/gentoo-mirror/bobwya.git masters: gentoo priority: -1100 volatile: False gentoo location: /var/db/repos/gentoo sync-type: git sync-uri: https://anongit.gentoo.org/git/repo/sync/gentoo.git priority: -1000 volatile: False sync-git-verify-commit-signature: yes darkbasic location: /var/db/repos/darkbasic masters: gentoo volatile: False guru location: /var/db/repos/guru sync-type: git sync-uri: https://github.com/gentoo-mirror/guru.git masters: gentoo volatile: False pf4public location: /var/db/repos/pf4public sync-type: git sync-uri: https://github.com/gentoo-mirror/pf4public.git masters: gentoo volatile: False ACCEPT_KEYWORDS="ppc64" ACCEPT_LICENSE="@FREE @FREE unRAR fping freedist Microsoft-vscode SSPL-1" CBUILD="powerpc64le-unknown-linux-gnu" CFLAGS="-O2 -pipe -mcpu=power9 -mtune=power9" CHOST="powerpc64le-unknown-linux-gnu" CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php8.1/ext-active/ /etc/php/cgi-php8.1/ext-active/ /etc/php/cli-php8.1/ext-active/ /etc/php/fpm-php8.1/ext-active/ /etc/php/phpdbg-php8.1/ext-active/ /etc/revdep-rebuild /etc/sandbox.d" CXXFLAGS="-O2 -pipe -mcpu=power9 -mtune=power9" DISTDIR="/var/cache/distfiles" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GDK_PIXBUF_MODULE_FILE GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME" FCFLAGS="-O2 -pipe -mcpu=power9 -mtune=power9" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg-live config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe -mcpu=power9 -mtune=power9" GENTOO_MIRRORS="https://gentoo.mirror.garr.it/" LANG="en_US.UTF-8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" LEX="flex" MAKEOPTS="-j32" PKGDIR="/var/cache/binpkgs" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" SHELL="/bin/bash" USE="X a52 aac acl alsa bluetooth branding btrfs bzip2 cairo cdda cdr cli colord crypt cups dbus dri dts dvd dvdr eds encode evo exif flac fortran gdbm gif gnome gnome-keyring gnome-online-accounts gpm grub gstreamer gtk gui iconv icu introspection ipv6 jpeg keyring lcms libnotify mad mng mp3 mp4 mpeg nautilus ncurses networkmanager nls nptl ogg opencl opengl openmp pam pango pcre pdf pipewire png policykit ppc64 ppds pulseaudio qt5 readline screencast sdl seccomp sound spell ssl startup-notification svg systemd test-rust tiff tracker truetype udev udisks unicode upower usb vaapi vorbis vpx vulkan wayland wxwidgets x264 xattr xcb xft xml xv xvid zeroconf zlib" ADA_TARGET="gnat_2021" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_PPC="altivec vsx vsx2 vsx3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php8-1" POSTGRES_TARGETS="postgres13" PYTHON_SINGLE_TARGET="python3_11" PYTHON_TARGETS="python3_11" QEMU_SOFTMMU_TARGETS="ppc ppc64 i386 x86_64 arm aarch64" QEMU_USER_TARGETS="ppc ppc64 i386 x86_64 arm aarch64" RUBY_TARGETS="ruby31" VIDEO_CARDS="amdgpu radeon" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EMERGE_DEFAULT_OPTS, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS
Upstream issue: https://invent.kde.org/sdk/kdiff3/-/issues/42
Please note that upstream is using bugzilla for user bugs, gitlab issue tracking is only used among developers. The linked bug claims this would be fixed in a future 1.10.6 - without citing any specific commit. You could try kdiff3-9999 from kde overlay and report back at the upstream bug if you can reproduce the problem.
ping.
I might try kdiff3 git but I'm not sure if I can reproduce the original problem anymore: I don't have the same exact repo to rebase in order to trigger the original issue. So I will have to upgrade to 1.10.5, see if I can replicate it again with another rebase and eventually upgrade to git and see if fixes it. I will try that by I'm currently rebuilding chromium and electron after the recent ffmpeg version bump so it will take a while and hopefully I won't forget again.
I'm having the same problem. Can we please revert to 1.10.4 until 1.10.6 is released? Or at least restore 1.10.4 to the portage tree?
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3603ddd304d2a081b073cc95765c1730de8787b commit e3603ddd304d2a081b073cc95765c1730de8787b Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2023-09-26 17:58:08 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2023-09-26 18:03:56 +0000 kde-misc/kdiff3: add 1.10.6_pre0 Bug: https://bugs.gentoo.org/912878 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-misc/kdiff3/Manifest | 1 + kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild | 48 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)
Please test this latest version first.
ping. please test it if you can.
(In reply to Andreas Sturmlechner from comment #9) > ping. please test it if you can. No crashes with 1.10.6_pre0 so far
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69bb8d23e895c3ae482a78349998bccdb3ff3ec4 commit 69bb8d23e895c3ae482a78349998bccdb3ff3ec4 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2023-10-01 06:58:11 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2023-10-01 10:46:52 +0000 kde-misc/kdiff3: add 1.10.6 Bug: https://bugs.gentoo.org/912878 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-misc/kdiff3/Manifest | 1 + kde-misc/kdiff3/kdiff3-1.10.6.ebuild | 47 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)
Thanks for testing.
