0s autopkgtest [07:38:29]: starting date and time: 2024-03-27 07:38:29+0000 0s autopkgtest [07:38:29]: git checkout: 4a1cd702 l/adt_testbed: don't blame the testbed for unsolvable build deps 0s autopkgtest [07:38:29]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.mug5chcs/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed --apt-upgrade git-imerge --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=python3-defaults/3.12.2-0ubuntu1 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@bos01-ppc64el-7.secgroup --name adt-noble-ppc64el-git-imerge-20240327-073829-juju-7f2275-prod-proposed-migration-environment-2-b63f2759-8894-41b6-8103-db5c1d29df92 --image adt/ubuntu-noble-ppc64el-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-proposed-migration -e TERM=linux -e ''"'"'http_proxy=http://squid.internal:3128'"'"'' -e ''"'"'https_proxy=http://squid.internal:3128'"'"'' -e ''"'"'no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com'"'"'' --mirror=http://us.ports.ubuntu.com/ubuntu-ports/ 138s autopkgtest [07:40:47]: testbed dpkg architecture: ppc64el 138s autopkgtest [07:40:47]: testbed apt version: 2.7.12 138s autopkgtest [07:40:47]: @@@@@@@@@@@@@@@@@@@@ test bed setup 139s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB] 139s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/multiverse Sources [55.4 kB] 139s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/restricted Sources [8504 B] 139s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/universe Sources [3964 kB] 141s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/main Sources [497 kB] 141s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el Packages [702 kB] 142s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el c-n-f Metadata [3116 B] 142s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/restricted ppc64el Packages [1372 B] 142s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/restricted ppc64el c-n-f Metadata [116 B] 142s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el Packages [4217 kB] 143s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el c-n-f Metadata [8652 B] 143s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/multiverse ppc64el Packages [62.2 kB] 143s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/multiverse ppc64el c-n-f Metadata [116 B] 146s Fetched 9637 kB in 5s (1943 kB/s) 146s Reading package lists... 148s Reading package lists... 148s Building dependency tree... 148s Reading state information... 148s Calculating upgrade... 149s The following packages will be upgraded: 149s psmisc 149s 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 149s Need to get 192 kB of archives. 149s After this operation, 28.7 kB disk space will be freed. 149s Get:1 http://ftpmaster.internal/ubuntu noble/main ppc64el psmisc ppc64el 23.7-1 [192 kB] 149s Fetched 192 kB in 0s (467 kB/s) 149s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70156 files and directories currently installed.) 149s Preparing to unpack .../psmisc_23.7-1_ppc64el.deb ... 149s Unpacking psmisc (23.7-1) over (23.6-2) ... 149s Setting up psmisc (23.7-1) ... 149s Processing triggers for man-db (2.12.0-3) ... 150s Reading package lists... 150s Building dependency tree... 150s Reading state information... 151s 0 upgraded, 0 newly installed, 0 to remove and 248 not upgraded. 151s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB] 151s Get:2 http://ftpmaster.internal/ubuntu noble InRelease [255 kB] 151s Hit:3 http://ftpmaster.internal/ubuntu noble-updates InRelease 152s Hit:4 http://ftpmaster.internal/ubuntu noble-security InRelease 152s Fetched 372 kB in 1s (459 kB/s) 153s Reading package lists... 153s Reading package lists... 153s Building dependency tree... 153s Reading state information... 153s Calculating upgrade... 153s The following packages were automatically installed and are no longer required: 153s libaio1 libnetplan0 python3-distutils python3-lib2to3 153s Use 'sudo apt autoremove' to remove them. 154s The following packages will be REMOVED: 154s libapt-pkg6.0 libarchive13 libatm1 libcurl3-gnutls libcurl4 libdb5.3 libelf1 154s libext2fs2 libgdbm-compat4 libgdbm6 libglib2.0-0 libgnutls30 libgpgme11 154s libhogweed6 libmagic1 libnettle8 libnpth0 libnvme1 libparted2 libperl5.38 154s libpng16-16 libpsl5 libreadline8 libreiserfscore0 libssl3 libtirpc3 liburcu8 154s libuv1 154s The following NEW packages will be installed: 154s bpfcc-tools bpftrace fontconfig-config fonts-dejavu-core fonts-dejavu-mono 154s ieee-data libaio1t64 libapt-pkg6.0t64 libarchive13t64 libatm1t64 libbpfcc 154s libc-dev-bin libc-devtools libc6-dev libclang-cpp18 libclang1-18 154s libcrypt-dev libcurl3t64-gnutls libcurl4t64 libdb5.3t64 libdeflate0 154s libdw1t64 libelf1t64 libext2fs2t64 libfontconfig1 libgd3 libgdbm-compat4t64 154s libgdbm6t64 libglib2.0-0t64 libgnutls30t64 libgpgme11t64 libhogweed6t64 154s libjbig0 libjpeg-turbo8 libjpeg8 liblerc4 libllvm18 libmagic1t64 libnetplan1 154s libnettle8t64 libnpth0t64 libnvme1t64 libparted2t64 libperl5.38t64 154s libpng16-16t64 libpsl5t64 libreadline8t64 libreiserfscore0t64 libsharpyuv0 154s libssl3t64 libtiff6 libtirpc3t64 libunwind8 liburcu8t64 libuv1t64 libwebp7 154s libxpm4 linux-headers-6.8.0-20 linux-headers-6.8.0-20-generic 154s linux-image-6.8.0-20-generic linux-libc-dev linux-modules-6.8.0-20-generic 154s linux-modules-extra-6.8.0-20-generic linux-tools-6.8.0-20 154s linux-tools-6.8.0-20-generic linux-tools-common manpages manpages-dev 154s python3-bpfcc python3-netaddr rpcsvc-proto ubuntu-kernel-accessories 154s xdg-user-dirs 154s The following packages will be upgraded: 154s apparmor apt apt-utils base-files bash bc bind9-dnsutils bind9-host 154s bind9-libs binutils binutils-common binutils-powerpc64le-linux-gnu bolt 154s bsdextrautils bsdutils btrfs-progs coreutils cryptsetup-bin curl dbus 154s dbus-bin dbus-daemon dbus-session-bus-common dbus-system-bus-common 154s dbus-user-session dhcpcd-base dirmngr dmsetup dpkg dpkg-dev e2fsprogs 154s e2fsprogs-l10n eject fdisk file ftp fwupd gawk gcc-13-base gcc-14-base 154s gir1.2-girepository-2.0 gir1.2-glib-2.0 gnupg gnupg-l10n gnupg-utils gpg 154s gpg-agent gpg-wks-client gpgconf gpgsm gpgv groff-base grub-common 154s grub-ieee1275 grub-ieee1275-bin grub2-common ibverbs-providers 154s inetutils-telnet info initramfs-tools initramfs-tools-bin 154s initramfs-tools-core install-info iproute2 jq keyboxd kmod kpartx 154s krb5-locales libapparmor1 libaudit-common libaudit1 libbinutils libblkid1 154s libblockdev-crypto3 libblockdev-fs3 libblockdev-loop3 libblockdev-mdraid3 154s libblockdev-nvme3 libblockdev-part3 libblockdev-swap3 libblockdev-utils3 154s libblockdev3 libbpf1 libbrotli1 libcap-ng0 libcom-err2 libcryptsetup12 154s libctf-nobfd0 libctf0 libdbus-1-3 libdebconfclient0 libdevmapper1.02.1 154s libdpkg-perl libevent-core-2.1-7 libexpat1 libfdisk1 libfido2-1 libfreetype6 154s libftdi1-2 libfwupd2 libgcc-s1 libgirepository-1.0-1 libglib2.0-data 154s libgssapi-krb5-2 libgudev-1.0-0 libgusb2 libibverbs1 libjcat1 libjq1 154s libjson-glib-1.0-0 libjson-glib-1.0-common libk5crypto3 libkmod2 libkrb5-3 154s libkrb5support0 libldap-common libldap2 liblocale-gettext-perl liblzma5 154s libmagic-mgc libmbim-glib4 libmbim-proxy libmm-glib0 libmount1 libnghttp2-14 154s libnsl2 libnss-systemd libpam-modules libpam-modules-bin libpam-runtime 154s libpam-systemd libpam0g libplymouth5 libpolkit-agent-1-0 154s libpolkit-gobject-1-0 libproc2-0 libprotobuf-c1 libpython3-stdlib 154s libpython3.11-minimal libpython3.11-stdlib libpython3.12-minimal 154s libpython3.12-stdlib libqmi-glib5 libqmi-proxy libqrtr-glib0 librtmp1 154s libsasl2-2 libsasl2-modules libsasl2-modules-db libseccomp2 libselinux1 154s libsemanage-common libsemanage2 libsframe1 libslang2 libsmartcols1 154s libsqlite3-0 libss2 libssh-4 libstdc++6 libsystemd-shared libsystemd0 154s libtext-charwidth-perl libtext-iconv-perl libtirpc-common libudev1 154s libudisks2-0 libusb-1.0-0 libuuid1 libvolume-key1 libxml2 libxmlb2 libxmuu1 154s linux-generic linux-headers-generic linux-headers-virtual 154s linux-image-generic linux-image-virtual linux-virtual logsave lshw lsof 154s man-db motd-news-config mount mtr-tiny multipath-tools netplan-generator 154s netplan.io openssh-client openssh-server openssh-sftp-server openssl parted 154s perl perl-base perl-modules-5.38 pinentry-curses plymouth 154s plymouth-theme-ubuntu-text procps python-apt-common python3 python3-apt 154s python3-cryptography python3-dbus python3-distutils python3-gdbm python3-gi 154s python3-lib2to3 python3-minimal python3-netplan python3-pkg-resources 154s python3-pyrsistent python3-setuptools python3-typing-extensions python3-yaml 154s python3.11 python3.11-minimal python3.12 python3.12-minimal readline-common 154s rsync rsyslog shared-mime-info sudo systemd systemd-dev systemd-resolved 154s systemd-sysv systemd-timesyncd tcpdump telnet tnftp ubuntu-pro-client 154s ubuntu-pro-client-l10n udev udisks2 usb.ids util-linux uuid-runtime 154s vim-common vim-tiny wget xxd xz-utils zlib1g 154s 248 upgraded, 73 newly installed, 28 to remove and 0 not upgraded. 154s Need to get 390 MB of archives. 154s After this operation, 640 MB of additional disk space will be used. 154s Get:1 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el motd-news-config all 13ubuntu8 [5098 B] 154s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el base-files ppc64el 13ubuntu8 [74.5 kB] 154s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bash ppc64el 5.2.21-2ubuntu3 [977 kB] 154s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bsdutils ppc64el 1:2.39.3-9ubuntu2 [98.3 kB] 154s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el coreutils ppc64el 9.4-3ubuntu3 [1523 kB] 154s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libudisks2-0 ppc64el 2.10.1-6 [182 kB] 154s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el udisks2 ppc64el 2.10.1-6 [344 kB] 154s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el shared-mime-info ppc64el 2.4-1build1 [481 kB] 154s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gir1.2-girepository-2.0 ppc64el 1.79.1-1ubuntu6 [24.8 kB] 154s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gir1.2-glib-2.0 ppc64el 2.79.3-3ubuntu5 [182 kB] 154s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgirepository-1.0-1 ppc64el 1.79.1-1ubuntu6 [93.8 kB] 154s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-gi ppc64el 3.47.0-3build1 [261 kB] 154s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-dbus ppc64el 1.3.2-5build2 [107 kB] 154s Get:14 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libnetplan1 ppc64el 1.0-1 [136 kB] 154s Get:15 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-netplan ppc64el 1.0-1 [21.8 kB] 154s Get:16 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el netplan-generator ppc64el 1.0-1 [59.2 kB] 154s Get:17 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el initramfs-tools-bin ppc64el 0.142ubuntu23 [21.0 kB] 154s Get:18 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el initramfs-tools-core all 0.142ubuntu23 [50.1 kB] 154s Get:19 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el initramfs-tools all 0.142ubuntu23 [9058 B] 154s Get:20 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el netplan.io ppc64el 1.0-1 [66.2 kB] 154s Get:21 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libxmlb2 ppc64el 0.3.15-1build1 [82.6 kB] 154s Get:22 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgpgme11t64 ppc64el 1.18.0-4.1ubuntu3 [173 kB] 154s Get:23 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libvolume-key1 ppc64el 0.3.12-7build1 [47.9 kB] 154s Get:24 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libqrtr-glib0 ppc64el 1.2.2-1ubuntu3 [18.3 kB] 155s Get:25 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libqmi-glib5 ppc64el 1.35.2-0ubuntu1 [966 kB] 155s Get:26 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libqmi-proxy ppc64el 1.35.2-0ubuntu1 [6208 B] 155s Get:27 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpolkit-agent-1-0 ppc64el 124-1ubuntu1 [18.8 kB] 155s Get:28 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpolkit-gobject-1-0 ppc64el 124-1ubuntu1 [52.7 kB] 155s Get:29 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libmm-glib0 ppc64el 1.23.4-0ubuntu1 [282 kB] 155s Get:30 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libmbim-glib4 ppc64el 1.31.2-0ubuntu2 [253 kB] 155s Get:31 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libmbim-proxy ppc64el 1.31.2-0ubuntu2 [6274 B] 155s Get:32 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libjson-glib-1.0-common all 1.8.0-2build1 [4210 B] 155s Get:33 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libjson-glib-1.0-0 ppc64el 1.8.0-2build1 [73.6 kB] 155s Get:34 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgusb2 ppc64el 0.4.8-1build1 [43.0 kB] 155s Get:35 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgudev-1.0-0 ppc64el 1:238-3ubuntu2 [15.8 kB] 155s Get:36 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el tnftp ppc64el 20230507-2build1 [116 kB] 155s Get:37 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el tcpdump ppc64el 4.99.4-3ubuntu2 [543 kB] 155s Get:38 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsystemd0 ppc64el 255.4-1ubuntu5 [526 kB] 155s Get:39 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el systemd-dev all 255.4-1ubuntu5 [103 kB] 155s Get:40 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libnss-systemd ppc64el 255.4-1ubuntu5 [208 kB] 155s Get:41 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libudev1 ppc64el 255.4-1ubuntu5 [200 kB] 155s Get:42 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libssl3t64 ppc64el 3.0.13-0ubuntu2 [2125 kB] 155s Get:43 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el systemd ppc64el 255.4-1ubuntu5 [3771 kB] 155s Get:44 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el udev ppc64el 255.4-1ubuntu5 [2038 kB] 155s Get:45 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el systemd-sysv ppc64el 255.4-1ubuntu5 [11.9 kB] 155s Get:46 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpam-systemd ppc64el 255.4-1ubuntu5 [304 kB] 155s Get:47 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el systemd-timesyncd ppc64el 255.4-1ubuntu5 [37.9 kB] 155s Get:48 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsystemd-shared ppc64el 255.4-1ubuntu5 [2351 kB] 155s Get:49 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el systemd-resolved ppc64el 255.4-1ubuntu5 [346 kB] 155s Get:50 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el sudo ppc64el 1.9.15p5-3ubuntu3 [1005 kB] 155s Get:51 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el rsync ppc64el 3.2.7-1build1 [487 kB] 155s Get:52 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-cryptography ppc64el 41.0.7-4build2 [860 kB] 155s Get:53 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el openssl ppc64el 3.0.13-0ubuntu2 [1026 kB] 155s Get:54 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el openssh-sftp-server ppc64el 1:9.6p1-3ubuntu11 [43.7 kB] 155s Get:55 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el openssh-client ppc64el 1:9.6p1-3ubuntu11 [1112 kB] 155s Get:56 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el openssh-server ppc64el 1:9.6p1-3ubuntu11 [627 kB] 155s Get:57 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libssh-4 ppc64el 0.10.6-2build1 [234 kB] 155s Get:58 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsasl2-modules ppc64el 2.1.28+dfsg1-5ubuntu1 [83.1 kB] 155s Get:59 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3.12 ppc64el 3.12.2-4build3 [645 kB] 155s Get:60 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3.12-minimal ppc64el 3.12.2-4build3 [2447 kB] 155s Get:61 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpython3.12-minimal ppc64el 3.12.2-4build3 [836 kB] 155s Get:62 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el grub-ieee1275 ppc64el 2.12-1ubuntu5 [63.1 kB] 155s Get:63 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el grub2-common ppc64el 2.12-1ubuntu5 [752 kB] 155s Get:64 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el grub-common ppc64el 2.12-1ubuntu5 [2356 kB] 155s Get:65 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el grub-ieee1275-bin ppc64el 2.12-1ubuntu5 [687 kB] 155s Get:66 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libparted2t64 ppc64el 3.6-3.1build2 [184 kB] 155s Get:67 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el parted ppc64el 3.6-3.1build2 [58.9 kB] 155s Get:68 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3.11 ppc64el 3.11.8-1build4 [589 kB] 155s Get:69 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3.11-minimal ppc64el 3.11.8-1build4 [2292 kB] 156s Get:70 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpython3.11-minimal ppc64el 3.11.8-1build4 [846 kB] 156s Get:71 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpython3.11-stdlib ppc64el 3.11.8-1build4 [1977 kB] 156s Get:72 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gnupg-utils ppc64el 2.4.4-2ubuntu15 [123 kB] 156s Get:73 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gpg-agent ppc64el 2.4.4-2ubuntu15 [275 kB] 156s Get:74 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gpg-wks-client ppc64el 2.4.4-2ubuntu15 [85.0 kB] 156s Get:75 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gpg ppc64el 2.4.4-2ubuntu15 [706 kB] 156s Get:76 http://ftpmaster.internal/ubuntu noble/main ppc64el libnpth0t64 ppc64el 1.6-3.1 [8864 B] 156s Get:77 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gpgv ppc64el 2.4.4-2ubuntu15 [198 kB] 156s Get:78 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dirmngr ppc64el 2.4.4-2ubuntu15 [391 kB] 156s Get:79 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gnupg all 2.4.4-2ubuntu15 [359 kB] 156s Get:80 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el keyboxd ppc64el 2.4.4-2ubuntu15 [94.3 kB] 156s Get:81 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gpgconf ppc64el 2.4.4-2ubuntu15 [115 kB] 156s Get:82 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gpgsm ppc64el 2.4.4-2ubuntu15 [292 kB] 156s Get:83 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libreadline8t64 ppc64el 8.2-4 [182 kB] 156s Get:84 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gawk ppc64el 1:5.2.1-2build2 [528 kB] 156s Get:85 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el fdisk ppc64el 2.39.3-9ubuntu2 [132 kB] 156s Get:86 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bc ppc64el 1.07.1-3ubuntu2 [93.2 kB] 156s Get:87 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpython3.12-stdlib ppc64el 3.12.2-4build3 [2082 kB] 156s Get:88 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el perl-base ppc64el 5.38.2-3.2 [1916 kB] 156s Get:89 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el perl-modules-5.38 all 5.38.2-3.2 [3110 kB] 156s Get:90 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-gdbm ppc64el 3.12.2-3ubuntu1.1 [19.8 kB] 156s Get:91 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el man-db ppc64el 2.12.0-3build4 [1274 kB] 156s Get:92 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgdbm6t64 ppc64el 1.23-5.1 [41.9 kB] 156s Get:93 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgdbm-compat4t64 ppc64el 1.23-5.1 [6972 B] 156s Get:94 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libperl5.38t64 ppc64el 5.38.2-3.2 [4957 kB] 156s Get:95 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el perl ppc64el 5.38.2-3.2 [231 kB] 156s Get:96 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libdb5.3t64 ppc64el 5.3.28+dfsg2-6 [875 kB] 156s Get:97 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsasl2-modules-db ppc64el 2.1.28+dfsg1-5ubuntu1 [23.4 kB] 156s Get:98 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsasl2-2 ppc64el 2.1.28+dfsg1-5ubuntu1 [68.0 kB] 156s Get:99 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libnvme1t64 ppc64el 1.8-3 [98.2 kB] 156s Get:100 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el wget ppc64el 1.21.4-1ubuntu2 [382 kB] 156s Get:101 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libcurl4t64 ppc64el 8.5.0-2ubuntu8 [428 kB] 156s Get:102 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el curl ppc64el 8.5.0-2ubuntu8 [234 kB] 157s Get:103 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpsl5t64 ppc64el 0.21.2-1.1 [59.0 kB] 157s Get:104 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libarchive13t64 ppc64el 3.7.2-1.1ubuntu2 [518 kB] 157s Get:105 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el fwupd ppc64el 1.9.15-2 [4634 kB] 157s Get:106 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libcurl3t64-gnutls ppc64el 8.5.0-2ubuntu8 [419 kB] 157s Get:107 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libfwupd2 ppc64el 1.9.15-2 [136 kB] 157s Get:108 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev3 ppc64el 3.1.0-1build1 [55.2 kB] 157s Get:109 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-utils3 ppc64el 3.1.0-1build1 [20.3 kB] 157s Get:110 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-swap3 ppc64el 3.1.0-1build1 [8616 B] 157s Get:111 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-part3 ppc64el 3.1.0-1build1 [17.5 kB] 157s Get:112 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-nvme3 ppc64el 3.1.0-1build1 [20.1 kB] 157s Get:113 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-mdraid3 ppc64el 3.1.0-1build1 [14.3 kB] 157s Get:114 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-loop3 ppc64el 3.1.0-1build1 [7742 B] 157s Get:115 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el e2fsprogs-l10n all 1.47.0-2.4~exp1ubuntu2 [5996 B] 157s Get:116 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el logsave ppc64el 1.47.0-2.4~exp1ubuntu2 [22.9 kB] 157s Get:117 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libext2fs2t64 ppc64el 1.47.0-2.4~exp1ubuntu2 [270 kB] 157s Get:118 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el e2fsprogs ppc64el 1.47.0-2.4~exp1ubuntu2 [663 kB] 157s Get:119 http://ftpmaster.internal/ubuntu noble/main ppc64el libreiserfscore0t64 ppc64el 1:3.6.27-7.1 [92.7 kB] 157s Get:120 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el btrfs-progs ppc64el 6.6.3-1.1build1 [1352 kB] 157s Get:121 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-fs3 ppc64el 3.1.0-1build1 [41.2 kB] 157s Get:122 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblockdev-crypto3 ppc64el 3.1.0-1build1 [22.5 kB] 157s Get:123 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bolt ppc64el 0.9.6-2build1 [171 kB] 157s Get:124 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libglib2.0-0t64 ppc64el 2.79.3-3ubuntu5 [1773 kB] 157s Get:125 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libjcat1 ppc64el 0.2.0-2build2 [40.0 kB] 157s Get:126 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libldap2 ppc64el 2.6.7+dfsg-1~exp1ubuntu6 [233 kB] 157s Get:127 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el ubuntu-pro-client-l10n ppc64el 31.2.2 [19.4 kB] 157s Get:128 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el ubuntu-pro-client ppc64el 31.2.2 [215 kB] 157s Get:129 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-apt ppc64el 2.7.7 [181 kB] 157s Get:130 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el apt-utils ppc64el 2.7.14 [226 kB] 157s Get:131 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libapt-pkg6.0t64 ppc64el 2.7.14 [1063 kB] 157s Get:132 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libnettle8t64 ppc64el 3.9.1-2.2 [226 kB] 157s Get:133 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libhogweed6t64 ppc64el 3.9.1-2.2 [208 kB] 157s Get:134 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgnutls30t64 ppc64el 3.8.3-1.1ubuntu2 [1154 kB] 157s Get:135 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el apt ppc64el 2.7.14 [1401 kB] 157s Get:136 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el librtmp1 ppc64el 2.4+20151223.gitfa8646d.1-2build6 [64.4 kB] 157s Get:137 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el liblzma5 ppc64el 5.6.0-0.2 [156 kB] 157s Get:138 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libblkid1 ppc64el 2.39.3-9ubuntu2 [155 kB] 157s Get:139 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el kmod ppc64el 31+20240202-2ubuntu4 [122 kB] 157s Get:140 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libkmod2 ppc64el 31+20240202-2ubuntu4 [64.4 kB] 157s Get:141 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libselinux1 ppc64el 3.5-2ubuntu1 [101 kB] 157s Get:142 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libaudit-common all 1:3.1.2-2.1 [5674 B] 157s Get:143 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libcap-ng0 ppc64el 0.8.4-2build1 [16.2 kB] 157s Get:144 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libaudit1 ppc64el 1:3.1.2-2.1 [52.8 kB] 158s Get:145 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpam0g ppc64el 1.5.3-5ubuntu3 [75.7 kB] 158s Get:146 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpam-modules-bin ppc64el 1.5.3-5ubuntu3 [57.9 kB] 158s Get:147 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpam-modules ppc64el 1.5.3-5ubuntu3 [320 kB] 158s Get:148 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpam-runtime all 1.5.3-5ubuntu3 [40.8 kB] 158s Get:149 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dbus-session-bus-common all 1.14.10-4ubuntu2 [80.3 kB] 158s Get:150 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dbus-user-session ppc64el 1.14.10-4ubuntu2 [9960 B] 158s Get:151 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libapparmor1 ppc64el 4.0.0-beta3-0ubuntu2 [55.0 kB] 158s Get:152 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libexpat1 ppc64el 2.6.1-2 [101 kB] 158s Get:153 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dbus-system-bus-common all 1.14.10-4ubuntu2 [81.5 kB] 158s Get:154 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dbus-bin ppc64el 1.14.10-4ubuntu2 [48.1 kB] 158s Get:155 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dbus ppc64el 1.14.10-4ubuntu2 [26.9 kB] 158s Get:156 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dbus-daemon ppc64el 1.14.10-4ubuntu2 [136 kB] 158s Get:157 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libdbus-1-3 ppc64el 1.14.10-4ubuntu2 [244 kB] 158s Get:158 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libdevmapper1.02.1 ppc64el 2:1.02.185-3ubuntu2 [182 kB] 158s Get:159 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libuuid1 ppc64el 2.39.3-9ubuntu2 [39.3 kB] 158s Get:160 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libcryptsetup12 ppc64el 2:2.7.0-1ubuntu2 [376 kB] 158s Get:161 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libfdisk1 ppc64el 2.39.3-9ubuntu2 [171 kB] 158s Get:162 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libseccomp2 ppc64el 2.5.5-1ubuntu2 [62.5 kB] 158s Get:163 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el mount ppc64el 2.39.3-9ubuntu2 [125 kB] 158s Get:164 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libmount1 ppc64el 2.39.3-9ubuntu2 [169 kB] 158s Get:165 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el zlib1g ppc64el 1:1.3.dfsg-3.1ubuntu1 [72.8 kB] 158s Get:166 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-minimal ppc64el 3.12.2-0ubuntu1 [27.1 kB] 158s Get:167 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3 ppc64el 3.12.2-0ubuntu1 [24.1 kB] 158s Get:168 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libplymouth5 ppc64el 24.004.60-1ubuntu6 [166 kB] 158s Get:169 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpng16-16t64 ppc64el 1.6.43-3 [242 kB] 158s Get:170 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libbrotli1 ppc64el 1.1.0-2build1 [410 kB] 158s Get:171 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libfreetype6 ppc64el 2.13.2+dfsg-1build2 [545 kB] 158s Get:172 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsqlite3-0 ppc64el 3.45.1-1ubuntu1 [804 kB] 158s Get:173 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el pinentry-curses ppc64el 1.2.1-3ubuntu4 [38.7 kB] 158s Get:174 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gcc-14-base ppc64el 14-20240315-1ubuntu1 [47.0 kB] 158s Get:175 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgcc-s1 ppc64el 14-20240315-1ubuntu1 [39.2 kB] 158s Get:176 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libstdc++6 ppc64el 14-20240315-1ubuntu1 [897 kB] 158s Get:177 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python-apt-common all 2.7.7 [19.8 kB] 158s Get:178 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsmartcols1 ppc64el 2.39.3-9ubuntu2 [79.0 kB] 158s Get:179 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el readline-common all 8.2-4 [56.4 kB] 158s Get:180 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bsdextrautils ppc64el 2.39.3-9ubuntu2 [78.6 kB] 158s Get:181 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el groff-base ppc64el 1.23.0-3build1 [1112 kB] 158s Get:182 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libpython3-stdlib ppc64el 3.12.2-0ubuntu1 [9798 B] 158s Get:183 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libfido2-1 ppc64el 1.14.0-1build1 [111 kB] 158s Get:184 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgssapi-krb5-2 ppc64el 1.20.1-6ubuntu1 [185 kB] 158s Get:185 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libkrb5-3 ppc64el 1.20.1-6ubuntu1 [432 kB] 158s Get:186 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libkrb5support0 ppc64el 1.20.1-6ubuntu1 [38.5 kB] 158s Get:187 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libk5crypto3 ppc64el 1.20.1-6ubuntu1 [108 kB] 158s Get:188 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libcom-err2 ppc64el 1.47.0-2.4~exp1ubuntu2 [22.9 kB] 158s Get:189 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libproc2-0 ppc64el 2:4.0.4-4ubuntu2 [68.8 kB] 158s Get:190 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el procps ppc64el 2:4.0.4-4ubuntu2 [736 kB] 158s Get:191 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libnghttp2-14 ppc64el 1.59.0-1build1 [89.0 kB] 158s Get:192 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dpkg ppc64el 1.22.6ubuntu5 [1343 kB] 158s Get:193 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el util-linux ppc64el 2.39.3-9ubuntu2 [1195 kB] 158s Get:194 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libxml2 ppc64el 2.9.14+dfsg-1.3ubuntu2 [840 kB] 158s Get:195 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libbpf1 ppc64el 1:1.3.0-2build1 [216 kB] 158s Get:196 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el iproute2 ppc64el 6.1.0-1ubuntu5 [1384 kB] 158s Get:197 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libelf1t64 ppc64el 0.190-1.1build2 [69.3 kB] 158s Get:198 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dhcpcd-base ppc64el 1:10.0.6-1ubuntu2 [276 kB] 158s Get:199 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el file ppc64el 1:5.45-3 [22.7 kB] 158s Get:200 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libmagic-mgc ppc64el 1:5.45-3 [307 kB] 158s Get:201 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libmagic1t64 ppc64el 1:5.45-3 [106 kB] 158s Get:202 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libtirpc-common all 1.3.4+ds-1.1 [8018 B] 158s Get:203 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el lsof ppc64el 4.95.0-1build2 [256 kB] 159s Get:204 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libnsl2 ppc64el 1.3.0-3build2 [48.9 kB] 159s Get:205 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libtirpc3t64 ppc64el 1.3.4+ds-1.1 [102 kB] 159s Get:206 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el multipath-tools ppc64el 0.9.4-5ubuntu6 [341 kB] 159s Get:207 http://ftpmaster.internal/ubuntu noble/main ppc64el liburcu8t64 ppc64el 0.14.0-3.1 [73.6 kB] 159s Get:208 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bind9-host ppc64el 1:9.18.24-0ubuntu3 [54.5 kB] 159s Get:209 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bind9-dnsutils ppc64el 1:9.18.24-0ubuntu3 [167 kB] 159s Get:210 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el bind9-libs ppc64el 1:9.18.24-0ubuntu3 [1436 kB] 159s Get:211 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libuv1t64 ppc64el 1.48.0-1.1 [117 kB] 159s Get:212 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el liblocale-gettext-perl ppc64el 1.07-6ubuntu4 [16.1 kB] 159s Get:213 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el uuid-runtime ppc64el 2.39.3-9ubuntu2 [33.8 kB] 159s Get:214 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libdebconfclient0 ppc64el 0.271ubuntu2 [11.2 kB] 159s Get:215 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsemanage-common all 3.5-1build4 [10.1 kB] 159s Get:216 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsemanage2 ppc64el 3.5-1build4 [115 kB] 159s Get:217 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el install-info ppc64el 7.1-3build1 [64.5 kB] 159s Get:218 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gcc-13-base ppc64el 13.2.0-21ubuntu1 [48.3 kB] 159s Get:219 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libss2 ppc64el 1.47.0-2.4~exp1ubuntu2 [18.0 kB] 159s Get:220 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dmsetup ppc64el 2:1.02.185-3ubuntu2 [91.8 kB] 159s Get:221 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el eject ppc64el 2.39.3-9ubuntu2 [28.2 kB] 159s Get:222 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el krb5-locales all 1.20.1-6ubuntu1 [13.8 kB] 159s Get:223 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libglib2.0-data all 2.79.3-3ubuntu5 [46.6 kB] 159s Get:224 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libslang2 ppc64el 2.3.3-3build1 [501 kB] 159s Get:225 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libtext-charwidth-perl ppc64el 0.04-11build2 [9506 B] 159s Get:226 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libtext-iconv-perl ppc64el 1.7-8build2 [13.7 kB] 159s Get:227 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-yaml ppc64el 6.0.1-2build1 [123 kB] 159s Get:228 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-setuptools all 68.1.2-2ubuntu1 [396 kB] 159s Get:229 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-pkg-resources all 68.1.2-2ubuntu1 [168 kB] 159s Get:230 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el rsyslog ppc64el 8.2312.0-3ubuntu7 [629 kB] 159s Get:231 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el vim-tiny ppc64el 2:9.1.0016-1ubuntu6 [1042 kB] 159s Get:232 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el vim-common all 2:9.1.0016-1ubuntu6 [385 kB] 159s Get:233 http://ftpmaster.internal/ubuntu noble/main ppc64el xdg-user-dirs ppc64el 0.18-1 [20.0 kB] 159s Get:234 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el xxd ppc64el 2:9.1.0016-1ubuntu6 [63.7 kB] 159s Get:235 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el apparmor ppc64el 4.0.0-beta3-0ubuntu2 [747 kB] 159s Get:236 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el ftp all 20230507-2build1 [4724 B] 159s Get:237 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el inetutils-telnet ppc64el 2:2.5-3ubuntu3 [115 kB] 159s Get:238 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el info ppc64el 7.1-3build1 [188 kB] 159s Get:239 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libusb-1.0-0 ppc64el 2:1.0.27-1 [64.0 kB] 159s Get:240 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libxmuu1 ppc64el 2:1.1.3-3build1 [9488 B] 159s Get:241 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el lshw ppc64el 02.19.git.2021.06.19.996aaad9c7-2build2 [334 kB] 159s Get:242 http://ftpmaster.internal/ubuntu noble/main ppc64el manpages all 6.05.01-1 [1340 kB] 160s Get:243 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el mtr-tiny ppc64el 0.95-1.1build1 [62.8 kB] 160s Get:244 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el plymouth-theme-ubuntu-text ppc64el 24.004.60-1ubuntu6 [11.1 kB] 160s Get:245 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el plymouth ppc64el 24.004.60-1ubuntu6 [155 kB] 160s Get:246 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el telnet all 0.17+2.5-3ubuntu3 [3682 B] 160s Get:247 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el usb.ids all 2024.03.18-1 [223 kB] 160s Get:248 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el xz-utils ppc64el 5.6.0-0.2 [281 kB] 160s Get:249 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libctf0 ppc64el 2.42-4ubuntu1 [112 kB] 160s Get:250 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libctf-nobfd0 ppc64el 2.42-4ubuntu1 [112 kB] 160s Get:251 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el binutils-powerpc64le-linux-gnu ppc64el 2.42-4ubuntu1 [2473 kB] 160s Get:252 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libbinutils ppc64el 2.42-4ubuntu1 [699 kB] 160s Get:253 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el binutils ppc64el 2.42-4ubuntu1 [3078 B] 160s Get:254 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el binutils-common ppc64el 2.42-4ubuntu1 [217 kB] 160s Get:255 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsframe1 ppc64el 2.42-4ubuntu1 [16.0 kB] 160s Get:256 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libllvm18 ppc64el 1:18.1.2-1ubuntu2 [28.9 MB] 162s Get:257 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libclang-cpp18 ppc64el 1:18.1.2-1ubuntu2 [14.6 MB] 164s Get:258 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el libbpfcc ppc64el 0.29.1+ds-1ubuntu4 [707 kB] 164s Get:259 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el python3-bpfcc all 0.29.1+ds-1ubuntu4 [40.2 kB] 164s Get:260 http://ftpmaster.internal/ubuntu noble/main ppc64el ieee-data all 20220827.1 [2113 kB] 164s Get:261 http://ftpmaster.internal/ubuntu noble/main ppc64el python3-netaddr all 0.8.0-2ubuntu1 [319 kB] 164s Get:262 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el bpfcc-tools all 0.29.1+ds-1ubuntu4 [687 kB] 164s Get:263 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libclang1-18 ppc64el 1:18.1.2-1ubuntu2 [8725 kB] 165s Get:264 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libdw1t64 ppc64el 0.190-1.1build2 [301 kB] 165s Get:265 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el bpftrace ppc64el 0.20.2-1ubuntu1 [1058 kB] 165s Get:266 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el cryptsetup-bin ppc64el 2:2.7.0-1ubuntu2 [227 kB] 165s Get:267 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dpkg-dev all 1.22.6ubuntu5 [1074 kB] 165s Get:268 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libdpkg-perl all 1.22.6ubuntu5 [269 kB] 165s Get:269 http://ftpmaster.internal/ubuntu noble/main ppc64el fonts-dejavu-mono all 2.37-8 [502 kB] 165s Get:270 http://ftpmaster.internal/ubuntu noble/main ppc64el fonts-dejavu-core all 2.37-8 [835 kB] 165s Get:271 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el fontconfig-config ppc64el 2.15.0-1.1ubuntu1 [37.4 kB] 165s Get:272 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libprotobuf-c1 ppc64el 1.4.1-1ubuntu3 [25.9 kB] 165s Get:273 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gnupg-l10n all 2.4.4-2ubuntu15 [65.8 kB] 165s Get:274 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libibverbs1 ppc64el 50.0-2build1 [74.4 kB] 165s Get:275 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el ibverbs-providers ppc64el 50.0-2build1 [420 kB] 165s Get:276 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el jq ppc64el 1.7.1-3 [66.1 kB] 165s Get:277 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libjq1 ppc64el 1.7.1-3 [173 kB] 165s Get:278 http://ftpmaster.internal/ubuntu noble/main ppc64el libaio1t64 ppc64el 0.3.113-6 [8188 B] 165s Get:279 http://ftpmaster.internal/ubuntu noble/main ppc64el libatm1t64 ppc64el 1:2.5.1-5.1 [26.9 kB] 165s Get:280 http://ftpmaster.internal/ubuntu noble/main ppc64el libc-dev-bin ppc64el 2.39-0ubuntu6 [21.3 kB] 165s Get:281 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libfontconfig1 ppc64el 2.15.0-1.1ubuntu1 [190 kB] 165s Get:282 http://ftpmaster.internal/ubuntu noble/main ppc64el libjpeg-turbo8 ppc64el 2.1.5-2ubuntu1 [212 kB] 165s Get:283 http://ftpmaster.internal/ubuntu noble/main ppc64el libjpeg8 ppc64el 8c-2ubuntu11 [2148 B] 165s Get:284 http://ftpmaster.internal/ubuntu noble/main ppc64el libdeflate0 ppc64el 1.19-1 [61.9 kB] 165s Get:285 http://ftpmaster.internal/ubuntu noble/main ppc64el libjbig0 ppc64el 2.1-6.1ubuntu1 [34.7 kB] 165s Get:286 http://ftpmaster.internal/ubuntu noble/main ppc64el liblerc4 ppc64el 4.0.0+ds-4ubuntu1 [266 kB] 165s Get:287 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libsharpyuv0 ppc64el 1.3.2-0.4build2 [28.8 kB] 165s Get:288 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libwebp7 ppc64el 1.3.2-0.4build2 [312 kB] 165s Get:289 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libtiff6 ppc64el 4.5.1+git230720-4ubuntu1 [274 kB] 165s Get:290 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libxpm4 ppc64el 1:3.5.17-1build1 [50.2 kB] 165s Get:291 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgd3 ppc64el 2.3.3-9ubuntu3 [162 kB] 165s Get:292 http://ftpmaster.internal/ubuntu noble/main ppc64el libc-devtools ppc64el 2.39-0ubuntu6 [29.6 kB] 165s Get:293 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-libc-dev ppc64el 6.8.0-20.20 [1586 kB] 166s Get:294 http://ftpmaster.internal/ubuntu noble/main ppc64el libcrypt-dev ppc64el 1:4.4.36-4 [167 kB] 166s Get:295 http://ftpmaster.internal/ubuntu noble/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 166s Get:296 http://ftpmaster.internal/ubuntu noble/main ppc64el libc6-dev ppc64el 2.39-0ubuntu6 [2102 kB] 166s Get:297 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libevent-core-2.1-7 ppc64el 2.1.12-stable-9build1 [110 kB] 166s Get:298 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libftdi1-2 ppc64el 1.5-6build4 [32.5 kB] 166s Get:299 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libldap-common all 2.6.7+dfsg-1~exp1ubuntu6 [31.3 kB] 166s Get:300 http://ftpmaster.internal/ubuntu noble/main ppc64el libunwind8 ppc64el 1.6.2-3 [59.9 kB] 166s Get:301 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-modules-6.8.0-20-generic ppc64el 6.8.0-20.20 [31.3 MB] 169s Get:302 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-image-6.8.0-20-generic ppc64el 6.8.0-20.20 [63.9 MB] 174s Get:303 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-modules-extra-6.8.0-20-generic ppc64el 6.8.0-20.20 [103 MB] 184s Get:304 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-generic ppc64el 6.8.0-20.20+1 [1734 B] 184s Get:305 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-image-generic ppc64el 6.8.0-20.20+1 [9698 B] 184s Get:306 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-virtual ppc64el 6.8.0-20.20+1 [1686 B] 184s Get:307 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-image-virtual ppc64el 6.8.0-20.20+1 [9702 B] 184s Get:308 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-headers-virtual ppc64el 6.8.0-20.20+1 [1648 B] 184s Get:309 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-headers-6.8.0-20 all 6.8.0-20.20 [13.6 MB] 185s Get:310 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-headers-6.8.0-20-generic ppc64el 6.8.0-20.20 [3728 kB] 185s Get:311 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-headers-generic ppc64el 6.8.0-20.20+1 [9612 B] 185s Get:312 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-tools-common all 6.8.0-20.20 [437 kB] 185s Get:313 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-tools-6.8.0-20 ppc64el 6.8.0-20.20 [2924 kB] 185s Get:314 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el linux-tools-6.8.0-20-generic ppc64el 6.8.0-20.20 [1730 B] 185s Get:315 http://ftpmaster.internal/ubuntu noble/main ppc64el manpages-dev all 6.05.01-1 [2018 kB] 185s Get:316 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-distutils all 3.12.2-3ubuntu1.1 [133 kB] 185s Get:317 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-lib2to3 all 3.12.2-3ubuntu1.1 [79.1 kB] 185s Get:318 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-pyrsistent ppc64el 0.20.0-1build1 [60.4 kB] 185s Get:319 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el python3-typing-extensions all 4.10.0-1 [60.7 kB] 185s Get:320 http://ftpmaster.internal/ubuntu noble/main ppc64el ubuntu-kernel-accessories ppc64el 1.536build1 [10.5 kB] 185s Get:321 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el kpartx ppc64el 0.9.4-5ubuntu6 [34.4 kB] 186s Preconfiguring packages ... 186s Fetched 390 MB in 31s (12.4 MB/s) 186s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70153 files and directories currently installed.) 186s Preparing to unpack .../motd-news-config_13ubuntu8_all.deb ... 186s Unpacking motd-news-config (13ubuntu8) over (13ubuntu7) ... 186s Preparing to unpack .../base-files_13ubuntu8_ppc64el.deb ... 186s Unpacking base-files (13ubuntu8) over (13ubuntu7) ... 186s Setting up base-files (13ubuntu8) ... 187s motd-news.service is a disabled or a static unit not running, not starting it. 187s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70153 files and directories currently installed.) 187s Preparing to unpack .../bash_5.2.21-2ubuntu3_ppc64el.deb ... 187s Unpacking bash (5.2.21-2ubuntu3) over (5.2.21-2ubuntu2) ... 187s Setting up bash (5.2.21-2ubuntu3) ... 187s update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode 187s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70153 files and directories currently installed.) 187s Preparing to unpack .../bsdutils_1%3a2.39.3-9ubuntu2_ppc64el.deb ... 187s Unpacking bsdutils (1:2.39.3-9ubuntu2) over (1:2.39.3-6ubuntu2) ... 187s Setting up bsdutils (1:2.39.3-9ubuntu2) ... 187s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70153 files and directories currently installed.) 187s Preparing to unpack .../coreutils_9.4-3ubuntu3_ppc64el.deb ... 187s Unpacking coreutils (9.4-3ubuntu3) over (9.4-2ubuntu4) ... 187s Setting up coreutils (9.4-3ubuntu3) ... 187s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70153 files and directories currently installed.) 187s Preparing to unpack .../00-libudisks2-0_2.10.1-6_ppc64el.deb ... 187s Unpacking libudisks2-0:ppc64el (2.10.1-6) over (2.10.1-1ubuntu2) ... 187s Preparing to unpack .../01-udisks2_2.10.1-6_ppc64el.deb ... 187s Unpacking udisks2 (2.10.1-6) over (2.10.1-1ubuntu2) ... 187s Preparing to unpack .../02-shared-mime-info_2.4-1build1_ppc64el.deb ... 187s Unpacking shared-mime-info (2.4-1build1) over (2.4-1) ... 187s Preparing to unpack .../03-gir1.2-girepository-2.0_1.79.1-1ubuntu6_ppc64el.deb ... 187s Unpacking gir1.2-girepository-2.0:ppc64el (1.79.1-1ubuntu6) over (1.79.1-1) ... 187s Preparing to unpack .../04-gir1.2-glib-2.0_2.79.3-3ubuntu5_ppc64el.deb ... 187s Unpacking gir1.2-glib-2.0:ppc64el (2.79.3-3ubuntu5) over (2.79.2-1~ubuntu1) ... 187s Preparing to unpack .../05-libgirepository-1.0-1_1.79.1-1ubuntu6_ppc64el.deb ... 187s Unpacking libgirepository-1.0-1:ppc64el (1.79.1-1ubuntu6) over (1.79.1-1) ... 187s Preparing to unpack .../06-python3-gi_3.47.0-3build1_ppc64el.deb ... 187s Unpacking python3-gi (3.47.0-3build1) over (3.47.0-3) ... 188s Preparing to unpack .../07-python3-dbus_1.3.2-5build2_ppc64el.deb ... 188s Unpacking python3-dbus (1.3.2-5build2) over (1.3.2-5build1) ... 188s Selecting previously unselected package libnetplan1:ppc64el. 188s Preparing to unpack .../08-libnetplan1_1.0-1_ppc64el.deb ... 188s Unpacking libnetplan1:ppc64el (1.0-1) ... 188s Preparing to unpack .../09-python3-netplan_1.0-1_ppc64el.deb ... 188s Unpacking python3-netplan (1.0-1) over (0.107.1-3) ... 188s Preparing to unpack .../10-netplan-generator_1.0-1_ppc64el.deb ... 188s Adding 'diversion of /lib/systemd/system-generators/netplan to /lib/systemd/system-generators/netplan.usr-is-merged by netplan-generator' 188s Unpacking netplan-generator (1.0-1) over (0.107.1-3) ... 188s Preparing to unpack .../11-initramfs-tools-bin_0.142ubuntu23_ppc64el.deb ... 188s Unpacking initramfs-tools-bin (0.142ubuntu23) over (0.142ubuntu20) ... 188s Preparing to unpack .../12-initramfs-tools-core_0.142ubuntu23_all.deb ... 188s Unpacking initramfs-tools-core (0.142ubuntu23) over (0.142ubuntu20) ... 188s Preparing to unpack .../13-initramfs-tools_0.142ubuntu23_all.deb ... 188s Unpacking initramfs-tools (0.142ubuntu23) over (0.142ubuntu20) ... 188s Preparing to unpack .../14-netplan.io_1.0-1_ppc64el.deb ... 188s Unpacking netplan.io (1.0-1) over (0.107.1-3) ... 188s Preparing to unpack .../15-libxmlb2_0.3.15-1build1_ppc64el.deb ... 188s Unpacking libxmlb2:ppc64el (0.3.15-1build1) over (0.3.15-1) ... 188s dpkg: libgpgme11:ppc64el: dependency problems, but removing anyway as you requested: 188s libvolume-key1:ppc64el depends on libgpgme11 (>= 1.4.1). 188s libjcat1:ppc64el depends on libgpgme11 (>= 1.2.0). 188s 188s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70157 files and directories currently installed.) 188s Removing libgpgme11:ppc64el (1.18.0-4ubuntu1) ... 188s Selecting previously unselected package libgpgme11t64:ppc64el. 188s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70151 files and directories currently installed.) 188s Preparing to unpack .../00-libgpgme11t64_1.18.0-4.1ubuntu3_ppc64el.deb ... 188s Unpacking libgpgme11t64:ppc64el (1.18.0-4.1ubuntu3) ... 188s Preparing to unpack .../01-libvolume-key1_0.3.12-7build1_ppc64el.deb ... 188s Unpacking libvolume-key1:ppc64el (0.3.12-7build1) over (0.3.12-5build2) ... 188s Preparing to unpack .../02-libqrtr-glib0_1.2.2-1ubuntu3_ppc64el.deb ... 188s Unpacking libqrtr-glib0:ppc64el (1.2.2-1ubuntu3) over (1.2.2-1ubuntu2) ... 188s Preparing to unpack .../03-libqmi-glib5_1.35.2-0ubuntu1_ppc64el.deb ... 188s Unpacking libqmi-glib5:ppc64el (1.35.2-0ubuntu1) over (1.34.0-2) ... 188s Preparing to unpack .../04-libqmi-proxy_1.35.2-0ubuntu1_ppc64el.deb ... 188s Unpacking libqmi-proxy (1.35.2-0ubuntu1) over (1.34.0-2) ... 188s Preparing to unpack .../05-libpolkit-agent-1-0_124-1ubuntu1_ppc64el.deb ... 188s Unpacking libpolkit-agent-1-0:ppc64el (124-1ubuntu1) over (124-1) ... 188s Preparing to unpack .../06-libpolkit-gobject-1-0_124-1ubuntu1_ppc64el.deb ... 188s Unpacking libpolkit-gobject-1-0:ppc64el (124-1ubuntu1) over (124-1) ... 188s Preparing to unpack .../07-libmm-glib0_1.23.4-0ubuntu1_ppc64el.deb ... 188s Unpacking libmm-glib0:ppc64el (1.23.4-0ubuntu1) over (1.22.0-3) ... 188s Preparing to unpack .../08-libmbim-glib4_1.31.2-0ubuntu2_ppc64el.deb ... 188s Unpacking libmbim-glib4:ppc64el (1.31.2-0ubuntu2) over (1.30.0-1) ... 188s Preparing to unpack .../09-libmbim-proxy_1.31.2-0ubuntu2_ppc64el.deb ... 188s Unpacking libmbim-proxy (1.31.2-0ubuntu2) over (1.30.0-1) ... 188s Preparing to unpack .../10-libjson-glib-1.0-common_1.8.0-2build1_all.deb ... 188s Unpacking libjson-glib-1.0-common (1.8.0-2build1) over (1.8.0-2) ... 188s Preparing to unpack .../11-libjson-glib-1.0-0_1.8.0-2build1_ppc64el.deb ... 188s Unpacking libjson-glib-1.0-0:ppc64el (1.8.0-2build1) over (1.8.0-2) ... 189s Preparing to unpack .../12-libgusb2_0.4.8-1build1_ppc64el.deb ... 189s Unpacking libgusb2:ppc64el (0.4.8-1build1) over (0.4.8-1) ... 189s Preparing to unpack .../13-libgudev-1.0-0_1%3a238-3ubuntu2_ppc64el.deb ... 189s Unpacking libgudev-1.0-0:ppc64el (1:238-3ubuntu2) over (1:238-3) ... 189s Preparing to unpack .../14-tnftp_20230507-2build1_ppc64el.deb ... 189s Unpacking tnftp (20230507-2build1) over (20230507-2) ... 189s Preparing to unpack .../15-tcpdump_4.99.4-3ubuntu2_ppc64el.deb ... 189s Unpacking tcpdump (4.99.4-3ubuntu2) over (4.99.4-3ubuntu1) ... 189s Preparing to unpack .../16-libsystemd0_255.4-1ubuntu5_ppc64el.deb ... 189s Unpacking libsystemd0:ppc64el (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 189s Setting up libsystemd0:ppc64el (255.4-1ubuntu5) ... 189s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70158 files and directories currently installed.) 189s Preparing to unpack .../systemd-dev_255.4-1ubuntu5_all.deb ... 189s Unpacking systemd-dev (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 189s Preparing to unpack .../libnss-systemd_255.4-1ubuntu5_ppc64el.deb ... 189s Unpacking libnss-systemd:ppc64el (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 189s Preparing to unpack .../libudev1_255.4-1ubuntu5_ppc64el.deb ... 189s Unpacking libudev1:ppc64el (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 189s Setting up libudev1:ppc64el (255.4-1ubuntu5) ... 189s dpkg: libssl3:ppc64el: dependency problems, but removing anyway as you requested: 189s wget depends on libssl3 (>= 3.0.0). 189s systemd-resolved depends on libssl3 (>= 3.0.0). 189s systemd depends on libssl3 (>= 3.0.0). 189s sudo depends on libssl3 (>= 3.0.0). 189s rsync depends on libssl3 (>= 3.0.0). 189s python3-cryptography depends on libssl3 (>= 3.0.0). 189s openssl depends on libssl3 (>= 3.0.9). 189s openssh-server depends on libssl3 (>= 3.0.10). 189s openssh-client depends on libssl3 (>= 3.0.10). 189s linux-headers-6.8.0-11-generic depends on libssl3 (>= 3.0.0). 189s libsystemd-shared:ppc64el depends on libssl3 (>= 3.0.0). 189s libssh-4:ppc64el depends on libssl3 (>= 3.0.0). 189s libsasl2-modules:ppc64el depends on libssl3 (>= 3.0.0). 189s libsasl2-2:ppc64el depends on libssl3 (>= 3.0.0). 189s libpython3.12-minimal:ppc64el depends on libssl3 (>= 3.0.0). 189s libpython3.11-minimal:ppc64el depends on libssl3 (>= 3.0.0). 189s libnvme1 depends on libssl3 (>= 3.0.0). 189s libkrb5-3:ppc64el depends on libssl3 (>= 3.0.0). 189s libkmod2:ppc64el depends on libssl3 (>= 3.0.0). 189s libfido2-1:ppc64el depends on libssl3 (>= 3.0.0). 189s libcurl4:ppc64el depends on libssl3 (>= 3.0.0). 189s libcryptsetup12:ppc64el depends on libssl3 (>= 3.0.0). 189s kmod depends on libssl3 (>= 3.0.0). 189s dhcpcd-base depends on libssl3 (>= 3.0.0). 189s coreutils depends on libssl3 (>= 3.0.0). 189s bind9-libs:ppc64el depends on libssl3 (>= 3.0.0). 189s 189s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70158 files and directories currently installed.) 189s Removing libssl3:ppc64el (3.0.10-1ubuntu4) ... 189s Selecting previously unselected package libssl3t64:ppc64el. 189s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70147 files and directories currently installed.) 189s Preparing to unpack .../libssl3t64_3.0.13-0ubuntu2_ppc64el.deb ... 189s Unpacking libssl3t64:ppc64el (3.0.13-0ubuntu2) ... 189s Setting up libssl3t64:ppc64el (3.0.13-0ubuntu2) ... 189s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70160 files and directories currently installed.) 189s Preparing to unpack .../systemd_255.4-1ubuntu5_ppc64el.deb ... 189s Unpacking systemd (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 189s Preparing to unpack .../udev_255.4-1ubuntu5_ppc64el.deb ... 189s Unpacking udev (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 189s Preparing to unpack .../libsystemd-shared_255.4-1ubuntu5_ppc64el.deb ... 189s Unpacking libsystemd-shared:ppc64el (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 189s Setting up libsystemd-shared:ppc64el (255.4-1ubuntu5) ... 189s Setting up systemd-dev (255.4-1ubuntu5) ... 189s Setting up systemd (255.4-1ubuntu5) ... 190s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70160 files and directories currently installed.) 190s Preparing to unpack .../00-systemd-sysv_255.4-1ubuntu5_ppc64el.deb ... 190s Unpacking systemd-sysv (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 190s Preparing to unpack .../01-libpam-systemd_255.4-1ubuntu5_ppc64el.deb ... 190s Unpacking libpam-systemd:ppc64el (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 190s Preparing to unpack .../02-systemd-timesyncd_255.4-1ubuntu5_ppc64el.deb ... 190s Unpacking systemd-timesyncd (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 190s Preparing to unpack .../03-systemd-resolved_255.4-1ubuntu5_ppc64el.deb ... 190s Unpacking systemd-resolved (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 190s Preparing to unpack .../04-sudo_1.9.15p5-3ubuntu3_ppc64el.deb ... 190s Unpacking sudo (1.9.15p5-3ubuntu3) over (1.9.15p5-3ubuntu1) ... 190s Preparing to unpack .../05-rsync_3.2.7-1build1_ppc64el.deb ... 190s Unpacking rsync (3.2.7-1build1) over (3.2.7-1) ... 190s Preparing to unpack .../06-python3-cryptography_41.0.7-4build2_ppc64el.deb ... 190s Unpacking python3-cryptography (41.0.7-4build2) over (41.0.7-3) ... 190s Preparing to unpack .../07-openssl_3.0.13-0ubuntu2_ppc64el.deb ... 190s Unpacking openssl (3.0.13-0ubuntu2) over (3.0.10-1ubuntu4) ... 190s Preparing to unpack .../08-openssh-sftp-server_1%3a9.6p1-3ubuntu11_ppc64el.deb ... 190s Unpacking openssh-sftp-server (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ... 190s Preparing to unpack .../09-openssh-client_1%3a9.6p1-3ubuntu11_ppc64el.deb ... 190s Unpacking openssh-client (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ... 191s Preparing to unpack .../10-openssh-server_1%3a9.6p1-3ubuntu11_ppc64el.deb ... 191s Unpacking openssh-server (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ... 191s Preparing to unpack .../11-libssh-4_0.10.6-2build1_ppc64el.deb ... 191s Unpacking libssh-4:ppc64el (0.10.6-2build1) over (0.10.6-2) ... 191s Preparing to unpack .../12-libsasl2-modules_2.1.28+dfsg1-5ubuntu1_ppc64el.deb ... 191s Unpacking libsasl2-modules:ppc64el (2.1.28+dfsg1-5ubuntu1) over (2.1.28+dfsg1-4) ... 191s Preparing to unpack .../13-python3.12_3.12.2-4build3_ppc64el.deb ... 191s Unpacking python3.12 (3.12.2-4build3) over (3.12.2-1) ... 191s Preparing to unpack .../14-python3.12-minimal_3.12.2-4build3_ppc64el.deb ... 191s Unpacking python3.12-minimal (3.12.2-4build3) over (3.12.2-1) ... 191s Preparing to unpack .../15-libpython3.12-minimal_3.12.2-4build3_ppc64el.deb ... 191s Unpacking libpython3.12-minimal:ppc64el (3.12.2-4build3) over (3.12.2-1) ... 191s Preparing to unpack .../16-grub-ieee1275_2.12-1ubuntu5_ppc64el.deb ... 191s Unpacking grub-ieee1275 (2.12-1ubuntu5) over (2.12-1ubuntu4) ... 191s Preparing to unpack .../17-grub2-common_2.12-1ubuntu5_ppc64el.deb ... 191s Unpacking grub2-common (2.12-1ubuntu5) over (2.12-1ubuntu4) ... 191s Preparing to unpack .../18-grub-common_2.12-1ubuntu5_ppc64el.deb ... 191s Unpacking grub-common (2.12-1ubuntu5) over (2.12-1ubuntu4) ... 191s Preparing to unpack .../19-grub-ieee1275-bin_2.12-1ubuntu5_ppc64el.deb ... 191s Unpacking grub-ieee1275-bin (2.12-1ubuntu5) over (2.12-1ubuntu4) ... 191s dpkg: libparted2:ppc64el: dependency problems, but removing anyway as you requested: 191s parted depends on libparted2 (= 3.6-3). 191s 191s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70160 files and directories currently installed.) 191s Removing libparted2:ppc64el (3.6-3) ... 192s Selecting previously unselected package libparted2t64:ppc64el. 192s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70154 files and directories currently installed.) 192s Preparing to unpack .../0-libparted2t64_3.6-3.1build2_ppc64el.deb ... 192s Unpacking libparted2t64:ppc64el (3.6-3.1build2) ... 192s Preparing to unpack .../1-parted_3.6-3.1build2_ppc64el.deb ... 192s Unpacking parted (3.6-3.1build2) over (3.6-3) ... 192s Preparing to unpack .../2-python3.11_3.11.8-1build4_ppc64el.deb ... 192s Unpacking python3.11 (3.11.8-1build4) over (3.11.8-1) ... 192s Preparing to unpack .../3-python3.11-minimal_3.11.8-1build4_ppc64el.deb ... 192s Unpacking python3.11-minimal (3.11.8-1build4) over (3.11.8-1) ... 192s Preparing to unpack .../4-libpython3.11-minimal_3.11.8-1build4_ppc64el.deb ... 192s Unpacking libpython3.11-minimal:ppc64el (3.11.8-1build4) over (3.11.8-1) ... 192s Preparing to unpack .../5-libpython3.11-stdlib_3.11.8-1build4_ppc64el.deb ... 192s Unpacking libpython3.11-stdlib:ppc64el (3.11.8-1build4) over (3.11.8-1) ... 192s Preparing to unpack .../6-gnupg-utils_2.4.4-2ubuntu15_ppc64el.deb ... 192s Unpacking gnupg-utils (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 192s Preparing to unpack .../7-gpg-agent_2.4.4-2ubuntu15_ppc64el.deb ... 192s Unpacking gpg-agent (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 192s Preparing to unpack .../8-gpg-wks-client_2.4.4-2ubuntu15_ppc64el.deb ... 192s Unpacking gpg-wks-client (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 192s Preparing to unpack .../9-gpg_2.4.4-2ubuntu15_ppc64el.deb ... 192s Unpacking gpg (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 192s dpkg: libnpth0:ppc64el: dependency problems, but removing anyway as you requested: 192s keyboxd depends on libnpth0 (>= 0.90). 192s gpgv depends on libnpth0 (>= 0.90). 192s gpgsm depends on libnpth0 (>= 0.90). 192s dirmngr depends on libnpth0 (>= 0.90). 192s 192s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70159 files and directories currently installed.) 192s Removing libnpth0:ppc64el (1.6-3build2) ... 192s Selecting previously unselected package libnpth0t64:ppc64el. 192s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70154 files and directories currently installed.) 192s Preparing to unpack .../libnpth0t64_1.6-3.1_ppc64el.deb ... 192s Unpacking libnpth0t64:ppc64el (1.6-3.1) ... 192s Setting up libnpth0t64:ppc64el (1.6-3.1) ... 192s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70160 files and directories currently installed.) 192s Preparing to unpack .../gpgv_2.4.4-2ubuntu15_ppc64el.deb ... 192s Unpacking gpgv (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 192s Setting up gpgv (2.4.4-2ubuntu15) ... 192s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70160 files and directories currently installed.) 192s Preparing to unpack .../dirmngr_2.4.4-2ubuntu15_ppc64el.deb ... 193s Unpacking dirmngr (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 193s Preparing to unpack .../gnupg_2.4.4-2ubuntu15_all.deb ... 193s Unpacking gnupg (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 193s Preparing to unpack .../keyboxd_2.4.4-2ubuntu15_ppc64el.deb ... 193s Unpacking keyboxd (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 193s Preparing to unpack .../gpgconf_2.4.4-2ubuntu15_ppc64el.deb ... 193s Unpacking gpgconf (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 193s Preparing to unpack .../gpgsm_2.4.4-2ubuntu15_ppc64el.deb ... 193s Unpacking gpgsm (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 193s dpkg: libreadline8:ppc64el: dependency problems, but removing anyway as you requested: 193s libpython3.12-stdlib:ppc64el depends on libreadline8 (>= 7.0~beta). 193s gawk depends on libreadline8 (>= 6.0). 193s fdisk depends on libreadline8 (>= 6.0). 193s bc depends on libreadline8 (>= 6.0). 193s 193s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70160 files and directories currently installed.) 193s Removing libreadline8:ppc64el (8.2-3) ... 193s Selecting previously unselected package libreadline8t64:ppc64el. 193s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70148 files and directories currently installed.) 193s Preparing to unpack .../libreadline8t64_8.2-4_ppc64el.deb ... 193s Adding 'diversion of /lib/powerpc64le-linux-gnu/libhistory.so.8 to /lib/powerpc64le-linux-gnu/libhistory.so.8.usr-is-merged by libreadline8t64' 193s Adding 'diversion of /lib/powerpc64le-linux-gnu/libhistory.so.8.2 to /lib/powerpc64le-linux-gnu/libhistory.so.8.2.usr-is-merged by libreadline8t64' 193s Adding 'diversion of /lib/powerpc64le-linux-gnu/libreadline.so.8 to /lib/powerpc64le-linux-gnu/libreadline.so.8.usr-is-merged by libreadline8t64' 193s Adding 'diversion of /lib/powerpc64le-linux-gnu/libreadline.so.8.2 to /lib/powerpc64le-linux-gnu/libreadline.so.8.2.usr-is-merged by libreadline8t64' 193s Unpacking libreadline8t64:ppc64el (8.2-4) ... 193s Setting up libreadline8t64:ppc64el (8.2-4) ... 193s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70168 files and directories currently installed.) 193s Preparing to unpack .../gawk_1%3a5.2.1-2build2_ppc64el.deb ... 193s Unpacking gawk (1:5.2.1-2build2) over (1:5.2.1-2) ... 193s Preparing to unpack .../fdisk_2.39.3-9ubuntu2_ppc64el.deb ... 193s Unpacking fdisk (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 193s Preparing to unpack .../bc_1.07.1-3ubuntu2_ppc64el.deb ... 193s Unpacking bc (1.07.1-3ubuntu2) over (1.07.1-3build1) ... 193s Preparing to unpack .../libpython3.12-stdlib_3.12.2-4build3_ppc64el.deb ... 193s Unpacking libpython3.12-stdlib:ppc64el (3.12.2-4build3) over (3.12.2-1) ... 193s Preparing to unpack .../perl-base_5.38.2-3.2_ppc64el.deb ... 193s Unpacking perl-base (5.38.2-3.2) over (5.38.2-3) ... 193s Setting up perl-base (5.38.2-3.2) ... 194s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70166 files and directories currently installed.) 194s Preparing to unpack .../perl-modules-5.38_5.38.2-3.2_all.deb ... 194s Unpacking perl-modules-5.38 (5.38.2-3.2) over (5.38.2-3) ... 194s Preparing to unpack .../python3-gdbm_3.12.2-3ubuntu1.1_ppc64el.deb ... 194s Unpacking python3-gdbm:ppc64el (3.12.2-3ubuntu1.1) over (3.11.5-1) ... 194s Preparing to unpack .../man-db_2.12.0-3build4_ppc64el.deb ... 194s Unpacking man-db (2.12.0-3build4) over (2.12.0-3) ... 194s dpkg: libgdbm-compat4:ppc64el: dependency problems, but removing anyway as you requested: 194s libperl5.38:ppc64el depends on libgdbm-compat4 (>= 1.18-3). 194s 194s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70166 files and directories currently installed.) 194s Removing libgdbm-compat4:ppc64el (1.23-5) ... 194s dpkg: libgdbm6:ppc64el: dependency problems, but removing anyway as you requested: 194s libperl5.38:ppc64el depends on libgdbm6 (>= 1.21). 194s 194s Removing libgdbm6:ppc64el (1.23-5) ... 194s Selecting previously unselected package libgdbm6t64:ppc64el. 194s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70156 files and directories currently installed.) 194s Preparing to unpack .../libgdbm6t64_1.23-5.1_ppc64el.deb ... 194s Unpacking libgdbm6t64:ppc64el (1.23-5.1) ... 194s Selecting previously unselected package libgdbm-compat4t64:ppc64el. 194s Preparing to unpack .../libgdbm-compat4t64_1.23-5.1_ppc64el.deb ... 194s Unpacking libgdbm-compat4t64:ppc64el (1.23-5.1) ... 194s dpkg: libperl5.38:ppc64el: dependency problems, but removing anyway as you requested: 194s perl depends on libperl5.38 (= 5.38.2-3). 194s 194s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70168 files and directories currently installed.) 194s Removing libperl5.38:ppc64el (5.38.2-3) ... 194s Selecting previously unselected package libperl5.38t64:ppc64el. 194s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 69645 files and directories currently installed.) 194s Preparing to unpack .../libperl5.38t64_5.38.2-3.2_ppc64el.deb ... 194s Unpacking libperl5.38t64:ppc64el (5.38.2-3.2) ... 195s Preparing to unpack .../perl_5.38.2-3.2_ppc64el.deb ... 195s Unpacking perl (5.38.2-3.2) over (5.38.2-3) ... 195s dpkg: libdb5.3:ppc64el: dependency problems, but removing anyway as you requested: 195s libsasl2-modules-db:ppc64el depends on libdb5.3. 195s libpam-modules:ppc64el depends on libdb5.3. 195s iproute2 depends on libdb5.3. 195s apt-utils depends on libdb5.3. 195s 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70168 files and directories currently installed.) 195s Removing libdb5.3:ppc64el (5.3.28+dfsg2-4) ... 195s Selecting previously unselected package libdb5.3t64:ppc64el. 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70162 files and directories currently installed.) 195s Preparing to unpack .../libdb5.3t64_5.3.28+dfsg2-6_ppc64el.deb ... 195s Unpacking libdb5.3t64:ppc64el (5.3.28+dfsg2-6) ... 195s Preparing to unpack .../libsasl2-modules-db_2.1.28+dfsg1-5ubuntu1_ppc64el.deb ... 195s Unpacking libsasl2-modules-db:ppc64el (2.1.28+dfsg1-5ubuntu1) over (2.1.28+dfsg1-4) ... 195s Preparing to unpack .../libsasl2-2_2.1.28+dfsg1-5ubuntu1_ppc64el.deb ... 195s Unpacking libsasl2-2:ppc64el (2.1.28+dfsg1-5ubuntu1) over (2.1.28+dfsg1-4) ... 195s dpkg: libnvme1: dependency problems, but removing anyway as you requested: 195s libblockdev-nvme3:ppc64el depends on libnvme1 (>= 1.7.1). 195s 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70168 files and directories currently installed.) 195s Removing libnvme1 (1.8-2) ... 195s Selecting previously unselected package libnvme1t64. 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70161 files and directories currently installed.) 195s Preparing to unpack .../libnvme1t64_1.8-3_ppc64el.deb ... 195s Unpacking libnvme1t64 (1.8-3) ... 195s Preparing to unpack .../wget_1.21.4-1ubuntu2_ppc64el.deb ... 195s Unpacking wget (1.21.4-1ubuntu2) over (1.21.4-1ubuntu1) ... 195s dpkg: libcurl4:ppc64el: dependency problems, but removing anyway as you requested: 195s curl depends on libcurl4 (= 8.5.0-2ubuntu2). 195s 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70169 files and directories currently installed.) 195s Removing libcurl4:ppc64el (8.5.0-2ubuntu2) ... 195s Selecting previously unselected package libcurl4t64:ppc64el. 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70164 files and directories currently installed.) 195s Preparing to unpack .../libcurl4t64_8.5.0-2ubuntu8_ppc64el.deb ... 195s Unpacking libcurl4t64:ppc64el (8.5.0-2ubuntu8) ... 195s Preparing to unpack .../curl_8.5.0-2ubuntu8_ppc64el.deb ... 195s Unpacking curl (8.5.0-2ubuntu8) over (8.5.0-2ubuntu2) ... 195s dpkg: libpsl5:ppc64el: dependency problems, but removing anyway as you requested: 195s libcurl3-gnutls:ppc64el depends on libpsl5 (>= 0.16.0). 195s 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70170 files and directories currently installed.) 195s Removing libpsl5:ppc64el (0.21.2-1build1) ... 195s Selecting previously unselected package libpsl5t64:ppc64el. 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70165 files and directories currently installed.) 195s Preparing to unpack .../libpsl5t64_0.21.2-1.1_ppc64el.deb ... 195s Unpacking libpsl5t64:ppc64el (0.21.2-1.1) ... 195s dpkg: libarchive13:ppc64el: dependency problems, but removing anyway as you requested: 195s fwupd depends on libarchive13 (>= 3.2.1). 195s 195s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70171 files and directories currently installed.) 195s Removing libarchive13:ppc64el (3.7.2-1ubuntu2) ... 195s Selecting previously unselected package libarchive13t64:ppc64el. 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70165 files and directories currently installed.) 196s Preparing to unpack .../libarchive13t64_3.7.2-1.1ubuntu2_ppc64el.deb ... 196s Unpacking libarchive13t64:ppc64el (3.7.2-1.1ubuntu2) ... 196s Preparing to unpack .../fwupd_1.9.15-2_ppc64el.deb ... 196s Unpacking fwupd (1.9.15-2) over (1.9.14-1) ... 196s dpkg: libcurl3-gnutls:ppc64el: dependency problems, but removing anyway as you requested: 196s libfwupd2:ppc64el depends on libcurl3-gnutls (>= 7.63.0). 196s 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70172 files and directories currently installed.) 196s Removing libcurl3-gnutls:ppc64el (8.5.0-2ubuntu2) ... 196s Selecting previously unselected package libcurl3t64-gnutls:ppc64el. 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70165 files and directories currently installed.) 196s Preparing to unpack .../00-libcurl3t64-gnutls_8.5.0-2ubuntu8_ppc64el.deb ... 196s Unpacking libcurl3t64-gnutls:ppc64el (8.5.0-2ubuntu8) ... 196s Preparing to unpack .../01-libfwupd2_1.9.15-2_ppc64el.deb ... 196s Unpacking libfwupd2:ppc64el (1.9.15-2) over (1.9.14-1) ... 196s Preparing to unpack .../02-libblockdev3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../03-libblockdev-utils3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-utils3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../04-libblockdev-swap3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-swap3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../05-libblockdev-part3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-part3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../06-libblockdev-nvme3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-nvme3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../07-libblockdev-mdraid3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-mdraid3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../08-libblockdev-loop3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-loop3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../09-e2fsprogs-l10n_1.47.0-2.4~exp1ubuntu2_all.deb ... 196s Unpacking e2fsprogs-l10n (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 196s Preparing to unpack .../10-logsave_1.47.0-2.4~exp1ubuntu2_ppc64el.deb ... 196s Unpacking logsave (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 196s dpkg: libext2fs2:ppc64el: dependency problems, but removing anyway as you requested: 196s libblockdev-fs3:ppc64el depends on libext2fs2 (>= 1.42.11). 196s e2fsprogs depends on libext2fs2 (= 1.47.0-2ubuntu1). 196s btrfs-progs depends on libext2fs2 (>= 1.42). 196s 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70172 files and directories currently installed.) 196s Removing libext2fs2:ppc64el (1.47.0-2ubuntu1) ... 196s Selecting previously unselected package libext2fs2t64:ppc64el. 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70165 files and directories currently installed.) 196s Preparing to unpack .../libext2fs2t64_1.47.0-2.4~exp1ubuntu2_ppc64el.deb ... 196s Adding 'diversion of /lib/powerpc64le-linux-gnu/libe2p.so.2 to /lib/powerpc64le-linux-gnu/libe2p.so.2.usr-is-merged by libext2fs2t64' 196s Adding 'diversion of /lib/powerpc64le-linux-gnu/libe2p.so.2.3 to /lib/powerpc64le-linux-gnu/libe2p.so.2.3.usr-is-merged by libext2fs2t64' 196s Adding 'diversion of /lib/powerpc64le-linux-gnu/libext2fs.so.2 to /lib/powerpc64le-linux-gnu/libext2fs.so.2.usr-is-merged by libext2fs2t64' 196s Adding 'diversion of /lib/powerpc64le-linux-gnu/libext2fs.so.2.4 to /lib/powerpc64le-linux-gnu/libext2fs.so.2.4.usr-is-merged by libext2fs2t64' 196s Unpacking libext2fs2t64:ppc64el (1.47.0-2.4~exp1ubuntu2) ... 196s Setting up libext2fs2t64:ppc64el (1.47.0-2.4~exp1ubuntu2) ... 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70181 files and directories currently installed.) 196s Preparing to unpack .../e2fsprogs_1.47.0-2.4~exp1ubuntu2_ppc64el.deb ... 196s Unpacking e2fsprogs (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 196s dpkg: libreiserfscore0: dependency problems, but removing anyway as you requested: 196s btrfs-progs depends on libreiserfscore0 (>= 1:3.6.27). 196s 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70181 files and directories currently installed.) 196s Removing libreiserfscore0 (1:3.6.27-7) ... 196s Selecting previously unselected package libreiserfscore0t64. 196s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70176 files and directories currently installed.) 196s Preparing to unpack .../libreiserfscore0t64_1%3a3.6.27-7.1_ppc64el.deb ... 196s Unpacking libreiserfscore0t64 (1:3.6.27-7.1) ... 196s Preparing to unpack .../btrfs-progs_6.6.3-1.1build1_ppc64el.deb ... 196s Unpacking btrfs-progs (6.6.3-1.1build1) over (6.6.3-1.1) ... 196s Preparing to unpack .../libblockdev-fs3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-fs3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../libblockdev-crypto3_3.1.0-1build1_ppc64el.deb ... 196s Unpacking libblockdev-crypto3:ppc64el (3.1.0-1build1) over (3.1.0-1) ... 196s Preparing to unpack .../bolt_0.9.6-2build1_ppc64el.deb ... 196s Unpacking bolt (0.9.6-2build1) over (0.9.6-2) ... 197s dpkg: libglib2.0-0:ppc64el: dependency problems, but removing anyway as you requested: 197s libnetplan0:ppc64el depends on libglib2.0-0 (>= 2.75.3). 197s libjcat1:ppc64el depends on libglib2.0-0 (>= 2.75.3). 197s 197s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70182 files and directories currently installed.) 197s Removing libglib2.0-0:ppc64el (2.79.2-1~ubuntu1) ... 197s Selecting previously unselected package libglib2.0-0t64:ppc64el. 197s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70157 files and directories currently installed.) 197s Preparing to unpack .../0-libglib2.0-0t64_2.79.3-3ubuntu5_ppc64el.deb ... 197s libglib2.0-0t64.preinst: Removing /var/lib/dpkg/info/libglib2.0-0:ppc64el.postrm to avoid loss of /usr/share/glib-2.0/schemas/gschemas.compiled... 197s removed '/var/lib/dpkg/info/libglib2.0-0:ppc64el.postrm' 197s Unpacking libglib2.0-0t64:ppc64el (2.79.3-3ubuntu5) ... 197s Preparing to unpack .../1-libjcat1_0.2.0-2build2_ppc64el.deb ... 197s Unpacking libjcat1:ppc64el (0.2.0-2build2) over (0.2.0-2) ... 197s Preparing to unpack .../2-libldap2_2.6.7+dfsg-1~exp1ubuntu6_ppc64el.deb ... 197s Unpacking libldap2:ppc64el (2.6.7+dfsg-1~exp1ubuntu6) over (2.6.7+dfsg-1~exp1ubuntu1) ... 197s Preparing to unpack .../3-ubuntu-pro-client-l10n_31.2.2_ppc64el.deb ... 197s Unpacking ubuntu-pro-client-l10n (31.2.2) over (31.1) ... 197s Preparing to unpack .../4-ubuntu-pro-client_31.2.2_ppc64el.deb ... 197s Unpacking ubuntu-pro-client (31.2.2) over (31.1) ... 197s Preparing to unpack .../5-python3-apt_2.7.7_ppc64el.deb ... 197s Unpacking python3-apt (2.7.7) over (2.7.6) ... 197s Preparing to unpack .../6-apt-utils_2.7.14_ppc64el.deb ... 197s Unpacking apt-utils (2.7.14) over (2.7.12) ... 197s dpkg: libapt-pkg6.0:ppc64el: dependency problems, but removing anyway as you requested: 197s apt depends on libapt-pkg6.0 (>= 2.7.12). 197s 197s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70180 files and directories currently installed.) 197s Removing libapt-pkg6.0:ppc64el (2.7.12) ... 197s dpkg: libnettle8:ppc64el: dependency problems, but removing anyway as you requested: 197s librtmp1:ppc64el depends on libnettle8. 197s libhogweed6:ppc64el depends on libnettle8. 197s libgnutls30:ppc64el depends on libnettle8 (>= 3.9~). 197s 197s Removing libnettle8:ppc64el (3.9.1-2) ... 197s Selecting previously unselected package libapt-pkg6.0t64:ppc64el. 198s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70124 files and directories currently installed.) 198s Preparing to unpack .../libapt-pkg6.0t64_2.7.14_ppc64el.deb ... 198s Unpacking libapt-pkg6.0t64:ppc64el (2.7.14) ... 198s Setting up libapt-pkg6.0t64:ppc64el (2.7.14) ... 198s Selecting previously unselected package libnettle8t64:ppc64el. 198s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70174 files and directories currently installed.) 198s Preparing to unpack .../libnettle8t64_3.9.1-2.2_ppc64el.deb ... 198s Unpacking libnettle8t64:ppc64el (3.9.1-2.2) ... 198s Setting up libnettle8t64:ppc64el (3.9.1-2.2) ... 198s dpkg: libhogweed6:ppc64el: dependency problems, but removing anyway as you requested: 198s librtmp1:ppc64el depends on libhogweed6. 198s libgnutls30:ppc64el depends on libhogweed6 (>= 3.6). 198s 198s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70182 files and directories currently installed.) 198s Removing libhogweed6:ppc64el (3.9.1-2) ... 198s Selecting previously unselected package libhogweed6t64:ppc64el. 198s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70177 files and directories currently installed.) 198s Preparing to unpack .../libhogweed6t64_3.9.1-2.2_ppc64el.deb ... 198s Unpacking libhogweed6t64:ppc64el (3.9.1-2.2) ... 198s Setting up libhogweed6t64:ppc64el (3.9.1-2.2) ... 198s dpkg: libgnutls30:ppc64el: dependency problems, but removing anyway as you requested: 198s librtmp1:ppc64el depends on libgnutls30 (>= 3.7.2). 198s apt depends on libgnutls30 (>= 3.8.1). 198s 198s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70183 files and directories currently installed.) 198s Removing libgnutls30:ppc64el (3.8.3-1ubuntu1) ... 198s Selecting previously unselected package libgnutls30t64:ppc64el. 198s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70174 files and directories currently installed.) 198s Preparing to unpack .../libgnutls30t64_3.8.3-1.1ubuntu2_ppc64el.deb ... 198s Unpacking libgnutls30t64:ppc64el (3.8.3-1.1ubuntu2) ... 198s Setting up libgnutls30t64:ppc64el (3.8.3-1.1ubuntu2) ... 198s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 198s Preparing to unpack .../apt_2.7.14_ppc64el.deb ... 198s Unpacking apt (2.7.14) over (2.7.12) ... 198s Setting up apt (2.7.14) ... 199s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 199s Preparing to unpack .../librtmp1_2.4+20151223.gitfa8646d.1-2build6_ppc64el.deb ... 199s Unpacking librtmp1:ppc64el (2.4+20151223.gitfa8646d.1-2build6) over (2.4+20151223.gitfa8646d.1-2build4) ... 199s Preparing to unpack .../liblzma5_5.6.0-0.2_ppc64el.deb ... 199s Unpacking liblzma5:ppc64el (5.6.0-0.2) over (5.4.5-0.3) ... 199s Setting up liblzma5:ppc64el (5.6.0-0.2) ... 199s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 199s Preparing to unpack .../libblkid1_2.39.3-9ubuntu2_ppc64el.deb ... 199s Unpacking libblkid1:ppc64el (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 199s Setting up libblkid1:ppc64el (2.39.3-9ubuntu2) ... 199s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 199s Preparing to unpack .../kmod_31+20240202-2ubuntu4_ppc64el.deb ... 199s Unpacking kmod (31+20240202-2ubuntu4) over (30+20230601-2ubuntu1) ... 199s Preparing to unpack .../libkmod2_31+20240202-2ubuntu4_ppc64el.deb ... 199s Unpacking libkmod2:ppc64el (31+20240202-2ubuntu4) over (30+20230601-2ubuntu1) ... 199s Preparing to unpack .../libselinux1_3.5-2ubuntu1_ppc64el.deb ... 199s Unpacking libselinux1:ppc64el (3.5-2ubuntu1) over (3.5-2build1) ... 199s Setting up libselinux1:ppc64el (3.5-2ubuntu1) ... 199s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 199s Preparing to unpack .../libaudit-common_1%3a3.1.2-2.1_all.deb ... 199s Unpacking libaudit-common (1:3.1.2-2.1) over (1:3.1.2-2) ... 199s Setting up libaudit-common (1:3.1.2-2.1) ... 199s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 199s Preparing to unpack .../libcap-ng0_0.8.4-2build1_ppc64el.deb ... 199s Unpacking libcap-ng0:ppc64el (0.8.4-2build1) over (0.8.4-2) ... 199s Setting up libcap-ng0:ppc64el (0.8.4-2build1) ... 199s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 199s Preparing to unpack .../libaudit1_1%3a3.1.2-2.1_ppc64el.deb ... 199s Unpacking libaudit1:ppc64el (1:3.1.2-2.1) over (1:3.1.2-2) ... 199s Setting up libaudit1:ppc64el (1:3.1.2-2.1) ... 199s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 199s Preparing to unpack .../libpam0g_1.5.3-5ubuntu3_ppc64el.deb ... 199s Unpacking libpam0g:ppc64el (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 199s Setting up libpam0g:ppc64el (1.5.3-5ubuntu3) ... 200s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 200s Preparing to unpack .../libpam-modules-bin_1.5.3-5ubuntu3_ppc64el.deb ... 200s Unpacking libpam-modules-bin (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 200s Setting up libpam-modules-bin (1.5.3-5ubuntu3) ... 200s pam_namespace.service is a disabled or a static unit not running, not starting it. 200s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 200s Preparing to unpack .../libpam-modules_1.5.3-5ubuntu3_ppc64el.deb ... 200s Unpacking libpam-modules:ppc64el (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 200s Setting up libpam-modules:ppc64el (1.5.3-5ubuntu3) ... 200s Installing new version of config file /etc/security/namespace.init ... 200s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 200s Preparing to unpack .../libpam-runtime_1.5.3-5ubuntu3_all.deb ... 200s Unpacking libpam-runtime (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 200s Setting up libpam-runtime (1.5.3-5ubuntu3) ... 201s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 201s Preparing to unpack .../00-dbus-session-bus-common_1.14.10-4ubuntu2_all.deb ... 201s Unpacking dbus-session-bus-common (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 201s Preparing to unpack .../01-dbus-user-session_1.14.10-4ubuntu2_ppc64el.deb ... 201s Unpacking dbus-user-session (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 201s Preparing to unpack .../02-libapparmor1_4.0.0-beta3-0ubuntu2_ppc64el.deb ... 201s Unpacking libapparmor1:ppc64el (4.0.0-beta3-0ubuntu2) over (4.0.0~alpha4-0ubuntu1) ... 201s Preparing to unpack .../03-libexpat1_2.6.1-2_ppc64el.deb ... 201s Unpacking libexpat1:ppc64el (2.6.1-2) over (2.6.0-1) ... 201s Preparing to unpack .../04-dbus-system-bus-common_1.14.10-4ubuntu2_all.deb ... 201s Unpacking dbus-system-bus-common (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 201s Preparing to unpack .../05-dbus-bin_1.14.10-4ubuntu2_ppc64el.deb ... 201s Unpacking dbus-bin (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 201s Preparing to unpack .../06-dbus_1.14.10-4ubuntu2_ppc64el.deb ... 201s Unpacking dbus (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 201s Preparing to unpack .../07-dbus-daemon_1.14.10-4ubuntu2_ppc64el.deb ... 201s Unpacking dbus-daemon (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 201s Preparing to unpack .../08-libdbus-1-3_1.14.10-4ubuntu2_ppc64el.deb ... 201s Unpacking libdbus-1-3:ppc64el (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 201s Preparing to unpack .../09-libdevmapper1.02.1_2%3a1.02.185-3ubuntu2_ppc64el.deb ... 201s Unpacking libdevmapper1.02.1:ppc64el (2:1.02.185-3ubuntu2) over (2:1.02.185-3ubuntu1) ... 201s Preparing to unpack .../10-libuuid1_2.39.3-9ubuntu2_ppc64el.deb ... 201s Unpacking libuuid1:ppc64el (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 201s Setting up libuuid1:ppc64el (2.39.3-9ubuntu2) ... 201s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 201s Preparing to unpack .../libcryptsetup12_2%3a2.7.0-1ubuntu2_ppc64el.deb ... 201s Unpacking libcryptsetup12:ppc64el (2:2.7.0-1ubuntu2) over (2:2.7.0-1ubuntu1) ... 201s Preparing to unpack .../libfdisk1_2.39.3-9ubuntu2_ppc64el.deb ... 201s Unpacking libfdisk1:ppc64el (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 201s Preparing to unpack .../libseccomp2_2.5.5-1ubuntu2_ppc64el.deb ... 201s Unpacking libseccomp2:ppc64el (2.5.5-1ubuntu2) over (2.5.5-1ubuntu1) ... 201s Setting up libseccomp2:ppc64el (2.5.5-1ubuntu2) ... 201s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 201s Preparing to unpack .../mount_2.39.3-9ubuntu2_ppc64el.deb ... 201s Unpacking mount (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 201s Preparing to unpack .../libmount1_2.39.3-9ubuntu2_ppc64el.deb ... 201s Unpacking libmount1:ppc64el (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 201s Setting up libmount1:ppc64el (2.39.3-9ubuntu2) ... 201s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 201s Preparing to unpack .../zlib1g_1%3a1.3.dfsg-3.1ubuntu1_ppc64el.deb ... 201s Unpacking zlib1g:ppc64el (1:1.3.dfsg-3.1ubuntu1) over (1:1.3.dfsg-3ubuntu1) ... 201s Setting up zlib1g:ppc64el (1:1.3.dfsg-3.1ubuntu1) ... 201s Setting up libpython3.12-minimal:ppc64el (3.12.2-4build3) ... 201s Setting up libexpat1:ppc64el (2.6.1-2) ... 201s Setting up python3.12-minimal (3.12.2-4build3) ... 202s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 202s Preparing to unpack .../python3-minimal_3.12.2-0ubuntu1_ppc64el.deb ... 202s Unpacking python3-minimal (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ... 202s Setting up python3-minimal (3.12.2-0ubuntu1) ... 203s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 203s Preparing to unpack .../python3_3.12.2-0ubuntu1_ppc64el.deb ... 203s Unpacking python3 (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ... 203s Preparing to unpack .../libplymouth5_24.004.60-1ubuntu6_ppc64el.deb ... 203s Unpacking libplymouth5:ppc64el (24.004.60-1ubuntu6) over (24.004.60-1ubuntu3) ... 203s dpkg: libpng16-16:ppc64el: dependency problems, but removing anyway as you requested: 203s libfreetype6:ppc64el depends on libpng16-16 (>= 1.6.2-1). 203s 203s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70200 files and directories currently installed.) 203s Removing libpng16-16:ppc64el (1.6.43-1) ... 203s Selecting previously unselected package libpng16-16t64:ppc64el. 203s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70190 files and directories currently installed.) 203s Preparing to unpack .../0-libpng16-16t64_1.6.43-3_ppc64el.deb ... 203s Unpacking libpng16-16t64:ppc64el (1.6.43-3) ... 203s Preparing to unpack .../1-libbrotli1_1.1.0-2build1_ppc64el.deb ... 203s Unpacking libbrotli1:ppc64el (1.1.0-2build1) over (1.1.0-2) ... 203s Preparing to unpack .../2-libfreetype6_2.13.2+dfsg-1build2_ppc64el.deb ... 203s Unpacking libfreetype6:ppc64el (2.13.2+dfsg-1build2) over (2.13.2+dfsg-1) ... 203s Preparing to unpack .../3-libsqlite3-0_3.45.1-1ubuntu1_ppc64el.deb ... 203s Unpacking libsqlite3-0:ppc64el (3.45.1-1ubuntu1) over (3.45.1-1) ... 203s Preparing to unpack .../4-pinentry-curses_1.2.1-3ubuntu4_ppc64el.deb ... 203s Unpacking pinentry-curses (1.2.1-3ubuntu4) over (1.2.1-3ubuntu1) ... 203s Preparing to unpack .../5-gcc-14-base_14-20240315-1ubuntu1_ppc64el.deb ... 203s Unpacking gcc-14-base:ppc64el (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ... 203s Setting up gcc-14-base:ppc64el (14-20240315-1ubuntu1) ... 203s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70201 files and directories currently installed.) 203s Preparing to unpack .../libgcc-s1_14-20240315-1ubuntu1_ppc64el.deb ... 203s Unpacking libgcc-s1:ppc64el (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ... 203s Setting up libgcc-s1:ppc64el (14-20240315-1ubuntu1) ... 203s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70201 files and directories currently installed.) 203s Preparing to unpack .../libstdc++6_14-20240315-1ubuntu1_ppc64el.deb ... 203s Unpacking libstdc++6:ppc64el (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ... 203s Setting up libstdc++6:ppc64el (14-20240315-1ubuntu1) ... 203s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70201 files and directories currently installed.) 203s Preparing to unpack .../python-apt-common_2.7.7_all.deb ... 203s Unpacking python-apt-common (2.7.7) over (2.7.6) ... 203s Preparing to unpack .../libsmartcols1_2.39.3-9ubuntu2_ppc64el.deb ... 203s Unpacking libsmartcols1:ppc64el (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 203s Setting up libsmartcols1:ppc64el (2.39.3-9ubuntu2) ... 203s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70201 files and directories currently installed.) 203s Preparing to unpack .../00-readline-common_8.2-4_all.deb ... 203s Unpacking readline-common (8.2-4) over (8.2-3) ... 203s Preparing to unpack .../01-bsdextrautils_2.39.3-9ubuntu2_ppc64el.deb ... 203s Unpacking bsdextrautils (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 203s Preparing to unpack .../02-groff-base_1.23.0-3build1_ppc64el.deb ... 203s Unpacking groff-base (1.23.0-3build1) over (1.23.0-3) ... 203s Preparing to unpack .../03-libpython3-stdlib_3.12.2-0ubuntu1_ppc64el.deb ... 203s Unpacking libpython3-stdlib:ppc64el (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ... 203s Preparing to unpack .../04-libfido2-1_1.14.0-1build1_ppc64el.deb ... 203s Unpacking libfido2-1:ppc64el (1.14.0-1build1) over (1.14.0-1) ... 203s Preparing to unpack .../05-libgssapi-krb5-2_1.20.1-6ubuntu1_ppc64el.deb ... 203s Unpacking libgssapi-krb5-2:ppc64el (1.20.1-6ubuntu1) over (1.20.1-5build1) ... 203s Preparing to unpack .../06-libkrb5-3_1.20.1-6ubuntu1_ppc64el.deb ... 203s Unpacking libkrb5-3:ppc64el (1.20.1-6ubuntu1) over (1.20.1-5build1) ... 203s Preparing to unpack .../07-libkrb5support0_1.20.1-6ubuntu1_ppc64el.deb ... 203s Unpacking libkrb5support0:ppc64el (1.20.1-6ubuntu1) over (1.20.1-5build1) ... 203s Preparing to unpack .../08-libk5crypto3_1.20.1-6ubuntu1_ppc64el.deb ... 203s Unpacking libk5crypto3:ppc64el (1.20.1-6ubuntu1) over (1.20.1-5build1) ... 203s Preparing to unpack .../09-libcom-err2_1.47.0-2.4~exp1ubuntu2_ppc64el.deb ... 203s Unpacking libcom-err2:ppc64el (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 203s Preparing to unpack .../10-libproc2-0_2%3a4.0.4-4ubuntu2_ppc64el.deb ... 203s Unpacking libproc2-0:ppc64el (2:4.0.4-4ubuntu2) over (2:4.0.4-4ubuntu1) ... 203s Preparing to unpack .../11-procps_2%3a4.0.4-4ubuntu2_ppc64el.deb ... 203s Unpacking procps (2:4.0.4-4ubuntu2) over (2:4.0.4-4ubuntu1) ... 204s Preparing to unpack .../12-libnghttp2-14_1.59.0-1build1_ppc64el.deb ... 204s Unpacking libnghttp2-14:ppc64el (1.59.0-1build1) over (1.59.0-1) ... 204s Preparing to unpack .../13-dpkg_1.22.6ubuntu5_ppc64el.deb ... 204s Unpacking dpkg (1.22.6ubuntu5) over (1.22.4ubuntu5) ... 204s Setting up dpkg (1.22.6ubuntu5) ... 204s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 204s Preparing to unpack .../util-linux_2.39.3-9ubuntu2_ppc64el.deb ... 204s Unpacking util-linux (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 204s Setting up util-linux (2.39.3-9ubuntu2) ... 205s fstrim.service is a disabled or a static unit not running, not starting it. 205s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 205s Preparing to unpack .../libxml2_2.9.14+dfsg-1.3ubuntu2_ppc64el.deb ... 205s Unpacking libxml2:ppc64el (2.9.14+dfsg-1.3ubuntu2) over (2.9.14+dfsg-1.3ubuntu1) ... 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 206s Removing libatm1:ppc64el (1:2.5.1-5) ... 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70197 files and directories currently installed.) 206s Preparing to unpack .../libbpf1_1%3a1.3.0-2build1_ppc64el.deb ... 206s Unpacking libbpf1:ppc64el (1:1.3.0-2build1) over (1:1.3.0-2) ... 206s Preparing to unpack .../iproute2_6.1.0-1ubuntu5_ppc64el.deb ... 206s Unpacking iproute2 (6.1.0-1ubuntu5) over (6.1.0-1ubuntu2) ... 206s dpkg: libelf1:ppc64el: dependency problems, but removing anyway as you requested: 206s linux-headers-6.8.0-11-generic depends on libelf1 (>= 0.144). 206s 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70197 files and directories currently installed.) 206s Removing libelf1:ppc64el (0.190-1) ... 206s Selecting previously unselected package libelf1t64:ppc64el. 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70192 files and directories currently installed.) 206s Preparing to unpack .../libelf1t64_0.190-1.1build2_ppc64el.deb ... 206s Unpacking libelf1t64:ppc64el (0.190-1.1build2) ... 206s Preparing to unpack .../dhcpcd-base_1%3a10.0.6-1ubuntu2_ppc64el.deb ... 206s Unpacking dhcpcd-base (1:10.0.6-1ubuntu2) over (1:10.0.6-1ubuntu1) ... 206s Preparing to unpack .../file_1%3a5.45-3_ppc64el.deb ... 206s Unpacking file (1:5.45-3) over (1:5.45-2) ... 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70197 files and directories currently installed.) 206s Removing libmagic1:ppc64el (1:5.45-2) ... 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70187 files and directories currently installed.) 206s Preparing to unpack .../libmagic-mgc_1%3a5.45-3_ppc64el.deb ... 206s Unpacking libmagic-mgc (1:5.45-3) over (1:5.45-2) ... 206s Selecting previously unselected package libmagic1t64:ppc64el. 206s Preparing to unpack .../libmagic1t64_1%3a5.45-3_ppc64el.deb ... 206s Unpacking libmagic1t64:ppc64el (1:5.45-3) ... 206s Preparing to unpack .../libtirpc-common_1.3.4+ds-1.1_all.deb ... 206s Unpacking libtirpc-common (1.3.4+ds-1.1) over (1.3.4+ds-1build1) ... 206s Preparing to unpack .../lsof_4.95.0-1build2_ppc64el.deb ... 206s Unpacking lsof (4.95.0-1build2) over (4.95.0-1build1) ... 206s Preparing to unpack .../libnsl2_1.3.0-3build2_ppc64el.deb ... 206s Unpacking libnsl2:ppc64el (1.3.0-3build2) over (1.3.0-3) ... 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70198 files and directories currently installed.) 206s Removing libtirpc3:ppc64el (1.3.4+ds-1build1) ... 206s Selecting previously unselected package libtirpc3t64:ppc64el. 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70192 files and directories currently installed.) 206s Preparing to unpack .../libtirpc3t64_1.3.4+ds-1.1_ppc64el.deb ... 206s Adding 'diversion of /lib/powerpc64le-linux-gnu/libtirpc.so.3 to /lib/powerpc64le-linux-gnu/libtirpc.so.3.usr-is-merged by libtirpc3t64' 206s Adding 'diversion of /lib/powerpc64le-linux-gnu/libtirpc.so.3.0.0 to /lib/powerpc64le-linux-gnu/libtirpc.so.3.0.0.usr-is-merged by libtirpc3t64' 206s Unpacking libtirpc3t64:ppc64el (1.3.4+ds-1.1) ... 206s Preparing to unpack .../multipath-tools_0.9.4-5ubuntu6_ppc64el.deb ... 206s Unpacking multipath-tools (0.9.4-5ubuntu6) over (0.9.4-5ubuntu3) ... 206s dpkg: liburcu8:ppc64el: dependency problems, but removing anyway as you requested: 206s xfsprogs depends on liburcu8 (>= 0.13.0). 206s 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70202 files and directories currently installed.) 206s Removing liburcu8:ppc64el (0.14.0-3) ... 206s Selecting previously unselected package liburcu8t64:ppc64el. 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70183 files and directories currently installed.) 206s Preparing to unpack .../liburcu8t64_0.14.0-3.1_ppc64el.deb ... 206s Unpacking liburcu8t64:ppc64el (0.14.0-3.1) ... 206s Preparing to unpack .../bind9-host_1%3a9.18.24-0ubuntu3_ppc64el.deb ... 206s Unpacking bind9-host (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ... 206s Preparing to unpack .../bind9-dnsutils_1%3a9.18.24-0ubuntu3_ppc64el.deb ... 206s Unpacking bind9-dnsutils (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ... 206s Preparing to unpack .../bind9-libs_1%3a9.18.24-0ubuntu3_ppc64el.deb ... 206s Unpacking bind9-libs:ppc64el (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ... 206s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70203 files and directories currently installed.) 206s Removing libuv1:ppc64el (1.48.0-1) ... 206s Selecting previously unselected package libuv1t64:ppc64el. 207s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70198 files and directories currently installed.) 207s Preparing to unpack .../libuv1t64_1.48.0-1.1_ppc64el.deb ... 207s Unpacking libuv1t64:ppc64el (1.48.0-1.1) ... 207s Preparing to unpack .../liblocale-gettext-perl_1.07-6ubuntu4_ppc64el.deb ... 207s Unpacking liblocale-gettext-perl (1.07-6ubuntu4) over (1.07-6build1) ... 207s Preparing to unpack .../uuid-runtime_2.39.3-9ubuntu2_ppc64el.deb ... 207s Unpacking uuid-runtime (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 207s Preparing to unpack .../libdebconfclient0_0.271ubuntu2_ppc64el.deb ... 207s Unpacking libdebconfclient0:ppc64el (0.271ubuntu2) over (0.271ubuntu1) ... 207s Setting up libdebconfclient0:ppc64el (0.271ubuntu2) ... 207s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70204 files and directories currently installed.) 207s Preparing to unpack .../libsemanage-common_3.5-1build4_all.deb ... 207s Unpacking libsemanage-common (3.5-1build4) over (3.5-1build2) ... 207s Setting up libsemanage-common (3.5-1build4) ... 207s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70204 files and directories currently installed.) 207s Preparing to unpack .../libsemanage2_3.5-1build4_ppc64el.deb ... 207s Unpacking libsemanage2:ppc64el (3.5-1build4) over (3.5-1build2) ... 207s Setting up libsemanage2:ppc64el (3.5-1build4) ... 207s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70204 files and directories currently installed.) 207s Preparing to unpack .../install-info_7.1-3build1_ppc64el.deb ... 207s Unpacking install-info (7.1-3build1) over (7.1-3) ... 207s Setting up install-info (7.1-3build1) ... 207s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 70204 files and directories currently installed.) 207s Preparing to unpack .../000-gcc-13-base_13.2.0-21ubuntu1_ppc64el.deb ... 207s Unpacking gcc-13-base:ppc64el (13.2.0-21ubuntu1) over (13.2.0-17ubuntu2) ... 207s Preparing to unpack .../001-libss2_1.47.0-2.4~exp1ubuntu2_ppc64el.deb ... 207s Unpacking libss2:ppc64el (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 207s Preparing to unpack .../002-dmsetup_2%3a1.02.185-3ubuntu2_ppc64el.deb ... 207s Unpacking dmsetup (2:1.02.185-3ubuntu2) over (2:1.02.185-3ubuntu1) ... 207s Preparing to unpack .../003-eject_2.39.3-9ubuntu2_ppc64el.deb ... 207s Unpacking eject (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 207s Preparing to unpack .../004-krb5-locales_1.20.1-6ubuntu1_all.deb ... 207s Unpacking krb5-locales (1.20.1-6ubuntu1) over (1.20.1-5build1) ... 207s Preparing to unpack .../005-libglib2.0-data_2.79.3-3ubuntu5_all.deb ... 207s Unpacking libglib2.0-data (2.79.3-3ubuntu5) over (2.79.2-1~ubuntu1) ... 207s Preparing to unpack .../006-libslang2_2.3.3-3build1_ppc64el.deb ... 207s Unpacking libslang2:ppc64el (2.3.3-3build1) over (2.3.3-3) ... 207s Preparing to unpack .../007-libtext-charwidth-perl_0.04-11build2_ppc64el.deb ... 207s Unpacking libtext-charwidth-perl:ppc64el (0.04-11build2) over (0.04-11build1) ... 207s Preparing to unpack .../008-libtext-iconv-perl_1.7-8build2_ppc64el.deb ... 207s Unpacking libtext-iconv-perl:ppc64el (1.7-8build2) over (1.7-8build1) ... 207s Preparing to unpack .../009-python3-yaml_6.0.1-2build1_ppc64el.deb ... 207s Unpacking python3-yaml (6.0.1-2build1) over (6.0.1-2) ... 207s Preparing to unpack .../010-python3-setuptools_68.1.2-2ubuntu1_all.deb ... 207s Unpacking python3-setuptools (68.1.2-2ubuntu1) over (68.1.2-2) ... 207s Preparing to unpack .../011-python3-pkg-resources_68.1.2-2ubuntu1_all.deb ... 207s Unpacking python3-pkg-resources (68.1.2-2ubuntu1) over (68.1.2-2) ... 207s Preparing to unpack .../012-rsyslog_8.2312.0-3ubuntu7_ppc64el.deb ... 207s Unpacking rsyslog (8.2312.0-3ubuntu7) over (8.2312.0-3ubuntu3) ... 208s Preparing to unpack .../013-vim-tiny_2%3a9.1.0016-1ubuntu6_ppc64el.deb ... 208s Unpacking vim-tiny (2:9.1.0016-1ubuntu6) over (2:9.1.0016-1ubuntu2) ... 208s Preparing to unpack .../014-vim-common_2%3a9.1.0016-1ubuntu6_all.deb ... 208s Unpacking vim-common (2:9.1.0016-1ubuntu6) over (2:9.1.0016-1ubuntu2) ... 208s Selecting previously unselected package xdg-user-dirs. 208s Preparing to unpack .../015-xdg-user-dirs_0.18-1_ppc64el.deb ... 208s Unpacking xdg-user-dirs (0.18-1) ... 208s Preparing to unpack .../016-xxd_2%3a9.1.0016-1ubuntu6_ppc64el.deb ... 208s Unpacking xxd (2:9.1.0016-1ubuntu6) over (2:9.1.0016-1ubuntu2) ... 208s Preparing to unpack .../017-apparmor_4.0.0-beta3-0ubuntu2_ppc64el.deb ... 208s Unpacking apparmor (4.0.0-beta3-0ubuntu2) over (4.0.0~alpha4-0ubuntu1) ... 208s Preparing to unpack .../018-ftp_20230507-2build1_all.deb ... 208s Unpacking ftp (20230507-2build1) over (20230507-2) ... 208s Preparing to unpack .../019-inetutils-telnet_2%3a2.5-3ubuntu3_ppc64el.deb ... 208s Unpacking inetutils-telnet (2:2.5-3ubuntu3) over (2:2.5-3ubuntu1) ... 208s Preparing to unpack .../020-info_7.1-3build1_ppc64el.deb ... 208s Unpacking info (7.1-3build1) over (7.1-3) ... 208s Preparing to unpack .../021-libusb-1.0-0_2%3a1.0.27-1_ppc64el.deb ... 208s Unpacking libusb-1.0-0:ppc64el (2:1.0.27-1) over (2:1.0.26-1) ... 208s Preparing to unpack .../022-libxmuu1_2%3a1.1.3-3build1_ppc64el.deb ... 208s Unpacking libxmuu1:ppc64el (2:1.1.3-3build1) over (2:1.1.3-3) ... 208s Preparing to unpack .../023-lshw_02.19.git.2021.06.19.996aaad9c7-2build2_ppc64el.deb ... 208s Unpacking lshw (02.19.git.2021.06.19.996aaad9c7-2build2) over (02.19.git.2021.06.19.996aaad9c7-2build1) ... 208s Selecting previously unselected package manpages. 208s Preparing to unpack .../024-manpages_6.05.01-1_all.deb ... 208s Unpacking manpages (6.05.01-1) ... 209s Preparing to unpack .../025-mtr-tiny_0.95-1.1build1_ppc64el.deb ... 209s Unpacking mtr-tiny (0.95-1.1build1) over (0.95-1.1) ... 209s Preparing to unpack .../026-plymouth-theme-ubuntu-text_24.004.60-1ubuntu6_ppc64el.deb ... 209s Unpacking plymouth-theme-ubuntu-text (24.004.60-1ubuntu6) over (24.004.60-1ubuntu3) ... 209s Preparing to unpack .../027-plymouth_24.004.60-1ubuntu6_ppc64el.deb ... 209s Unpacking plymouth (24.004.60-1ubuntu6) over (24.004.60-1ubuntu3) ... 209s Preparing to unpack .../028-telnet_0.17+2.5-3ubuntu3_all.deb ... 209s Unpacking telnet (0.17+2.5-3ubuntu3) over (0.17+2.5-3ubuntu1) ... 209s Preparing to unpack .../029-usb.ids_2024.03.18-1_all.deb ... 209s Unpacking usb.ids (2024.03.18-1) over (2024.01.30-1) ... 209s Preparing to unpack .../030-xz-utils_5.6.0-0.2_ppc64el.deb ... 209s Unpacking xz-utils (5.6.0-0.2) over (5.4.5-0.3) ... 209s Preparing to unpack .../031-libctf0_2.42-4ubuntu1_ppc64el.deb ... 209s Unpacking libctf0:ppc64el (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 209s Preparing to unpack .../032-libctf-nobfd0_2.42-4ubuntu1_ppc64el.deb ... 209s Unpacking libctf-nobfd0:ppc64el (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 209s Preparing to unpack .../033-binutils-powerpc64le-linux-gnu_2.42-4ubuntu1_ppc64el.deb ... 209s Unpacking binutils-powerpc64le-linux-gnu (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 209s Preparing to unpack .../034-libbinutils_2.42-4ubuntu1_ppc64el.deb ... 209s Unpacking libbinutils:ppc64el (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 209s Preparing to unpack .../035-binutils_2.42-4ubuntu1_ppc64el.deb ... 209s Unpacking binutils (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 209s Preparing to unpack .../036-binutils-common_2.42-4ubuntu1_ppc64el.deb ... 209s Unpacking binutils-common:ppc64el (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 209s Preparing to unpack .../037-libsframe1_2.42-4ubuntu1_ppc64el.deb ... 209s Unpacking libsframe1:ppc64el (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 209s Selecting previously unselected package libllvm18:ppc64el. 209s Preparing to unpack .../038-libllvm18_1%3a18.1.2-1ubuntu2_ppc64el.deb ... 209s Unpacking libllvm18:ppc64el (1:18.1.2-1ubuntu2) ... 210s Selecting previously unselected package libclang-cpp18. 210s Preparing to unpack .../039-libclang-cpp18_1%3a18.1.2-1ubuntu2_ppc64el.deb ... 210s Unpacking libclang-cpp18 (1:18.1.2-1ubuntu2) ... 211s Selecting previously unselected package libbpfcc:ppc64el. 211s Preparing to unpack .../040-libbpfcc_0.29.1+ds-1ubuntu4_ppc64el.deb ... 211s Unpacking libbpfcc:ppc64el (0.29.1+ds-1ubuntu4) ... 211s Selecting previously unselected package python3-bpfcc. 211s Preparing to unpack .../041-python3-bpfcc_0.29.1+ds-1ubuntu4_all.deb ... 211s Unpacking python3-bpfcc (0.29.1+ds-1ubuntu4) ... 211s Selecting previously unselected package ieee-data. 211s Preparing to unpack .../042-ieee-data_20220827.1_all.deb ... 211s Unpacking ieee-data (20220827.1) ... 211s Selecting previously unselected package python3-netaddr. 211s Preparing to unpack .../043-python3-netaddr_0.8.0-2ubuntu1_all.deb ... 211s Unpacking python3-netaddr (0.8.0-2ubuntu1) ... 211s Selecting previously unselected package bpfcc-tools. 211s Preparing to unpack .../044-bpfcc-tools_0.29.1+ds-1ubuntu4_all.deb ... 211s Unpacking bpfcc-tools (0.29.1+ds-1ubuntu4) ... 211s Selecting previously unselected package libclang1-18. 211s Preparing to unpack .../045-libclang1-18_1%3a18.1.2-1ubuntu2_ppc64el.deb ... 211s Unpacking libclang1-18 (1:18.1.2-1ubuntu2) ... 211s Selecting previously unselected package libdw1t64:ppc64el. 211s Preparing to unpack .../046-libdw1t64_0.190-1.1build2_ppc64el.deb ... 211s Unpacking libdw1t64:ppc64el (0.190-1.1build2) ... 211s Selecting previously unselected package bpftrace. 211s Preparing to unpack .../047-bpftrace_0.20.2-1ubuntu1_ppc64el.deb ... 211s Unpacking bpftrace (0.20.2-1ubuntu1) ... 211s Preparing to unpack .../048-cryptsetup-bin_2%3a2.7.0-1ubuntu2_ppc64el.deb ... 211s Unpacking cryptsetup-bin (2:2.7.0-1ubuntu2) over (2:2.7.0-1ubuntu1) ... 212s Preparing to unpack .../049-dpkg-dev_1.22.6ubuntu5_all.deb ... 212s Unpacking dpkg-dev (1.22.6ubuntu5) over (1.22.4ubuntu5) ... 212s Preparing to unpack .../050-libdpkg-perl_1.22.6ubuntu5_all.deb ... 212s Unpacking libdpkg-perl (1.22.6ubuntu5) over (1.22.4ubuntu5) ... 212s Selecting previously unselected package fonts-dejavu-mono. 212s Preparing to unpack .../051-fonts-dejavu-mono_2.37-8_all.deb ... 212s Unpacking fonts-dejavu-mono (2.37-8) ... 212s Selecting previously unselected package fonts-dejavu-core. 212s Preparing to unpack .../052-fonts-dejavu-core_2.37-8_all.deb ... 212s Unpacking fonts-dejavu-core (2.37-8) ... 212s Selecting previously unselected package fontconfig-config. 212s Preparing to unpack .../053-fontconfig-config_2.15.0-1.1ubuntu1_ppc64el.deb ... 212s Unpacking fontconfig-config (2.15.0-1.1ubuntu1) ... 212s Preparing to unpack .../054-libprotobuf-c1_1.4.1-1ubuntu3_ppc64el.deb ... 212s Unpacking libprotobuf-c1:ppc64el (1.4.1-1ubuntu3) over (1.4.1-1ubuntu2) ... 212s Preparing to unpack .../055-gnupg-l10n_2.4.4-2ubuntu15_all.deb ... 212s Unpacking gnupg-l10n (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 212s Preparing to unpack .../056-libibverbs1_50.0-2build1_ppc64el.deb ... 212s Unpacking libibverbs1:ppc64el (50.0-2build1) over (50.0-2) ... 212s Preparing to unpack .../057-ibverbs-providers_50.0-2build1_ppc64el.deb ... 212s Unpacking ibverbs-providers:ppc64el (50.0-2build1) over (50.0-2) ... 212s Preparing to unpack .../058-jq_1.7.1-3_ppc64el.deb ... 212s Unpacking jq (1.7.1-3) over (1.7.1-2) ... 212s Preparing to unpack .../059-libjq1_1.7.1-3_ppc64el.deb ... 212s Unpacking libjq1:ppc64el (1.7.1-3) over (1.7.1-2) ... 212s Selecting previously unselected package libaio1t64:ppc64el. 212s Preparing to unpack .../060-libaio1t64_0.3.113-6_ppc64el.deb ... 212s Unpacking libaio1t64:ppc64el (0.3.113-6) ... 212s Selecting previously unselected package libatm1t64:ppc64el. 212s Preparing to unpack .../061-libatm1t64_1%3a2.5.1-5.1_ppc64el.deb ... 212s Unpacking libatm1t64:ppc64el (1:2.5.1-5.1) ... 212s Selecting previously unselected package libc-dev-bin. 212s Preparing to unpack .../062-libc-dev-bin_2.39-0ubuntu6_ppc64el.deb ... 212s Unpacking libc-dev-bin (2.39-0ubuntu6) ... 212s Selecting previously unselected package libfontconfig1:ppc64el. 212s Preparing to unpack .../063-libfontconfig1_2.15.0-1.1ubuntu1_ppc64el.deb ... 212s Unpacking libfontconfig1:ppc64el (2.15.0-1.1ubuntu1) ... 212s Selecting previously unselected package libjpeg-turbo8:ppc64el. 212s Preparing to unpack .../064-libjpeg-turbo8_2.1.5-2ubuntu1_ppc64el.deb ... 212s Unpacking libjpeg-turbo8:ppc64el (2.1.5-2ubuntu1) ... 212s Selecting previously unselected package libjpeg8:ppc64el. 212s Preparing to unpack .../065-libjpeg8_8c-2ubuntu11_ppc64el.deb ... 212s Unpacking libjpeg8:ppc64el (8c-2ubuntu11) ... 212s Selecting previously unselected package libdeflate0:ppc64el. 212s Preparing to unpack .../066-libdeflate0_1.19-1_ppc64el.deb ... 212s Unpacking libdeflate0:ppc64el (1.19-1) ... 212s Selecting previously unselected package libjbig0:ppc64el. 212s Preparing to unpack .../067-libjbig0_2.1-6.1ubuntu1_ppc64el.deb ... 212s Unpacking libjbig0:ppc64el (2.1-6.1ubuntu1) ... 212s Selecting previously unselected package liblerc4:ppc64el. 212s Preparing to unpack .../068-liblerc4_4.0.0+ds-4ubuntu1_ppc64el.deb ... 212s Unpacking liblerc4:ppc64el (4.0.0+ds-4ubuntu1) ... 212s Selecting previously unselected package libsharpyuv0:ppc64el. 212s Preparing to unpack .../069-libsharpyuv0_1.3.2-0.4build2_ppc64el.deb ... 212s Unpacking libsharpyuv0:ppc64el (1.3.2-0.4build2) ... 212s Selecting previously unselected package libwebp7:ppc64el. 212s Preparing to unpack .../070-libwebp7_1.3.2-0.4build2_ppc64el.deb ... 212s Unpacking libwebp7:ppc64el (1.3.2-0.4build2) ... 212s Selecting previously unselected package libtiff6:ppc64el. 212s Preparing to unpack .../071-libtiff6_4.5.1+git230720-4ubuntu1_ppc64el.deb ... 212s Unpacking libtiff6:ppc64el (4.5.1+git230720-4ubuntu1) ... 212s Selecting previously unselected package libxpm4:ppc64el. 212s Preparing to unpack .../072-libxpm4_1%3a3.5.17-1build1_ppc64el.deb ... 212s Unpacking libxpm4:ppc64el (1:3.5.17-1build1) ... 212s Selecting previously unselected package libgd3:ppc64el. 212s Preparing to unpack .../073-libgd3_2.3.3-9ubuntu3_ppc64el.deb ... 212s Unpacking libgd3:ppc64el (2.3.3-9ubuntu3) ... 212s Selecting previously unselected package libc-devtools. 212s Preparing to unpack .../074-libc-devtools_2.39-0ubuntu6_ppc64el.deb ... 212s Unpacking libc-devtools (2.39-0ubuntu6) ... 212s Selecting previously unselected package linux-libc-dev:ppc64el. 212s Preparing to unpack .../075-linux-libc-dev_6.8.0-20.20_ppc64el.deb ... 212s Unpacking linux-libc-dev:ppc64el (6.8.0-20.20) ... 213s Selecting previously unselected package libcrypt-dev:ppc64el. 213s Preparing to unpack .../076-libcrypt-dev_1%3a4.4.36-4_ppc64el.deb ... 213s Unpacking libcrypt-dev:ppc64el (1:4.4.36-4) ... 213s Selecting previously unselected package rpcsvc-proto. 213s Preparing to unpack .../077-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 213s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 213s Selecting previously unselected package libc6-dev:ppc64el. 213s Preparing to unpack .../078-libc6-dev_2.39-0ubuntu6_ppc64el.deb ... 213s Unpacking libc6-dev:ppc64el (2.39-0ubuntu6) ... 213s Preparing to unpack .../079-libevent-core-2.1-7_2.1.12-stable-9build1_ppc64el.deb ... 213s Unpacking libevent-core-2.1-7:ppc64el (2.1.12-stable-9build1) over (2.1.12-stable-9) ... 213s Preparing to unpack .../080-libftdi1-2_1.5-6build4_ppc64el.deb ... 213s Unpacking libftdi1-2:ppc64el (1.5-6build4) over (1.5-6build3) ... 213s Preparing to unpack .../081-libldap-common_2.6.7+dfsg-1~exp1ubuntu6_all.deb ... 213s Unpacking libldap-common (2.6.7+dfsg-1~exp1ubuntu6) over (2.6.7+dfsg-1~exp1ubuntu1) ... 213s Selecting previously unselected package libunwind8:ppc64el. 213s Preparing to unpack .../082-libunwind8_1.6.2-3_ppc64el.deb ... 213s Unpacking libunwind8:ppc64el (1.6.2-3) ... 213s Selecting previously unselected package linux-modules-6.8.0-20-generic. 213s Preparing to unpack .../083-linux-modules-6.8.0-20-generic_6.8.0-20.20_ppc64el.deb ... 213s Unpacking linux-modules-6.8.0-20-generic (6.8.0-20.20) ... 213s Selecting previously unselected package linux-image-6.8.0-20-generic. 213s Preparing to unpack .../084-linux-image-6.8.0-20-generic_6.8.0-20.20_ppc64el.deb ... 213s Unpacking linux-image-6.8.0-20-generic (6.8.0-20.20) ... 214s Selecting previously unselected package linux-modules-extra-6.8.0-20-generic. 214s Preparing to unpack .../085-linux-modules-extra-6.8.0-20-generic_6.8.0-20.20_ppc64el.deb ... 214s Unpacking linux-modules-extra-6.8.0-20-generic (6.8.0-20.20) ... 215s Preparing to unpack .../086-linux-generic_6.8.0-20.20+1_ppc64el.deb ... 215s Unpacking linux-generic (6.8.0-20.20+1) over (6.8.0-11.11+1) ... 215s Preparing to unpack .../087-linux-image-generic_6.8.0-20.20+1_ppc64el.deb ... 215s Unpacking linux-image-generic (6.8.0-20.20+1) over (6.8.0-11.11+1) ... 215s Preparing to unpack .../088-linux-virtual_6.8.0-20.20+1_ppc64el.deb ... 215s Unpacking linux-virtual (6.8.0-20.20+1) over (6.8.0-11.11+1) ... 215s Preparing to unpack .../089-linux-image-virtual_6.8.0-20.20+1_ppc64el.deb ... 215s Unpacking linux-image-virtual (6.8.0-20.20+1) over (6.8.0-11.11+1) ... 215s Preparing to unpack .../090-linux-headers-virtual_6.8.0-20.20+1_ppc64el.deb ... 215s Unpacking linux-headers-virtual (6.8.0-20.20+1) over (6.8.0-11.11+1) ... 215s Selecting previously unselected package linux-headers-6.8.0-20. 215s Preparing to unpack .../091-linux-headers-6.8.0-20_6.8.0-20.20_all.deb ... 215s Unpacking linux-headers-6.8.0-20 (6.8.0-20.20) ... 218s Selecting previously unselected package linux-headers-6.8.0-20-generic. 218s Preparing to unpack .../092-linux-headers-6.8.0-20-generic_6.8.0-20.20_ppc64el.deb ... 219s Unpacking linux-headers-6.8.0-20-generic (6.8.0-20.20) ... 220s Preparing to unpack .../093-linux-headers-generic_6.8.0-20.20+1_ppc64el.deb ... 220s Unpacking linux-headers-generic (6.8.0-20.20+1) over (6.8.0-11.11+1) ... 220s Selecting previously unselected package linux-tools-common. 220s Preparing to unpack .../094-linux-tools-common_6.8.0-20.20_all.deb ... 220s Unpacking linux-tools-common (6.8.0-20.20) ... 220s Selecting previously unselected package linux-tools-6.8.0-20. 220s Preparing to unpack .../095-linux-tools-6.8.0-20_6.8.0-20.20_ppc64el.deb ... 220s Unpacking linux-tools-6.8.0-20 (6.8.0-20.20) ... 220s Selecting previously unselected package linux-tools-6.8.0-20-generic. 220s Preparing to unpack .../096-linux-tools-6.8.0-20-generic_6.8.0-20.20_ppc64el.deb ... 220s Unpacking linux-tools-6.8.0-20-generic (6.8.0-20.20) ... 220s Selecting previously unselected package manpages-dev. 220s Preparing to unpack .../097-manpages-dev_6.05.01-1_all.deb ... 220s Unpacking manpages-dev (6.05.01-1) ... 220s Preparing to unpack .../098-python3-distutils_3.12.2-3ubuntu1.1_all.deb ... 220s Unpacking python3-distutils (3.12.2-3ubuntu1.1) over (3.11.5-1) ... 220s Preparing to unpack .../099-python3-lib2to3_3.12.2-3ubuntu1.1_all.deb ... 220s Unpacking python3-lib2to3 (3.12.2-3ubuntu1.1) over (3.11.5-1) ... 220s Preparing to unpack .../100-python3-pyrsistent_0.20.0-1build1_ppc64el.deb ... 221s Unpacking python3-pyrsistent:ppc64el (0.20.0-1build1) over (0.20.0-1) ... 221s Preparing to unpack .../101-python3-typing-extensions_4.10.0-1_all.deb ... 221s Unpacking python3-typing-extensions (4.10.0-1) over (4.9.0-1) ... 221s Selecting previously unselected package ubuntu-kernel-accessories. 221s Preparing to unpack .../102-ubuntu-kernel-accessories_1.536build1_ppc64el.deb ... 221s Unpacking ubuntu-kernel-accessories (1.536build1) ... 221s Preparing to unpack .../103-kpartx_0.9.4-5ubuntu6_ppc64el.deb ... 221s Unpacking kpartx (0.9.4-5ubuntu6) over (0.9.4-5ubuntu3) ... 221s Setting up pinentry-curses (1.2.1-3ubuntu4) ... 221s Setting up motd-news-config (13ubuntu8) ... 221s Setting up libtext-iconv-perl:ppc64el (1.7-8build2) ... 221s Setting up libtext-charwidth-perl:ppc64el (0.04-11build2) ... 221s Setting up libsharpyuv0:ppc64el (1.3.2-0.4build2) ... 221s Setting up liburcu8t64:ppc64el (0.14.0-3.1) ... 221s Setting up tcpdump (4.99.4-3ubuntu2) ... 221s Setting up libibverbs1:ppc64el (50.0-2build1) ... 221s Setting up systemd-sysv (255.4-1ubuntu5) ... 221s Setting up ubuntu-kernel-accessories (1.536build1) ... 221s Setting up libapparmor1:ppc64el (4.0.0-beta3-0ubuntu2) ... 221s Setting up libatm1t64:ppc64el (1:2.5.1-5.1) ... 221s Setting up liblerc4:ppc64el (4.0.0+ds-4ubuntu1) ... 221s Setting up libgdbm6t64:ppc64el (1.23-5.1) ... 221s Setting up bsdextrautils (2.39.3-9ubuntu2) ... 221s Setting up libxpm4:ppc64el (1:3.5.17-1build1) ... 221s Setting up libgdbm-compat4t64:ppc64el (1.23-5.1) ... 221s Setting up xdg-user-dirs (0.18-1) ... 221s Setting up ibverbs-providers:ppc64el (50.0-2build1) ... 221s Setting up linux-headers-6.8.0-20 (6.8.0-20.20) ... 221s Setting up libmagic-mgc (1:5.45-3) ... 221s Setting up gawk (1:5.2.1-2build2) ... 221s Setting up libjq1:ppc64el (1.7.1-3) ... 221s Setting up manpages (6.05.01-1) ... 221s Setting up libtirpc-common (1.3.4+ds-1.1) ... 221s Setting up libbrotli1:ppc64el (1.1.0-2build1) ... 221s Setting up libsqlite3-0:ppc64el (3.45.1-1ubuntu1) ... 221s Setting up libsasl2-modules:ppc64el (2.1.28+dfsg1-5ubuntu1) ... 221s Setting up libuv1t64:ppc64el (1.48.0-1.1) ... 221s Setting up libmagic1t64:ppc64el (1:5.45-3) ... 221s Setting up rsyslog (8.2312.0-3ubuntu7) ... 221s info: The user `syslog' is already a member of `adm'. 222s Setting up binutils-common:ppc64el (2.42-4ubuntu1) ... 222s Setting up libpsl5t64:ppc64el (0.21.2-1.1) ... 222s Setting up libnghttp2-14:ppc64el (1.59.0-1build1) ... 222s Setting up libdeflate0:ppc64el (1.19-1) ... 222s Setting up linux-libc-dev:ppc64el (6.8.0-20.20) ... 222s Setting up bc (1.07.1-3ubuntu2) ... 222s Setting up libctf-nobfd0:ppc64el (2.42-4ubuntu1) ... 222s Setting up libnss-systemd:ppc64el (255.4-1ubuntu5) ... 222s Setting up krb5-locales (1.20.1-6ubuntu1) ... 222s Setting up libcom-err2:ppc64el (1.47.0-2.4~exp1ubuntu2) ... 222s Setting up file (1:5.45-3) ... 222s Setting up lshw (02.19.git.2021.06.19.996aaad9c7-2build2) ... 222s Setting up libldap-common (2.6.7+dfsg-1~exp1ubuntu6) ... 222s Setting up libunwind8:ppc64el (1.6.2-3) ... 222s Setting up libprotobuf-c1:ppc64el (1.4.1-1ubuntu3) ... 222s Setting up libjbig0:ppc64el (2.1-6.1ubuntu1) ... 222s Setting up xxd (2:9.1.0016-1ubuntu6) ... 222s Setting up libsframe1:ppc64el (2.42-4ubuntu1) ... 222s Setting up libelf1t64:ppc64el (0.190-1.1build2) ... 222s Setting up libkrb5support0:ppc64el (1.20.1-6ubuntu1) ... 222s Setting up libdw1t64:ppc64el (0.190-1.1build2) ... 222s Setting up linux-headers-6.8.0-20-generic (6.8.0-20.20) ... 222s Setting up eject (2.39.3-9ubuntu2) ... 222s Setting up apparmor (4.0.0-beta3-0ubuntu2) ... 222s Installing new version of config file /etc/apparmor.d/abstractions/authentication ... 222s Installing new version of config file /etc/apparmor.d/abstractions/crypto ... 222s Installing new version of config file /etc/apparmor.d/abstractions/kde-open5 ... 223s Installing new version of config file /etc/apparmor.d/abstractions/openssl ... 223s Installing new version of config file /etc/apparmor.d/code ... 223s Installing new version of config file /etc/apparmor.d/firefox ... 224s Reloading AppArmor profiles 224s Setting up libglib2.0-0t64:ppc64el (2.79.3-3ubuntu5) ... 224s No schema files found: doing nothing. 224s Setting up libglib2.0-data (2.79.3-3ubuntu5) ... 224s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 224s Setting up vim-common (2:9.1.0016-1ubuntu6) ... 224s Setting up gcc-13-base:ppc64el (13.2.0-21ubuntu1) ... 224s Setting up libqrtr-glib0:ppc64el (1.2.2-1ubuntu3) ... 224s Setting up libslang2:ppc64el (2.3.3-3build1) ... 224s Setting up libnvme1t64 (1.8-3) ... 224s Setting up mtr-tiny (0.95-1.1build1) ... 224s Setting up gnupg-l10n (2.4.4-2ubuntu15) ... 224s Setting up librtmp1:ppc64el (2.4+20151223.gitfa8646d.1-2build6) ... 224s Setting up libdbus-1-3:ppc64el (1.14.10-4ubuntu2) ... 224s Setting up xz-utils (5.6.0-0.2) ... 224s Setting up perl-modules-5.38 (5.38.2-3.2) ... 224s Setting up libproc2-0:ppc64el (2:4.0.4-4ubuntu2) ... 224s Setting up fonts-dejavu-mono (2.37-8) ... 224s Setting up libpng16-16t64:ppc64el (1.6.43-3) ... 224s Setting up systemd-timesyncd (255.4-1ubuntu5) ... 225s Setting up libevent-core-2.1-7:ppc64el (2.1.12-stable-9build1) ... 225s Setting up libss2:ppc64el (1.47.0-2.4~exp1ubuntu2) ... 225s Setting up usb.ids (2024.03.18-1) ... 225s Setting up sudo (1.9.15p5-3ubuntu3) ... 225s Setting up fonts-dejavu-core (2.37-8) ... 225s Setting up dhcpcd-base (1:10.0.6-1ubuntu2) ... 225s Setting up gir1.2-glib-2.0:ppc64el (2.79.3-3ubuntu5) ... 225s Setting up libk5crypto3:ppc64el (1.20.1-6ubuntu1) ... 225s Setting up libjpeg-turbo8:ppc64el (2.1.5-2ubuntu1) ... 225s Setting up logsave (1.47.0-2.4~exp1ubuntu2) ... 225s Setting up libwebp7:ppc64el (1.3.2-0.4build2) ... 225s Setting up libfdisk1:ppc64el (2.39.3-9ubuntu2) ... 225s Setting up libdb5.3t64:ppc64el (5.3.28+dfsg2-6) ... 225s Setting up libdevmapper1.02.1:ppc64el (2:1.02.185-3ubuntu2) ... 225s Setting up libaio1t64:ppc64el (0.3.113-6) ... 225s Setting up python-apt-common (2.7.7) ... 225s Setting up mount (2.39.3-9ubuntu2) ... 225s Setting up dmsetup (2:1.02.185-3ubuntu2) ... 225s Setting up uuid-runtime (2.39.3-9ubuntu2) ... 226s uuidd.service is a disabled or a static unit not running, not starting it. 226s Setting up libmm-glib0:ppc64el (1.23.4-0ubuntu1) ... 226s Setting up groff-base (1.23.0-3build1) ... 226s Setting up libcrypt-dev:ppc64el (1:4.4.36-4) ... 226s Setting up libplymouth5:ppc64el (24.004.60-1ubuntu6) ... 226s Setting up dbus-session-bus-common (1.14.10-4ubuntu2) ... 226s Setting up jq (1.7.1-3) ... 226s Setting up procps (2:4.0.4-4ubuntu2) ... 227s Setting up gpgconf (2.4.4-2ubuntu15) ... 227s Setting up libcryptsetup12:ppc64el (2:2.7.0-1ubuntu2) ... 227s Setting up libgirepository-1.0-1:ppc64el (1.79.1-1ubuntu6) ... 227s Setting up libjson-glib-1.0-common (1.8.0-2build1) ... 227s Setting up libkrb5-3:ppc64el (1.20.1-6ubuntu1) ... 227s Setting up libpython3.11-minimal:ppc64el (3.11.8-1build4) ... 227s Setting up libusb-1.0-0:ppc64el (2:1.0.27-1) ... 227s Setting up libperl5.38t64:ppc64el (5.38.2-3.2) ... 227s Setting up tnftp (20230507-2build1) ... 227s Setting up libbinutils:ppc64el (2.42-4ubuntu1) ... 227s Setting up dbus-system-bus-common (1.14.10-4ubuntu2) ... 227s Setting up libfido2-1:ppc64el (1.14.0-1build1) ... 227s Setting up libc-dev-bin (2.39-0ubuntu6) ... 227s Setting up openssl (3.0.13-0ubuntu2) ... 227s Setting up linux-modules-6.8.0-20-generic (6.8.0-20.20) ... 232s Setting up linux-tools-common (6.8.0-20.20) ... 232s Setting up readline-common (8.2-4) ... 232s Setting up libxml2:ppc64el (2.9.14+dfsg-1.3ubuntu2) ... 232s Setting up libxmuu1:ppc64el (2:1.1.3-3build1) ... 232s Setting up dbus-bin (1.14.10-4ubuntu2) ... 232s Setting up info (7.1-3build1) ... 232s Setting up liblocale-gettext-perl (1.07-6ubuntu4) ... 232s Setting up gpg (2.4.4-2ubuntu15) ... 232s Setting up libgudev-1.0-0:ppc64el (1:238-3ubuntu2) ... 232s Setting up libpolkit-gobject-1-0:ppc64el (124-1ubuntu1) ... 232s Setting up libbpf1:ppc64el (1:1.3.0-2build1) ... 232s Setting up libmbim-glib4:ppc64el (1.31.2-0ubuntu2) ... 232s Setting up rsync (3.2.7-1build1) ... 233s rsync.service is a disabled or a static unit not running, not starting it. 233s Setting up libudisks2-0:ppc64el (2.10.1-6) ... 233s Setting up libkmod2:ppc64el (31+20240202-2ubuntu4) ... 233s Setting up bolt (0.9.6-2build1) ... 233s bolt.service is a disabled or a static unit not running, not starting it. 233s Setting up libllvm18:ppc64el (1:18.1.2-1ubuntu2) ... 233s Setting up gnupg-utils (2.4.4-2ubuntu15) ... 233s Setting up initramfs-tools-bin (0.142ubuntu23) ... 233s Setting up libctf0:ppc64el (2.42-4ubuntu1) ... 233s Setting up libjpeg8:ppc64el (8c-2ubuntu11) ... 233s Setting up cryptsetup-bin (2:2.7.0-1ubuntu2) ... 233s Setting up python3.11-minimal (3.11.8-1build4) ... 235s Setting up libclang1-18 (1:18.1.2-1ubuntu2) ... 235s Setting up manpages-dev (6.05.01-1) ... 235s Setting up linux-modules-extra-6.8.0-20-generic (6.8.0-20.20) ... 237s Setting up apt-utils (2.7.14) ... 237s Setting up gpg-agent (2.4.4-2ubuntu15) ... 237s Setting up libpython3.12-stdlib:ppc64el (3.12.2-4build3) ... 237s Setting up wget (1.21.4-1ubuntu2) ... 237s Setting up fontconfig-config (2.15.0-1.1ubuntu1) ... 238s Setting up libxmlb2:ppc64el (0.3.15-1build1) ... 238s Setting up libpython3.11-stdlib:ppc64el (3.11.8-1build4) ... 238s Setting up python3.12 (3.12.2-4build3) ... 239s Setting up gpgsm (2.4.4-2ubuntu15) ... 239s Setting up inetutils-telnet (2:2.5-3ubuntu3) ... 239s Setting up libreiserfscore0t64 (1:3.6.27-7.1) ... 239s Setting up e2fsprogs (1.47.0-2.4~exp1ubuntu2) ... 239s update-initramfs: deferring update (trigger activated) 240s e2scrub_all.service is a disabled or a static unit not running, not starting it. 240s Setting up linux-tools-6.8.0-20 (6.8.0-20.20) ... 240s Setting up libparted2t64:ppc64el (3.6-3.1build2) ... 240s Setting up linux-headers-generic (6.8.0-20.20+1) ... 240s Setting up dbus-daemon (1.14.10-4ubuntu2) ... 240s Setting up libmbim-proxy (1.31.2-0ubuntu2) ... 240s Setting up vim-tiny (2:9.1.0016-1ubuntu6) ... 240s Setting up kmod (31+20240202-2ubuntu4) ... 241s Setting up libnetplan1:ppc64el (1.0-1) ... 241s Setting up man-db (2.12.0-3build4) ... 241s Updating database of manual pages ... 245s man-db.service is a disabled or a static unit not running, not starting it. 245s Setting up fdisk (2.39.3-9ubuntu2) ... 245s Setting up libjson-glib-1.0-0:ppc64el (1.8.0-2build1) ... 245s Setting up libsasl2-modules-db:ppc64el (2.1.28+dfsg1-5ubuntu1) ... 245s Setting up libftdi1-2:ppc64el (1.5-6build4) ... 245s Setting up perl (5.38.2-3.2) ... 245s Setting up libfreetype6:ppc64el (2.13.2+dfsg-1build2) ... 245s Setting up linux-tools-6.8.0-20-generic (6.8.0-20.20) ... 245s Setting up gir1.2-girepository-2.0:ppc64el (1.79.1-1ubuntu6) ... 245s Setting up dbus (1.14.10-4ubuntu2) ... 245s A reboot is required to replace the running dbus-daemon. 245s Please reboot the system when convenient. 245s Setting up shared-mime-info (2.4-1build1) ... 246s Setting up libblockdev-utils3:ppc64el (3.1.0-1build1) ... 246s Setting up libgssapi-krb5-2:ppc64el (1.20.1-6ubuntu1) ... 246s Setting up udev (255.4-1ubuntu5) ... 247s Setting up ftp (20230507-2build1) ... 247s Setting up keyboxd (2.4.4-2ubuntu15) ... 247s Setting up libdpkg-perl (1.22.6ubuntu5) ... 247s Setting up libsasl2-2:ppc64el (2.1.28+dfsg1-5ubuntu1) ... 247s Setting up libssh-4:ppc64el (0.10.6-2build1) ... 247s Setting up libblockdev-nvme3:ppc64el (3.1.0-1build1) ... 247s Setting up libblockdev-fs3:ppc64el (3.1.0-1build1) ... 247s Setting up ieee-data (20220827.1) ... 247s Setting up libtiff6:ppc64el (4.5.1+git230720-4ubuntu1) ... 247s Setting up kpartx (0.9.4-5ubuntu6) ... 247s Setting up libpam-systemd:ppc64el (255.4-1ubuntu5) ... 247s Setting up libpolkit-agent-1-0:ppc64el (124-1ubuntu1) ... 247s Setting up libc6-dev:ppc64el (2.39-0ubuntu6) ... 247s Setting up libgpgme11t64:ppc64el (1.18.0-4.1ubuntu3) ... 248s Setting up libfontconfig1:ppc64el (2.15.0-1.1ubuntu1) ... 248s Setting up binutils-powerpc64le-linux-gnu (2.42-4ubuntu1) ... 248s Setting up netplan-generator (1.0-1) ... 248s Removing 'diversion of /lib/systemd/system-generators/netplan to /lib/systemd/system-generators/netplan.usr-is-merged by netplan-generator' 248s Setting up initramfs-tools-core (0.142ubuntu23) ... 248s Setting up libclang-cpp18 (1:18.1.2-1ubuntu2) ... 248s Setting up libbpfcc:ppc64el (0.29.1+ds-1ubuntu4) ... 248s Setting up libarchive13t64:ppc64el (3.7.2-1.1ubuntu2) ... 248s Setting up libldap2:ppc64el (2.6.7+dfsg-1~exp1ubuntu6) ... 248s Setting up libpython3-stdlib:ppc64el (3.12.2-0ubuntu1) ... 248s Setting up systemd-resolved (255.4-1ubuntu5) ... 248s Setting up python3.11 (3.11.8-1build4) ... 250s Setting up telnet (0.17+2.5-3ubuntu3) ... 250s Setting up initramfs-tools (0.142ubuntu23) ... 250s update-initramfs: deferring update (trigger activated) 250s Setting up libblockdev-mdraid3:ppc64el (3.1.0-1build1) ... 250s Setting up linux-headers-virtual (6.8.0-20.20+1) ... 250s Setting up libcurl4t64:ppc64el (8.5.0-2ubuntu8) ... 250s Setting up bpftrace (0.20.2-1ubuntu1) ... 250s Setting up bind9-libs:ppc64el (1:9.18.24-0ubuntu3) ... 250s Setting up linux-image-6.8.0-20-generic (6.8.0-20.20) ... 255s I: /boot/vmlinux is now a symlink to vmlinux-6.8.0-20-generic 255s I: /boot/initrd.img is now a symlink to initrd.img-6.8.0-20-generic 255s Setting up libtirpc3t64:ppc64el (1.3.4+ds-1.1) ... 255s Setting up e2fsprogs-l10n (1.47.0-2.4~exp1ubuntu2) ... 255s Setting up libblockdev-swap3:ppc64el (3.1.0-1build1) ... 255s Setting up plymouth (24.004.60-1ubuntu6) ... 255s update-initramfs: Generating /boot/initrd.img-6.8.0-11-generic 255s W: No lz4 in /usr/bin:/sbin:/bin, using gzip 262s update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults 262s update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults 263s Setting up iproute2 (6.1.0-1ubuntu5) ... 263s Setting up openssh-client (1:9.6p1-3ubuntu11) ... 263s Setting up libgusb2:ppc64el (0.4.8-1build1) ... 263s Setting up btrfs-progs (6.6.3-1.1build1) ... 263s Setting up libblockdev-loop3:ppc64el (3.1.0-1build1) ... 263s Setting up libcurl3t64-gnutls:ppc64el (8.5.0-2ubuntu8) ... 263s Setting up parted (3.6-3.1build2) ... 263s Setting up libqmi-glib5:ppc64el (1.35.2-0ubuntu1) ... 263s Setting up python3 (3.12.2-0ubuntu1) ... 263s Setting up binutils (2.42-4ubuntu1) ... 263s Setting up libblockdev3:ppc64el (3.1.0-1build1) ... 263s Setting up libjcat1:ppc64el (0.2.0-2build2) ... 263s Setting up multipath-tools (0.9.4-5ubuntu6) ... 264s Setting up dpkg-dev (1.22.6ubuntu5) ... 264s Setting up libblockdev-part3:ppc64el (3.1.0-1build1) ... 264s Setting up dirmngr (2.4.4-2ubuntu15) ... 264s Setting up dbus-user-session (1.14.10-4ubuntu2) ... 264s Setting up plymouth-theme-ubuntu-text (24.004.60-1ubuntu6) ... 264s update-initramfs: deferring update (trigger activated) 264s Setting up python3-cryptography (41.0.7-4build2) ... 265s Setting up python3-gi (3.47.0-3build1) ... 265s Setting up libgd3:ppc64el (2.3.3-9ubuntu3) ... 265s Setting up python3-typing-extensions (4.10.0-1) ... 265s Setting up lsof (4.95.0-1build2) ... 265s Setting up python3-pyrsistent:ppc64el (0.20.0-1build1) ... 265s Setting up python3-netaddr (0.8.0-2ubuntu1) ... 266s Setting up libnsl2:ppc64el (1.3.0-3build2) ... 266s Setting up gnupg (2.4.4-2ubuntu15) ... 266s Setting up python3-netplan (1.0-1) ... 266s Setting up curl (8.5.0-2ubuntu8) ... 266s Setting up libvolume-key1:ppc64el (0.3.12-7build1) ... 266s Setting up linux-image-virtual (6.8.0-20.20+1) ... 266s Setting up bind9-host (1:9.18.24-0ubuntu3) ... 266s Setting up python3-lib2to3 (3.12.2-3ubuntu1.1) ... 266s Setting up python3-bpfcc (0.29.1+ds-1ubuntu4) ... 266s Setting up libc-devtools (2.39-0ubuntu6) ... 266s Setting up python3-pkg-resources (68.1.2-2ubuntu1) ... 267s Setting up python3-distutils (3.12.2-3ubuntu1.1) ... 267s python3.12: can't get files for byte-compilation 267s Setting up openssh-sftp-server (1:9.6p1-3ubuntu11) ... 267s Setting up linux-image-generic (6.8.0-20.20+1) ... 267s Setting up python3-dbus (1.3.2-5build2) ... 267s Setting up python3-setuptools (68.1.2-2ubuntu1) ... 268s Setting up gpg-wks-client (2.4.4-2ubuntu15) ... 268s Setting up openssh-server (1:9.6p1-3ubuntu11) ... 268s Replacing config file /etc/ssh/sshd_config with new version 270s Created symlink /etc/systemd/system/ssh.service.requires/ssh.socket → /usr/lib/systemd/system/ssh.socket. 271s Setting up linux-generic (6.8.0-20.20+1) ... 271s Setting up libblockdev-crypto3:ppc64el (3.1.0-1build1) ... 271s Setting up python3-gdbm:ppc64el (3.12.2-3ubuntu1.1) ... 271s Setting up python3-apt (2.7.7) ... 272s Setting up libfwupd2:ppc64el (1.9.15-2) ... 272s Setting up python3-yaml (6.0.1-2build1) ... 272s Setting up libqmi-proxy (1.35.2-0ubuntu1) ... 272s Setting up netplan.io (1.0-1) ... 272s Setting up linux-virtual (6.8.0-20.20+1) ... 272s Setting up grub-common (2.12-1ubuntu5) ... 273s Setting up bpfcc-tools (0.29.1+ds-1ubuntu4) ... 273s Setting up bind9-dnsutils (1:9.18.24-0ubuntu3) ... 273s Setting up ubuntu-pro-client (31.2.2) ... 275s Setting up fwupd (1.9.15-2) ... 275s fwupd-offline-update.service is a disabled or a static unit not running, not starting it. 275s fwupd-refresh.service is a disabled or a static unit not running, not starting it. 276s Setting up ubuntu-pro-client-l10n (31.2.2) ... 276s Setting up udisks2 (2.10.1-6) ... 276s Setting up grub2-common (2.12-1ubuntu5) ... 276s Setting up grub-ieee1275-bin (2.12-1ubuntu5) ... 276s Setting up grub-ieee1275 (2.12-1ubuntu5) ... 277s Installing for powerpc-ieee1275 platform. 277s Installation finished. No error reported. 277s Sourcing file `/etc/default/grub' 277s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 277s Generating grub configuration file ... 277s Found linux image: /boot/vmlinux-6.8.0-20-generic 277s Found linux image: /boot/vmlinux-6.8.0-11-generic 277s Found initrd image: /boot/initrd.img-6.8.0-11-generic 278s Warning: os-prober will not be executed to detect other bootable partitions. 278s Systems on them will not be added to the GRUB boot configuration. 278s Check GRUB_DISABLE_OS_PROBER documentation entry. 278s Adding boot menu entry for UEFI Firmware Settings ... 278s done 278s Processing triggers for ufw (0.36.2-5) ... 278s Processing triggers for systemd (255.4-1ubuntu5) ... 278s Processing triggers for debianutils (5.17) ... 278s Processing triggers for install-info (7.1-3build1) ... 278s Processing triggers for libc-bin (2.39-0ubuntu6) ... 278s Processing triggers for initramfs-tools (0.142ubuntu23) ... 278s update-initramfs: Generating /boot/initrd.img-6.8.0-11-generic 278s W: No lz4 in /usr/bin:/sbin:/bin, using gzip 285s Processing triggers for linux-image-6.8.0-20-generic (6.8.0-20.20) ... 285s /etc/kernel/postinst.d/initramfs-tools: 285s update-initramfs: Generating /boot/initrd.img-6.8.0-20-generic 285s W: No lz4 in /usr/bin:/sbin:/bin, using gzip 292s /etc/kernel/postinst.d/zz-update-grub: 292s Sourcing file `/etc/default/grub' 292s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 292s Generating grub configuration file ... 292s Found linux image: /boot/vmlinux-6.8.0-20-generic 292s Found initrd image: /boot/initrd.img-6.8.0-20-generic 293s Found linux image: /boot/vmlinux-6.8.0-11-generic 293s Found initrd image: /boot/initrd.img-6.8.0-11-generic 293s Warning: os-prober will not be executed to detect other bootable partitions. 293s Systems on them will not be added to the GRUB boot configuration. 293s Check GRUB_DISABLE_OS_PROBER documentation entry. 293s Adding boot menu entry for UEFI Firmware Settings ... 293s done 295s Reading package lists... 295s Building dependency tree... 295s Reading state information... 295s The following packages will be REMOVED: 295s libaio1* libnetplan0* python3-distutils* python3-lib2to3* 295s 0 upgraded, 0 newly installed, 4 to remove and 0 not upgraded. 295s After this operation, 1613 kB disk space will be freed. 296s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 112169 files and directories currently installed.) 296s Removing libaio1:ppc64el (0.3.113-5) ... 296s Removing libnetplan0:ppc64el (0.107.1-3) ... 296s Removing python3-distutils (3.12.2-3ubuntu1.1) ... 296s Removing python3-lib2to3 (3.12.2-3ubuntu1.1) ... 296s Processing triggers for libc-bin (2.39-0ubuntu6) ... 296s autopkgtest [07:43:25]: rebooting testbed after setup commands that affected boot 466s autopkgtest-virt-ssh: WARNING: ssh connection failed. Retrying in 3 seconds... 490s autopkgtest [07:46:39]: testbed running kernel: Linux 6.8.0-20-generic #20-Ubuntu SMP Mon Mar 18 11:46:05 UTC 2024 493s autopkgtest [07:46:42]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 495s Get:1 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (dsc) [1896 B] 495s Get:2 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 495s Get:3 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (diff) [3144 B] 496s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 496s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 496s gpgv: Can't check signature: No public key 496s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 496s autopkgtest [07:46:45]: testing package git-imerge version 1.2.0-5 496s autopkgtest [07:46:45]: build not needed 497s autopkgtest [07:46:46]: test pybuild-autopkgtest: preparing testbed 498s Reading package lists... 499s Building dependency tree... 499s Reading state information... 499s Starting pkgProblemResolver with broken count: 0 499s Starting 2 pkgProblemResolver with broken count: 0 499s Done 499s The following additional packages will be installed: 499s autoconf automake autopoint autotools-dev build-essential cpp cpp-13 499s cpp-13-powerpc64le-linux-gnu cpp-powerpc64le-linux-gnu debhelper debugedit 499s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 499s g++-13-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu gcc gcc-13 499s gcc-13-powerpc64le-linux-gnu gcc-powerpc64le-linux-gnu gettext git 499s git-imerge git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 499s libcc1-0 libdebhelper-perl liberror-perl libfile-stripnondeterminism-perl 499s libgcc-13-dev libgomp1 libisl23 libitm1 libjs-jquery libjs-sphinxdoc 499s libjs-underscore liblsan0 libmpc3 libpkgconf3 libquadmath0 libstdc++-13-dev 499s libsub-override-perl libtool libtsan2 libubsan1 m4 pkg-config pkgconf 499s pkgconf-bin po-debconf pybuild-plugin-autopkgtest python3-cachetools 499s python3-colorama python3-distlib python3-filelock python3-packaging 499s python3-pip-whl python3-platformdirs python3-pluggy python3-pyproject-api 499s python3-setuptools-whl python3-virtualenv python3-wheel python3-wheel-whl 499s tox 499s Suggested packages: 499s autoconf-archive gnu-standards autoconf-doc cpp-doc gcc-13-locales 499s cpp-13-doc dh-make flit python3-build python3-installer gcc-13-doc 499s gcc-multilib flex bison gdb gcc-doc gdb-powerpc64le-linux-gnu gettext-doc 499s libasprintf-dev libgettextpo-dev git-daemon-run | git-daemon-sysvinit 499s git-doc git-email git-gui gitk gitweb git-cvs git-mediawiki git-svn 499s git-mergify-rebase mergify libstdc++-13-doc libtool-doc gfortran 499s | fortran95-compiler gcj-jdk m4-doc libmail-box-perl 499s Recommended packages: 499s libarchive-cpio-perl javascript-common libltdl-dev libmail-sendmail-perl 499s python3-dev python3-distutils 500s The following NEW packages will be installed: 500s autoconf automake autopkgtest-satdep autopoint autotools-dev build-essential 500s cpp cpp-13 cpp-13-powerpc64le-linux-gnu cpp-powerpc64le-linux-gnu debhelper 500s debugedit dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 500s g++-13-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu gcc gcc-13 500s gcc-13-powerpc64le-linux-gnu gcc-powerpc64le-linux-gnu gettext git 500s git-imerge git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 500s libcc1-0 libdebhelper-perl liberror-perl libfile-stripnondeterminism-perl 500s libgcc-13-dev libgomp1 libisl23 libitm1 libjs-jquery libjs-sphinxdoc 500s libjs-underscore liblsan0 libmpc3 libpkgconf3 libquadmath0 libstdc++-13-dev 500s libsub-override-perl libtool libtsan2 libubsan1 m4 pkg-config pkgconf 500s pkgconf-bin po-debconf pybuild-plugin-autopkgtest python3-cachetools 500s python3-colorama python3-distlib python3-filelock python3-packaging 500s python3-pip-whl python3-platformdirs python3-pluggy python3-pyproject-api 500s python3-setuptools-whl python3-virtualenv python3-wheel python3-wheel-whl 500s tox 500s 0 upgraded, 72 newly installed, 0 to remove and 0 not upgraded. 500s Need to get 72.2 MB/72.2 MB of archives. 500s After this operation, 275 MB of additional disk space will be used. 500s Get:1 /tmp/autopkgtest.eDJJFA/1-autopkgtest-satdep.deb autopkgtest-satdep ppc64el 0 [812 B] 500s Get:2 http://ftpmaster.internal/ubuntu noble/main ppc64el m4 ppc64el 1.4.19-4 [275 kB] 500s Get:3 http://ftpmaster.internal/ubuntu noble/main ppc64el autoconf all 2.71-3 [339 kB] 500s Get:4 http://ftpmaster.internal/ubuntu noble/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 500s Get:5 http://ftpmaster.internal/ubuntu noble/main ppc64el automake all 1:1.16.5-1.3ubuntu1 [558 kB] 500s Get:6 http://ftpmaster.internal/ubuntu noble/main ppc64el autopoint all 0.21-14ubuntu1 [422 kB] 500s Get:7 http://ftpmaster.internal/ubuntu noble/main ppc64el libisl23 ppc64el 0.26-3 [864 kB] 500s Get:8 http://ftpmaster.internal/ubuntu noble/main ppc64el libmpc3 ppc64el 1.3.1-1 [61.2 kB] 500s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el cpp-13-powerpc64le-linux-gnu ppc64el 13.2.0-21ubuntu1 [10.7 MB] 501s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el cpp-13 ppc64el 13.2.0-21ubuntu1 [1034 B] 501s Get:11 http://ftpmaster.internal/ubuntu noble/main ppc64el cpp-powerpc64le-linux-gnu ppc64el 4:13.2.0-7ubuntu1 [5330 B] 501s Get:12 http://ftpmaster.internal/ubuntu noble/main ppc64el cpp ppc64el 4:13.2.0-7ubuntu1 [22.5 kB] 501s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libcc1-0 ppc64el 14-20240315-1ubuntu1 [48.1 kB] 501s Get:14 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgomp1 ppc64el 14-20240315-1ubuntu1 [161 kB] 501s Get:15 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libitm1 ppc64el 14-20240315-1ubuntu1 [32.2 kB] 501s Get:16 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libatomic1 ppc64el 14-20240315-1ubuntu1 [10.7 kB] 501s Get:17 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libasan8 ppc64el 14-20240315-1ubuntu1 [2973 kB] 501s Get:18 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el liblsan0 ppc64el 14-20240315-1ubuntu1 [1325 kB] 501s Get:19 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libtsan2 ppc64el 14-20240315-1ubuntu1 [2702 kB] 501s Get:20 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libubsan1 ppc64el 14-20240315-1ubuntu1 [1193 kB] 501s Get:21 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libquadmath0 ppc64el 14-20240315-1ubuntu1 [158 kB] 501s Get:22 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libgcc-13-dev ppc64el 13.2.0-21ubuntu1 [1579 kB] 501s Get:23 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gcc-13-powerpc64le-linux-gnu ppc64el 13.2.0-21ubuntu1 [20.6 MB] 502s Get:24 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el gcc-13 ppc64el 13.2.0-21ubuntu1 [479 kB] 502s Get:25 http://ftpmaster.internal/ubuntu noble/main ppc64el gcc-powerpc64le-linux-gnu ppc64el 4:13.2.0-7ubuntu1 [1224 B] 502s Get:26 http://ftpmaster.internal/ubuntu noble/main ppc64el gcc ppc64el 4:13.2.0-7ubuntu1 [5022 B] 502s Get:27 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libstdc++-13-dev ppc64el 13.2.0-21ubuntu1 [2510 kB] 502s Get:28 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el g++-13-powerpc64le-linux-gnu ppc64el 13.2.0-21ubuntu1 [12.1 MB] 502s Get:29 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el g++-13 ppc64el 13.2.0-21ubuntu1 [14.5 kB] 502s Get:30 http://ftpmaster.internal/ubuntu noble/main ppc64el g++-powerpc64le-linux-gnu ppc64el 4:13.2.0-7ubuntu1 [968 B] 502s Get:31 http://ftpmaster.internal/ubuntu noble/main ppc64el g++ ppc64el 4:13.2.0-7ubuntu1 [1086 B] 502s Get:32 http://ftpmaster.internal/ubuntu noble/main ppc64el build-essential ppc64el 12.10ubuntu1 [4936 B] 502s Get:33 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libdebhelper-perl all 13.14.1ubuntu5 [89.8 kB] 502s Get:34 http://ftpmaster.internal/ubuntu noble/main ppc64el libtool all 2.4.7-7 [166 kB] 502s Get:35 http://ftpmaster.internal/ubuntu noble/main ppc64el dh-autoreconf all 20 [16.1 kB] 502s Get:36 http://ftpmaster.internal/ubuntu noble/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 502s Get:37 http://ftpmaster.internal/ubuntu noble/main ppc64el libsub-override-perl all 0.10-1 [10.0 kB] 502s Get:38 http://ftpmaster.internal/ubuntu noble/main ppc64el libfile-stripnondeterminism-perl all 1.13.1-1 [18.1 kB] 502s Get:39 http://ftpmaster.internal/ubuntu noble/main ppc64el dh-strip-nondeterminism all 1.13.1-1 [5362 B] 502s Get:40 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el debugedit ppc64el 1:5.0-5build1 [51.4 kB] 502s Get:41 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el dwz ppc64el 0.15-1build5 [142 kB] 502s Get:42 http://ftpmaster.internal/ubuntu noble/main ppc64el gettext ppc64el 0.21-14ubuntu1 [979 kB] 502s Get:43 http://ftpmaster.internal/ubuntu noble/main ppc64el intltool-debian all 0.35.0+20060710.6 [23.2 kB] 502s Get:44 http://ftpmaster.internal/ubuntu noble/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 502s Get:45 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el debhelper all 13.14.1ubuntu5 [869 kB] 502s Get:46 http://ftpmaster.internal/ubuntu noble/universe ppc64el dh-python all 6.20231223ubuntu2 [111 kB] 502s Get:47 http://ftpmaster.internal/ubuntu noble/main ppc64el liberror-perl all 0.17029-2 [25.6 kB] 503s Get:48 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el git-man all 1:2.43.0-1ubuntu5 [1099 kB] 503s Get:49 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el git ppc64el 1:2.43.0-1ubuntu5 [4789 kB] 503s Get:50 http://ftpmaster.internal/ubuntu noble/universe ppc64el git-imerge all 1.2.0-5 [49.5 kB] 503s Get:51 http://ftpmaster.internal/ubuntu noble/main ppc64el libjs-jquery all 3.6.1+dfsg+~3.5.14-1 [328 kB] 503s Get:52 http://ftpmaster.internal/ubuntu noble/main ppc64el libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 503s Get:53 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el libjs-sphinxdoc all 7.2.6-6 [149 kB] 503s Get:54 http://ftpmaster.internal/ubuntu noble/main ppc64el libpkgconf3 ppc64el 1.8.1-2 [36.9 kB] 503s Get:55 http://ftpmaster.internal/ubuntu noble/main ppc64el pkgconf-bin ppc64el 1.8.1-2 [22.0 kB] 503s Get:56 http://ftpmaster.internal/ubuntu noble/main ppc64el pkgconf ppc64el 1.8.1-2 [16.7 kB] 503s Get:57 http://ftpmaster.internal/ubuntu noble/main ppc64el pkg-config ppc64el 1.8.1-2 [7170 B] 503s Get:58 http://ftpmaster.internal/ubuntu noble/universe ppc64el pybuild-plugin-autopkgtest all 6.20231223ubuntu2 [1760 B] 503s Get:59 http://ftpmaster.internal/ubuntu noble/main ppc64el python3-cachetools all 5.3.0-2 [10.6 kB] 503s Get:60 http://ftpmaster.internal/ubuntu noble/main ppc64el python3-colorama all 0.4.6-4 [32.1 kB] 503s Get:61 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-distlib all 0.3.8-1 [318 kB] 503s Get:62 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-filelock all 3.13.1-1 [10.8 kB] 503s Get:63 http://ftpmaster.internal/ubuntu noble/main ppc64el python3-packaging all 23.2-1 [40.6 kB] 503s Get:64 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el python3-pip-whl all 24.0+dfsg-1ubuntu1 [1702 kB] 503s Get:65 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-platformdirs all 4.2.0-1 [16.1 kB] 503s Get:66 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-pluggy all 1.4.0-1 [20.4 kB] 503s Get:67 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-pyproject-api all 1.6.1-1 [50.9 kB] 503s Get:68 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el python3-setuptools-whl all 68.1.2-2ubuntu1 [715 kB] 503s Get:69 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el python3-wheel-whl all 0.42.0-2 [67.8 kB] 503s Get:70 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el python3-virtualenv all 20.25.0+ds-2 [70.8 kB] 503s Get:71 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el python3-wheel all 0.42.0-2 [53.1 kB] 503s Get:72 http://ftpmaster.internal/ubuntu noble/universe ppc64el tox all 4.13.0-1 [302 kB] 504s Fetched 72.2 MB in 3s (21.2 MB/s) 504s Selecting previously unselected package m4. 504s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 111945 files and directories currently installed.) 504s Preparing to unpack .../00-m4_1.4.19-4_ppc64el.deb ... 504s Unpacking m4 (1.4.19-4) ... 504s Selecting previously unselected package autoconf. 504s Preparing to unpack .../01-autoconf_2.71-3_all.deb ... 504s Unpacking autoconf (2.71-3) ... 504s Selecting previously unselected package autotools-dev. 504s Preparing to unpack .../02-autotools-dev_20220109.1_all.deb ... 504s Unpacking autotools-dev (20220109.1) ... 504s Selecting previously unselected package automake. 504s Preparing to unpack .../03-automake_1%3a1.16.5-1.3ubuntu1_all.deb ... 504s Unpacking automake (1:1.16.5-1.3ubuntu1) ... 504s Selecting previously unselected package autopoint. 504s Preparing to unpack .../04-autopoint_0.21-14ubuntu1_all.deb ... 504s Unpacking autopoint (0.21-14ubuntu1) ... 504s Selecting previously unselected package libisl23:ppc64el. 504s Preparing to unpack .../05-libisl23_0.26-3_ppc64el.deb ... 504s Unpacking libisl23:ppc64el (0.26-3) ... 504s Selecting previously unselected package libmpc3:ppc64el. 504s Preparing to unpack .../06-libmpc3_1.3.1-1_ppc64el.deb ... 504s Unpacking libmpc3:ppc64el (1.3.1-1) ... 504s Selecting previously unselected package cpp-13-powerpc64le-linux-gnu. 504s Preparing to unpack .../07-cpp-13-powerpc64le-linux-gnu_13.2.0-21ubuntu1_ppc64el.deb ... 504s Unpacking cpp-13-powerpc64le-linux-gnu (13.2.0-21ubuntu1) ... 505s Selecting previously unselected package cpp-13. 505s Preparing to unpack .../08-cpp-13_13.2.0-21ubuntu1_ppc64el.deb ... 505s Unpacking cpp-13 (13.2.0-21ubuntu1) ... 505s Selecting previously unselected package cpp-powerpc64le-linux-gnu. 505s Preparing to unpack .../09-cpp-powerpc64le-linux-gnu_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 505s Unpacking cpp-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 505s Selecting previously unselected package cpp. 505s Preparing to unpack .../10-cpp_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 505s Unpacking cpp (4:13.2.0-7ubuntu1) ... 505s Selecting previously unselected package libcc1-0:ppc64el. 505s Preparing to unpack .../11-libcc1-0_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libcc1-0:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libgomp1:ppc64el. 505s Preparing to unpack .../12-libgomp1_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libgomp1:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libitm1:ppc64el. 505s Preparing to unpack .../13-libitm1_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libitm1:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libatomic1:ppc64el. 505s Preparing to unpack .../14-libatomic1_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libatomic1:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libasan8:ppc64el. 505s Preparing to unpack .../15-libasan8_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libasan8:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package liblsan0:ppc64el. 505s Preparing to unpack .../16-liblsan0_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking liblsan0:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libtsan2:ppc64el. 505s Preparing to unpack .../17-libtsan2_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libtsan2:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libubsan1:ppc64el. 505s Preparing to unpack .../18-libubsan1_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libubsan1:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libquadmath0:ppc64el. 505s Preparing to unpack .../19-libquadmath0_14-20240315-1ubuntu1_ppc64el.deb ... 505s Unpacking libquadmath0:ppc64el (14-20240315-1ubuntu1) ... 505s Selecting previously unselected package libgcc-13-dev:ppc64el. 505s Preparing to unpack .../20-libgcc-13-dev_13.2.0-21ubuntu1_ppc64el.deb ... 505s Unpacking libgcc-13-dev:ppc64el (13.2.0-21ubuntu1) ... 505s Selecting previously unselected package gcc-13-powerpc64le-linux-gnu. 505s Preparing to unpack .../21-gcc-13-powerpc64le-linux-gnu_13.2.0-21ubuntu1_ppc64el.deb ... 505s Unpacking gcc-13-powerpc64le-linux-gnu (13.2.0-21ubuntu1) ... 506s Selecting previously unselected package gcc-13. 506s Preparing to unpack .../22-gcc-13_13.2.0-21ubuntu1_ppc64el.deb ... 506s Unpacking gcc-13 (13.2.0-21ubuntu1) ... 506s Selecting previously unselected package gcc-powerpc64le-linux-gnu. 506s Preparing to unpack .../23-gcc-powerpc64le-linux-gnu_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 506s Unpacking gcc-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 506s Selecting previously unselected package gcc. 506s Preparing to unpack .../24-gcc_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 506s Unpacking gcc (4:13.2.0-7ubuntu1) ... 506s Selecting previously unselected package libstdc++-13-dev:ppc64el. 506s Preparing to unpack .../25-libstdc++-13-dev_13.2.0-21ubuntu1_ppc64el.deb ... 506s Unpacking libstdc++-13-dev:ppc64el (13.2.0-21ubuntu1) ... 506s Selecting previously unselected package g++-13-powerpc64le-linux-gnu. 506s Preparing to unpack .../26-g++-13-powerpc64le-linux-gnu_13.2.0-21ubuntu1_ppc64el.deb ... 506s Unpacking g++-13-powerpc64le-linux-gnu (13.2.0-21ubuntu1) ... 507s Selecting previously unselected package g++-13. 507s Preparing to unpack .../27-g++-13_13.2.0-21ubuntu1_ppc64el.deb ... 507s Unpacking g++-13 (13.2.0-21ubuntu1) ... 507s Selecting previously unselected package g++-powerpc64le-linux-gnu. 507s Preparing to unpack .../28-g++-powerpc64le-linux-gnu_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 507s Unpacking g++-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 507s Selecting previously unselected package g++. 507s Preparing to unpack .../29-g++_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 507s Unpacking g++ (4:13.2.0-7ubuntu1) ... 507s Selecting previously unselected package build-essential. 507s Preparing to unpack .../30-build-essential_12.10ubuntu1_ppc64el.deb ... 507s Unpacking build-essential (12.10ubuntu1) ... 507s Selecting previously unselected package libdebhelper-perl. 507s Preparing to unpack .../31-libdebhelper-perl_13.14.1ubuntu5_all.deb ... 507s Unpacking libdebhelper-perl (13.14.1ubuntu5) ... 507s Selecting previously unselected package libtool. 507s Preparing to unpack .../32-libtool_2.4.7-7_all.deb ... 507s Unpacking libtool (2.4.7-7) ... 507s Selecting previously unselected package dh-autoreconf. 507s Preparing to unpack .../33-dh-autoreconf_20_all.deb ... 507s Unpacking dh-autoreconf (20) ... 507s Selecting previously unselected package libarchive-zip-perl. 507s Preparing to unpack .../34-libarchive-zip-perl_1.68-1_all.deb ... 507s Unpacking libarchive-zip-perl (1.68-1) ... 507s Selecting previously unselected package libsub-override-perl. 507s Preparing to unpack .../35-libsub-override-perl_0.10-1_all.deb ... 507s Unpacking libsub-override-perl (0.10-1) ... 507s Selecting previously unselected package libfile-stripnondeterminism-perl. 507s Preparing to unpack .../36-libfile-stripnondeterminism-perl_1.13.1-1_all.deb ... 507s Unpacking libfile-stripnondeterminism-perl (1.13.1-1) ... 507s Selecting previously unselected package dh-strip-nondeterminism. 507s Preparing to unpack .../37-dh-strip-nondeterminism_1.13.1-1_all.deb ... 507s Unpacking dh-strip-nondeterminism (1.13.1-1) ... 507s Selecting previously unselected package debugedit. 507s Preparing to unpack .../38-debugedit_1%3a5.0-5build1_ppc64el.deb ... 507s Unpacking debugedit (1:5.0-5build1) ... 507s Selecting previously unselected package dwz. 507s Preparing to unpack .../39-dwz_0.15-1build5_ppc64el.deb ... 507s Unpacking dwz (0.15-1build5) ... 507s Selecting previously unselected package gettext. 507s Preparing to unpack .../40-gettext_0.21-14ubuntu1_ppc64el.deb ... 507s Unpacking gettext (0.21-14ubuntu1) ... 507s Selecting previously unselected package intltool-debian. 507s Preparing to unpack .../41-intltool-debian_0.35.0+20060710.6_all.deb ... 507s Unpacking intltool-debian (0.35.0+20060710.6) ... 507s Selecting previously unselected package po-debconf. 507s Preparing to unpack .../42-po-debconf_1.0.21+nmu1_all.deb ... 507s Unpacking po-debconf (1.0.21+nmu1) ... 507s Selecting previously unselected package debhelper. 507s Preparing to unpack .../43-debhelper_13.14.1ubuntu5_all.deb ... 507s Unpacking debhelper (13.14.1ubuntu5) ... 507s Selecting previously unselected package dh-python. 507s Preparing to unpack .../44-dh-python_6.20231223ubuntu2_all.deb ... 507s Unpacking dh-python (6.20231223ubuntu2) ... 507s Selecting previously unselected package liberror-perl. 507s Preparing to unpack .../45-liberror-perl_0.17029-2_all.deb ... 507s Unpacking liberror-perl (0.17029-2) ... 507s Selecting previously unselected package git-man. 507s Preparing to unpack .../46-git-man_1%3a2.43.0-1ubuntu5_all.deb ... 507s Unpacking git-man (1:2.43.0-1ubuntu5) ... 507s Selecting previously unselected package git. 507s Preparing to unpack .../47-git_1%3a2.43.0-1ubuntu5_ppc64el.deb ... 507s Unpacking git (1:2.43.0-1ubuntu5) ... 508s Selecting previously unselected package git-imerge. 508s Preparing to unpack .../48-git-imerge_1.2.0-5_all.deb ... 508s Unpacking git-imerge (1.2.0-5) ... 508s Selecting previously unselected package libjs-jquery. 508s Preparing to unpack .../49-libjs-jquery_3.6.1+dfsg+~3.5.14-1_all.deb ... 508s Unpacking libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 508s Selecting previously unselected package libjs-underscore. 508s Preparing to unpack .../50-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 508s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 508s Selecting previously unselected package libjs-sphinxdoc. 508s Preparing to unpack .../51-libjs-sphinxdoc_7.2.6-6_all.deb ... 508s Unpacking libjs-sphinxdoc (7.2.6-6) ... 508s Selecting previously unselected package libpkgconf3:ppc64el. 508s Preparing to unpack .../52-libpkgconf3_1.8.1-2_ppc64el.deb ... 508s Unpacking libpkgconf3:ppc64el (1.8.1-2) ... 508s Selecting previously unselected package pkgconf-bin. 508s Preparing to unpack .../53-pkgconf-bin_1.8.1-2_ppc64el.deb ... 508s Unpacking pkgconf-bin (1.8.1-2) ... 508s Selecting previously unselected package pkgconf:ppc64el. 508s Preparing to unpack .../54-pkgconf_1.8.1-2_ppc64el.deb ... 508s Unpacking pkgconf:ppc64el (1.8.1-2) ... 508s Selecting previously unselected package pkg-config:ppc64el. 508s Preparing to unpack .../55-pkg-config_1.8.1-2_ppc64el.deb ... 508s Unpacking pkg-config:ppc64el (1.8.1-2) ... 508s Selecting previously unselected package pybuild-plugin-autopkgtest. 508s Preparing to unpack .../56-pybuild-plugin-autopkgtest_6.20231223ubuntu2_all.deb ... 508s Unpacking pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 508s Selecting previously unselected package python3-cachetools. 508s Preparing to unpack .../57-python3-cachetools_5.3.0-2_all.deb ... 508s Unpacking python3-cachetools (5.3.0-2) ... 508s Selecting previously unselected package python3-colorama. 508s Preparing to unpack .../58-python3-colorama_0.4.6-4_all.deb ... 508s Unpacking python3-colorama (0.4.6-4) ... 508s Selecting previously unselected package python3-distlib. 508s Preparing to unpack .../59-python3-distlib_0.3.8-1_all.deb ... 508s Unpacking python3-distlib (0.3.8-1) ... 508s Selecting previously unselected package python3-filelock. 508s Preparing to unpack .../60-python3-filelock_3.13.1-1_all.deb ... 508s Unpacking python3-filelock (3.13.1-1) ... 508s Selecting previously unselected package python3-packaging. 508s Preparing to unpack .../61-python3-packaging_23.2-1_all.deb ... 508s Unpacking python3-packaging (23.2-1) ... 508s Selecting previously unselected package python3-pip-whl. 508s Preparing to unpack .../62-python3-pip-whl_24.0+dfsg-1ubuntu1_all.deb ... 508s Unpacking python3-pip-whl (24.0+dfsg-1ubuntu1) ... 508s Selecting previously unselected package python3-platformdirs. 508s Preparing to unpack .../63-python3-platformdirs_4.2.0-1_all.deb ... 508s Unpacking python3-platformdirs (4.2.0-1) ... 508s Selecting previously unselected package python3-pluggy. 508s Preparing to unpack .../64-python3-pluggy_1.4.0-1_all.deb ... 508s Unpacking python3-pluggy (1.4.0-1) ... 508s Selecting previously unselected package python3-pyproject-api. 508s Preparing to unpack .../65-python3-pyproject-api_1.6.1-1_all.deb ... 508s Unpacking python3-pyproject-api (1.6.1-1) ... 508s Selecting previously unselected package python3-setuptools-whl. 508s Preparing to unpack .../66-python3-setuptools-whl_68.1.2-2ubuntu1_all.deb ... 508s Unpacking python3-setuptools-whl (68.1.2-2ubuntu1) ... 508s Selecting previously unselected package python3-wheel-whl. 508s Preparing to unpack .../67-python3-wheel-whl_0.42.0-2_all.deb ... 508s Unpacking python3-wheel-whl (0.42.0-2) ... 508s Selecting previously unselected package python3-virtualenv. 508s Preparing to unpack .../68-python3-virtualenv_20.25.0+ds-2_all.deb ... 508s Unpacking python3-virtualenv (20.25.0+ds-2) ... 508s Selecting previously unselected package python3-wheel. 508s Preparing to unpack .../69-python3-wheel_0.42.0-2_all.deb ... 508s Unpacking python3-wheel (0.42.0-2) ... 508s Selecting previously unselected package tox. 508s Preparing to unpack .../70-tox_4.13.0-1_all.deb ... 508s Unpacking tox (4.13.0-1) ... 508s Selecting previously unselected package autopkgtest-satdep. 508s Preparing to unpack .../71-1-autopkgtest-satdep.deb ... 508s Unpacking autopkgtest-satdep (0) ... 508s Setting up dh-python (6.20231223ubuntu2) ... 508s Setting up python3-setuptools-whl (68.1.2-2ubuntu1) ... 508s Setting up python3-filelock (3.13.1-1) ... 509s Setting up python3-cachetools (5.3.0-2) ... 509s Setting up python3-colorama (0.4.6-4) ... 509s Setting up python3-pip-whl (24.0+dfsg-1ubuntu1) ... 509s Setting up libarchive-zip-perl (1.68-1) ... 509s Setting up libdebhelper-perl (13.14.1ubuntu5) ... 509s Setting up m4 (1.4.19-4) ... 509s Setting up python3-distlib (0.3.8-1) ... 509s Setting up libgomp1:ppc64el (14-20240315-1ubuntu1) ... 509s Setting up python3-wheel (0.42.0-2) ... 509s Setting up python3-platformdirs (4.2.0-1) ... 510s Setting up liberror-perl (0.17029-2) ... 510s Setting up autotools-dev (20220109.1) ... 510s Setting up python3-packaging (23.2-1) ... 510s Setting up libpkgconf3:ppc64el (1.8.1-2) ... 510s Setting up libquadmath0:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up libmpc3:ppc64el (1.3.1-1) ... 510s Setting up libatomic1:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up autopoint (0.21-14ubuntu1) ... 510s Setting up pkgconf-bin (1.8.1-2) ... 510s Setting up autoconf (2.71-3) ... 510s Setting up python3-pluggy (1.4.0-1) ... 510s Setting up libubsan1:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up dwz (0.15-1build5) ... 510s Setting up libasan8:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up debugedit (1:5.0-5build1) ... 510s Setting up libsub-override-perl (0.10-1) ... 510s Setting up git-man (1:2.43.0-1ubuntu5) ... 510s Setting up libtsan2:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 510s Setting up libisl23:ppc64el (0.26-3) ... 510s Setting up cpp-13-powerpc64le-linux-gnu (13.2.0-21ubuntu1) ... 510s Setting up python3-wheel-whl (0.42.0-2) ... 510s Setting up libcc1-0:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up liblsan0:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up libitm1:ppc64el (14-20240315-1ubuntu1) ... 510s Setting up cpp-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 510s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 510s Setting up automake (1:1.16.5-1.3ubuntu1) ... 510s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 510s Setting up libfile-stripnondeterminism-perl (1.13.1-1) ... 510s Setting up gettext (0.21-14ubuntu1) ... 510s Setting up cpp-13 (13.2.0-21ubuntu1) ... 510s Setting up python3-virtualenv (20.25.0+ds-2) ... 510s Setting up pkgconf:ppc64el (1.8.1-2) ... 510s Setting up intltool-debian (0.35.0+20060710.6) ... 510s Setting up pkg-config:ppc64el (1.8.1-2) ... 510s Setting up git (1:2.43.0-1ubuntu5) ... 510s Setting up libjs-sphinxdoc (7.2.6-6) ... 510s Setting up dh-strip-nondeterminism (1.13.1-1) ... 510s Setting up libgcc-13-dev:ppc64el (13.2.0-21ubuntu1) ... 510s Setting up cpp (4:13.2.0-7ubuntu1) ... 510s Setting up libstdc++-13-dev:ppc64el (13.2.0-21ubuntu1) ... 510s Setting up po-debconf (1.0.21+nmu1) ... 510s Setting up python3-pyproject-api (1.6.1-1) ... 510s Setting up git-imerge (1.2.0-5) ... 511s Setting up gcc-13-powerpc64le-linux-gnu (13.2.0-21ubuntu1) ... 511s Setting up gcc-13 (13.2.0-21ubuntu1) ... 511s Setting up tox (4.13.0-1) ... 511s Setting up libtool (2.4.7-7) ... 511s Setting up g++-13-powerpc64le-linux-gnu (13.2.0-21ubuntu1) ... 511s Setting up dh-autoreconf (20) ... 511s Setting up gcc-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 511s Setting up g++-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 511s Setting up g++-13 (13.2.0-21ubuntu1) ... 511s Setting up debhelper (13.14.1ubuntu5) ... 511s Setting up gcc (4:13.2.0-7ubuntu1) ... 511s Setting up g++ (4:13.2.0-7ubuntu1) ... 511s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 511s Setting up build-essential (12.10ubuntu1) ... 511s Setting up pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 511s Setting up autopkgtest-satdep (0) ... 511s Processing triggers for man-db (2.12.0-3build4) ... 514s Processing triggers for install-info (7.1-3build1) ... 514s Processing triggers for libc-bin (2.39-0ubuntu6) ... 517s (Reading database ... 116040 files and directories currently installed.) 517s Removing autopkgtest-satdep (0) ... 518s autopkgtest [07:47:07]: test pybuild-autopkgtest: pybuild-autopkgtest 518s autopkgtest [07:47:07]: test pybuild-autopkgtest: [----------------------- 518s pybuild-autopkgtest 519s I: pybuild base:305: cd /tmp/autopkgtest.eDJJFA/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.eDJJFA/build.5NL/src/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 520s py312: skip building and installing the package 520s py312: commands[0] /tmp/autopkgtest.eDJJFA/build.5NL/src> /bin/sh t/test-unconflicted 520s + dirname t/test-unconflicted 520s + cd t 520s + pwd 520s + dirname /tmp/autopkgtest.eDJJFA/build.5NL/src/t 520s + BASE=/tmp/autopkgtest.eDJJFA/build.5NL/src 520s + . /tmp/autopkgtest.eDJJFA/build.5NL/src/t/test-lib.sh 520s + GIT_IMERGE=git-imerge 520s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s + DESCRIPTION=git-imerge test repository without conflicts 520s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted git-imerge test repository without conflicts 520s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s + local description=git-imerge test repository without conflicts 520s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted git-imerge test repository without conflicts 520s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s + local description=git-imerge test repository without conflicts 520s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s hint: Using 'master' as the name for the initial branch. This default branch name 520s hint: is subject to change. To configure the initial branch name to use in all 520s hint: of your new repositories, which will suppress this warning, call: 520s hint: 520s hint: git config --global init.defaultBranch 520s hint: 520s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 520s hint: 'development'. The just-created branch can be renamed via this command: 520s hint: 520s hint: git branch -m 520s + echo git-imerge test repository without conflicts 520s + printf %s\n /*.out /*.css /*.html 520s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted/.git config user.name Loú User 520s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted/.git/ 520s [master (root-commit) 780ddf5] m⇒0 520s 2 files changed, 2 insertions(+) 520s create mode 100644 a.txt 520s create mode 100644 b.txt 520s [a b862e30] a⇒1 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted/.git config user.email luser@example.com 520s + TIME=1112911993 520s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/unconflicted 520s + modify a.txt 0 520s + filename=a.txt 520s + text=0 520s + echo 0 520s + git add a.txt 520s + modify b.txt 0 520s + filename=b.txt 520s + text=0 520s + echo 0 520s + git add b.txt 520s + commit -m m⇒0 520s + TIME=1112911994 520s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 520s + git checkout -b a -- 520s Switched to a new branch 'a' 520s + seq 8 520s + modify a.txt 1 520s + filename=a.txt 520s + text=1 520s + echo 1 520s + git add a.txt 520s + commit -m a⇒1 520s + TIME=1112911995 520s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 520s + modify a.txt 2 520s + filename=a.txt 520s + text=2 520s + echo 2 520s + git add a.txt 520s + commit -m a⇒2 520s + TIME=1112911996 520s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 520s [a dcbe282] a⇒2 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + modify a.txt 3 520s + filename=a.txt 520s + text=3 520s + echo 3 520s + git add a.txt 520s + commit -m a⇒3 520s + TIME=1112911997 520s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 520s [a ecd8647] a⇒3 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + modify a.txt 4 520s + filename=a.txt 520s + text=4 520s + echo 4 520s + git add a.txt 520s + commit -m a⇒4 520s + TIME=1112911998 520s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 520s + modify a.txt 5 520s + filename=a.txt 520s + text=5 520s + echo 5 520s + git add a.txt 520s [a 1634bab] a⇒4 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + commit -m a⇒5 520s + TIME=1112911999 520s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 520s [a 909ce12] a⇒5 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + modify a.txt 6 520s + filename=a.txt 520s + text=6 520s + echo 6 520s + git add a.txt 520s + commit -m a⇒6 520s + TIME=1112912000 520s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 520s [a f6520bf] a⇒6 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s [a 6797186] a⇒7 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s [a 49643dd] a⇒8 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + modify a.txt 7 520s + filename=a.txt 520s + text=7 520s + echo 7 520s + git add a.txt 520s + commit -m a⇒7 520s + TIME=1112912001 520s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 520s + modify a.txt 8 520s + filename=a.txt 520s + text=8 520s + echo 8 520s + git add a.txt 520s + commit -m a⇒8 520s + TIME=1112912002 520s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 520s + git checkout -b b master -- 520s Switched to a new branch 'b' 520s + seq 5 520s + modify b.txt 1 520s + filename=b.txt 520s + text=1 520s + echo 1 520s + git add b.txt 520s + commit -m b⇒1 520s + TIME=1112912003 520s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 520s [b d43305b] b⇒1 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + modify b.txt 2 520s + filename=b.txt 520s + text=2 520s + echo 2 520s + git add b.txt 520s + commit -m b⇒2 520s + TIME=1112912004 520s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 520s [b 853ee68] b⇒2 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + modify b.txt 3 520s + filename=b.txt 520s + text=3 520s + echo 3 520s + git add b.txt 520s + commit -m b⇒3 520s + TIME=1112912005 520s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 520s + modify b.txt 4 520s + filename=b.txt 520s + text=4 520s + echo 4 520s + git add b.txt 520s [b 03a2455] b⇒3 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + commit -m b⇒4 520s + TIME=1112912006 520s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 520s + modify b.txt 5 520s + filename=b.txt 520s + text=5 520s + echo 5 520s + git add b.txt 520s [b 484ea85] b⇒4 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + commit -m b⇒5 520s + TIME=1112912007 520s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 520s [b e22cd97] b⇒5 520s 1 file changed, 1 insertion(+), 1 deletion(-) 520s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 520s + git checkout a 520s Switched to branch 'a' 520s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 520s Attempting automerge of 8-5...success. 520s Autofilling 1-5...success. 520s Autofilling 2-5...success. 520s Autofilling 3-5...success. 520s Autofilling 4-5...success. 520s Autofilling 5-5...success. 520s Autofilling 6-5...success. 520s Autofilling 7-5...success. 520s Autofilling 8-1...success. 520s Autofilling 8-2...success. 520s Autofilling 8-3...success. 520s Autofilling 8-4...success. 520s Autofilling 8-5 (first way)...success. 520s Autofilling 8-5 (second way)...success. 520s The two ways of autofilling 8-5 agree. 520s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 520s Merge is complete! 520s + git-imerge list 520s * a-b 521s + git-imerge diagram --commits --frontier --html=imerge3.html 521s 0 5 8 521s | | | 521s 0 - ********* - a 521s *???????. 521s *???????. 521s *???????. 521s *???????. 521s 5 - *........ 521s | 521s b 521s 521s 0 5 8 521s | | | 521s 0 - ********* - a 521s *???????| 521s *???????| 521s *???????| 521s *???????| 521s 5 - *-------+ 521s | 521s b 521s 521s Key: 521s |,-,+ = rectangles forming current merge frontier 521s * = merge done manually 521s . = merge done automatically 521s # = conflict that is currently blocking progress 521s @ = merge was blocked but has been resolved 521s ? = no merge recorded 521s 521s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 521s Merge b into a (using imerge) 521s 521s # Please enter the commit message for your changes. Lines starting 521s # with '#' will be ignored, and an empty message aborts the commit. 521s # 521s # Date: Wed Mar 27 07:47:10 2024 +0000 521s # 521s # On branch a-b-merge 521s # Changes to be committed: 521s # modified: b.txt 521s # 521s [a-b-merge 6646d0c] Merge b into a (using imerge) 521s Date: Wed Mar 27 07:47:10 2024 +0000 521s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + local refname=a-b-merge 521s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git rev-parse a-b-merge^{tree} 521s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git-imerge simplify --goal=rebase --branch=a-b-rebase 521s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + local refname=a-b-rebase 521s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git rev-parse a-b-rebase^{tree} 521s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 521s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + local refname=a-b-rebase-with-history 521s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git rev-parse a-b-rebase-with-history^{tree} 521s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git-imerge simplify --goal=border --branch=a-b-border 521s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + local refname=a-b-border 521s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git rev-parse a-b-border^{tree} 521s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 521s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 522s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 522s + local refname=a-b-border-with-history 522s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 522s + git rev-parse a-b-border-with-history^{tree} 522s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 522s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 522s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 522s + local refname=a-b-border-with-history2 522s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 522s + git rev-parse a-b-border-with-history2^{tree} 522s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 522s + git-imerge remove 522s + git checkout a 522s Switched to branch 'a' 522s + git-imerge start --goal=full --name=a-b b 522s Attempting to merge 1-1...success. 522s Attempting to merge 1-2...success. 522s Attempting to merge 1-3...success. 522s Attempting to merge 1-4...success. 522s Attempting to merge 1-5...success. 522s Attempting to merge 2-1...success. 522s Attempting to merge 2-2...success. 522s Attempting to merge 2-3...success. 522s Attempting to merge 2-4...success. 522s Attempting to merge 2-5...success. 522s Attempting to merge 3-1...success. 522s Attempting to merge 3-2...success. 522s Attempting to merge 3-3...success. 522s Attempting to merge 3-4...success. 522s Attempting to merge 3-5...success. 522s Attempting to merge 4-1...success. 522s Attempting to merge 4-2...success. 522s Attempting to merge 4-3...success. 522s Attempting to merge 4-4...success. 522s Attempting to merge 4-5...success. 522s Attempting to merge 5-1...success. 522s Attempting to merge 5-2...success. 522s Attempting to merge 5-3...success. 522s Attempting to merge 5-4...success. 522s Attempting to merge 5-5...success. 522s Attempting to merge 6-1...success. 522s Attempting to merge 6-2...success. 522s Attempting to merge 6-3...success. 522s Attempting to merge 6-4...success. 522s Attempting to merge 6-5...success. 522s Attempting to merge 7-1...success. 522s Attempting to merge 7-2...success. 523s Attempting to merge 7-3...success. 523s Attempting to merge 7-4...success. 523s Attempting to merge 7-5...success. 523s Attempting to merge 8-1...success. 523s Attempting to merge 8-2...success. 523s Attempting to merge 8-3...success. 523s Attempting to merge 8-4...success. 523s Attempting to merge 8-5...success. 523s Merge is complete! 523s + git-imerge list 523s * a-b 523s + git-imerge diagram --commits --frontier --html=imerge4.html 523s 0 5 8 523s | | | 523s 0 - ********* - a 523s *........ 523s *........ 523s *........ 523s *........ 523s 5 - *........ 523s | 523s b 523s 523s 0 5 8 523s | | | 523s 0 - ********* - a 523s *.......| 523s *.......| 523s *.......| 523s *.......| 523s 5 - *-------+ 523s | 523s b 523s 523s Key: 523s |,-,+ = rectangles forming current merge frontier 523s * = merge done manually 523s . = merge done automatically 523s # = conflict that is currently blocking progress 523s @ = merge was blocked but has been resolved 523s ? = no merge recorded 523s 523s + git-imerge finish --branch=a-b-full 523s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 523s + local refname=a-b-full 523s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 523s + git rev-parse a-b-full^{tree} 523s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 523s py312: commands[1] /tmp/autopkgtest.eDJJFA/build.5NL/src> /bin/sh t/test-conflicted 523s + dirname t/test-conflicted 523s + cd t 523s + pwd 523s + dirname /tmp/autopkgtest.eDJJFA/build.5NL/src/t 523s + BASE=/tmp/autopkgtest.eDJJFA/build.5NL/src 523s + . /tmp/autopkgtest.eDJJFA/build.5NL/src/t/test-lib.sh 523s + GIT_IMERGE=git-imerge 523s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 523s + test_conflict 4-3 523s + local conflict=4-3 523s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s + DESCRIPTION=git-imerge test repository with conflict at 4-3 523s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 523s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s + local description=git-imerge test repository with conflict at 4-3 523s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 523s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s + local description=git-imerge test repository with conflict at 4-3 523s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s hint: Using 'master' as the name for the initial branch. This default branch name 523s hint: is subject to change. To configure the initial branch name to use in all 523s hint: of your new repositories, which will suppress this warning, call: 523s hint: 523s hint: git config --global init.defaultBranch 523s hint: 523s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 523s hint: 'development'. The just-created branch can be renamed via this command: 523s hint: 523s hint: git branch -m 523s + echo git-imerge test repository with conflict at 4-3 523s + printf %s\n /*.out /*.css /*.html 523s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3/.git config user.name Loú User 523s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3/.git/ 523s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 523s + TIME=1112911993 523s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-4-3 523s + modify c.txt 0 523s + filename=c.txt 523s + text=0 523s + echo 0 523s + git add c.txt 523s + modify d.txt 0 523s + filename=d.txt 523s + text=0 523s + echo 0 523s + git add d.txt 523s + modify conflict.txt original version 523s + filename=conflict.txt 523s + text=original version 523s + echo original version 523s + git add conflict.txt 523s + commit -m m⇒0 523s + TIME=1112911994 523s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 523s [master (root-commit) d70e04b] m⇒0 523s 3 files changed, 3 insertions(+) 523s create mode 100644 c.txt 523s create mode 100644 conflict.txt 523s create mode 100644 d.txt 523s + git checkout -b c master -- 523s Switched to a new branch 'c' 523s + seq 9 523s + modify c.txt 1 523s + filename=c.txt 523s + text=1 523s + echo 1 523s + git add c.txt 523s + commit -m c⇒1 523s + TIME=1112911995 523s [c 89e2141] c⇒1 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 523s + modify c.txt 2 523s + filename=c.txt 523s + text=2 523s + echo 2 523s + git add c.txt 523s + commit -m c⇒2 523s + TIME=1112911996 523s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 523s + modify c.txt 3 523s + filename=c.txt 523s + text=3 523s + echo 3 523s [c 7c431f2] c⇒2 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + git add c.txt 523s + commit -m c⇒3 523s + TIME=1112911997 523s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 523s [c f02ab24] c⇒3 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify c.txt 4 523s + filename=c.txt 523s + text=4 523s + echo 4 523s + git add c.txt 523s + modify conflict.txt c version 523s + filename=conflict.txt 523s + text=c version 523s + echo c version 523s + git add conflict.txt 523s + commit -m c⇒4 523s + TIME=1112911998 523s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 523s [c 3c091de] c⇒4 523s 2 files changed, 2 insertions(+), 2 deletions(-) 523s + modify c.txt 5 523s + filename=c.txt 523s + text=5 523s + echo 5 523s + git add c.txt 523s + commit -m c⇒5 523s + TIME=1112911999 523s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 523s [c a0ac37a] c⇒5 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify c.txt 6 523s + filename=c.txt 523s + text=6 523s + echo 6 523s + git add c.txt 523s + commit -m c⇒6 523s + TIME=1112912000 523s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 523s [c ed9fdfa] c⇒6 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify c.txt 7 523s + filename=c.txt 523s + text=7 523s + echo 7 523s + git add c.txt 523s + commit -m c⇒7 523s + TIME=1112912001 523s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 523s [c 1da7bf5] c⇒7 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify c.txt 8 523s + filename=c.txt 523s + text=8 523s + echo 8 523s + git add c.txt 523s + commit -m c⇒8 523s + TIME=1112912002 523s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 523s + modify c.txt 9 523s + filename=c.txt 523s + text=9 523s + echo 9 523s + git add c.txt 523s + commit -m c⇒9 523s + TIME=1112912003 523s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 523s [c d8de99f] c⇒8 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + git checkout -b d master -- 523s [c 9cde605] c⇒9 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s Switched to a new branch 'd' 523s + seq 6 523s + modify d.txt 1 523s + filename=d.txt 523s + text=1 523s + echo 1 523s + git add d.txt 523s + commit -m d⇒1 523s + TIME=1112912004 523s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 523s [d bd5368a] d⇒1 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify d.txt 2 523s + filename=d.txt 523s + text=2 523s + echo 2 523s + git add d.txt 523s + commit -m d⇒2 523s + TIME=1112912005 523s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 523s [d 93e27e6] d⇒2 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify d.txt 3 523s + filename=d.txt 523s + text=3 523s + echo 3 523s + git add d.txt 523s + modify conflict.txt d version 523s + filename=conflict.txt 523s + text=d version 523s + echo d version 523s + git add conflict.txt 523s + commit -m d⇒3 523s + TIME=1112912006 523s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 523s [d 2bb1a7e] d⇒3 523s 2 files changed, 2 insertions(+), 2 deletions(-) 523s + modify d.txt 4 523s + filename=d.txt 523s + text=4 523s + echo 4 523s + git add d.txt 523s + commit -m d⇒4 523s + TIME=1112912007 523s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 523s [d 81f9c80] d⇒4 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify d.txt 5 523s + filename=d.txt 523s + text=5 523s + echo 5 523s + git add d.txt 523s + commit -m d⇒5 523s + TIME=1112912008 523s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 523s [d 3690dde] d⇒5 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + modify d.txt 6 523s + filename=d.txt 523s + text=6 523s + echo 6 523s + git add d.txt 523s + commit -m d⇒6 523s + TIME=1112912009 523s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 523s [d 8085853] d⇒6 523s 1 file changed, 1 insertion(+), 1 deletion(-) 523s + git checkout c 523s Switched to branch 'c' 523s + git-imerge init --name=c-d d 523s + git-imerge list 523s * c-d 524s + git-imerge diagram --commits --frontier --html=imerge0.html 524s 0 5 9 524s | | | 524s 0 - ********** - c 524s *????????? 524s *????????? 524s *????????? 524s *????????? 524s 5 - *????????? 524s 6 - *????????? 524s | 524s d 524s 524s 0 5 9 524s | | | 524s 0 - ********** - c 524s *????????? 524s *????????? 524s *????????? 524s *????????? 524s 5 - *????????? 524s 6 - *????????? 524s | 524s d 524s 524s Key: 524s |,-,+ = rectangles forming current merge frontier 524s * = merge done manually 524s . = merge done automatically 524s # = conflict that is currently blocking progress 524s @ = merge was blocked but has been resolved 524s ? = no merge recorded 524s 524s + git-imerge autofill+ 524s tee autofill.out 524s Attempting automerge of 9-6...failure. 524s Attempting automerge of 1-1...success. 524s Attempting automerge of 1-4...success. 524s Attempting automerge of 1-6...success. 524s Attempting automerge of 9-6...failure. 524s Attempting automerge of 5-6...failure. 524s Attempting automerge of 3-6...success. 524s Attempting automerge of 4-6...failure. 524s Attempting automerge of 4-1...success. 524s Attempting automerge of 4-4...failure. 524s Attempting automerge of 4-3...failure. 524s Attempting automerge of 4-2...success. 524s Attempting automerge of 9-2...success. 524s Autofilling 1-6...success. 524s Autofilling 2-6...success. 524s Autofilling 3-1...success. 524s Autofilling 3-2...success. 524s Autofilling 3-3...success. 524s Autofilling 3-4...success. 524s Autofilling 3-5...success. 524s Autofilling 3-6 (first way)...success. 524s Autofilling 3-6 (second way)...success. 524s The two ways of autofilling 3-6 agree. 524s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 524s Autofilling 4-2...success. 524s Autofilling 5-2...success. 524s Autofilling 6-2...success. 524s Autofilling 7-2...success. 524s Autofilling 8-2...success. 524s Autofilling 9-1...success. 524s Autofilling 9-2 (first way)...success. 524s Autofilling 9-2 (second way)...success. 524s The two ways of autofilling 9-2 agree. 524s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 524s Attempting automerge of 9-6...failure. 524s Attempting automerge of 4-3...failure. 524s HEAD is now at 9cde605 c⇒9 524s Conflict; suggest manual merge of 4-3 524s + grep -q Traceback autofill.out 524s + grep -q suggest manual merge of 4-3 autofill.out 524s + git-imerge diagram --commits --frontier --html=imerge1.html 524s 0 5 9 524s | | | 524s 0 - ********** - c 524s *??.?????. 524s *??....... 524s *??.#????? 524s *??.?????? 524s 5 - *??.?????? 524s 6 - *...?????? 524s | 524s d 524s 524s 0 5 9 524s | | | 524s 0 - ********** - c 524s *??.?????| 524s *??.-----+ 524s *??|#????? 524s *??|?????? 524s 5 - *??|?????? 524s 6 - *--+?????? 524s | 524s d 524s 524s Key: 524s |,-,+ = rectangles forming current merge frontier 524s * = merge done manually 524s . = merge done automatically 524s # = conflict that is currently blocking progress 524s @ = merge was blocked but has been resolved 524s ? = no merge recorded 524s 524s + git-imerge continue --edit 524s Switched to branch 'imerge/c-d' 524s Auto-merging conflict.txt 524s CONFLICT (content): Merge conflict in conflict.txt 524s Automatic merge failed; fix conflicts and then commit the result. 524s 524s Original first commit: 524s commit 3c091ded129a5edf9061360bab867edade996c93 524s Author: Loú User 524s Date: Thu Apr 7 22:13:18 2005 +0000 524s 524s c⇒4 524s 524s Original second commit: 524s 524s There was a conflict merging commit 4-3, shown above. 524s Please resolve the conflict, commit the result, then type 524s 524s git-imerge continue 524s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 524s Author: Loú User 524s Date: Thu Apr 7 22:13:26 2005 +0000 524s 524s d⇒3 524s + echo merged version 524s + git add conflict.txt 524s + git-imerge continue --no-edit 525s [imerge/c-d 977e410] imerge 'c-d': manual merge 4-3 525s Merge has been recorded for merge 4-3. 525s Attempting automerge of 4-6...success. 525s Autofilling 4-4...success. 525s Autofilling 4-5...success. 525s Autofilling 4-6...success. 525s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 525s Attempting automerge of 9-6...success. 525s Autofilling 5-6...success. 525s Autofilling 6-6...success. 525s Autofilling 7-6...success. 525s Autofilling 8-6...success. 525s Autofilling 9-3...success. 525s Autofilling 9-4...success. 525s Autofilling 9-5...success. 525s Autofilling 9-6 (first way)...success. 525s Autofilling 9-6 (second way)...success. 525s The two ways of autofilling 9-6 agree. 525s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 525s Merge is complete! 525s + git-imerge diagram --commits --frontier --html=imerge2.html 525s 0 5 9 525s | | | 525s 0 - ********** - c 525s *??.?????. 525s *??....... 525s *??.*????. 525s *??..????. 525s 5 - *??..????. 525s 6 - *......... 525s | 525s d 525s 525s 0 5 9 525s | | | 525s 0 - ********** - c 525s *??.?????| 525s *??......| 525s *??.*????| 525s *??..????| 525s 5 - *??..????| 525s 6 - *--------+ 525s | 525s d 525s 525s Key: 525s |,-,+ = rectangles forming current merge frontier 525s * = merge done manually 525s . = merge done automatically 525s # = conflict that is currently blocking progress 525s @ = merge was blocked but has been resolved 525s ? = no merge recorded 525s 525s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 525s Merge d into c (using imerge) 525s 525s # Please enter the commit message for your changes. Lines starting 525s # with '#' will be ignored, and an empty message aborts the commit. 525s # 525s # Date: Wed Mar 27 07:47:14 2024 +0000 525s # 525s # On branch c-d-merge 525s # Changes to be committed: 525s # modified: conflict.txt 525s # modified: d.txt 525s # 525s [c-d-merge 46fd1fc] Merge d into c (using imerge) 525s Date: Wed Mar 27 07:47:14 2024 +0000 525s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 525s + local refname=c-d-merge 525s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 525s + git rev-parse c-d-merge^{tree} 525s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 525s + git-imerge simplify --goal=rebase --branch=c-d-rebase 525s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 525s + local refname=c-d-rebase 525s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 525s + git rev-parse c-d-rebase^{tree} 525s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 525s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 526s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + local refname=c-d-rebase-with-history 526s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git rev-parse c-d-rebase-with-history^{tree} 526s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git-imerge simplify --goal=border --branch=c-d-border 526s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + local refname=c-d-border 526s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git rev-parse c-d-border^{tree} 526s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 526s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + local refname=c-d-border-with-history 526s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git rev-parse c-d-border-with-history^{tree} 526s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 526s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + local refname=c-d-border-with-history2 526s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git rev-parse c-d-border-with-history2^{tree} 526s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 526s + git-imerge remove 526s + git checkout c 526s Switched to branch 'c' 526s + + git-imerge start --goal=fulltee --first-parent --name=c-d d 526s start.out 527s Attempting to merge 1-1...success. 527s Attempting to merge 1-2...success. 527s Attempting to merge 1-3...success. 527s Attempting to merge 1-4...success. 527s Attempting to merge 1-5...success. 527s Attempting to merge 1-6...success. 527s Attempting to merge 2-1...success. 527s Attempting to merge 2-2...success. 527s Attempting to merge 2-3...success. 527s Attempting to merge 2-4...success. 527s Attempting to merge 2-5...success. 527s Attempting to merge 2-6...success. 527s Attempting to merge 3-1...success. 527s Attempting to merge 3-2...success. 527s Attempting to merge 3-3...success. 527s Attempting to merge 3-4...success. 527s Attempting to merge 3-5...success. 527s Attempting to merge 3-6...success. 527s Attempting to merge 4-1...success. 527s Attempting to merge 4-2...success. 527s Attempting to merge 4-3...conflict. 527s Attempting to merge 5-1...success. 527s Attempting to merge 5-2...success. 527s Attempting to merge 6-1...success. 527s Attempting to merge 6-2...success. 527s Attempting to merge 7-1...success. 527s Attempting to merge 7-2...success. 527s Attempting to merge 8-1...success. 527s Attempting to merge 8-2...success. 527s Attempting to merge 9-1...success. 527s Attempting to merge 9-2...success. 527s Previous HEAD position was cfb1672 imerge 'c-d': automatic merge 9-2 527s Switched to branch 'imerge/c-d' 527s Auto-merging conflict.txt 527s CONFLICT (content): Merge conflict in conflict.txt 527s Automatic merge failed; fix conflicts and then commit the result. 527s 527s Original first commit: 527s commit 3c091ded129a5edf9061360bab867edade996c93 527s Author: Loú User 527s Date: Thu Apr 7 22:13:18 2005 +0000 527s 527s c⇒4 527s 527s Original second commit: 527s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 527s Author: Loú User 527s Date: Thu Apr 7 22:13:26 2005 +0000 527s 527s d⇒3 527s 527s There was a conflict merging commit 4-3, shown above. 527s Please resolve the conflict, commit the result, then type 527s 527s git-imerge continue 527s + grep -q Traceback start.out 527s + grep -q suggest manual merge of 4-3 autofill.out 527s + git-imerge diagram --commits --frontier --html=imerge3.html 527s 0 5 9 527s | | | 527s 0 - ********** - c 527s *......... 527s *......... 527s *...#????? 527s *...?????? 527s 5 - *...?????? 527s 6 - *...?????? 527s | 527s d 527s 527s 0 5 9 527s | | | 527s 0 - ********** - c 527s *........| 527s *...-----+ 527s *..|#????? 527s *..|?????? 527s 5 - *..|?????? 527s 6 - *--+?????? 527s | 527s d 527s 527s Key: 527s |,-,+ = rectangles forming current merge frontier 527s * = merge done manually 527s . = merge done automatically 527s # = conflict that is currently blocking progress 527s @ = merge was blocked but has been resolved 527s ? = no merge recorded 527s 527s + echo merged version 527s + git add conflict.txt 527s + GIT_EDITOR=cat git commit 527s imerge 'c-d': manual merge 4-3 527s 527s # Conflicts: 527s # conflict.txt 527s # 527s # It looks like you may be committing a merge. 527s # If this is not correct, please run 527s # git update-ref -d MERGE_HEAD 527s # and try again. 527s 527s 527s # Please enter the commit message for your changes. Lines starting 527s # with '#' will be ignored, and an empty message aborts the commit. 527s # 527s # On branch imerge/c-d 527s # All conflicts fixed but you are still merging. 527s # 527s # Changes to be committed: 527s # modified: conflict.txt 527s # modified: d.txt 527s # 527s [imerge/c-d 93173d6] imerge 'c-d': manual merge 4-3 527s + git-imerge continue --edit 527s Merge has been recorded for merge 4-3. 527s Attempting to merge 4-4...success. 527s Attempting to merge 4-5...success. 527s Attempting to merge 4-6...success. 527s Attempting to merge 5-3...success. 527s Attempting to merge 5-4...success. 527s Attempting to merge 5-5...success. 527s Attempting to merge 5-6...success. 527s Attempting to merge 6-3...success. 527s Attempting to merge 6-4...success. 527s Attempting to merge 6-5...success. 527s Attempting to merge 6-6...success. 527s Attempting to merge 7-3...success. 527s Attempting to merge 7-4...success. 528s Attempting to merge 7-5...success. 528s Attempting to merge 7-6...success. 528s Attempting to merge 8-3...success. 528s Attempting to merge 8-4...success. 528s Attempting to merge 8-5...success. 528s Attempting to merge 8-6...success. 528s Attempting to merge 9-3...success. 528s Attempting to merge 9-4...success. 528s Attempting to merge 9-5...success. 528s Attempting to merge 9-6...success. 528s Merge is complete! 528s + git-imerge diagram --commits --frontier --html=imerge4.html 528s 0 5 9 528s | | | 528s 0 - ********** - c 528s *......... 528s *......... 528s *...*..... 528s *......... 528s 5 - *......... 528s 6 - *......... 528s | 528s d 528s 528s 0 5 9 528s | | | 528s 0 - ********** - c 528s *........| 528s *........| 528s *...*....| 528s *........| 528s 5 - *........| 528s 6 - *--------+ 528s | 528s d 528s 528s Key: 528s |,-,+ = rectangles forming current merge frontier 528s * = merge done manually 528s . = merge done automatically 528s # = conflict that is currently blocking progress 528s @ = merge was blocked but has been resolved 528s ? = no merge recorded 528s 528s + git-imerge finish --branch=c-d-full 528s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 528s + local refname=c-d-full 528s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 528s + git rev-parse c-d-full^{tree} 528s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 528s + test_conflict 1-1 528s + local conflict=1-1 528s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s + DESCRIPTION=git-imerge test repository with conflict at 1-1 528s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 528s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s + local description=git-imerge test repository with conflict at 1-1 528s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 528s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s + local description=git-imerge test repository with conflict at 1-1 528s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s hint: Using 'master' as the name for the initial branch. This default branch name 528s hint: is subject to change. To configure the initial branch name to use in all 528s hint: of your new repositories, which will suppress this warning, call: 528s hint: 528s hint: git config --global init.defaultBranch 528s hint: 528s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 528s hint: 'development'. The just-created branch can be renamed via this command: 528s hint: 528s hint: git branch -m 528s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1/.git/ 528s + echo git-imerge test repository with conflict at 1-1 528s + printf %s\n /*.out /*.css /*.html 528s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1/.git config user.name Loú User 528s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 528s + TIME=1112911993 528s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-1 528s + modify c.txt 0 528s + filename=c.txt 528s + text=0 528s + echo 0 528s + git add c.txt 528s + modify d.txt 0 528s + filename=d.txt 528s + text=0 528s + echo 0 528s + git add d.txt 528s + modify conflict.txt original version 528s + filename=conflict.txt 528s + text=original version 528s + echo original version 528s + git add conflict.txt 528s + commit -m m⇒0 528s + TIME=1112911994 528s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 528s [master (root-commit) d70e04b] m⇒0 528s 3 files changed, 3 insertions(+) 528s create mode 100644 c.txt 528s create mode 100644 conflict.txt 528s create mode 100644 d.txt 528s + git checkout -b c master -- 528s Switched to a new branch 'c' 528s + seq 9 528s + modify c.txt 1 528s + filename=c.txt 528s + text=1 528s + echo 1 528s + git add c.txt 528s + modify conflict.txt c version 528s + filename=conflict.txt 528s + text=c version 528s + echo c version 528s + git add conflict.txt 528s + commit -m c⇒1 528s + TIME=1112911995 528s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 528s [c 2120f40] c⇒1 528s 2 files changed, 2 insertions(+), 2 deletions(-) 528s + modify c.txt 2 528s + filename=c.txt 528s + text=2 528s + echo 2 528s + git add c.txt 528s + commit -m c⇒2 528s + TIME=1112911996 528s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 528s + modify c.txt 3 528s + filename=c.txt 528s + text=3 528s + echo 3 528s + git add c.txt 528s + commit -m c⇒3 528s [c 90cc7de] c⇒2 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + TIME=1112911997 528s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 528s [c 2046ed2] c⇒3 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify c.txt 4 528s + filename=c.txt 528s + text=4 528s + echo 4 528s + git add c.txt 528s + commit -m c⇒4 528s + TIME=1112911998 528s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 528s [c 8a2cee9] c⇒4 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify c.txt 5 528s + filename=c.txt 528s + text=5 528s + echo 5 528s + git add c.txt 528s + commit -m c⇒5 528s + TIME=1112911999 528s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 528s [c ac16a05] c⇒5 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify c.txt 6 528s + filename=c.txt 528s + text=6 528s + echo 6 528s + git add c.txt 528s + commit -m c⇒6 528s + TIME=1112912000 528s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 528s [c 30dd2ae] c⇒6 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify c.txt 7 528s + filename=c.txt 528s + text=7 528s + echo 7 528s + git add c.txt 528s + commit -m c⇒7 528s + TIME=1112912001 528s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 528s + modify c.txt 8 528s + filename=c.txt 528s + text=8 528s + echo 8 528s + git add c.txt 528s [c 0883eb9] c⇒7 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + commit -m c⇒8 528s + TIME=1112912002 528s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 528s [c f661c06] c⇒8 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify c.txt 9 528s + filename=c.txt 528s + text=9 528s + echo 9 528s + git add c.txt 528s + commit -m c⇒9 528s + TIME=1112912003 528s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 528s [c 243e8ed] c⇒9 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + git checkout -b d master -- 528s Switched to a new branch 'd' 528s + seq 6 528s + modify d.txt 1 528s + filename=d.txt 528s + text=1 528s + echo 1 528s + git add d.txt 528s + modify conflict.txt d version 528s + filename=conflict.txt 528s + text=d version 528s + echo d version 528s + git add conflict.txt 528s + commit -m d⇒1 528s + TIME=1112912004 528s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 528s [d ac0427a] d⇒1 528s 2 files changed, 2 insertions(+), 2 deletions(-) 528s + modify d.txt 2 528s + filename=d.txt 528s + text=2 528s + echo 2 528s + git add d.txt 528s + commit -m d⇒2 528s + TIME=1112912005 528s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 528s [d 43c38c0] d⇒2 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify d.txt 3 528s + filename=d.txt 528s + text=3 528s + echo 3 528s + git add d.txt 528s + commit -m d⇒3 528s + TIME=1112912006 528s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 528s [d 0260058] d⇒3 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify d.txt 4 528s + filename=d.txt 528s + text=4 528s + echo 4 528s + git add d.txt 528s + commit -m d⇒4 528s + TIME=1112912007 528s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 528s [d 40fef44] d⇒4 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify d.txt 5 528s + filename=d.txt 528s + text=5 528s + echo 5 528s + git add d.txt 528s + commit -m d⇒5 528s + TIME=1112912008 528s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 528s [d b080a65] d⇒5 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + modify d.txt 6 528s + filename=d.txt 528s + text=6 528s + echo 6 528s + git add d.txt 528s + commit -m d⇒6 528s + TIME=1112912009 528s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 528s [d 200ce5c] d⇒6 528s 1 file changed, 1 insertion(+), 1 deletion(-) 528s + git checkout c 528s Switched to branch 'c' 528s + git-imerge init --name=c-d d 528s + git-imerge list 528s * c-d 529s + git-imerge diagram --commits --frontier --html=imerge0.html 529s 0 5 9 529s | | | 529s 0 - ********** - c 529s *????????? 529s *????????? 529s *????????? 529s *????????? 529s 5 - *????????? 529s 6 - *????????? 529s | 529s d 529s 529s 0 5 9 529s | | | 529s 0 - ********** - c 529s *????????? 529s *????????? 529s *????????? 529s *????????? 529s 5 - *????????? 529s 6 - *????????? 529s | 529s d 529s 529s Key: 529s |,-,+ = rectangles forming current merge frontier 529s * = merge done manually 529s . = merge done automatically 529s # = conflict that is currently blocking progress 529s @ = merge was blocked but has been resolved 529s ? = no merge recorded 529s 529s + + git-imerge autofill 529s tee autofill.out 529s Attempting automerge of 9-6...failure. 529s Attempting automerge of 1-1...failure. 529s HEAD is now at 243e8ed c⇒9 529s No progress was possible; suggest manual merge of 1-1 529s + grep -q Traceback autofill.out 529s + grep -q suggest manual merge of 1-1 autofill.out 529s + git-imerge diagram --commits --frontier --html=imerge1.html 529s 0 5 9 529s | | | 529s 0 - ********** - c 529s *#???????? 529s *????????? 529s *????????? 529s *????????? 529s 5 - *????????? 529s 6 - *????????? 529s | 529s d 529s 529s 0 5 9 529s | | | 529s 0 - ********** - c 529s *#???????? 529s *????????? 529s *????????? 529s *????????? 529s 5 - *????????? 529s 6 - *????????? 529s | 529s d 529s 529s Key: 529s |,-,+ = rectangles forming current merge frontier 529s * = merge done manually 529s . = merge done automatically 529s # = conflict that is currently blocking progress 529s @ = merge was blocked but has been resolved 529s ? = no merge recorded 529s 529s + git-imerge continue --edit 529s Switched to branch 'imerge/c-d' 529s Auto-merging conflict.txt 529s CONFLICT (content): Merge conflict in conflict.txt 529s Automatic merge failed; fix conflicts and then commit the result. 529s 529s Original first commit: 529s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 529s Author: Loú User 529s Date: Thu Apr 7 22:13:15 2005 +0000 529s 529s c⇒1 529s 529s Original second commit: 529s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 529s Author: Loú User 529s Date: Thu Apr 7 22:13:24 2005 +0000 529s 529s d⇒1 529s 529s There was a conflict merging commit 1-1, shown above. 529s Please resolve the conflict, commit the result, then type 529s 529s git-imerge continue 529s + echo merged version 529s + git add conflict.txt 529s + git-imerge continue --no-edit 529s [imerge/c-d 6f5b640] imerge 'c-d': manual merge 1-1 529s Merge has been recorded for merge 1-1. 529s Attempting automerge of 1-6...success. 529s Autofilling 1-2...success. 529s Autofilling 1-3...success. 529s Autofilling 1-4...success. 529s Autofilling 1-5...success. 529s Autofilling 1-6...success. 529s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 529s Attempting automerge of 9-6...success. 529s Autofilling 2-6...success. 529s Autofilling 3-6...success. 529s Autofilling 4-6...success. 529s Autofilling 5-6...success. 529s Autofilling 6-6...success. 529s Autofilling 7-6...success. 529s Autofilling 8-6...success. 530s Autofilling 9-1...success. 530s Autofilling 9-2...success. 530s Autofilling 9-3...success. 530s Autofilling 9-4...success. 530s Autofilling 9-5...success. 530s Autofilling 9-6 (first way)...success. 530s Autofilling 9-6 (second way)...success. 530s The two ways of autofilling 9-6 agree. 530s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 530s Merge is complete! 530s + git-imerge diagram --commits --frontier --html=imerge2.html 530s 0 5 9 530s | | | 530s 0 - ********** - c 530s **???????. 530s *.???????. 530s *.???????. 530s *.???????. 530s 5 - *.???????. 530s 6 - *......... 530s | 530s d 530s 530s 0 5 9 530s | | | 530s 0 - ********** - c 530s **???????| 530s *.???????| 530s *.???????| 530s *.???????| 530s 5 - *.???????| 530s 6 - *--------+ 530s | 530s d 530s 530s Key: 530s |,-,+ = rectangles forming current merge frontier 530s * = merge done manually 530s . = merge done automatically 530s # = conflict that is currently blocking progress 530s @ = merge was blocked but has been resolved 530s ? = no merge recorded 530s 530s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 530s Merge d into c (using imerge) 530s 530s # Please enter the commit message for your changes. Lines starting 530s # with '#' will be ignored, and an empty message aborts the commit. 530s # 530s # Date: Wed Mar 27 07:47:19 2024 +0000 530s # 530s # On branch c-d-merge 530s # Changes to be committed: 530s # modified: conflict.txt 530s # modified: d.txt 530s # 530s [c-d-merge c7000d0] Merge d into c (using imerge) 530s Date: Wed Mar 27 07:47:19 2024 +0000 530s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + local refname=c-d-merge 530s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git rev-parse c-d-merge^{tree} 530s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git-imerge simplify --goal=rebase --branch=c-d-rebase 530s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + local refname=c-d-rebase 530s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git rev-parse c-d-rebase^{tree} 530s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 530s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + local refname=c-d-rebase-with-history 530s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git rev-parse c-d-rebase-with-history^{tree} 530s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git-imerge simplify --goal=border --branch=c-d-border 530s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + local refname=c-d-border 530s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git rev-parse c-d-border^{tree} 530s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 530s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 531s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 531s + local refname=c-d-border-with-history 531s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 531s + git rev-parse c-d-border-with-history^{tree} 531s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 531s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 531s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 531s + local refname=c-d-border-with-history2 531s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 531s + git rev-parse c-d-border-with-history2^{tree} 531s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 531s + git-imerge remove 531s + git checkout c 531s Switched to branch 'c' 531s + git-imerge start --goal=full --first-parent --name=c-d d 531s + tee start.out 531s Attempting to merge 1-1...conflict. 531s Switched to branch 'imerge/c-d' 531s Auto-merging conflict.txt 531s CONFLICT (content): Merge conflict in conflict.txt 531s Automatic merge failed; fix conflicts and then commit the result. 531s 531s Original first commit: 531s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 531s Author: Loú User 531s Date: Thu Apr 7 22:13:15 2005 +0000 531s 531s c⇒1 531s 531s Original second commit: 531s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 531s Author: Loú User 531s Date: Thu Apr 7 22:13:24 2005 +0000 531s 531s d⇒1 531s 531s There was a conflict merging commit 1-1, shown above. 531s Please resolve the conflict, commit the result, then type 531s 531s git-imerge continue 531s + grep -q Traceback start.out 531s + grep -q suggest manual merge of 1-1 autofill.out 531s + git-imerge diagram --commits --frontier --html=imerge3.html 531s 0 5 9 531s | | | 531s 0 - ********** - c 531s *#???????? 531s *????????? 531s *????????? 531s *????????? 531s 5 - *????????? 531s 6 - *????????? 531s | 531s d 531s 531s 0 5 9 531s | | | 531s 0 - ********** - c 531s *#???????? 531s *????????? 531s *????????? 531s *????????? 531s 5 - *????????? 531s 6 - *????????? 531s | 531s d 531s 531s Key: 531s |,-,+ = rectangles forming current merge frontier 531s * = merge done manually 531s . = merge done automatically 531s # = conflict that is currently blocking progress 531s @ = merge was blocked but has been resolved 531s ? = no merge recorded 531s 531s + echo merged version 531s + git add conflict.txt 531s + GIT_EDITOR=cat git commit 531s imerge 'c-d': manual merge 1-1 531s 531s # Conflicts: 531s # conflict.txt 531s # 531s # It looks like you may be committing a merge. 531s # If this is not correct, please run 531s # git update-ref -d MERGE_HEAD 531s # and try again. 531s 531s 531s # Please enter the commit message for your changes. Lines starting 531s # with '#' will be ignored, and an empty message aborts the commit. 531s # 531s # On branch imerge/c-d 531s # All conflicts fixed but you are still merging. 531s # 531s # Changes to be committed: 531s # modified: conflict.txt 531s # modified: d.txt 531s # 531s + git-imerge continue --edit 531s [imerge/c-d e46d2e4] imerge 'c-d': manual merge 1-1 531s Merge has been recorded for merge 1-1. 531s Attempting to merge 1-2...success. 532s Attempting to merge 1-3...success. 532s Attempting to merge 1-4...success. 532s Attempting to merge 1-5...success. 532s Attempting to merge 1-6...success. 532s Attempting to merge 2-1...success. 532s Attempting to merge 2-2...success. 532s Attempting to merge 2-3...success. 532s Attempting to merge 2-4...success. 532s Attempting to merge 2-5...success. 532s Attempting to merge 2-6...success. 532s Attempting to merge 3-1...success. 532s Attempting to merge 3-2...success. 532s Attempting to merge 3-3...success. 532s Attempting to merge 3-4...success. 532s Attempting to merge 3-5...success. 532s Attempting to merge 3-6...success. 532s Attempting to merge 4-1...success. 532s Attempting to merge 4-2...success. 532s Attempting to merge 4-3...success. 532s Attempting to merge 4-4...success. 532s Attempting to merge 4-5...success. 532s Attempting to merge 4-6...success. 532s Attempting to merge 5-1...success. 532s Attempting to merge 5-2...success. 532s Attempting to merge 5-3...success. 532s Attempting to merge 5-4...success. 532s Attempting to merge 5-5...success. 532s Attempting to merge 5-6...success. 532s Attempting to merge 6-1...success. 532s Attempting to merge 6-2...success. 532s Attempting to merge 6-3...success. 532s Attempting to merge 6-4...success. 532s Attempting to merge 6-5...success. 532s Attempting to merge 6-6...success. 532s Attempting to merge 7-1...success. 532s Attempting to merge 7-2...success. 532s Attempting to merge 7-3...success. 532s Attempting to merge 7-4...success. 532s Attempting to merge 7-5...success. 532s Attempting to merge 7-6...success. 532s Attempting to merge 8-1...success. 532s Attempting to merge 8-2...success. 532s Attempting to merge 8-3...success. 532s Attempting to merge 8-4...success. 532s Attempting to merge 8-5...success. 532s Attempting to merge 8-6...success. 532s Attempting to merge 9-1...success. 532s Attempting to merge 9-2...success. 532s Attempting to merge 9-3...success. 532s Attempting to merge 9-4...success. 532s Attempting to merge 9-5...success. 532s Attempting to merge 9-6...success. 532s Merge is complete! 532s + git-imerge diagram --commits --frontier --html=imerge4.html 533s 0 5 9 533s | | | 533s 0 - ********** - c 533s **........ 533s *......... 533s *......... 533s *......... 533s 5 - *......... 533s 6 - *......... 533s | 533s d 533s 533s 0 5 9 533s | | | 533s 0 - ********** - c 533s **.......| 533s *........| 533s *........| 533s *........| 533s 5 - *........| 533s 6 - *--------+ 533s | 533s d 533s 533s Key: 533s |,-,+ = rectangles forming current merge frontier 533s * = merge done manually 533s . = merge done automatically 533s # = conflict that is currently blocking progress 533s @ = merge was blocked but has been resolved 533s ? = no merge recorded 533s 533s + git-imerge finish --branch=c-d-full 533s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 533s + local refname=c-d-full 533s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 533s + git rev-parse c-d-full^{tree} 533s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 533s + test_conflict 9-1 533s + local conflict=9-1 533s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s + DESCRIPTION=git-imerge test repository with conflict at 9-1 533s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 533s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s + local description=git-imerge test repository with conflict at 9-1 533s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 533s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s + local description=git-imerge test repository with conflict at 9-1 533s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s hint: Using 'master' as the name for the initial branch. This default branch name 533s hint: is subject to change. To configure the initial branch name to use in all 533s hint: of your new repositories, which will suppress this warning, call: 533s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1/.git/ 533s hint: 533s hint: git config --global init.defaultBranch 533s hint: 533s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 533s hint: 'development'. The just-created branch can be renamed via this command: 533s hint: 533s hint: git branch -m 533s + echo git-imerge test repository with conflict at 9-1 533s + printf %s\n /*.out /*.css /*.html 533s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1/.git config user.name Loú User 533s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 533s + TIME=1112911993 533s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-1 533s + modify c.txt 0 533s + filename=c.txt 533s + text=0 533s + echo 0 533s + git add c.txt 533s + modify d.txt 0 533s + filename=d.txt 533s + text=0 533s + echo 0 533s + git add d.txt 533s + modify conflict.txt original version 533s + filename=conflict.txt 533s + text=original version 533s + echo original version 533s + git add conflict.txt 533s + commit -m m⇒0 533s + TIME=1112911994 533s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 533s [master (root-commit) d70e04b] m⇒0 533s 3 files changed, 3 insertions(+) 533s create mode 100644 c.txt 533s create mode 100644 conflict.txt 533s create mode 100644 d.txt 533s + git checkout -b c master -- 533s Switched to a new branch 'c' 533s + seq 9 533s + modify c.txt 1 533s + filename=c.txt 533s + text=1 533s + echo 1 533s + git add c.txt 533s + commit -m c⇒1 533s + TIME=1112911995 533s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 533s [c 89e2141] c⇒1 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 2 533s + filename=c.txt 533s + text=2 533s + echo 2 533s + git add c.txt 533s + commit -m c⇒2 533s + TIME=1112911996 533s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 533s [c 7c431f2] c⇒2 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 3 533s + filename=c.txt 533s + text=3 533s + echo 3 533s + git add c.txt 533s + commit -m c⇒3 533s + TIME=1112911997 533s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 533s [c f02ab24] c⇒3 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 4 533s + filename=c.txt 533s + text=4 533s + echo 4 533s + git add c.txt 533s + commit -m c⇒4 533s + TIME=1112911998 533s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 533s [c ed9122f] c⇒4 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 5 533s + filename=c.txt 533s + text=5 533s + echo 5 533s + git add c.txt 533s + commit -m c⇒5 533s + TIME=1112911999 533s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 533s [c 1d3bf09] c⇒5 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 6 533s + filename=c.txt 533s + text=6 533s + echo 6 533s + git add c.txt 533s + commit -m c⇒6 533s + TIME=1112912000 533s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 533s [c f999ecd] c⇒6 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 7 533s + filename=c.txt 533s + text=7 533s + echo 7 533s + git add c.txt 533s + commit -m c⇒7 533s + TIME=1112912001 533s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 533s [c 7050a8a] c⇒7 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 8 533s + filename=c.txt 533s + text=8 533s + echo 8 533s + git add c.txt 533s + commit -m c⇒8 533s + TIME=1112912002 533s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 533s [c 9732e77] c⇒8 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify c.txt 9 533s + filename=c.txt 533s + text=9 533s + echo 9 533s + git add c.txt 533s + modify conflict.txt c version 533s + filename=conflict.txt 533s + text=c version 533s + echo c version 533s + git add conflict.txt 533s + commit -m c⇒9 533s + TIME=1112912003 533s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 533s [c 73a5eed] c⇒9 533s 2 files changed, 2 insertions(+), 2 deletions(-) 533s + git checkout -b d master -- 533s Switched to a new branch 'd' 533s + seq 6 533s + modify d.txt 1 533s + filename=d.txt 533s + text=1 533s + echo 1 533s + git add d.txt 533s + modify conflict.txt d version 533s + filename=conflict.txt 533s + text=d version 533s + echo d version 533s + git add conflict.txt 533s + commit -m d⇒1 533s + TIME=1112912004 533s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 533s [d ac0427a] d⇒1 533s 2 files changed, 2 insertions(+), 2 deletions(-) 533s + modify d.txt 2 533s + filename=d.txt 533s + text=2 533s + echo 2 533s + git add d.txt 533s + commit -m d⇒2 533s + TIME=1112912005 533s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 533s [d 43c38c0] d⇒2 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify d.txt 3 533s + filename=d.txt 533s + text=3 533s + echo 3 533s + git add d.txt 533s + commit -m d⇒3 533s + TIME=1112912006 533s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 533s [d 0260058] d⇒3 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify d.txt 4 533s + filename=d.txt 533s + text=4 533s + echo 4 533s + git add d.txt 533s + commit -m d⇒4 533s + TIME=1112912007 533s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 533s [d 40fef44] d⇒4 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify d.txt 5 533s + filename=d.txt 533s + text=5 533s + echo 5 533s + git add d.txt 533s + commit -m d⇒5 533s + TIME=1112912008 533s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 533s [d b080a65] d⇒5 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + modify d.txt 6 533s + filename=d.txt 533s + text=6 533s + echo 6 533s + git add d.txt 533s + commit -m d⇒6 533s + TIME=1112912009 533s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 533s [d 200ce5c] d⇒6 533s 1 file changed, 1 insertion(+), 1 deletion(-) 533s + git checkout c 533s Switched to branch 'c' 533s + git-imerge init --name=c-d d 533s + git-imerge list 533s * c-d 533s + git-imerge diagram --commits --frontier --html=imerge0.html 533s 0 5 9 533s | | | 533s 0 - ********** - c 533s *????????? 533s *????????? 533s *????????? 533s *????????? 533s 5 - *????????? 533s 6 - *????????? 533s | 533s d 533s 533s 0 5 9 533s | | | 533s 0 - ********** - c 533s *????????? 533s *????????? 533s *????????? 533s *????????? 533s 5 - *????????? 533s 6 - *????????? 533s | 533s d 533s 533s Key: 533s |,-,+ = rectangles forming current merge frontier 533s * = merge done manually 533s . = merge done automatically 533s # = conflict that is currently blocking progress 533s @ = merge was blocked but has been resolved 533s ? = no merge recorded 533s 533s + + git-imerge autofill 533s tee autofill.out 533s Attempting automerge of 9-6...failure. 533s Attempting automerge of 1-1...success. 533s Attempting automerge of 1-4...success. 533s Attempting automerge of 1-6...success. 533s Attempting automerge of 9-6...failure. 534s Attempting automerge of 5-6...success. 534s Attempting automerge of 7-6...success. 534s Attempting automerge of 8-6...success. 534s Attempting automerge of 9-1...failure. 534s Autofilling 1-6...success. 534s Autofilling 2-6...success. 534s Autofilling 3-6...success. 534s Autofilling 4-6...success. 534s Autofilling 5-6...success. 534s Autofilling 6-6...success. 534s Autofilling 7-6...success. 534s Autofilling 8-1...success. 534s Autofilling 8-2...success. 534s Autofilling 8-3...success. 534s Autofilling 8-4...success. 534s Autofilling 8-5...success. 534s Autofilling 8-6 (first way)...success. 534s Autofilling 8-6 (second way)...success. 534s The two ways of autofilling 8-6 agree. 534s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 534s Attempting automerge of 9-6...failure. 534s Attempting automerge of 9-1...failure. 534s HEAD is now at 73a5eed c⇒9 534s Conflict; suggest manual merge of 9-1 534s + grep -q Traceback autofill.out 534s + grep -q suggest manual merge of 9-1 autofill.out 534s + git-imerge diagram --commits --frontier --html=imerge1.html 534s 0 5 9 534s | | | 534s 0 - ********** - c 534s *???????.# 534s *???????.? 534s *???????.? 534s *???????.? 534s 5 - *???????.? 534s 6 - *........? 534s | 534s d 534s 534s 0 5 9 534s | | | 534s 0 - ********** - c 534s *???????|# 534s *???????|? 534s *???????|? 534s *???????|? 534s 5 - *???????|? 534s 6 - *-------+? 534s | 534s d 534s 534s Key: 534s |,-,+ = rectangles forming current merge frontier 534s * = merge done manually 534s . = merge done automatically 534s # = conflict that is currently blocking progress 534s @ = merge was blocked but has been resolved 534s ? = no merge recorded 534s 534s + git-imerge continue --edit 534s Switched to branch 'imerge/c-d' 534s Auto-merging conflict.txt 534s CONFLICT (content): Merge conflict in conflict.txt 534s Automatic merge failed; fix conflicts and then commit the result. 534s 534s Original first commit: 534s 534s Original second commit: 534s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 534s Author: Loú User 534s Date: Thu Apr 7 22:13:23 2005 +0000 534s 534s c⇒9 534s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 534s Author: Loú User 534s Date: Thu Apr 7 22:13:24 2005 +0000 534s 534s d⇒1 534s 534s There was a conflict merging commit 9-1, shown above. 534s Please resolve the conflict, commit the result, then type 534s 534s git-imerge continue 534s + echo merged version 534s + git add conflict.txt 534s + git-imerge continue --no-edit 534s [imerge/c-d 1fbcad9] imerge 'c-d': manual merge 9-1 534s Merge has been recorded for merge 9-1. 534s Attempting automerge of 9-6...success. 534s Autofilling 9-2...success. 534s Autofilling 9-3...success. 534s Autofilling 9-4...success. 534s Autofilling 9-5...success. 534s Autofilling 9-6...success. 534s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 534s Merge is complete! 534s + git-imerge diagram --commits --frontier --html=imerge2.html 534s 0 5 9 534s | | | 534s 0 - ********** - c 534s *???????.* 534s *???????.. 534s *???????.. 534s *???????.. 535s 5 - *???????.. 535s 6 - *......... 535s | 535s d 535s 535s 0 5 9 535s | | | 535s 0 - ********** - c 535s *???????.* 535s *???????.| 535s *???????.| 535s *???????.| 535s 5 - *???????.| 535s 6 - *--------+ 535s | 535s d 535s 535s Key: 535s |,-,+ = rectangles forming current merge frontier 535s * = merge done manually 535s . = merge done automatically 535s # = conflict that is currently blocking progress 535s @ = merge was blocked but has been resolved 535s ? = no merge recorded 535s 535s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 535s Merge d into c (using imerge) 535s 535s # Please enter the commit message for your changes. Lines starting 535s # with '#' will be ignored, and an empty message aborts the commit. 535s # 535s # Date: Wed Mar 27 07:47:24 2024 +0000 535s # 535s # On branch c-d-merge 535s # Changes to be committed: 535s # modified: conflict.txt 535s # modified: d.txt 535s # 535s [c-d-merge e41a14a] Merge d into c (using imerge) 535s Date: Wed Mar 27 07:47:24 2024 +0000 535s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + local refname=c-d-merge 535s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git rev-parse c-d-merge^{tree} 535s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git-imerge simplify --goal=rebase --branch=c-d-rebase 535s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + local refname=c-d-rebase 535s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git rev-parse c-d-rebase^{tree} 535s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 535s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + local refname=c-d-rebase-with-history 535s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git rev-parse c-d-rebase-with-history^{tree} 535s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git-imerge simplify --goal=border --branch=c-d-border 535s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + local refname=c-d-border 535s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git rev-parse c-d-border^{tree} 535s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 535s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 536s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 536s + local refname=c-d-border-with-history 536s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 536s + git rev-parse c-d-border-with-history^{tree} 536s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 536s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 536s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 536s + local refname=c-d-border-with-history2 536s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 536s + git rev-parse c-d-border-with-history2^{tree} 536s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 536s + git-imerge remove 536s + git checkout c 536s Switched to branch 'c' 536s + + git-imerge start --goal=fulltee --first-parent --name=c-d d 536s start.out 537s Attempting to merge 1-1...success. 537s Attempting to merge 1-2...success. 537s Attempting to merge 1-3...success. 537s Attempting to merge 1-4...success. 537s Attempting to merge 1-5...success. 537s Attempting to merge 1-6...success. 537s Attempting to merge 2-1...success. 537s Attempting to merge 2-2...success. 537s Attempting to merge 2-3...success. 537s Attempting to merge 2-4...success. 537s Attempting to merge 2-5...success. 537s Attempting to merge 2-6...success. 537s Attempting to merge 3-1...success. 537s Attempting to merge 3-2...success. 537s Attempting to merge 3-3...success. 537s Attempting to merge 3-4...success. 537s Attempting to merge 3-5...success. 537s Attempting to merge 3-6...success. 537s Attempting to merge 4-1...success. 537s Attempting to merge 4-2...success. 537s Attempting to merge 4-3...success. 537s Attempting to merge 4-4...success. 537s Attempting to merge 4-5...success. 537s Attempting to merge 4-6...success. 537s Attempting to merge 5-1...success. 537s Attempting to merge 5-2...success. 537s Attempting to merge 5-3...success. 537s Attempting to merge 5-4...success. 537s Attempting to merge 5-5...success. 537s Attempting to merge 5-6...success. 537s Attempting to merge 6-1...success. 537s Attempting to merge 6-2...success. 537s Attempting to merge 6-3...success. 537s Attempting to merge 6-4...success. 537s Attempting to merge 6-5...success. 537s Attempting to merge 6-6...success. 537s Attempting to merge 7-1...success. 537s Attempting to merge 7-2...success. 537s Attempting to merge 7-3...success. 537s Attempting to merge 7-4...success. 537s Attempting to merge 7-5...success. 537s Attempting to merge 7-6...success. 537s Attempting to merge 8-1...success. 537s Attempting to merge 8-2...success. 537s Attempting to merge 8-3...success. 537s Attempting to merge 8-4...success. 537s Attempting to merge 8-5...success. 538s Attempting to merge 8-6...success. 538s Attempting to merge 9-1...conflict. 538s Switched to branch 'imerge/c-d' 538s Auto-merging conflict.txt 538s CONFLICT (content): Merge conflict in conflict.txt 538s Automatic merge failed; fix conflicts and then commit the result. 538s 538s Original first commit: 538s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 538s Author: Loú User 538s Date: Thu Apr 7 22:13:23 2005 +0000 538s 538s c⇒9 538s 538s Original second commit: 538s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 538s Author: Loú User 538s Date: Thu Apr 7 22:13:24 2005 +0000 538s 538s d⇒1 538s 538s There was a conflict merging commit 9-1, shown above. 538s Please resolve the conflict, commit the result, then type 538s 538s git-imerge continue 538s + grep -q Traceback start.out 538s + grep -q suggest manual merge of 9-1 autofill.out 538s + git-imerge diagram --commits --frontier --html=imerge3.html 538s 0 5 9 538s | | | 538s 0 - ********** - c 538s *........# 538s *........? 538s *........? 538s *........? 538s 5 - *........? 538s 6 - *........? 538s | 538s d 538s 538s 0 5 9 538s | | | 538s 0 - ********** - c 538s *.......|# 538s *.......|? 538s *.......|? 538s *.......|? 538s 5 - *.......|? 538s 6 - *-------+? 538s | 538s d 538s 538s Key: 538s |,-,+ = rectangles forming current merge frontier 538s * = merge done manually 538s . = merge done automatically 538s # = conflict that is currently blocking progress 538s @ = merge was blocked but has been resolved 538s ? = no merge recorded 538s 538s + echo merged version 538s + git add conflict.txt 538s + GIT_EDITOR=cat git commit 538s imerge 'c-d': manual merge 9-1 538s 538s # Conflicts: 538s # conflict.txt 538s # 538s # It looks like you may be committing a merge. 538s # If this is not correct, please run 538s # git update-ref -d MERGE_HEAD 538s # and try again. 538s 538s 538s # Please enter the commit message for your changes. Lines starting 538s # with '#' will be ignored, and an empty message aborts the commit. 538s # 538s # On branch imerge/c-d 538s # All conflicts fixed but you are still merging. 538s # 538s # Changes to be committed: 538s # modified: conflict.txt 538s # modified: d.txt 538s # 538s [imerge/c-d e29105a] imerge 'c-d': manual merge 9-1 538s + git-imerge continue --edit 538s Merge has been recorded for merge 9-1. 538s Attempting to merge 9-2...success. 538s Attempting to merge 9-3...success. 538s Attempting to merge 9-4...success. 538s Attempting to merge 9-5...success. 538s Attempting to merge 9-6...success. 538s Merge is complete! 538s + git-imerge diagram --commits --frontier --html=imerge4.html 538s 0 5 9 538s | | | 538s 0 - ********** - c 538s *........* 538s *......... 538s *......... 538s *......... 538s 5 - *......... 538s 6 - *......... 538s | 538s d 538s 538s 0 5 9 538s | | | 538s 0 - ********** - c 538s *........* 538s *........| 538s *........| 538s *........| 538s 5 - *........| 538s 6 - *--------+ 538s | 538s d 538s 538s Key: 538s |,-,+ = rectangles forming current merge frontier 538s * = merge done manually 538s . = merge done automatically 538s # = conflict that is currently blocking progress 538s @ = merge was blocked but has been resolved 538s ? = no merge recorded 538s 538s + git-imerge finish --branch=c-d-full 538s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 538s + local refname=c-d-full 538s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 538s + git rev-parse c-d-full^{tree} 538s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 538s + test_conflict 1-6 538s + local conflict=1-6 538s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s + DESCRIPTION=git-imerge test repository with conflict at 1-6 538s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 538s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s + local description=git-imerge test repository with conflict at 1-6 538s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 538s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s + local description=git-imerge test repository with conflict at 1-6 538s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s hint: Using 'master' as the name for the initial branch. This default branch name 538s hint: is subject to change. To configure the initial branch name to use in all 538s hint: of your new repositories, which will suppress this warning, call: 538s hint: 538s hint: git config --global init.defaultBranch 538s hint: 538s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 538s hint: 'development'. The just-created branch can be renamed via this command: 538s hint: 538s hint: git branch -m 538s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6/.git/ 538s + echo git-imerge test repository with conflict at 1-6 538s + printf %s\n /*.out /*.css /*.html 538s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6/.git config user.name Loú User 538s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 538s + TIME=1112911993 538s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-6 538s + modify c.txt 0 538s + filename=c.txt 538s + text=0 538s + echo 0 538s + git add c.txt 538s + modify d.txt 0 538s + filename=d.txt 538s + text=0 538s + echo 0 538s + git add d.txt 539s + modify conflict.txt original version 539s + filename=conflict.txt 539s + text=original version 539s + echo original version 539s + git add conflict.txt 539s + commit -m m⇒0 539s + TIME=1112911994 539s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 539s + git checkout -b c master -- 539s [master (root-commit) d70e04b] m⇒0 539s 3 files changed, 3 insertions(+) 539s create mode 100644 c.txt 539s create mode 100644 conflict.txt 539s create mode 100644 d.txt 539s Switched to a new branch 'c' 539s + seq 9 539s + modify c.txt 1 539s + filename=c.txt 539s + text=1 539s + echo 1 539s + git add c.txt 539s + modify conflict.txt c version 539s + filename=conflict.txt 539s + text=c version 539s + echo c version 539s + git add conflict.txt 539s + commit -m c⇒1 539s + TIME=1112911995 539s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 539s [c 2120f40] c⇒1 539s 2 files changed, 2 insertions(+), 2 deletions(-) 539s + modify c.txt 2 539s + filename=c.txt 539s + text=2 539s + echo 2 539s + git add c.txt 539s + commit -m c⇒2 539s + TIME=1112911996 539s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 539s [c 90cc7de] c⇒2 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify c.txt 3 539s + filename=c.txt 539s + text=3 539s + echo 3 539s + git add c.txt 539s + commit -m c⇒3 539s + TIME=1112911997 539s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 539s [c 2046ed2] c⇒3 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify c.txt 4 539s + filename=c.txt 539s + text=4 539s + echo 4 539s + git add c.txt 539s + commit -m c⇒4 539s + TIME=1112911998 539s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 539s [c 8a2cee9] c⇒4 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify c.txt 5 539s + filename=c.txt 539s + text=5 539s + echo 5 539s + git add c.txt 539s + commit -m c⇒5 539s + TIME=1112911999 539s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 539s [c ac16a05] c⇒5 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify c.txt 6 539s + filename=c.txt 539s + text=6 539s + echo 6 539s + git add c.txt 539s + commit -m c⇒6 539s + TIME=1112912000 539s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 539s [c 30dd2ae] c⇒6 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify c.txt 7 539s + filename=c.txt 539s + text=7 539s + echo 7 539s + git add c.txt 539s + commit -m c⇒7 539s + TIME=1112912001 539s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 539s [c 0883eb9] c⇒7 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify c.txt 8 539s + filename=c.txt 539s + text=8 539s + echo 8 539s + git add c.txt 539s + commit -m c⇒8 539s + TIME=1112912002 539s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 539s [c f661c06] c⇒8 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify c.txt 9 539s + filename=c.txt 539s + text=9 539s + echo 9 539s + git add c.txt 539s + commit -m c⇒9 539s + TIME=1112912003 539s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 539s [c 243e8ed] c⇒9 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + git checkout -b d master -- 539s Switched to a new branch 'd' 539s + seq 6 539s + modify d.txt 1 539s + filename=d.txt 539s + text=1 539s + echo 1 539s + git add d.txt 539s + commit -m d⇒1 539s + TIME=1112912004 539s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 539s + modify d.txt 2 539s + filename=d.txt 539s + text=2 539s + echo 2 539s + git add d.txt 539s [d bd5368a] d⇒1 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + commit -m d⇒2 539s + TIME=1112912005 539s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 539s + modify d.txt 3 539s + filename=d.txt 539s + text=3 539s + echo 3 539s + git add d.txt 539s [d 93e27e6] d⇒2 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + commit -m d⇒3 539s + TIME=1112912006 539s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 539s + modify d.txt 4 539s + filename=d.txt 539s + text=4 539s + echo 4 539s + git add d.txt 539s [d 133f385] d⇒3 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + commit -m d⇒4 539s + TIME=1112912007 539s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 539s [d 586472a] d⇒4 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify d.txt 5 539s + filename=d.txt 539s + text=5 539s + echo 5 539s + git add d.txt 539s + commit -m d⇒5 539s + TIME=1112912008 539s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 539s [d 9522207] d⇒5 539s 1 file changed, 1 insertion(+), 1 deletion(-) 539s + modify d.txt 6 539s + filename=d.txt 539s + text=6 539s + echo 6 539s + git add d.txt 539s + modify conflict.txt d version 539s + filename=conflict.txt 539s + text=d version 539s + echo d version 539s + git add conflict.txt 539s + commit -m d⇒6 539s + TIME=1112912009 539s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 539s [d f7e451a] d⇒6 539s 2 files changed, 2 insertions(+), 2 deletions(-) 539s + git checkout c 539s Switched to branch 'c' 539s + git-imerge init --name=c-d d 539s + git-imerge list 540s * c-d 540s + git-imerge diagram --commits --frontier --html=imerge0.html 540s + + git-imerge autofill 540s tee autofill.out 540s + grep -q Traceback autofill.out 540s + grep -q suggest manual merge of 1-6 autofill.out 540s + git-imerge diagram --commits --frontier --html=imerge1.html 540s + git-imerge continue --edit 540s Switched to branch 'imerge/c-d' 540s 540s Original first commit: 540s 540s Original second commit: 540s 540s There was a conflict merging commit 1-6, shown above. 540s Please resolve the conflict, commit the result, then type 540s 540s git-imerge continue 540s + echo merged version 540s + git add conflict.txt 540s + git-imerge continue --no-edit 540s Merge has been recorded for merge 1-6. 540s Attempting automerge of 9-6...success. 540s Autofilling 2-6...success. 540s Autofilling 3-6...success. 540s Autofilling 4-6...success. 540s Autofilling 5-6...success. 540s Autofilling 6-6...success. 540s 0 5 9 540s | | | 540s 0 - ********** - c 540s *????????? 540s *????????? 540s *????????? 540s *????????? 540s 5 - *????????? 540s 6 - *????????? 540s | 540s d 540s 540s 0 5 9 540s | | | 540s 0 - ********** - c 540s *????????? 540s *????????? 540s *????????? 540s *????????? 540s 5 - *????????? 540s 6 - *????????? 540s | 540s d 540s 540s Key: 540s |,-,+ = rectangles forming current merge frontier 540s * = merge done manually 540s . = merge done automatically 540s # = conflict that is currently blocking progress 540s @ = merge was blocked but has been resolved 540s ? = no merge recorded 540s 540s Attempting automerge of 9-6...failure. 540s Attempting automerge of 1-1...success. 540s Attempting automerge of 1-4...success. 540s Attempting automerge of 1-6...failure. 540s Attempting automerge of 1-5...success. 540s Attempting automerge of 9-5...success. 540s Autofilling 1-5...success. 540s Autofilling 2-5...success. 540s Autofilling 3-5...success. 540s Autofilling 4-5...success. 540s Autofilling 5-5...success. 540s Autofilling 6-5...success. 540s Autofilling 7-5...success. 540s Autofilling 8-5...success. 540s Autofilling 9-1...success. 540s Autofilling 9-2...success. 540s Autofilling 9-3...success. 540s Autofilling 9-4...success. 540s Autofilling 9-5 (first way)...success. 540s Autofilling 9-5 (second way)...success. 540s The two ways of autofilling 9-5 agree. 540s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 540s Attempting automerge of 9-6...failure. 540s Attempting automerge of 1-6...failure. 540s HEAD is now at 243e8ed c⇒9 540s Conflict; suggest manual merge of 1-6 540s 0 5 9 540s | | | 540s 0 - ********** - c 540s *????????. 540s *????????. 540s *????????. 540s *????????. 540s 5 - *......... 540s 6 - *#???????? 540s | 540s d 540s 540s 0 5 9 540s | | | 540s 0 - ********** - c 540s *????????| 540s *????????| 540s *????????| 540s *????????| 540s 5 - *--------+ 540s 6 - *#???????? 540s | 540s d 540s 540s Key: 540s |,-,+ = rectangles forming current merge frontier 540s * = merge done manually 540s . = merge done automatically 540s # = conflict that is currently blocking progress 540s @ = merge was blocked but has been resolved 540s ? = no merge recorded 540s 540s Auto-merging conflict.txt 540s CONFLICT (content): Merge conflict in conflict.txt 540s Automatic merge failed; fix conflicts and then commit the result. 540s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 540s Author: Loú User 540s Date: Thu Apr 7 22:13:15 2005 +0000 540s 540s c⇒1 540s commit f7e451a6c9656dda15641a9fbc591a602f158692 540s Author: Loú User 540s Date: Thu Apr 7 22:13:29 2005 +0000 540s 540s d⇒6 540s [imerge/c-d e986390] imerge 'c-d': manual merge 1-6 540s Autofilling 7-6...success. 540s Autofilling 8-6...success. 540s Autofilling 9-6...success. 540s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 540s Merge is complete! 541s + git-imerge diagram --commits --frontier --html=imerge2.html 541s 0 5 9 541s | | | 541s 0 - ********** - c 541s *????????. 541s *????????. 541s *????????. 541s *????????. 541s 5 - *......... 541s 6 - **........ 541s | 541s d 541s 541s 0 5 9 541s | | | 541s 0 - ********** - c 541s *????????| 541s *????????| 541s *????????| 541s *????????| 541s 5 - *........| 541s 6 - **-------+ 541s | 541s d 541s 541s Key: 541s |,-,+ = rectangles forming current merge frontier 541s * = merge done manually 541s . = merge done automatically 541s # = conflict that is currently blocking progress 541s @ = merge was blocked but has been resolved 541s ? = no merge recorded 541s 541s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 541s Merge d into c (using imerge) 541s 541s # Please enter the commit message for your changes. Lines starting 541s # with '#' will be ignored, and an empty message aborts the commit. 541s # 541s # Date: Wed Mar 27 07:47:30 2024 +0000 541s # 541s # On branch c-d-merge 541s # Changes to be committed: 541s # modified: conflict.txt 541s # modified: d.txt 541s # 541s [c-d-merge 57143ab] Merge d into c (using imerge) 541s Date: Wed Mar 27 07:47:30 2024 +0000 541s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + local refname=c-d-merge 541s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + git rev-parse c-d-merge^{tree} 541s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + git-imerge simplify --goal=rebase --branch=c-d-rebase 541s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + local refname=c-d-rebase 541s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + git rev-parse c-d-rebase^{tree} 541s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 541s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + local refname=c-d-rebase-with-history 541s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + git rev-parse c-d-rebase-with-history^{tree} 541s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 541s + git-imerge simplify --goal=border --branch=c-d-border 542s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + local refname=c-d-border 542s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + git rev-parse c-d-border^{tree} 542s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 542s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + local refname=c-d-border-with-history 542s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + git rev-parse c-d-border-with-history^{tree} 542s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 542s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + local refname=c-d-border-with-history2 542s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + git rev-parse c-d-border-with-history2^{tree} 542s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 542s + git-imerge remove 542s + git checkout c 542s Switched to branch 'c' 542s + git-imerge start --goal=full --first-parent --name=c-d d 542s + tee start.out 542s Attempting to merge 1-1...success. 542s Attempting to merge 1-2...success. 543s Attempting to merge 1-3...success. 543s Attempting to merge 1-4...success. 543s Attempting to merge 1-5...success. 543s Attempting to merge 1-6...conflict. 543s Attempting to merge 2-1...success. 543s Attempting to merge 2-2...success. 543s Attempting to merge 2-3...success. 543s Attempting to merge 2-4...success. 543s Attempting to merge 2-5...success. 543s Attempting to merge 3-1...success. 543s Attempting to merge 3-2...success. 543s Attempting to merge 3-3...success. 543s Attempting to merge 3-4...success. 543s Attempting to merge 3-5...success. 543s Attempting to merge 4-1...success. 543s Attempting to merge 4-2...success. 543s Attempting to merge 4-3...success. 543s Attempting to merge 4-4...success. 543s Attempting to merge 4-5...success. 543s Attempting to merge 5-1...success. 543s Attempting to merge 5-2...success. 543s Attempting to merge 5-3...success. 543s Attempting to merge 5-4...success. 543s Attempting to merge 5-5...success. 543s Attempting to merge 6-1...success. 543s Attempting to merge 6-2...success. 543s Attempting to merge 6-3...success. 543s Attempting to merge 6-4...success. 543s Attempting to merge 6-5...success. 543s Attempting to merge 7-1...success. 543s Attempting to merge 7-2...success. 543s Attempting to merge 7-3...success. 543s Attempting to merge 7-4...success. 543s Attempting to merge 7-5...success. 543s Attempting to merge 8-1...success. 543s Attempting to merge 8-2...success. 543s Attempting to merge 8-3...success. 543s Attempting to merge 8-4...success. 543s Attempting to merge 8-5...success. 543s Attempting to merge 9-1...success. 543s Attempting to merge 9-2...success. 543s Attempting to merge 9-3...success. 543s Attempting to merge 9-4...success. 543s Attempting to merge 9-5...success. 543s Previous HEAD position was 6bad0cb imerge 'c-d': automatic merge 9-5 543s Switched to branch 'imerge/c-d' 543s Auto-merging conflict.txt 543s CONFLICT (content): Merge conflict in conflict.txt 543s Automatic merge failed; fix conflicts and then commit the result. 543s 543s Original first commit: 543s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 543s Author: Loú User 543s Date: Thu Apr 7 22:13:15 2005 +0000 543s 543s c⇒1 543s 543s Original second commit: 543s commit f7e451a6c9656dda15641a9fbc591a602f158692 543s Author: Loú User 543s Date: Thu Apr 7 22:13:29 2005 +0000 543s 543s d⇒6 543s 543s There was a conflict merging commit 1-6, shown above. 543s Please resolve the conflict, commit the result, then type 543s 543s git-imerge continue 543s + grep -q Traceback start.out 543s + grep -q suggest manual merge of 1-6 autofill.out 543s + git-imerge diagram --commits --frontier --html=imerge3.html 543s 0 5 9 543s | | | 543s 0 - ********** - c 543s *......... 543s *......... 543s *......... 543s *......... 543s 5 - *......... 543s 6 - *#???????? 543s | 543s d 543s 543s 0 5 9 543s | | | 543s 0 - ********** - c 543s *........| 543s *........| 543s *........| 543s *........| 543s 5 - *--------+ 543s 6 - *#???????? 543s | 543s d 543s 543s Key: 543s |,-,+ = rectangles forming current merge frontier 543s * = merge done manually 543s . = merge done automatically 543s # = conflict that is currently blocking progress 543s @ = merge was blocked but has been resolved 543s ? = no merge recorded 543s 543s + echo merged version 543s + git add conflict.txt 543s + GIT_EDITOR=cat git commit 543s imerge 'c-d': manual merge 1-6 543s 543s # Conflicts: 543s # conflict.txt 543s # 543s # It looks like you may be committing a merge. 543s # If this is not correct, please run 543s # git update-ref -d MERGE_HEAD 543s # and try again. 543s 543s 543s # Please enter the commit message for your changes. Lines starting 543s # with '#' will be ignored, and an empty message aborts the commit. 543s # 543s # On branch imerge/c-d 543s # All conflicts fixed but you are still merging. 543s # 543s # Changes to be committed: 543s # modified: conflict.txt 543s # modified: d.txt 543s # 543s [imerge/c-d e900d2f] imerge 'c-d': manual merge 1-6 543s + git-imerge continue --edit 544s Merge has been recorded for merge 1-6. 544s Attempting to merge 2-6...success. 544s Attempting to merge 3-6...success. 544s Attempting to merge 4-6...success. 544s Attempting to merge 5-6...success. 544s Attempting to merge 6-6...success. 544s Attempting to merge 7-6...success. 544s Attempting to merge 8-6...success. 544s Attempting to merge 9-6...success. 544s Merge is complete! 544s + git-imerge diagram --commits --frontier --html=imerge4.html 544s 0 5 9 544s | | | 544s 0 - ********** - c 544s *......... 544s *......... 544s *......... 544s *......... 544s 5 - *......... 544s 6 - **........ 544s | 544s d 544s 544s 0 5 9 544s | | | 544s 0 - ********** - c 544s *........| 544s *........| 544s *........| 544s *........| 544s 5 - *........| 544s 6 - **-------+ 544s | 544s d 544s 544s Key: 544s |,-,+ = rectangles forming current merge frontier 544s * = merge done manually 544s . = merge done automatically 544s # = conflict that is currently blocking progress 544s @ = merge was blocked but has been resolved 544s ? = no merge recorded 544s 544s + git-imerge finish --branch=c-d-full 544s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 544s + local refname=c-d-full 544s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 544s + git rev-parse c-d-full^{tree} 544s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 544s + test_conflict 9-6 544s + local conflict=9-6 544s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s + DESCRIPTION=git-imerge test repository with conflict at 9-6 544s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 544s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s + local description=git-imerge test repository with conflict at 9-6 544s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 544s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s + local description=git-imerge test repository with conflict at 9-6 544s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s hint: Using 'master' as the name for the initial branch. This default branch name 544s hint: is subject to change. To configure the initial branch name to use in all 544s hint: of your new repositories, which will suppress this warning, call: 544s hint: 544s hint: git config --global init.defaultBranch 544s hint: 544s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 544s hint: 'development'. The just-created branch can be renamed via this command: 544s hint: 544s hint: git branch -m 544s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6/.git/ 544s + echo git-imerge test repository with conflict at 9-6 544s + printf %s\n /*.out /*.css /*.html 544s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6/.git config user.name Loú User 544s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 544s + TIME=1112911993 544s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-6 544s + modify c.txt 0 544s + filename=c.txt 544s + text=0 544s + echo 0 544s + git add c.txt 544s + modify d.txt 0 544s + filename=d.txt 544s + text=0 544s + echo 0 544s + git add d.txt 544s + modify conflict.txt original version 544s + filename=conflict.txt 544s + text=original version 544s + echo original version 544s + git add conflict.txt 544s + commit -m m⇒0 544s + TIME=1112911994 544s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 544s [master (root-commit) d70e04b] m⇒0 544s 3 files changed, 3 insertions(+) 544s create mode 100644 c.txt 544s create mode 100644 conflict.txt 544s create mode 100644 d.txt 544s + git checkout -b c master -- 544s Switched to a new branch 'c' 544s + seq 9 544s + modify c.txt 1 544s + filename=c.txt 544s + text=1 544s + echo 1 544s + git add c.txt 544s [c 89e2141] c⇒1 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s [c 7c431f2] c⇒2 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + commit -m c⇒1 544s + TIME=1112911995 544s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 544s + modify c.txt 2 544s + filename=c.txt 544s + text=2 544s + echo 2 544s + git add c.txt 544s + commit -m c⇒2 544s + TIME=1112911996 544s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 544s + modify c.txt 3 544s + filename=c.txt 544s + text=3 544s + echo 3 544s + git add c.txt 544s + commit -m c⇒3 544s + TIME=1112911997 544s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 544s [c f02ab24] c⇒3 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify c.txt 4 544s + filename=c.txt 544s + text=4 544s + echo 4 544s + git add c.txt 544s + commit -m c⇒4 544s + TIME=1112911998 544s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 544s [c ed9122f] c⇒4 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify c.txt 5 544s + filename=c.txt 544s + text=5 544s + echo 5 544s + git add c.txt 544s + commit -m c⇒5 544s + TIME=1112911999 544s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 544s [c 1d3bf09] c⇒5 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify c.txt 6 544s + filename=c.txt 544s + text=6 544s + echo 6 544s + git add c.txt 544s + commit -m c⇒6 544s + TIME=1112912000 544s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 544s [c f999ecd] c⇒6 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify c.txt 7 544s + filename=c.txt 544s + text=7 544s + echo 7 544s + git add c.txt 544s + commit -m c⇒7 544s + TIME=1112912001 544s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 544s [c 7050a8a] c⇒7 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify c.txt 8 544s + filename=c.txt 544s + text=8 544s + echo 8 544s + git add c.txt 544s + commit -m c⇒8 544s + TIME=1112912002 544s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 544s + modify c.txt 9 544s + filename=c.txt 544s + text=9 544s + echo 9 544s + git add c.txt 544s [c 9732e77] c⇒8 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify conflict.txt c version 544s + filename=conflict.txt 544s + text=c version 544s + echo c version 544s + git add conflict.txt 544s + commit -m c⇒9 544s + TIME=1112912003 544s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 544s [c 73a5eed] c⇒9 544s 2 files changed, 2 insertions(+), 2 deletions(-) 544s + git checkout -b d master -- 544s Switched to a new branch 'd' 544s + seq 6 544s + modify d.txt 1 544s + filename=d.txt 544s + text=1 544s + echo 1 544s + git add d.txt 544s + commit -m d⇒1 544s + TIME=1112912004 544s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 544s [d bd5368a] d⇒1 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify d.txt 2 544s + filename=d.txt 544s + text=2 544s + echo 2 544s + git add d.txt 544s + commit -m d⇒2 544s + TIME=1112912005 544s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 544s [d 93e27e6] d⇒2 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify d.txt 3 544s + filename=d.txt 544s + text=3 544s + echo 3 544s + git add d.txt 544s + commit -m d⇒3 544s + TIME=1112912006 544s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 544s [d 133f385] d⇒3 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify d.txt 4 544s + filename=d.txt 544s + text=4 544s + echo 4 544s + git add d.txt 544s + commit -m d⇒4 544s + TIME=1112912007 544s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 544s [d 586472a] d⇒4 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify d.txt 5 544s + filename=d.txt 544s + text=5 544s + echo 5 544s + git add d.txt 544s + commit -m d⇒5 544s + TIME=1112912008 544s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 544s [d 9522207] d⇒5 544s 1 file changed, 1 insertion(+), 1 deletion(-) 544s + modify d.txt 6 544s + filename=d.txt 544s + text=6 544s + echo 6 544s + git add d.txt 544s + modify conflict.txt d version 544s + filename=conflict.txt 544s + text=d version 544s + echo d version 544s + git add conflict.txt 544s + commit -m d⇒6 544s + TIME=1112912009 544s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 544s [d f7e451a] d⇒6 544s 2 files changed, 2 insertions(+), 2 deletions(-) 544s + git checkout c 544s Switched to branch 'c' 544s + git-imerge init --name=c-d d 545s + git-imerge list 545s * c-d 545s + git-imerge diagram --commits --frontier --html=imerge0.html 545s 0 5 9 545s | | | 545s 0 - ********** - c 545s *????????? 545s *????????? 545s *????????? 545s *????????? 545s 5 - *????????? 545s 6 - *????????? 545s | 545s d 545s 545s 0 5 9 545s | | | 545s 0 - ********** - c 545s *????????? 545s *????????? 545s *????????? 545s *????????? 545s 5 - *????????? 545s 6 - *????????? 545s | 545s d 545s 545s Key: 545s |,-,+ = rectangles forming current merge frontier 545s * = merge done manually 545s . = merge done automatically 545s # = conflict that is currently blocking progress 545s @ = merge was blocked but has been resolved 545s ? = no merge recorded 545s 545s + git-imerge autofill 545s + tee autofill.out 545s Attempting automerge of 9-6...failure. 545s Attempting automerge of 1-1...success. 545s Attempting automerge of 1-4...success. 545s Attempting automerge of 1-6...success. 545s Attempting automerge of 9-6...failure. 545s Attempting automerge of 5-6...success. 545s Attempting automerge of 7-6...success. 545s Attempting automerge of 8-6...success. 545s Attempting automerge of 9-1...success. 545s Attempting automerge of 9-4...success. 545s Attempting automerge of 9-5...success. 545s Autofilling 1-6...success. 545s Autofilling 2-6...success. 545s Autofilling 3-6...success. 545s Autofilling 4-6...success. 545s Autofilling 5-6...success. 545s Autofilling 6-6...success. 545s Autofilling 7-6...success. 545s Autofilling 8-1...success. 545s Autofilling 8-2...success. 545s Autofilling 8-3...success. 545s Autofilling 8-4...success. 545s Autofilling 8-5...success. 545s Autofilling 8-6 (first way)...success. 545s Autofilling 8-6 (second way)...success. 545s The two ways of autofilling 8-6 agree. 545s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 545s Autofilling 9-1...success. 545s Autofilling 9-2...success. 545s Autofilling 9-3...success. 545s Autofilling 9-4...success. 545s Autofilling 9-5...success. 545s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 545s Attempting automerge of 9-6...failure. 545s Attempting automerge of 9-6...failure. 545s HEAD is now at 73a5eed c⇒9 545s Conflict; suggest manual merge of 9-6 545s + grep -q Traceback autofill.out 545s + grep -q suggest manual merge of 9-6 autofill.out 545s + git-imerge diagram --commits --frontier --html=imerge1.html 546s 0 5 9 546s | | | 546s 0 - ********** - c 546s *???????.. 546s *???????.. 546s *???????.. 546s *???????.. 546s 5 - *???????.. 546s 6 - *........# 546s | 546s d 546s 546s 0 5 9 546s | | | 546s 0 - ********** - c 546s *???????.| 546s *???????.| 546s *???????.| 546s *???????.| 546s 5 - *???????.+ 546s 6 - *-------+# 546s | 546s d 546s 546s Key: 546s |,-,+ = rectangles forming current merge frontier 546s * = merge done manually 546s . = merge done automatically 546s # = conflict that is currently blocking progress 546s @ = merge was blocked but has been resolved 546s ? = no merge recorded 546s 546s + git-imerge continue --edit 546s Switched to branch 'imerge/c-d' 546s Auto-merging conflict.txt 546s CONFLICT (content): Merge conflict in conflict.txt 546s Automatic merge failed; fix conflicts and then commit the result. 546s 546s Original first commit: 546s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 546s Author: Loú User 546s Date: Thu Apr 7 22:13:23 2005 +0000 546s 546s c⇒9 546s 546s Original second commit: 546s 546s There was a conflict merging commit 9-6, shown above. 546s Please resolve the conflict, commit the result, then type 546s 546s git-imerge continue 546s commit f7e451a6c9656dda15641a9fbc591a602f158692 546s Author: Loú User 546s Date: Thu Apr 7 22:13:29 2005 +0000 546s 546s d⇒6 546s + echo merged version 546s + git add conflict.txt 546s + git-imerge continue --no-edit 546s [imerge/c-d 00d55ee] imerge 'c-d': manual merge 9-6 546s Merge has been recorded for merge 9-6. 546s Merge is complete! 546s + git-imerge diagram --commits --frontier --html=imerge2.html 546s 0 5 9 546s | | | 546s 0 - ********** - c 546s *???????.. 546s *???????.. 546s *???????.. 546s *???????.. 546s 5 - *???????.. 546s 6 - *........* 546s | 546s d 546s 546s 0 5 9 546s | | | 546s 0 - ********** - c 546s *???????.| 546s *???????.| 546s *???????.| 546s *???????.| 546s 5 - *???????.| 546s 6 - *--------* 546s | 546s d 546s 546s Key: 546s |,-,+ = rectangles forming current merge frontier 546s * = merge done manually 546s . = merge done automatically 546s # = conflict that is currently blocking progress 546s @ = merge was blocked but has been resolved 546s ? = no merge recorded 546s 546s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 546s Merge d into c (using imerge) 546s 546s # Please enter the commit message for your changes. Lines starting 546s # with '#' will be ignored, and an empty message aborts the commit. 546s # 546s # Date: Wed Mar 27 07:47:35 2024 +0000 546s # 546s # On branch c-d-merge 546s # Changes to be committed: 546s # modified: conflict.txt 546s # modified: d.txt 546s # 546s [c-d-merge ac8d83f] Merge d into c (using imerge) 546s Date: Wed Mar 27 07:47:35 2024 +0000 546s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 546s + local refname=c-d-merge 546s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 546s + git rev-parse c-d-merge^{tree} 546s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 546s + git-imerge simplify --goal=rebase --branch=c-d-rebase 546s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 546s + local refname=c-d-rebase 546s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 546s + git rev-parse c-d-rebase^{tree} 546s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 546s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 547s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + local refname=c-d-rebase-with-history 547s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git rev-parse c-d-rebase-with-history^{tree} 547s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git-imerge simplify --goal=border --branch=c-d-border 547s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + local refname=c-d-border 547s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git rev-parse c-d-border^{tree} 547s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 547s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + local refname=c-d-border-with-history 547s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git rev-parse c-d-border-with-history^{tree} 547s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 547s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + local refname=c-d-border-with-history2 547s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git rev-parse c-d-border-with-history2^{tree} 547s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 547s + git-imerge remove 547s + git checkout c 547s Switched to branch 'c' 547s + + git-imerge start --goal=full --first-parent --name=c-d d 547s tee start.out 547s Attempting to merge 1-1...success. 548s Attempting to merge 1-2...success. 548s Attempting to merge 1-3...success. 548s Attempting to merge 1-4...success. 548s Attempting to merge 1-5...success. 548s Attempting to merge 1-6...success. 548s Attempting to merge 2-1...success. 548s Attempting to merge 2-2...success. 548s Attempting to merge 2-3...success. 548s Attempting to merge 2-4...success. 548s Attempting to merge 2-5...success. 548s Attempting to merge 2-6...success. 548s Attempting to merge 3-1...success. 548s Attempting to merge 3-2...success. 548s Attempting to merge 3-3...success. 548s Attempting to merge 3-4...success. 548s Attempting to merge 3-5...success. 548s Attempting to merge 3-6...success. 548s Attempting to merge 4-1...success. 548s Attempting to merge 4-2...success. 548s Attempting to merge 4-3...success. 548s Attempting to merge 4-4...success. 548s Attempting to merge 4-5...success. 548s Attempting to merge 4-6...success. 548s Attempting to merge 5-1...success. 548s Attempting to merge 5-2...success. 548s Attempting to merge 5-3...success. 548s Attempting to merge 5-4...success. 548s Attempting to merge 5-5...success. 548s Attempting to merge 5-6...success. 548s Attempting to merge 6-1...success. 548s Attempting to merge 6-2...success. 548s Attempting to merge 6-3...success. 548s Attempting to merge 6-4...success. 548s Attempting to merge 6-5...success. 548s Attempting to merge 6-6...success. 548s Attempting to merge 7-1...success. 548s Attempting to merge 7-2...success. 548s Attempting to merge 7-3...success. 548s Attempting to merge 7-4...success. 548s Attempting to merge 7-5...success. 548s Attempting to merge 7-6...success. 548s Attempting to merge 8-1...success. 548s Attempting to merge 8-2...success. 548s Attempting to merge 8-3...success. 548s Attempting to merge 8-4...success. 548s Attempting to merge 8-5...success. 548s Attempting to merge 8-6...success. 548s Attempting to merge 9-1...success. 548s Attempting to merge 9-2...success. 548s Attempting to merge 9-3...success. 548s Attempting to merge 9-4...success. 548s Attempting to merge 9-5...success. 548s Attempting to merge 9-6...conflict. 548s Switched to branch 'imerge/c-d' 548s Auto-merging conflict.txt 548s CONFLICT (content): Merge conflict in conflict.txt 548s Automatic merge failed; fix conflicts and then commit the result. 548s 548s Original first commit: 548s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 548s Author: Loú User 548s Date: Thu Apr 7 22:13:23 2005 +0000 548s 548s c⇒9 548s 548s Original second commit: 548s commit f7e451a6c9656dda15641a9fbc591a602f158692 548s Author: Loú User 548s Date: Thu Apr 7 22:13:29 2005 +0000 548s 548s d⇒6 548s 548s There was a conflict merging commit 9-6, shown above. 548s Please resolve the conflict, commit the result, then type 548s 548s git-imerge continue 548s + grep -q Traceback start.out 548s + grep -q suggest manual merge of 9-6 autofill.out 548s + git-imerge diagram --commits --frontier --html=imerge3.html 549s 0 5 9 549s | | | 549s 0 - ********** - c 549s *......... 549s *......... 549s *......... 549s *......... 549s 5 - *......... 549s 6 - *........# 549s | 549s d 549s 549s 0 5 9 549s | | | 549s 0 - ********** - c 549s *........| 549s *........| 549s *........| 549s *........| 549s 5 - *........+ 549s 6 - *-------+# 549s | 549s d 549s 549s Key: 549s |,-,+ = rectangles forming current merge frontier 549s * = merge done manually 549s . = merge done automatically 549s # = conflict that is currently blocking progress 549s @ = merge was blocked but has been resolved 549s ? = no merge recorded 549s 549s + echo merged version 549s + git add conflict.txt 549s + GIT_EDITOR=cat git commit 549s imerge 'c-d': manual merge 9-6 549s 549s # Conflicts: 549s # conflict.txt 549s # 549s # It looks like you may be committing a merge. 549s # If this is not correct, please run 549s # git update-ref -d MERGE_HEAD 549s # and try again. 549s 549s 549s # Please enter the commit message for your changes. Lines starting 549s # with '#' will be ignored, and an empty message aborts the commit. 549s # 549s # On branch imerge/c-d 549s # All conflicts fixed but you are still merging. 549s # 549s # Changes to be committed: 549s # modified: conflict.txt 549s # modified: d.txt 549s # 549s [imerge/c-d 543e616] imerge 'c-d': manual merge 9-6 549s + git-imerge continue --edit 549s Merge has been recorded for merge 9-6. 549s Merge is complete! 549s + git-imerge diagram --commits --frontier --html=imerge4.html 549s 0 5 9 549s | | | 549s 0 - ********** - c 549s *......... 549s *......... 549s *......... 549s *......... 549s 5 - *......... 549s 6 - *........* 549s | 549s d 549s 549s 0 5 9 549s | | | 549s 0 - ********** - c 549s *........| 549s *........| 549s *........| 549s *........| 549s 5 - *........| 549s 6 - *--------* 549s | 549s d 549s 549s Key: 549s |,-,+ = rectangles forming current merge frontier 549s * = merge done manually 549s . = merge done automatically 549s # = conflict that is currently blocking progress 549s @ = merge was blocked but has been resolved 549s ? = no merge recorded 549s 549s + git-imerge finish --branch=c-d-full 549s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 549s + local refname=c-d-full 549s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 549s + git rev-parse c-d-full^{tree} 549s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 549s + test_conflict 1-2 549s + local conflict=1-2 549s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s + DESCRIPTION=git-imerge test repository with conflict at 1-2 549s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 549s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s + local description=git-imerge test repository with conflict at 1-2 549s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 549s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s + local description=git-imerge test repository with conflict at 1-2 549s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s hint: Using 'master' as the name for the initial branch. This default branch name 549s hint: is subject to change. To configure the initial branch name to use in all 549s hint: of your new repositories, which will suppress this warning, call: 549s hint: 549s hint: git config --global init.defaultBranch 549s hint: 549s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 549s hint: 'development'. The just-created branch can be renamed via this command: 549s hint: 549s hint: git branch -m 549s + echo git-imerge test repository with conflict at 1-2 549s + printf %s\n /*.out /*.css /*.html 549s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2/.git config user.name Loú User 549s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2/.git/ 549s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 549s + TIME=1112911993 549s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-1-2 549s + modify c.txt 0 549s + filename=c.txt 549s + text=0 549s + echo 0 549s + git add c.txt 549s + modify d.txt 0 549s + filename=d.txt 549s + text=0 549s + echo 0 549s + git add d.txt 549s + modify conflict.txt original version 549s + filename=conflict.txt 549s + text=original version 549s + echo original version 549s + git add conflict.txt 549s + commit -m m⇒0 549s + TIME=1112911994 549s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 549s [master (root-commit) d70e04b] m⇒0 549s 3 files changed, 3 insertions(+) 549s create mode 100644 c.txt 549s create mode 100644 conflict.txt 549s create mode 100644 d.txt 549s + git checkout -b c master -- 549s Switched to a new branch 'c' 549s + seq 9 549s + modify c.txt 1 549s + filename=c.txt 549s + text=1 549s + echo 1 549s + git add c.txt 549s + modify conflict.txt c version 549s + filename=conflict.txt 549s + text=c version 549s + echo c version 549s + git add conflict.txt 549s + commit -m c⇒1 549s + TIME=1112911995 549s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 549s [c 2120f40] c⇒1 549s 2 files changed, 2 insertions(+), 2 deletions(-) 549s + modify c.txt 2 549s + filename=c.txt 549s + text=2 549s + echo 2 549s + git add c.txt 549s + commit -m c⇒2 549s + TIME=1112911996 549s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 549s [c 90cc7de] c⇒2 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify c.txt 3 549s + filename=c.txt 549s + text=3 549s + echo 3 549s + git add c.txt 549s + commit -m c⇒3 549s + TIME=1112911997 549s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 549s [c 2046ed2] c⇒3 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify c.txt 4 549s + filename=c.txt 549s + text=4 549s + echo 4 549s + git add c.txt 549s + commit -m c⇒4 549s + TIME=1112911998 549s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 549s [c 8a2cee9] c⇒4 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify c.txt 5 549s + filename=c.txt 549s + text=5 549s + echo 5 549s + git add c.txt 549s + commit -m c⇒5 549s + TIME=1112911999 549s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 549s + modify c.txt 6 549s + filename=c.txt 549s + text=6 549s + echo 6 549s + git add c.txt 549s [c ac16a05] c⇒5 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + commit -m c⇒6 549s + TIME=1112912000 549s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 549s [c 30dd2ae] c⇒6 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify c.txt 7 549s + filename=c.txt 549s + text=7 549s + echo 7 549s + git add c.txt 549s + commit -m c⇒7 549s + TIME=1112912001 549s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 549s + modify c.txt 8 549s + filename=c.txt 549s + text=8 549s + echo 8 549s + git add c.txt 549s [c 0883eb9] c⇒7 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + commit -m c⇒8 549s + TIME=1112912002 549s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 549s [c f661c06] c⇒8 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify c.txt 9 549s + filename=c.txt 549s + text=9 549s + echo 9 549s + git add c.txt 549s + commit -m c⇒9 549s + TIME=1112912003 549s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 549s + git checkout -b d master -- 549s Switched to a new branch 'd' 549s [c 243e8ed] c⇒9 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + seq 6 549s + modify d.txt 1 549s + filename=d.txt 549s + text=1 549s + echo 1 549s + git add d.txt 549s + commit -m d⇒1 549s + TIME=1112912004 549s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 549s [d bd5368a] d⇒1 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify d.txt 2 549s + filename=d.txt 549s + text=2 549s + echo 2 549s + git add d.txt 549s + modify conflict.txt d version 549s + filename=conflict.txt 549s + text=d version 549s + echo d version 549s + git add conflict.txt 549s + commit -m d⇒2 549s + TIME=1112912005 549s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 549s [d 69efde8] d⇒2 549s 2 files changed, 2 insertions(+), 2 deletions(-) 549s + modify d.txt 3 549s + filename=d.txt 549s + text=3 549s + echo 3 549s + git add d.txt 549s + commit -m d⇒3 549s + TIME=1112912006 549s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 549s [d 3169557] d⇒3 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify d.txt 4 549s + filename=d.txt 549s + text=4 549s + echo 4 549s + git add d.txt 549s + commit -m d⇒4 549s + TIME=1112912007 549s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 549s [d 86c8052] d⇒4 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify d.txt 5 549s + filename=d.txt 549s + text=5 549s + echo 5 549s + git add d.txt 549s + commit -m d⇒5 549s + TIME=1112912008 549s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 549s [d 1700773] d⇒5 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + modify d.txt 6 549s + filename=d.txt 549s + text=6 549s + echo 6 549s + git add d.txt 549s + commit -m d⇒6 549s + TIME=1112912009 549s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 549s [d df2e493] d⇒6 549s 1 file changed, 1 insertion(+), 1 deletion(-) 549s + git checkout c 549s Switched to branch 'c' 549s + git-imerge init --name=c-d d 549s + git-imerge list 550s * c-d 550s + git-imerge diagram --commits --frontier --html=imerge0.html 550s 0 5 9 550s | | | 550s 0 - ********** - c 550s *????????? 550s *????????? 550s *????????? 550s *????????? 550s 5 - *????????? 550s 6 - *????????? 550s | 550s d 550s 550s 0 5 9 550s | | | 550s 0 - ********** - c 550s *????????? 550s *????????? 550s *????????? 550s *????????? 550s 5 - *????????? 550s 6 - *????????? 550s | 550s d 550s 550s Key: 550s |,-,+ = rectangles forming current merge frontier 550s * = merge done manually 550s . = merge done automatically 550s # = conflict that is currently blocking progress 550s @ = merge was blocked but has been resolved 550s ? = no merge recorded 550s 550s + + git-imerge autofill 550s tee autofill.out 550s Attempting automerge of 9-6...failure. 550s Attempting automerge of 1-1...success. 550s Attempting automerge of 1-4...failure. 550s Attempting automerge of 1-3...failure. 550s Attempting automerge of 1-2...failure. 550s Attempting automerge of 9-1...success. 550s Autofilling 1-1...success. 550s Autofilling 2-1...success. 550s Autofilling 3-1...success. 550s Autofilling 4-1...success. 550s Autofilling 5-1...success. 550s Autofilling 6-1...success. 550s Autofilling 7-1...success. 550s Autofilling 8-1...success. 550s Autofilling 9-1...success. 550s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 550s Attempting automerge of 9-6...failure. 550s Attempting automerge of 1-2...failure. 550s HEAD is now at 243e8ed c⇒9 550s Conflict; suggest manual merge of 1-2 550s + grep -q Traceback autofill.out 550s + grep -q suggest manual merge of 1-2 autofill.out 550s + git-imerge diagram --commits --frontier --html=imerge1.html 550s 0 5 9 550s | | | 550s 0 - ********** - c 550s *......... 550s *#???????? 550s *????????? 550s *????????? 550s 5 - *????????? 550s 6 - *????????? 550s | 550s d 550s 550s 0 5 9 550s | | | 550s 0 - ********** - c 550s *--------+ 550s *#???????? 550s *????????? 550s *????????? 550s 5 - *????????? 550s 6 - *????????? 550s | 550s d 550s 550s Key: 550s |,-,+ = rectangles forming current merge frontier 550s * = merge done manually 550s . = merge done automatically 550s # = conflict that is currently blocking progress 550s @ = merge was blocked but has been resolved 550s ? = no merge recorded 550s 550s + git-imerge continue --edit 550s Switched to branch 'imerge/c-d' 550s Auto-merging conflict.txt 550s CONFLICT (content): Merge conflict in conflict.txt 550s 550s Original first commit: 550s 550s Original second commit: 550s Automatic merge failed; fix conflicts and then commit the result. 550s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 550s Author: Loú User 550s Date: Thu Apr 7 22:13:15 2005 +0000 550s 550s c⇒1 550s commit 69efde8f66d581a765a3909ffacb9f895f95c345 550s Author: Loú User 550s Date: Thu Apr 7 22:13:25 2005 +0000 550s 550s d⇒2 550s 550s There was a conflict merging commit 1-2, shown above. 550s Please resolve the conflict, commit the result, then type 550s 550s git-imerge continue 550s + echo merged version 550s + git add conflict.txt 550s + git-imerge continue --no-edit 550s [imerge/c-d 6a95dac] imerge 'c-d': manual merge 1-2 550s Merge has been recorded for merge 1-2. 550s Attempting automerge of 1-6...success. 550s Autofilling 1-3...success. 550s Autofilling 1-4...success. 550s Autofilling 1-5...success. 550s Autofilling 1-6...success. 550s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 551s Attempting automerge of 9-6...success. 551s Autofilling 2-6...success. 551s Autofilling 3-6...success. 551s Autofilling 4-6...success. 551s Autofilling 5-6...success. 551s Autofilling 6-6...success. 551s Autofilling 7-6...success. 551s Autofilling 8-6...success. 551s Autofilling 9-2...success. 551s Autofilling 9-3...success. 551s Autofilling 9-4...success. 551s Autofilling 9-5...success. 551s Autofilling 9-6 (first way)...success. 551s Autofilling 9-6 (second way)...success. 551s The two ways of autofilling 9-6 agree. 551s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 551s Merge is complete! 551s + git-imerge diagram --commits --frontier --html=imerge2.html 551s 0 5 9 551s | | | 551s 0 - ********** - c 551s *......... 551s **???????. 551s *.???????. 551s *.???????. 551s 5 - *.???????. 551s 6 - *......... 551s | 551s d 551s 551s 0 5 9 551s | | | 551s 0 - ********** - c 551s *........| 551s **???????| 551s *.???????| 551s *.???????| 551s 5 - *.???????| 551s 6 - *--------+ 551s | 551s d 551s 551s Key: 551s |,-,+ = rectangles forming current merge frontier 551s * = merge done manually 551s . = merge done automatically 551s # = conflict that is currently blocking progress 551s @ = merge was blocked but has been resolved 551s ? = no merge recorded 551s 551s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 551s Merge d into c (using imerge) 551s 551s # Please enter the commit message for your changes. Lines starting 551s # with '#' will be ignored, and an empty message aborts the commit. 551s # 551s # Date: Wed Mar 27 07:47:40 2024 +0000 551s # 551s # On branch c-d-merge 551s # Changes to be committed: 551s # modified: conflict.txt 551s # modified: d.txt 551s # 551s [c-d-merge 8b72bcf] Merge d into c (using imerge) 551s Date: Wed Mar 27 07:47:40 2024 +0000 551s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + local refname=c-d-merge 551s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + git rev-parse c-d-merge^{tree} 551s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + git-imerge simplify --goal=rebase --branch=c-d-rebase 551s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + local refname=c-d-rebase 551s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + git rev-parse c-d-rebase^{tree} 551s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 551s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + local refname=c-d-rebase-with-history 551s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + git rev-parse c-d-rebase-with-history^{tree} 551s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 551s + git-imerge simplify --goal=border --branch=c-d-border 552s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + local refname=c-d-border 552s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + git rev-parse c-d-border^{tree} 552s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 552s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + local refname=c-d-border-with-history 552s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + git rev-parse c-d-border-with-history^{tree} 552s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 552s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + local refname=c-d-border-with-history2 552s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + git rev-parse c-d-border-with-history2^{tree} 552s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 552s + git-imerge remove 552s + git checkout c 552s Switched to branch 'c' 552s + + git-imerge start --goal=fulltee --first-parent --name=c-d d 552s start.out 552s Attempting to merge 1-1...success. 552s Attempting to merge 1-2...conflict. 552s Attempting to merge 2-1...success. 552s Attempting to merge 3-1...success. 552s Attempting to merge 4-1...success. 552s Attempting to merge 5-1...success. 552s Attempting to merge 6-1...success. 552s Attempting to merge 7-1...success. 553s Attempting to merge 8-1...success. 553s Attempting to merge 9-1...success. 553s Previous HEAD position was 3f31583 imerge 'c-d': automatic merge 9-1 553s Switched to branch 'imerge/c-d' 553s Auto-merging conflict.txt 553s CONFLICT (content): Merge conflict in conflict.txt 553s Automatic merge failed; fix conflicts and then commit the result. 553s 553s Original first commit: 553s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 553s Author: Loú User 553s Date: Thu Apr 7 22:13:15 2005 +0000 553s 553s c⇒1 553s 553s Original second commit: 553s commit 69efde8f66d581a765a3909ffacb9f895f95c345 553s Author: Loú User 553s Date: Thu Apr 7 22:13:25 2005 +0000 553s 553s d⇒2 553s 553s There was a conflict merging commit 1-2, shown above. 553s Please resolve the conflict, commit the result, then type 553s 553s git-imerge continue 553s + grep -q Traceback start.out 553s + grep -q suggest manual merge of 1-2 autofill.out 553s + git-imerge diagram --commits --frontier --html=imerge3.html 553s 0 5 9 553s | | | 553s 0 - ********** - c 553s *......... 553s *#???????? 553s *????????? 553s *????????? 553s 5 - *????????? 553s 6 - *????????? 553s | 553s d 553s 553s 0 5 9 553s | | | 553s 0 - ********** - c 553s *--------+ 553s *#???????? 553s *????????? 553s *????????? 553s 5 - *????????? 553s 6 - *????????? 553s | 553s d 553s 553s Key: 553s |,-,+ = rectangles forming current merge frontier 553s * = merge done manually 553s . = merge done automatically 553s # = conflict that is currently blocking progress 553s @ = merge was blocked but has been resolved 553s ? = no merge recorded 553s 553s + echo merged version 553s + git add conflict.txt 553s imerge 'c-d': manual merge 1-2 553s 553s # Conflicts: 553s # conflict.txt 553s # 553s # It looks like you may be committing a merge. 553s # If this is not correct, please run 553s # git update-ref -d MERGE_HEAD 553s # and try again. 553s 553s 553s # Please enter the commit message for your changes. Lines starting 553s # with '#' will be ignored, and an empty message aborts the commit. 553s # 553s # On branch imerge/c-d 553s # All conflicts fixed but you are still merging. 553s # 553s # Changes to be committed: 553s # modified: conflict.txt 553s # modified: d.txt 553s # 553s + GIT_EDITOR=cat git commit 553s [imerge/c-d a3f6f22] imerge 'c-d': manual merge 1-2 553s + git-imerge continue --edit 553s Merge has been recorded for merge 1-2. 553s Attempting to merge 1-3...success. 553s Attempting to merge 1-4...success. 553s Attempting to merge 1-5...success. 553s Attempting to merge 1-6...success. 553s Attempting to merge 2-2...success. 553s Attempting to merge 2-3...success. 553s Attempting to merge 2-4...success. 553s Attempting to merge 2-5...success. 553s Attempting to merge 2-6...success. 553s Attempting to merge 3-2...success. 553s Attempting to merge 3-3...success. 553s Attempting to merge 3-4...success. 553s Attempting to merge 3-5...success. 553s Attempting to merge 3-6...success. 553s Attempting to merge 4-2...success. 553s Attempting to merge 4-3...success. 553s Attempting to merge 4-4...success. 553s Attempting to merge 4-5...success. 553s Attempting to merge 4-6...success. 553s Attempting to merge 5-2...success. 553s Attempting to merge 5-3...success. 553s Attempting to merge 5-4...success. 553s Attempting to merge 5-5...success. 553s Attempting to merge 5-6...success. 553s Attempting to merge 6-2...success. 553s Attempting to merge 6-3...success. 553s Attempting to merge 6-4...success. 553s Attempting to merge 6-5...success. 553s Attempting to merge 6-6...success. 553s Attempting to merge 7-2...success. 553s Attempting to merge 7-3...success. 553s Attempting to merge 7-4...success. 553s Attempting to merge 7-5...success. 553s Attempting to merge 7-6...success. 554s Attempting to merge 8-2...success. 554s Attempting to merge 8-3...success. 554s Attempting to merge 8-4...success. 554s Attempting to merge 8-5...success. 554s Attempting to merge 8-6...success. 554s Attempting to merge 9-2...success. 554s Attempting to merge 9-3...success. 554s Attempting to merge 9-4...success. 554s Attempting to merge 9-5...success. 554s Attempting to merge 9-6...success. 554s Merge is complete! 554s + git-imerge diagram --commits --frontier --html=imerge4.html 554s 0 5 9 554s | | | 554s 0 - ********** - c 554s *......... 554s **........ 554s *......... 554s *......... 554s 5 - *......... 554s 6 - *......... 554s | 554s d 554s 554s 0 5 9 554s | | | 554s 0 - ********** - c 554s *........| 554s **.......| 554s *........| 554s *........| 554s 5 - *........| 554s 6 - *--------+ 554s | 554s d 554s 554s Key: 554s |,-,+ = rectangles forming current merge frontier 554s * = merge done manually 554s . = merge done automatically 554s # = conflict that is currently blocking progress 554s @ = merge was blocked but has been resolved 554s ? = no merge recorded 554s 554s + git-imerge finish --branch=c-d-full 554s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 554s + local refname=c-d-full 554s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 554s + git rev-parse c-d-full^{tree} 554s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 554s + test_conflict 9-5 554s + local conflict=9-5 554s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s + DESCRIPTION=git-imerge test repository with conflict at 9-5 554s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 554s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s + local description=git-imerge test repository with conflict at 9-5 554s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 554s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s + local description=git-imerge test repository with conflict at 9-5 554s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s hint: Using 'master' as the name for the initial branch. This default branch name 554s hint: is subject to change. To configure the initial branch name to use in all 554s hint: of your new repositories, which will suppress this warning, call: 554s hint: 554s hint: git config --global init.defaultBranch 554s hint: 554s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 554s hint: 'development'. The just-created branch can be renamed via this command: 554s hint: 554s hint: git branch -m 554s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5/.git/ 554s + echo git-imerge test repository with conflict at 9-5 554s + printf %s\n /*.out /*.css /*.html 554s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5/.git config user.name Loú User 554s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 554s + TIME=1112911993 554s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-9-5 554s + modify c.txt 0 554s + filename=c.txt 554s + text=0 554s + echo 0 554s + git add c.txt 554s + modify d.txt 0 554s + filename=d.txt 554s + text=0 554s + echo 0 554s + git add d.txt 554s + modify conflict.txt original version 554s + filename=conflict.txt 554s + text=original version 554s + echo original version 554s + git add conflict.txt 554s + commit -m m⇒0 554s + TIME=1112911994 554s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 554s [master (root-commit) d70e04b] m⇒0 554s 3 files changed, 3 insertions(+) 554s create mode 100644 c.txt 554s create mode 100644 conflict.txt 554s create mode 100644 d.txt 554s + git checkout -b c master -- 554s Switched to a new branch 'c' 554s + seq 9 554s + modify c.txt 1 554s + filename=c.txt 554s + text=1 554s + echo 1 554s + git add c.txt 554s + commit -m c⇒1 554s + TIME=1112911995 554s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 554s [c 89e2141] c⇒1 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + modify c.txt 2 554s + filename=c.txt 554s + text=2 554s + echo 2 554s + git add c.txt 554s + commit -m c⇒2 554s + TIME=1112911996 554s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 554s [c 7c431f2] c⇒2 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s [c f02ab24] c⇒3 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s [c ed9122f] c⇒4 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s [c 1d3bf09] c⇒5 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s [c f999ecd] c⇒6 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + modify c.txt 3 554s + filename=c.txt 554s + text=3 554s + echo 3 554s + git add c.txt 554s + commit -m c⇒3 554s + TIME=1112911997 554s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 554s + modify c.txt 4 554s + filename=c.txt 554s + text=4 554s + echo 4 554s + git add c.txt 554s + commit -m c⇒4 554s + TIME=1112911998 554s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 554s + modify c.txt 5 554s + filename=c.txt 554s + text=5 554s + echo 5 554s + git add c.txt 554s + commit -m c⇒5 554s + TIME=1112911999 554s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 554s + modify c.txt 6 554s + filename=c.txt 554s + text=6 554s + echo 6 554s + git add c.txt 554s + commit -m c⇒6 554s + TIME=1112912000 554s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 554s + modify c.txt 7 554s + filename=c.txt 554s + text=7 554s + echo 7 554s + git add c.txt 554s + commit -m c⇒7 554s + TIME=1112912001 554s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 554s [c 7050a8a] c⇒7 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + modify c.txt 8 554s + filename=c.txt 554s + text=8 554s + echo 8 554s + git add c.txt 554s + commit -m c⇒8 554s + TIME=1112912002 554s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 554s [c 9732e77] c⇒8 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + modify c.txt 9 554s + filename=c.txt 554s + text=9 554s + echo 9 554s + git add c.txt 554s + modify conflict.txt c version 554s + filename=conflict.txt 554s + text=c version 554s + echo c version 554s + git add conflict.txt 554s + commit -m c⇒9 554s + TIME=1112912003 554s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 554s [c 73a5eed] c⇒9 554s 2 files changed, 2 insertions(+), 2 deletions(-) 554s + git checkout -b d master -- 554s Switched to a new branch 'd' 554s + seq 6 554s + modify d.txt 1 554s + filename=d.txt 554s + text=1 554s + echo 1 554s + git add d.txt 554s + commit -m d⇒1 554s + TIME=1112912004 554s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 554s [d bd5368a] d⇒1 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + modify d.txt 2 554s + filename=d.txt 554s + text=2 554s + echo 2 554s + git add d.txt 554s + commit -m d⇒2 554s + TIME=1112912005 554s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 554s + modify d.txt 3 554s + filename=d.txt 554s + text=3 554s + echo 3 554s + git add d.txt 554s [d 93e27e6] d⇒2 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + commit -m d⇒3 554s + TIME=1112912006 554s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 554s [d 133f385] d⇒3 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + modify d.txt 4 554s + filename=d.txt 554s + text=4 554s + echo 4 554s + git add d.txt 554s + commit -m d⇒4 554s + TIME=1112912007 554s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 554s [d 586472a] d⇒4 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + modify d.txt 5 554s + filename=d.txt 554s + text=5 554s + echo 5 554s + git add d.txt 554s + modify conflict.txt d version 554s + filename=conflict.txt 554s + text=d version 554s + echo d version 554s + git add conflict.txt 554s + commit -m d⇒5 554s + TIME=1112912008 554s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 554s [d 0a6f956] d⇒5 554s 2 files changed, 2 insertions(+), 2 deletions(-) 554s + modify d.txt 6 554s + filename=d.txt 554s + text=6 554s + echo 6 554s + git add d.txt 554s + commit -m d⇒6 554s + TIME=1112912009 554s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 554s [d bfb30f0] d⇒6 554s 1 file changed, 1 insertion(+), 1 deletion(-) 554s + git checkout c 554s Switched to branch 'c' 554s + git-imerge init --name=c-d d 554s + git-imerge list 555s * c-d 555s + git-imerge diagram --commits --frontier --html=imerge0.html 555s 0 5 9 555s | | | 555s 0 - ********** - c 555s *????????? 555s *????????? 555s *????????? 555s *????????? 555s 5 - *????????? 555s 6 - *????????? 555s | 555s d 555s 555s 0 5 9 555s | | | 555s 0 - ********** - c 555s *????????? 555s *????????? 555s *????????? 555s *????????? 555s 5 - *????????? 555s 6 - *????????? 555s | 555s d 555s 555s Key: 555s |,-,+ = rectangles forming current merge frontier 555s * = merge done manually 555s . = merge done automatically 555s # = conflict that is currently blocking progress 555s @ = merge was blocked but has been resolved 555s ? = no merge recorded 555s 555s + + git-imerge autofill 555s tee autofill.out 555s Attempting automerge of 9-6...failure. 555s Attempting automerge of 1-1...success. 555s Attempting automerge of 1-4...success. 555s Attempting automerge of 1-6...success. 555s Attempting automerge of 9-6...failure. 555s Attempting automerge of 5-6...success. 555s Attempting automerge of 7-6...success. 555s Attempting automerge of 8-6...success. 555s Attempting automerge of 9-1...success. 555s Attempting automerge of 9-4...success. 555s Attempting automerge of 9-5...failure. 555s Autofilling 1-6...success. 555s Autofilling 2-6...success. 555s Autofilling 3-6...success. 555s Autofilling 4-6...success. 555s Autofilling 5-6...success. 555s Autofilling 6-6...success. 555s Autofilling 7-6...success. 555s Autofilling 8-1...success. 555s Autofilling 8-2...success. 555s Autofilling 8-3...success. 555s Autofilling 8-4...success. 555s Autofilling 8-5...success. 555s Autofilling 8-6 (first way)...success. 555s Autofilling 8-6 (second way)...success. 555s The two ways of autofilling 8-6 agree. 555s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 555s Autofilling 9-1...success. 555s Autofilling 9-2...success. 555s Autofilling 9-3...success. 555s Autofilling 9-4...success. 555s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 555s Attempting automerge of 9-6...failure. 555s Attempting automerge of 9-5...failure. 555s HEAD is now at 73a5eed c⇒9 555s Conflict; suggest manual merge of 9-5 555s + grep -q Traceback autofill.out 555s + grep -q suggest manual merge of 9-5 autofill.out 555s + git-imerge diagram --commits --frontier --html=imerge1.html 555s 0 5 9 555s | | | 555s 0 - ********** - c 555s *???????.. 555s *???????.. 555s *???????.. 555s *???????.. 555s 5 - *???????.# 555s 6 - *........? 555s | 555s d 555s 555s 0 5 9 555s | | | 555s 0 - ********** - c 555s *???????.| 555s *???????.| 555s *???????.| 555s *???????.+ 555s 5 - *???????|# 555s 6 - *-------+? 555s | 555s d 555s 555s Key: 555s |,-,+ = rectangles forming current merge frontier 555s * = merge done manually 555s . = merge done automatically 555s # = conflict that is currently blocking progress 555s @ = merge was blocked but has been resolved 555s ? = no merge recorded 555s 555s + git-imerge continue --edit 555s Switched to branch 'imerge/c-d' 555s 555s Original first commit: 555s Auto-merging conflict.txt 555s CONFLICT (content): Merge conflict in conflict.txt 555s Automatic merge failed; fix conflicts and then commit the result. 555s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 555s Author: Loú User 555s Date: Thu Apr 7 22:13:23 2005 +0000 555s 555s c⇒9 555s 555s Original second commit: 555s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 555s Author: Loú User 555s Date: Thu Apr 7 22:13:28 2005 +0000 555s 555s d⇒5 555s 555s There was a conflict merging commit 9-5, shown above. 555s Please resolve the conflict, commit the result, then type 555s 555s git-imerge continue 555s + echo merged version 555s + git add conflict.txt 555s + git-imerge continue --no-edit 556s [imerge/c-d b4c51e5] imerge 'c-d': manual merge 9-5 556s Merge has been recorded for merge 9-5. 556s Attempting automerge of 9-6...success. 556s Autofilling 9-6...success. 556s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 556s Merge is complete! 556s + git-imerge diagram --commits --frontier --html=imerge2.html 556s 0 5 9 556s | | | 556s 0 - ********** - c 556s *???????.. 556s *???????.. 556s *???????.. 556s *???????.. 556s 5 - *???????.* 556s 6 - *......... 556s | 556s d 556s 556s 0 5 9 556s | | | 556s 0 - ********** - c 556s *???????.| 556s *???????.| 556s *???????.| 556s *???????.| 556s 5 - *???????.* 556s 6 - *--------+ 556s | 556s d 556s 556s Key: 556s |,-,+ = rectangles forming current merge frontier 556s * = merge done manually 556s . = merge done automatically 556s # = conflict that is currently blocking progress 556s @ = merge was blocked but has been resolved 556s ? = no merge recorded 556s 556s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 556s Merge d into c (using imerge) 556s 556s # Please enter the commit message for your changes. Lines starting 556s # with '#' will be ignored, and an empty message aborts the commit. 556s # 556s # Date: Wed Mar 27 07:47:45 2024 +0000 556s # 556s # On branch c-d-merge 556s # Changes to be committed: 556s # modified: conflict.txt 556s # modified: d.txt 556s # 556s [c-d-merge f06ebbe] Merge d into c (using imerge) 556s Date: Wed Mar 27 07:47:45 2024 +0000 556s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + local refname=c-d-merge 556s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git rev-parse c-d-merge^{tree} 556s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git-imerge simplify --goal=rebase --branch=c-d-rebase 556s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + local refname=c-d-rebase 556s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git rev-parse c-d-rebase^{tree} 556s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 556s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + local refname=c-d-rebase-with-history 556s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git rev-parse c-d-rebase-with-history^{tree} 556s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git-imerge simplify --goal=border --branch=c-d-border 556s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + local refname=c-d-border 556s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git rev-parse c-d-border^{tree} 556s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 556s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 557s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 557s + local refname=c-d-border-with-history 557s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 557s + git rev-parse c-d-border-with-history^{tree} 557s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 557s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 557s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 557s + local refname=c-d-border-with-history2 557s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 557s + git rev-parse c-d-border-with-history2^{tree} 557s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 557s + git-imerge remove 557s + git checkout c 557s Switched to branch 'c' 557s + + git-imergetee start.out 557s start --goal=full --first-parent --name=c-d d 557s Attempting to merge 1-1...success. 557s Attempting to merge 1-2...success. 557s Attempting to merge 1-3...success. 557s Attempting to merge 1-4...success. 557s Attempting to merge 1-5...success. 557s Attempting to merge 1-6...success. 557s Attempting to merge 2-1...success. 557s Attempting to merge 2-2...success. 557s Attempting to merge 2-3...success. 557s Attempting to merge 2-4...success. 557s Attempting to merge 2-5...success. 557s Attempting to merge 2-6...success. 557s Attempting to merge 3-1...success. 557s Attempting to merge 3-2...success. 557s Attempting to merge 3-3...success. 557s Attempting to merge 3-4...success. 557s Attempting to merge 3-5...success. 557s Attempting to merge 3-6...success. 557s Attempting to merge 4-1...success. 557s Attempting to merge 4-2...success. 557s Attempting to merge 4-3...success. 557s Attempting to merge 4-4...success. 557s Attempting to merge 4-5...success. 557s Attempting to merge 4-6...success. 557s Attempting to merge 5-1...success. 557s Attempting to merge 5-2...success. 557s Attempting to merge 5-3...success. 557s Attempting to merge 5-4...success. 558s Attempting to merge 5-5...success. 558s Attempting to merge 5-6...success. 558s Attempting to merge 6-1...success. 558s Attempting to merge 6-2...success. 558s Attempting to merge 6-3...success. 558s Attempting to merge 6-4...success. 558s Attempting to merge 6-5...success. 558s Attempting to merge 6-6...success. 558s Attempting to merge 7-1...success. 558s Attempting to merge 7-2...success. 558s Attempting to merge 7-3...success. 558s Attempting to merge 7-4...success. 558s Attempting to merge 7-5...success. 558s Attempting to merge 7-6...success. 558s Attempting to merge 8-1...success. 558s Attempting to merge 8-2...success. 558s Attempting to merge 8-3...success. 558s Attempting to merge 8-4...success. 558s Attempting to merge 8-5...success. 558s Attempting to merge 8-6...success. 558s Attempting to merge 9-1...success. 558s Attempting to merge 9-2...success. 558s Attempting to merge 9-3...success. 558s Attempting to merge 9-4...success. 558s Attempting to merge 9-5...conflict. 558s Switched to branch 'imerge/c-d' 558s Auto-merging conflict.txt 558s CONFLICT (content): Merge conflict in conflict.txt 558s Automatic merge failed; fix conflicts and then commit the result. 558s 558s Original first commit: 558s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 558s Author: Loú User 558s Date: Thu Apr 7 22:13:23 2005 +0000 558s 558s c⇒9 558s 558s Original second commit: 558s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 558s Author: Loú User 558s Date: Thu Apr 7 22:13:28 2005 +0000 558s 558s d⇒5 558s 558s There was a conflict merging commit 9-5, shown above. 558s Please resolve the conflict, commit the result, then type 558s 558s git-imerge continue 558s + grep -q Traceback start.out 558s + grep -q suggest manual merge of 9-5 autofill.out 558s + git-imerge diagram --commits --frontier --html=imerge3.html 558s 0 5 9 558s | | | 558s 0 - ********** - c 558s *......... 558s *......... 558s *......... 558s *......... 558s 5 - *........# 558s 6 - *........? 558s | 558s d 558s 558s 0 5 9 558s | | | 558s 0 - ********** - c 558s *........| 558s *........| 558s *........| 558s *........+ 558s 5 - *.......|# 558s 6 - *-------+? 558s | 558s d 558s 558s Key: 558s |,-,+ = rectangles forming current merge frontier 558s * = merge done manually 558s . = merge done automatically 558s # = conflict that is currently blocking progress 558s @ = merge was blocked but has been resolved 558s ? = no merge recorded 558s 558s + echo merged version 558s + git add conflict.txt 558s + GIT_EDITOR=cat git commit 558s imerge 'c-d': manual merge 9-5 558s 558s # Conflicts: 558s # conflict.txt 558s # 558s # It looks like you may be committing a merge. 558s # If this is not correct, please run 558s # git update-ref -d MERGE_HEAD 558s # and try again. 558s 558s 558s # Please enter the commit message for your changes. Lines starting 558s # with '#' will be ignored, and an empty message aborts the commit. 558s # 558s # On branch imerge/c-d 558s # All conflicts fixed but you are still merging. 558s # 558s # Changes to be committed: 558s # modified: conflict.txt 558s # modified: d.txt 558s # 558s [imerge/c-d d8adddf] imerge 'c-d': manual merge 9-5 558s + git-imerge continue --edit 558s Merge has been recorded for merge 9-5. 558s Attempting to merge 9-6...success. 558s Merge is complete! 558s + git-imerge diagram --commits --frontier --html=imerge4.html 558s 0 5 9 558s | | | 558s 0 - ********** - c 558s *......... 558s *......... 558s *......... 558s *......... 558s 5 - *........* 558s 6 - *......... 558s | 558s d 558s 558s 0 5 9 558s | | | 558s 0 - ********** - c 558s *........| 558s *........| 558s *........| 558s *........| 558s 5 - *........* 558s 6 - *--------+ 558s | 558s d 558s 558s Key: 558s |,-,+ = rectangles forming current merge frontier 558s * = merge done manually 558s . = merge done automatically 558s # = conflict that is currently blocking progress 558s @ = merge was blocked but has been resolved 558s ? = no merge recorded 558s 558s + git-imerge finish --branch=c-d-full 559s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 559s + local refname=c-d-full 559s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 559s + git rev-parse c-d-full^{tree} 559s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 559s + test_conflict 5-1 559s + local conflict=5-1 559s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s + DESCRIPTION=git-imerge test repository with conflict at 5-1 559s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 559s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s + local description=git-imerge test repository with conflict at 5-1 559s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 559s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s + local description=git-imerge test repository with conflict at 5-1 559s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s hint: Using 'master' as the name for the initial branch. This default branch name 559s hint: is subject to change. To configure the initial branch name to use in all 559s hint: of your new repositories, which will suppress this warning, call: 559s hint: 559s hint: git config --global init.defaultBranch 559s hint: 559s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 559s hint: 'development'. The just-created branch can be renamed via this command: 559s hint: 559s hint: git branch -m 559s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1/.git/ 559s + echo git-imerge test repository with conflict at 5-1 559s + printf %s\n /*.out /*.css /*.html 559s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1/.git config user.name Loú User 559s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 559s + TIME=1112911993 559s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-5-1 559s + modify c.txt 0 559s + filename=c.txt 559s + text=0 559s + echo 0 559s + git add c.txt 559s + modify d.txt 0 559s + filename=d.txt 559s + text=0 559s + echo 0 559s + git add d.txt 559s + modify conflict.txt original version 559s + filename=conflict.txt 559s + text=original version 559s + echo original version 559s + git add conflict.txt 559s + commit -m m⇒0 559s + TIME=1112911994 559s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 559s [master (root-commit) d70e04b] m⇒0 559s 3 files changed, 3 insertions(+) 559s create mode 100644 c.txt 559s create mode 100644 conflict.txt 559s create mode 100644 d.txt 559s + git checkout -b c master -- 559s Switched to a new branch 'c' 559s + seq 9 559s + modify c.txt 1 559s + filename=c.txt 559s + text=1 559s + echo 1 559s + git add c.txt 559s + commit -m c⇒1 559s + TIME=1112911995 559s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 559s [c 89e2141] c⇒1 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify c.txt 2 559s + filename=c.txt 559s + text=2 559s + echo 2 559s + git add c.txt 559s + commit -m c⇒2 559s + TIME=1112911996 559s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 559s [c 7c431f2] c⇒2 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify c.txt 3 559s + filename=c.txt 559s + text=3 559s + echo 3 559s + git add c.txt 559s + commit -m c⇒3 559s + TIME=1112911997 559s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 559s [c f02ab24] c⇒3 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify c.txt 4 559s + filename=c.txt 559s + text=4 559s + echo 4 559s + git add c.txt 559s + commit -m c⇒4 559s + TIME=1112911998 559s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 559s [c ed9122f] c⇒4 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify c.txt 5 559s + filename=c.txt 559s + text=5 559s + echo 5 559s + git add c.txt 559s + modify conflict.txt c version 559s + filename=conflict.txt 559s + text=c version 559s + echo c version 559s + git add conflict.txt 559s + commit -m c⇒5 559s + TIME=1112911999 559s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 559s [c 7e31f25] c⇒5 559s 2 files changed, 2 insertions(+), 2 deletions(-) 559s + modify c.txt 6 559s + filename=c.txt 559s + text=6 559s + echo 6 559s + git add c.txt 559s + commit -m c⇒6 559s + TIME=1112912000 559s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 559s [c df3c57a] c⇒6 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify c.txt 7 559s + filename=c.txt 559s + text=7 559s + echo 7 559s + git add c.txt 559s + commit -m c⇒7 559s + TIME=1112912001 559s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 559s [c ea32d81] c⇒7 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify c.txt 8 559s + filename=c.txt 559s + text=8 559s + echo 8 559s + git add c.txt 559s + commit -m c⇒8 559s + TIME=1112912002 559s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 559s [c 44473d6] c⇒8 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify c.txt 9 559s + filename=c.txt 559s + text=9 559s + echo 9 559s + git add c.txt 559s + commit -m c⇒9 559s + TIME=1112912003 559s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 559s [c d8d80cf] c⇒9 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + git checkout -b d master -- 559s Switched to a new branch 'd' 559s + seq 6 559s + modify d.txt 1 559s + filename=d.txt 559s + text=1 559s + echo 1 559s + git add d.txt 559s + modify conflict.txt d version 559s + filename=conflict.txt 559s + text=d version 559s + echo d version 559s + git add conflict.txt 559s + commit -m d⇒1 559s + TIME=1112912004 559s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 559s [d ac0427a] d⇒1 559s 2 files changed, 2 insertions(+), 2 deletions(-) 559s + modify d.txt 2 559s + filename=d.txt 559s + text=2 559s + echo 2 559s + git add d.txt 559s + commit -m d⇒2 559s + TIME=1112912005 559s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 559s [d 43c38c0] d⇒2 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify d.txt 3 559s + filename=d.txt 559s + text=3 559s + echo 3 559s + git add d.txt 559s + commit -m d⇒3 559s + TIME=1112912006 559s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 559s [d 0260058] d⇒3 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify d.txt 4 559s + filename=d.txt 559s + text=4 559s + echo 4 559s + git add d.txt 559s + commit -m d⇒4 559s + TIME=1112912007 559s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 559s [d 40fef44] d⇒4 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + modify d.txt 5 559s + filename=d.txt 559s + text=5 559s + echo 5 559s + git add d.txt 559s + commit -m d⇒5 559s + TIME=1112912008 559s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 559s + modify d.txt 6 559s + filename=d.txt 559s + text=6 559s + echo 6 559s + git add d.txt 559s [d b080a65] d⇒5 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s [d 200ce5c] d⇒6 559s 1 file changed, 1 insertion(+), 1 deletion(-) 559s + commit -m d⇒6 559s + TIME=1112912009 559s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 559s + git checkout c 559s Switched to branch 'c' 559s + git-imerge init --name=c-d d 559s + git-imerge list 559s * c-d 559s + git-imerge diagram --commits --frontier --html=imerge0.html 559s 0 5 9 559s | | | 559s 0 - ********** - c 559s *????????? 559s *????????? 559s *????????? 559s *????????? 559s 5 - *????????? 559s 6 - *????????? 559s | 559s d 559s 559s 0 5 9 559s | | | 559s 0 - ********** - c 559s *????????? 559s *????????? 559s *????????? 559s *????????? 559s 5 - *????????? 559s 6 - *????????? 559s | 559s d 559s 559s Key: 559s |,-,+ = rectangles forming current merge frontier 559s * = merge done manually 559s . = merge done automatically 559s # = conflict that is currently blocking progress 559s @ = merge was blocked but has been resolved 559s ? = no merge recorded 559s 559s + + git-imerge autofill 559s tee autofill.out 559s Attempting automerge of 9-6...failure. 559s Attempting automerge of 1-1...success. 559s Attempting automerge of 1-4...success. 559s Attempting automerge of 1-6...success. 559s Attempting automerge of 9-6...failure. 559s Attempting automerge of 5-6...failure. 559s Attempting automerge of 3-6...success. 559s Attempting automerge of 4-6...success. 559s Attempting automerge of 5-1...failure. 559s Autofilling 1-6...success. 559s Autofilling 2-6...success. 559s Autofilling 3-6...success. 559s Autofilling 4-1...success. 559s Autofilling 4-2...success. 559s Autofilling 4-3...success. 559s Autofilling 4-4...success. 559s Autofilling 4-5...success. 559s Autofilling 4-6 (first way)...success. 559s Autofilling 4-6 (second way)...success. 559s The two ways of autofilling 4-6 agree. 559s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 559s Attempting automerge of 9-6...failure. 560s Attempting automerge of 5-1...failure. 560s HEAD is now at d8d80cf c⇒9 560s Conflict; suggest manual merge of 5-1 560s + grep -q Traceback autofill.out 560s + grep -q suggest manual merge of 5-1 autofill.out 560s + git-imerge diagram --commits --frontier --html=imerge1.html 560s 0 5 9 560s | | | 560s 0 - ********** - c 560s *???.#???? 560s *???.????? 560s *???.????? 560s *???.????? 560s 5 - *???.????? 560s 6 - *....????? 560s | 560s d 560s 560s 0 5 9 560s | | | 560s 0 - ********** - c 560s *???|#???? 560s *???|????? 560s *???|????? 560s *???|????? 560s 5 - *???|????? 560s 6 - *---+????? 560s | 560s d 560s 560s Key: 560s |,-,+ = rectangles forming current merge frontier 560s * = merge done manually 560s . = merge done automatically 560s # = conflict that is currently blocking progress 560s @ = merge was blocked but has been resolved 560s ? = no merge recorded 560s 560s + git-imerge continue --edit 560s Switched to branch 'imerge/c-d' 560s Auto-merging conflict.txt 560s CONFLICT (content): Merge conflict in conflict.txt 560s Automatic merge failed; fix conflicts and then commit the result. 560s 560s Original first commit: 560s commit 7e31f254c318decc434628f023dac0703f3d2b9e 560s Author: Loú User 560s Date: Thu Apr 7 22:13:19 2005 +0000 560s 560s c⇒5 560s 560s Original second commit: 560s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 560s Author: Loú User 560s Date: Thu Apr 7 22:13:24 2005 +0000 560s 560s d⇒1 560s 560s There was a conflict merging commit 5-1, shown above. 560s Please resolve the conflict, commit the result, then type 560s 560s git-imerge continue 560s + echo merged version 560s + git add conflict.txt 560s + git-imerge continue --no-edit 560s [imerge/c-d 8af476e] imerge 'c-d': manual merge 5-1 560s Merge has been recorded for merge 5-1. 560s Attempting automerge of 5-6...success. 560s Autofilling 5-2...success. 560s Autofilling 5-3...success. 560s Autofilling 5-4...success. 560s Autofilling 5-5...success. 560s Autofilling 5-6...success. 560s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 560s Attempting automerge of 9-6...success. 560s Autofilling 6-6...success. 560s Autofilling 7-6...success. 560s Autofilling 8-6...success. 560s Autofilling 9-1...success. 560s Autofilling 9-2...success. 560s Autofilling 9-3...success. 560s Autofilling 9-4...success. 560s Autofilling 9-5...success. 560s Autofilling 9-6 (first way)...success. 560s Autofilling 9-6 (second way)...success. 560s The two ways of autofilling 9-6 agree. 560s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 560s Merge is complete! 560s + git-imerge diagram --commits --frontier --html=imerge2.html 560s 0 5 9 560s | | | 560s 0 - ********** - c 560s *???.*???. 560s *???..???. 560s *???..???. 560s *???..???. 560s 5 - *???..???. 560s 6 - *......... 560s | 560s d 560s 560s 0 5 9 560s | | | 560s 0 - ********** - c 560s *???.*???| 560s *???..???| 560s *???..???| 560s *???..???| 560s 5 - *???..???| 560s 6 - *--------+ 560s | 560s d 560s 560s Key: 560s |,-,+ = rectangles forming current merge frontier 560s * = merge done manually 560s . = merge done automatically 560s # = conflict that is currently blocking progress 560s @ = merge was blocked but has been resolved 560s ? = no merge recorded 560s 560s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 560s Merge d into c (using imerge) 560s 560s # Please enter the commit message for your changes. Lines starting 560s # with '#' will be ignored, and an empty message aborts the commit. 560s # 560s # Date: Wed Mar 27 07:47:49 2024 +0000 560s # 560s # On branch c-d-merge 560s # Changes to be committed: 560s # modified: conflict.txt 560s # modified: d.txt 560s # 560s [c-d-merge 8f0204d] Merge d into c (using imerge) 560s Date: Wed Mar 27 07:47:49 2024 +0000 560s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 560s + local refname=c-d-merge 560s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 560s + git rev-parse c-d-merge^{tree} 560s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 560s + git-imerge simplify --goal=rebase --branch=c-d-rebase 561s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + local refname=c-d-rebase 561s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git rev-parse c-d-rebase^{tree} 561s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 561s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + local refname=c-d-rebase-with-history 561s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git rev-parse c-d-rebase-with-history^{tree} 561s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git-imerge simplify --goal=border --branch=c-d-border 561s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + local refname=c-d-border 561s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git rev-parse c-d-border^{tree} 561s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 561s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + local refname=c-d-border-with-history 561s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git rev-parse c-d-border-with-history^{tree} 561s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 561s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + local refname=c-d-border-with-history2 561s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git rev-parse c-d-border-with-history2^{tree} 561s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 561s + git-imerge remove 562s + git checkout c 562s Switched to branch 'c' 562s + + git-imerge start --goal=full --first-parent --name=c-d d 562s tee start.out 562s Attempting to merge 1-1...success. 562s Attempting to merge 1-2...success. 562s Attempting to merge 1-3...success. 562s Attempting to merge 1-4...success. 562s Attempting to merge 1-5...success. 562s Attempting to merge 1-6...success. 562s Attempting to merge 2-1...success. 562s Attempting to merge 2-2...success. 562s Attempting to merge 2-3...success. 562s Attempting to merge 2-4...success. 562s Attempting to merge 2-5...success. 562s Attempting to merge 2-6...success. 562s Attempting to merge 3-1...success. 562s Attempting to merge 3-2...success. 562s Attempting to merge 3-3...success. 562s Attempting to merge 3-4...success. 562s Attempting to merge 3-5...success. 562s Attempting to merge 3-6...success. 562s Attempting to merge 4-1...success. 562s Attempting to merge 4-2...success. 562s Attempting to merge 4-3...success. 562s Attempting to merge 4-4...success. 562s Attempting to merge 4-5...success. 562s Attempting to merge 4-6...success. 562s Attempting to merge 5-1...conflict. 562s Switched to branch 'imerge/c-d' 562s Auto-merging conflict.txt 562s CONFLICT (content): Merge conflict in conflict.txt 562s Automatic merge failed; fix conflicts and then commit the result. 562s 562s Original first commit: 562s commit 7e31f254c318decc434628f023dac0703f3d2b9e 562s Author: Loú User 562s Date: Thu Apr 7 22:13:19 2005 +0000 562s 562s c⇒5 562s 562s Original second commit: 562s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 562s Author: Loú User 562s Date: Thu Apr 7 22:13:24 2005 +0000 562s 562s d⇒1 562s 562s There was a conflict merging commit 5-1, shown above. 562s Please resolve the conflict, commit the result, then type 562s 562s git-imerge continue 562s + grep -q Traceback start.out 562s + grep -q suggest manual merge of 5-1 autofill.out 562s + git-imerge diagram --commits --frontier --html=imerge3.html 562s 0 5 9 562s | | | 562s 0 - ********** - c 562s *....#???? 562s *....????? 562s *....????? 562s *....????? 562s 5 - *....????? 562s 6 - *....????? 562s | 562s d 562s 562s 0 5 9 562s | | | 562s 0 - ********** - c 562s *...|#???? 562s *...|????? 562s *...|????? 562s *...|????? 562s 5 - *...|????? 562s 6 - *---+????? 562s | 562s d 562s 562s Key: 562s |,-,+ = rectangles forming current merge frontier 562s * = merge done manually 562s . = merge done automatically 562s # = conflict that is currently blocking progress 562s @ = merge was blocked but has been resolved 562s ? = no merge recorded 562s 562s + echo merged version 562s + git add conflict.txt 562s + GIT_EDITOR=cat git commit 562s imerge 'c-d': manual merge 5-1 562s 562s # Conflicts: 562s # conflict.txt 562s # 562s # It looks like you may be committing a merge. 562s # If this is not correct, please run 562s # git update-ref -d MERGE_HEAD 562s # and try again. 562s 562s 562s # Please enter the commit message for your changes. Lines starting 562s # with '#' will be ignored, and an empty message aborts the commit. 562s # 562s # On branch imerge/c-d 562s # All conflicts fixed but you are still merging. 562s # 562s # Changes to be committed: 562s # modified: conflict.txt 562s # modified: d.txt 562s # 562s [imerge/c-d 04dda7c] imerge 'c-d': manual merge 5-1 562s + git-imerge continue --edit 562s Merge has been recorded for merge 5-1. 562s Attempting to merge 5-2...success. 562s Attempting to merge 5-3...success. 563s Attempting to merge 5-4...success. 563s Attempting to merge 5-5...success. 563s Attempting to merge 5-6...success. 563s Attempting to merge 6-1...success. 563s Attempting to merge 6-2...success. 563s Attempting to merge 6-3...success. 563s Attempting to merge 6-4...success. 563s Attempting to merge 6-5...success. 563s Attempting to merge 6-6...success. 563s Attempting to merge 7-1...success. 563s Attempting to merge 7-2...success. 563s Attempting to merge 7-3...success. 563s Attempting to merge 7-4...success. 563s Attempting to merge 7-5...success. 563s Attempting to merge 7-6...success. 563s Attempting to merge 8-1...success. 563s Attempting to merge 8-2...success. 563s Attempting to merge 8-3...success. 563s Attempting to merge 8-4...success. 563s Attempting to merge 8-5...success. 563s Attempting to merge 8-6...success. 563s Attempting to merge 9-1...success. 563s Attempting to merge 9-2...success. 563s Attempting to merge 9-3...success. 563s Attempting to merge 9-4...success. 563s Attempting to merge 9-5...success. 563s Attempting to merge 9-6...success. 563s Merge is complete! 563s + git-imerge diagram --commits --frontier --html=imerge4.html 563s 0 5 9 563s | | | 563s 0 - ********** - c 563s *....*.... 563s *......... 563s *......... 563s *......... 563s 5 - *......... 563s 6 - *......... 563s | 563s d 563s 563s 0 5 9 563s | | | 563s 0 - ********** - c 563s *....*...| 563s *........| 563s *........| 563s *........| 563s 5 - *........| 563s 6 - *--------+ 563s | 563s d 563s 563s Key: 563s |,-,+ = rectangles forming current merge frontier 563s * = merge done manually 563s . = merge done automatically 563s # = conflict that is currently blocking progress 563s @ = merge was blocked but has been resolved 563s ? = no merge recorded 563s 563s + git-imerge finish --branch=c-d-full 563s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 563s + local refname=c-d-full 563s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 563s + git rev-parse c-d-full^{tree} 563s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 563s + test_conflict 6-6 563s + local conflict=6-6 563s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s + DESCRIPTION=git-imerge test repository with conflict at 6-6 563s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 563s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s + local description=git-imerge test repository with conflict at 6-6 563s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 563s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s + local description=git-imerge test repository with conflict at 6-6 563s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s hint: Using 'master' as the name for the initial branch. This default branch name 563s hint: is subject to change. To configure the initial branch name to use in all 563s hint: of your new repositories, which will suppress this warning, call: 563s hint: 563s hint: git config --global init.defaultBranch 563s hint: 563s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 563s hint: 'development'. The just-created branch can be renamed via this command: 563s hint: 563s hint: git branch -m 563s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6/.git/ 563s + echo git-imerge test repository with conflict at 6-6 563s + printf %s\n /*.out /*.css /*.html 563s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6/.git config user.name Loú User 563s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 563s + TIME=1112911993 563s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/conflicted-6-6 563s + modify c.txt 0 563s + filename=c.txt 563s + text=0 563s + echo 0 563s + git add c.txt 563s + modify d.txt 0 563s + filename=d.txt 563s + text=0 563s + echo 0 563s + git add d.txt 563s + modify conflict.txt original version 563s + filename=conflict.txt 563s + text=original version 563s + echo original version 563s + git add conflict.txt 563s + commit -m m⇒0 563s + TIME=1112911994 563s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 563s [master (root-commit) d70e04b] m⇒0 563s 3 files changed, 3 insertions(+) 563s create mode 100644 c.txt 563s create mode 100644 conflict.txt 563s create mode 100644 d.txt 563s + git checkout -b c master -- 563s Switched to a new branch 'c' 563s + seq 9 563s + modify c.txt 1 563s + filename=c.txt 563s + text=1 563s + echo 1 563s + git add c.txt 563s + commit -m c⇒1 563s + TIME=1112911995 563s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 563s [c 89e2141] c⇒1 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify c.txt 2 563s + filename=c.txt 563s + text=2 563s + echo 2 563s + git add c.txt 563s + commit -m c⇒2 563s + TIME=1112911996 563s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 563s [c 7c431f2] c⇒2 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify c.txt 3 563s + filename=c.txt 563s + text=3 563s + echo 3 563s + git add c.txt 563s + commit -m c⇒3 563s + TIME=1112911997 563s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 563s [c f02ab24] c⇒3 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify c.txt 4 563s + filename=c.txt 563s + text=4 563s + echo 4 563s + git add c.txt 563s + commit -m c⇒4 563s + TIME=1112911998 563s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 563s [c ed9122f] c⇒4 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify c.txt 5 563s + filename=c.txt 563s + text=5 563s + echo 5 563s + git add c.txt 563s + commit -m c⇒5 563s + TIME=1112911999 563s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 563s + modify c.txt 6 563s + filename=c.txt 563s + text=6 563s + echo 6 563s + git add c.txt 563s [c 1d3bf09] c⇒5 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify conflict.txt c version 563s + filename=conflict.txt 563s + text=c version 563s + echo c version 563s + git add conflict.txt 563s + commit -m c⇒6 563s + TIME=1112912000 563s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 563s [c fe4fed8] c⇒6 563s 2 files changed, 2 insertions(+), 2 deletions(-) 563s + modify c.txt 7 563s + filename=c.txt 563s + text=7 563s + echo 7 563s + git add c.txt 563s + commit -m c⇒7 563s + TIME=1112912001 563s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 563s + modify c.txt 8 563s + filename=c.txt 563s + text=8 563s + echo 8 563s + git add c.txt 563s + commit -m c⇒8 563s + TIME=1112912002 563s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 563s [c ec255ea] c⇒7 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s [c 7459ac3] c⇒8 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify c.txt 9 563s + filename=c.txt 563s + text=9 563s + echo 9 563s + git add c.txt 563s + commit -m c⇒9 563s + TIME=1112912003 563s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 563s + git checkout -b d master -- 563s [c 70408c8] c⇒9 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s Switched to a new branch 'd' 563s + seq 6 563s + modify d.txt 1 563s + filename=d.txt 563s + text=1 563s + echo 1 563s + git add d.txt 563s + commit -m d⇒1 563s + TIME=1112912004 563s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 563s [d bd5368a] d⇒1 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify d.txt 2 563s + filename=d.txt 563s + text=2 563s + echo 2 563s + git add d.txt 563s + commit -m d⇒2 563s + TIME=1112912005 563s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 563s [d 93e27e6] d⇒2 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify d.txt 3 563s + filename=d.txt 563s + text=3 563s + echo 3 563s + git add d.txt 563s + commit -m d⇒3 563s + TIME=1112912006 563s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 563s [d 133f385] d⇒3 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify d.txt 4 563s + filename=d.txt 563s + text=4 563s + echo 4 563s + git add d.txt 563s + commit -m d⇒4 563s + TIME=1112912007 563s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 563s [d 586472a] d⇒4 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify d.txt 5 563s + filename=d.txt 563s + text=5 563s + echo 5 563s + git add d.txt 563s + commit -m d⇒5 563s + TIME=1112912008 563s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 563s [d 9522207] d⇒5 563s 1 file changed, 1 insertion(+), 1 deletion(-) 563s + modify d.txt 6 563s + filename=d.txt 563s + text=6 563s + echo 6 563s + git add d.txt 563s + modify conflict.txt d version 563s + filename=conflict.txt 563s + text=d version 563s + echo d version 563s + git add conflict.txt 563s + commit -m d⇒6 563s + TIME=1112912009 563s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 563s [d f7e451a] d⇒6 563s 2 files changed, 2 insertions(+), 2 deletions(-) 563s + git checkout c 563s Switched to branch 'c' 563s + git-imerge init --name=c-d d 564s + git-imerge list 564s * c-d 564s + git-imerge diagram --commits --frontier --html=imerge0.html 564s 0 5 9 564s | | | 564s 0 - ********** - c 564s *????????? 564s *????????? 564s *????????? 564s *????????? 564s 5 - *????????? 564s 6 - *????????? 564s | 564s d 564s 564s 0 5 9 564s | | | 564s 0 - ********** - c 564s *????????? 564s *????????? 564s *????????? 564s *????????? 564s 5 - *????????? 564s 6 - *????????? 564s | 564s d 564s 564s Key: 564s |,-,+ = rectangles forming current merge frontier 564s * = merge done manually 564s . = merge done automatically 564s # = conflict that is currently blocking progress 564s @ = merge was blocked but has been resolved 564s ? = no merge recorded 564s 564s + + git-imerge autofill 564s tee autofill.out 564s Attempting automerge of 9-6...failure. 564s Attempting automerge of 1-1...success. 564s Attempting automerge of 1-4...success. 564s Attempting automerge of 1-6...success. 564s Attempting automerge of 9-6...failure. 564s Attempting automerge of 5-6...success. 564s Attempting automerge of 7-6...failure. 564s Attempting automerge of 6-6...failure. 564s Attempting automerge of 6-1...success. 564s Attempting automerge of 6-4...success. 564s Attempting automerge of 6-5...success. 564s Attempting automerge of 9-5...success. 564s Autofilling 1-6...success. 564s Autofilling 2-6...success. 564s Autofilling 3-6...success. 564s Autofilling 4-6...success. 564s Autofilling 5-1...success. 564s Autofilling 5-2...success. 564s Autofilling 5-3...success. 564s Autofilling 5-4...success. 564s Autofilling 5-5...success. 564s Autofilling 5-6 (first way)...success. 564s Autofilling 5-6 (second way)...success. 564s The two ways of autofilling 5-6 agree. 564s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 564s Autofilling 6-5...success. 564s Autofilling 7-5...success. 564s Autofilling 8-5...success. 564s Autofilling 9-1...success. 564s Autofilling 9-2...success. 564s Autofilling 9-3...success. 564s Autofilling 9-4...success. 564s Autofilling 9-5 (first way)...success. 564s Autofilling 9-5 (second way)...success. 564s The two ways of autofilling 9-5 agree. 564s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 564s Attempting automerge of 9-6...failure. 564s Attempting automerge of 6-6...failure. 564s HEAD is now at 70408c8 c⇒9 564s Conflict; suggest manual merge of 6-6 564s + grep -q Traceback autofill.out 564s + grep -q suggest manual merge of 6-6 autofill.out 564s + git-imerge diagram --commits --frontier --html=imerge1.html 564s 0 5 9 564s | | | 564s 0 - ********** - c 564s *????.???. 564s *????.???. 564s *????.???. 564s *????.???. 564s 5 - *????..... 564s 6 - *.....#??? 564s | 564s d 564s 564s 0 5 9 564s | | | 564s 0 - ********** - c 564s *????.???| 564s *????.???| 564s *????.???| 564s *????.???| 564s 5 - *????.---+ 564s 6 - *----+#??? 564s | 564s d 564s 564s Key: 564s |,-,+ = rectangles forming current merge frontier 564s * = merge done manually 564s . = merge done automatically 564s # = conflict that is currently blocking progress 564s @ = merge was blocked but has been resolved 564s ? = no merge recorded 564s 564s + git-imerge continue --edit 565s Switched to branch 'imerge/c-d' 565s Auto-merging conflict.txt 565s CONFLICT (content): Merge conflict in conflict.txt 565s Automatic merge failed; fix conflicts and then commit the result. 565s 565s Original first commit: 565s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 565s Author: Loú User 565s Date: Thu Apr 7 22:13:20 2005 +0000 565s 565s c⇒6 565s 565s Original second commit: 565s commit f7e451a6c9656dda15641a9fbc591a602f158692 565s Author: Loú User 565s Date: Thu Apr 7 22:13:29 2005 +0000 565s 565s d⇒6 565s 565s There was a conflict merging commit 6-6, shown above. 565s Please resolve the conflict, commit the result, then type 565s 565s git-imerge continue 565s + echo merged version 565s + git add conflict.txt 565s + git-imerge continue --no-edit 565s [imerge/c-d 06fcf72] imerge 'c-d': manual merge 6-6 565s Merge has been recorded for merge 6-6. 565s Attempting automerge of 9-6...success. 565s Autofilling 7-6...success. 565s Autofilling 8-6...success. 565s Autofilling 9-6...success. 565s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 565s Merge is complete! 565s + git-imerge diagram --commits --frontier --html=imerge2.html 565s 0 5 9 565s | | | 565s 0 - ********** - c 565s *????.???. 565s *????.???. 565s *????.???. 565s *????.???. 565s 5 - *????..... 565s 6 - *.....*... 565s | 565s d 565s 565s 0 5 9 565s | | | 565s 0 - ********** - c 565s *????.???| 565s *????.???| 565s *????.???| 565s *????.???| 565s 5 - *????....| 565s 6 - *-----*--+ 565s | 565s d 565s 565s Key: 565s |,-,+ = rectangles forming current merge frontier 565s * = merge done manually 565s . = merge done automatically 565s # = conflict that is currently blocking progress 565s @ = merge was blocked but has been resolved 565s ? = no merge recorded 565s 565s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 565s Merge d into c (using imerge) 565s 565s # Please enter the commit message for your changes. Lines starting 565s # with '#' will be ignored, and an empty message aborts the commit. 565s # 565s # Date: Wed Mar 27 07:47:54 2024 +0000 565s # 565s # On branch c-d-merge 565s # Changes to be committed: 565s # modified: conflict.txt 565s # modified: d.txt 565s # 565s [c-d-merge df7c5fb] Merge d into c (using imerge) 565s Date: Wed Mar 27 07:47:54 2024 +0000 565s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + local refname=c-d-merge 565s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + git rev-parse c-d-merge^{tree} 565s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + git-imerge simplify --goal=rebase --branch=c-d-rebase 565s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + local refname=c-d-rebase 565s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + git rev-parse c-d-rebase^{tree} 565s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 565s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + local refname=c-d-rebase-with-history 565s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + git rev-parse c-d-rebase-with-history^{tree} 565s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 565s + git-imerge simplify --goal=border --branch=c-d-border 566s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + local refname=c-d-border 566s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + git rev-parse c-d-border^{tree} 566s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 566s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + local refname=c-d-border-with-history 566s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + git rev-parse c-d-border-with-history^{tree} 566s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 566s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + local refname=c-d-border-with-history2 566s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + git rev-parse c-d-border-with-history2^{tree} 566s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 566s + git-imerge remove 566s + git checkout c 566s Switched to branch 'c' 566s + + git-imerge start --goal=full --first-parent --name=c-d d 566s tee start.out 566s Attempting to merge 1-1...success. 566s Attempting to merge 1-2...success. 566s Attempting to merge 1-3...success. 566s Attempting to merge 1-4...success. 566s Attempting to merge 1-5...success. 566s Attempting to merge 1-6...success. 566s Attempting to merge 2-1...success. 566s Attempting to merge 2-2...success. 566s Attempting to merge 2-3...success. 566s Attempting to merge 2-4...success. 566s Attempting to merge 2-5...success. 566s Attempting to merge 2-6...success. 567s Attempting to merge 3-1...success. 567s Attempting to merge 3-2...success. 567s Attempting to merge 3-3...success. 567s Attempting to merge 3-4...success. 567s Attempting to merge 3-5...success. 567s Attempting to merge 3-6...success. 567s Attempting to merge 4-1...success. 567s Attempting to merge 4-2...success. 567s Attempting to merge 4-3...success. 567s Attempting to merge 4-4...success. 567s Attempting to merge 4-5...success. 567s Attempting to merge 4-6...success. 567s Attempting to merge 5-1...success. 567s Attempting to merge 5-2...success. 567s Attempting to merge 5-3...success. 567s Attempting to merge 5-4...success. 567s Attempting to merge 5-5...success. 567s Attempting to merge 5-6...success. 567s Attempting to merge 6-1...success. 567s Attempting to merge 6-2...success. 567s Attempting to merge 6-3...success. 567s Attempting to merge 6-4...success. 567s Attempting to merge 6-5...success. 567s Attempting to merge 6-6...conflict. 567s Attempting to merge 7-1...success. 567s Attempting to merge 7-2...success. 567s Attempting to merge 7-3...success. 567s Attempting to merge 7-4...success. 567s Attempting to merge 7-5...success. 567s Attempting to merge 8-1...success. 567s Attempting to merge 8-2...success. 567s Attempting to merge 8-3...success. 567s Attempting to merge 8-4...success. 567s Attempting to merge 8-5...success. 567s Attempting to merge 9-1...success. 567s Attempting to merge 9-2...success. 567s Attempting to merge 9-3...success. 567s Attempting to merge 9-4...success. 567s Attempting to merge 9-5...success. 567s Previous HEAD position was a79a754 imerge 'c-d': automatic merge 9-5 567s Switched to branch 'imerge/c-d' 567s Auto-merging conflict.txt 567s CONFLICT (content): Merge conflict in conflict.txt 567s Automatic merge failed; fix conflicts and then commit the result. 567s 567s Original first commit: 567s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 567s Author: Loú User 567s Date: Thu Apr 7 22:13:20 2005 +0000 567s 567s c⇒6 567s 567s Original second commit: 567s commit f7e451a6c9656dda15641a9fbc591a602f158692 567s Author: Loú User 567s Date: Thu Apr 7 22:13:29 2005 +0000 567s 567s d⇒6 567s 567s There was a conflict merging commit 6-6, shown above. 567s Please resolve the conflict, commit the result, then type 567s 567s git-imerge continue 567s + grep -q Traceback start.out 567s + grep -q suggest manual merge of 6-6 autofill.out 567s + git-imerge diagram --commits --frontier --html=imerge3.html 567s 0 5 9 567s | | | 567s 0 - ********** - c 567s *......... 567s *......... 567s *......... 567s *......... 567s 5 - *......... 567s 6 - *.....#??? 567s | 567s d 567s 567s 0 5 9 567s | | | 567s 0 - ********** - c 567s *........| 567s *........| 567s *........| 567s *........| 567s 5 - *.....---+ 567s 6 - *----+#??? 567s | 567s d 567s 567s Key: 567s |,-,+ = rectangles forming current merge frontier 567s * = merge done manually 567s . = merge done automatically 567s # = conflict that is currently blocking progress 567s @ = merge was blocked but has been resolved 567s ? = no merge recorded 567s 567s + echo merged version 567s + git add conflict.txt 567s + GIT_EDITOR=cat git commit 567s imerge 'c-d': manual merge 6-6 567s 567s # Conflicts: 567s # conflict.txt 567s # 567s # It looks like you may be committing a merge. 567s # If this is not correct, please run 567s # git update-ref -d MERGE_HEAD 567s # and try again. 567s 567s 567s # Please enter the commit message for your changes. Lines starting 567s # with '#' will be ignored, and an empty message aborts the commit. 567s # 567s # On branch imerge/c-d 567s # All conflicts fixed but you are still merging. 567s # 567s # Changes to be committed: 567s # modified: conflict.txt 567s # modified: d.txt 567s # 567s + git-imerge continue --edit 567s [imerge/c-d de61af7] imerge 'c-d': manual merge 6-6 567s Merge has been recorded for merge 6-6. 567s Attempting to merge 7-6...success. 567s Attempting to merge 8-6...success. 567s Attempting to merge 9-6...success. 567s Merge is complete! 567s + git-imerge diagram --commits --frontier --html=imerge4.html 568s 0 5 9 568s | | | 568s 0 - ********** - c 568s *......... 568s *......... 568s *......... 568s *......... 568s 5 - *......... 568s 6 - *.....*... 568s | 568s d 568s 568s 0 5 9 568s | | | 568s 0 - ********** - c 568s *........| 568s *........| 568s *........| 568s *........| 568s 5 - *........| 568s 6 - *-----*--+ 568s | 568s d 568s 568s Key: 568s |,-,+ = rectangles forming current merge frontier 568s * = merge done manually 568s . = merge done automatically 568s # = conflict that is currently blocking progress 568s @ = merge was blocked but has been resolved 568s ? = no merge recorded 568s 568s + git-imerge finish --branch=c-d-full 568s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 568s + local refname=c-d-full 568s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 568s + git rev-parse c-d-full^{tree} 568s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 568s py312: commands[2] /tmp/autopkgtest.eDJJFA/build.5NL/src> /bin/sh t/test-really-conflicted 568s + dirname t/test-really-conflicted 568s + cd t 568s + pwd 568s + dirname /tmp/autopkgtest.eDJJFA/build.5NL/src/t 568s + BASE=/tmp/autopkgtest.eDJJFA/build.5NL/src 568s + . /tmp/autopkgtest.eDJJFA/build.5NL/src/t/test-lib.sh 568s + GIT_IMERGE=git-imerge 568s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s + DESCRIPTION=git-imerge test repository with multiple conflicts 568s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 568s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s + local description=git-imerge test repository with multiple conflicts 568s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 568s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s + local description=git-imerge test repository with multiple conflicts 568s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s hint: Using 'master' as the name for the initial branch. This default branch name 568s hint: is subject to change. To configure the initial branch name to use in all 568s hint: of your new repositories, which will suppress this warning, call: 568s hint: 568s hint: git config --global init.defaultBranch 568s hint: 568s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 568s hint: 'development'. The just-created branch can be renamed via this command: 568s hint: 568s hint: git branch -m 568s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted/.git/ 568s + echo git-imerge test repository with multiple conflicts 568s + printf %s\n /*.out /*.css /*.html 568s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted/.git config user.name Loú User 568s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted/.git config user.email luser@example.com 568s + TIME=1112911993 568s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/really-conflicted 568s + modify c.txt 0 568s + filename=c.txt 568s + text=0 568s + echo 0 568s + git add c.txt 568s + modify d.txt 0 568s + filename=d.txt 568s + text=0 568s + echo 0 568s + git add d.txt 568s + seq 0 7 568s + modify conflict0.txt original version 568s + filename=conflict0.txt 568s + text=original version 568s + echo original version 568s + git add conflict0.txt 568s + modify conflict1.txt original version 568s + filename=conflict1.txt 568s + text=original version 568s + echo original version 568s + git add conflict1.txt 568s + modify conflict2.txt original version 568s + filename=conflict2.txt 568s + text=original version 568s + echo original version 568s + git add conflict2.txt 568s + modify conflict3.txt original version 568s + filename=conflict3.txt 568s + text=original version 568s + echo original version 568s + git add conflict3.txt 568s + modify conflict4.txt original version 568s + filename=conflict4.txt 568s + text=original version 568s + echo original version 568s + git add conflict4.txt 568s + modify conflict5.txt original version 568s + filename=conflict5.txt 568s + text=original version 568s + echo original version 568s + git add conflict5.txt 568s + modify conflict6.txt original version 568s + filename=conflict6.txt 568s + text=original version 568s + echo original version 568s + git add conflict6.txt 568s + modify conflict7.txt original version 568s + filename=conflict7.txt 568s + text=original version 568s + echo original version 568s + git add conflict7.txt 568s + commit -m m⇒0 568s + TIME=1112911994 568s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 568s [master (root-commit) 8e21fbd] m⇒0 568s 10 files changed, 10 insertions(+) 568s create mode 100644 c.txt 568s create mode 100644 conflict0.txt 568s create mode 100644 conflict1.txt 568s create mode 100644 conflict2.txt 568s create mode 100644 conflict3.txt 568s create mode 100644 conflict4.txt 568s create mode 100644 conflict5.txt 568s create mode 100644 conflict6.txt 568s create mode 100644 conflict7.txt 568s create mode 100644 d.txt 568s + git checkout -b c master -- 568s Switched to a new branch 'c' 568s + modify c.txt 1 568s + filename=c.txt 568s + text=1 568s + echo 1 568s + git add c.txt 568s + modify conflict0.txt c version 568s + filename=conflict0.txt 568s + text=c version 568s + echo c version 568s + git add conflict0.txt 568s + modify conflict4.txt c version 568s + filename=conflict4.txt 568s + text=c version 568s + echo c version 568s + git add conflict4.txt 568s + commit -m c⇒1 568s + TIME=1112911995 568s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 568s [c 4e6007a] c⇒1 568s 3 files changed, 3 insertions(+), 3 deletions(-) 568s + modify c.txt 2 568s + filename=c.txt 568s + text=2 568s + echo 2 568s + git add c.txt 568s + commit -m c⇒2 568s + TIME=1112911996 568s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 568s + modify c.txt 3 568s + filename=c.txt 568s + text=3 568s + echo 3 568s + git add c.txt 568s [c c2b7c49] c⇒2 568s 1 file changed, 1 insertion(+), 1 deletion(-) 568s + commit -m c⇒3 568s + TIME=1112911997 568s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 568s + modify c.txt 4 568s + filename=c.txt 568s + text=4 568s + echo 4 568s + git add c.txt 568s [c 42ad55a] c⇒3 568s 1 file changed, 1 insertion(+), 1 deletion(-) 568s + modify conflict1.txt c version 568s + filename=conflict1.txt 568s + text=c version 568s + echo c version 568s + git add conflict1.txt 568s + commit -m c⇒4 568s + TIME=1112911998 568s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 568s [c a891793] c⇒4 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + modify c.txt 5 568s + filename=c.txt 568s + text=5 568s + echo 5 568s + git add c.txt 568s + modify conflict3.txt c version 568s + filename=conflict3.txt 568s + text=c version 568s + echo c version 568s + git add conflict3.txt 568s + modify conflict6.txt c version 568s + filename=conflict6.txt 568s + text=c version 568s + echo c version 568s + git add conflict6.txt 568s + commit -m c⇒5 568s + TIME=1112911999 568s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 568s [c c21441d] c⇒5 568s 3 files changed, 3 insertions(+), 3 deletions(-) 568s + modify c.txt 6 568s + filename=c.txt 568s + text=6 568s + echo 6 568s + git add c.txt 568s + modify conflict5.txt c version 568s + filename=conflict5.txt 568s + text=c version 568s + echo c version 568s + git add conflict5.txt 568s + commit -m c⇒6 568s + TIME=1112912000 568s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 568s [c a797a66] c⇒6 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + modify c.txt 7 568s + filename=c.txt 568s + text=7 568s + echo 7 568s + git add c.txt 568s + modify conflict2.txt c version 568s + filename=conflict2.txt 568s + text=c version 568s + echo c version 568s + git add conflict2.txt 568s + commit -m c⇒7 568s + TIME=1112912001 568s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 568s [c c0e1537] c⇒7 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + modify c.txt 8 568s + filename=c.txt 568s + text=8 568s + echo 8 568s + git add c.txt 568s + commit -m c⇒8 568s + TIME=1112912002 568s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 568s [c 9f3e7c8] c⇒8 568s 1 file changed, 1 insertion(+), 1 deletion(-) 568s + modify c.txt 9 568s + filename=c.txt 568s + text=9 568s + echo 9 568s + git add c.txt 568s + modify conflict7.txt c version 568s + filename=conflict7.txt 568s + text=c version 568s + echo c version 568s + git add conflict7.txt 568s + commit -m c⇒9 568s + TIME=1112912003 568s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 568s [c ccbfccb] c⇒9 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + git checkout -b d master -- 568s Switched to a new branch 'd' 568s + modify d.txt 1 568s + filename=d.txt 568s + text=1 568s + echo 1 568s + git add d.txt 568s + modify conflict0.txt d version 568s + filename=conflict0.txt 568s + text=d version 568s + echo d version 568s + git add conflict0.txt 568s + modify conflict6.txt d version 568s + filename=conflict6.txt 568s + text=d version 568s + echo d version 568s + git add conflict6.txt 568s + commit -m d⇒1 568s + TIME=1112912004 568s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 568s [d 8c3c065] d⇒1 568s 3 files changed, 3 insertions(+), 3 deletions(-) 568s + modify d.txt 2 568s + filename=d.txt 568s + text=2 568s + echo 2 568s + git add d.txt 568s + modify conflict1.txt d version 568s + filename=conflict1.txt 568s + text=d version 568s + echo d version 568s + git add conflict1.txt 568s + modify conflict2.txt d version 568s + filename=conflict2.txt 568s + text=d version 568s + echo d version 568s + git add conflict2.txt 568s + commit -m d⇒2 568s + TIME=1112912005 568s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 568s [d 820b787] d⇒2 568s 3 files changed, 3 insertions(+), 3 deletions(-) 568s + modify d.txt 3 568s + filename=d.txt 568s + text=3 568s + echo 3 568s + git add d.txt 568s + commit -m d⇒3 568s + TIME=1112912006 568s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 568s [d 821c792] d⇒3 568s 1 file changed, 1 insertion(+), 1 deletion(-) 568s + modify d.txt 4 568s + filename=d.txt 568s + text=4 568s + echo 4 568s + git add d.txt 568s + commit -m d⇒4 568s + TIME=1112912007 568s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 568s [d c2a1456] d⇒4 568s 1 file changed, 1 insertion(+), 1 deletion(-) 568s + modify d.txt 5 568s + filename=d.txt 568s + text=5 568s + echo 5 568s + git add d.txt 568s + modify conflict3.txt d version 568s + filename=conflict3.txt 568s + text=d version 568s + echo d version 568s + git add conflict3.txt 568s + commit -m d⇒5 568s + TIME=1112912008 568s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 568s [d c3e3890] d⇒5 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + modify d.txt 6 568s + filename=d.txt 568s + text=6 568s + echo 6 568s + git add d.txt 568s + modify conflict4.txt d version 568s + filename=conflict4.txt 568s + text=d version 568s + echo d version 568s + git add conflict4.txt 568s + commit -m d⇒6 568s + TIME=1112912009 568s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 568s + modify d.txt 7 568s + filename=d.txt 568s + text=7 568s + echo 7 568s + git add d.txt 568s + modify conflict5.txt d version 568s + filename=conflict5.txt 568s + text=d version 568s + echo d version 568s + git add conflict5.txt 568s [d b2f5c5e] d⇒6 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + commit -m d⇒7 568s + TIME=1112912010 568s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 568s [d 892af56] d⇒7 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + modify d.txt 8 568s + filename=d.txt 568s + text=8 568s + echo 8 568s + git add d.txt 568s + modify conflict7.txt d version 568s + filename=conflict7.txt 568s + text=d version 568s + echo d version 568s + git add conflict7.txt 568s + commit -m d⇒8 568s + TIME=1112912011 568s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 568s [d 67099d0] d⇒8 568s 2 files changed, 2 insertions(+), 2 deletions(-) 568s + git checkout c 568s Switched to branch 'c' 568s + git-imerge init --name=c-d d 568s + git-imerge diagram --commits --frontier 568s 0 5 9 568s | | | 568s 0 - ********** - c 568s *????????? 568s *????????? 568s *????????? 568s *????????? 568s 5 - *????????? 568s *????????? 568s *????????? 568s 8 - *????????? 568s | 568s d 568s 568s 0 5 9 568s | | | 568s 0 - ********** - c 568s *????????? 568s *????????? 568s *????????? 568s *????????? 568s 5 - *????????? 568s *????????? 568s *????????? 568s 8 - *????????? 568s | 568s d 568s 568s Key: 568s |,-,+ = rectangles forming current merge frontier 568s * = merge done manually 568s . = merge done automatically 568s # = conflict that is currently blocking progress 568s @ = merge was blocked but has been resolved 568s ? = no merge recorded 568s 568s + conflict_count=0 568s + true 568s + git-imerge continue --no-edit 568s + tee autofill.out 568s Attempting automerge of 9-8...failure. 568s Attempting automerge of 1-1...failure. 568s Switched to branch 'imerge/c-d' 568s Auto-merging conflict0.txt 568s CONFLICT (content): Merge conflict in conflict0.txt 568s Automatic merge failed; fix conflicts and then commit the result. 568s 568s Original first commit: 568s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 568s Author: Loú User 568s Date: Thu Apr 7 22:13:15 2005 +0000 568s 568s c⇒1 568s 568s Original second commit: 568s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 568s Author: Loú User 568s Date: Thu Apr 7 22:13:24 2005 +0000 568s 568s d⇒1 568s 568s There was a conflict merging commit 1-1, shown above. 568s Please resolve the conflict, commit the result, then type 568s 568s git-imerge continue 568s + grep -q Traceback autofill.out 568s + git-imerge diagram --frontier 569s 0 5 9 569s | | | 569s 0 - ********** - c 569s *#???????? 569s *????????? 569s *????????? 569s *????????? 569s 5 - *????????? 569s *????????? 569s *????????? 569s 8 - *????????? 569s | 569s d 569s 569s Key: 569s |,-,+ = rectangles forming current merge frontier 569s * = merge done manually 569s . = merge done automatically 569s # = conflict that is currently blocking progress 569s @ = merge was blocked but has been resolved 569s ? = no merge recorded 569s 569s + grep -q There was a conflict merging autofill.out 569s + seq 0 7 569s + grep -q ==== conflict0.txt 569s + modify conflict0.txt merged version 569s + filename=conflict0.txt 569s + text=merged version 569s + echo merged version 569s + git add conflict0.txt 569s + conflict_count=1 569s + grep -q ==== conflict1.txt 569s + grep -q ==== conflict2.txt 569s + grep -q ==== conflict3.txt 569s + grep -q ==== conflict4.txt 569s + grep -q ==== conflict5.txt 569s + grep -q ==== conflict6.txt 569s + grep -q ==== conflict7.txt 569s + true 569s + git-imerge continue --no-edit 569s + tee autofill.out 569s [imerge/c-d ea4f83e] imerge 'c-d': manual merge 1-1 569s Merge has been recorded for merge 1-1. 569s Attempting automerge of 1-8...failure. 569s Attempting automerge of 1-2...success. 569s Attempting automerge of 1-6...failure. 569s Attempting automerge of 1-4...success. 569s Attempting automerge of 1-5...success. 569s Autofilling 1-2...success. 569s Autofilling 1-3...success. 569s Autofilling 1-4...success. 569s Autofilling 1-5...success. 569s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 569s Attempting automerge of 1-8...failure. 569s Attempting automerge of 1-6...failure. 569s Attempting automerge of 9-5...failure. 569s Attempting automerge of 2-1...success. 569s Attempting automerge of 2-4...success. 569s Attempting automerge of 2-5...success. 569s Attempting automerge of 9-5...failure. 569s Attempting automerge of 6-5...failure. 569s Attempting automerge of 4-5...failure. 569s Attempting automerge of 3-5...success. 569s Attempting automerge of 4-1...success. 569s Attempting automerge of 4-3...failure. 569s Attempting automerge of 4-2...failure. 569s Attempting automerge of 9-1...failure. 569s Attempting automerge of 7-1...failure. 569s Attempting automerge of 6-1...failure. 569s Attempting automerge of 5-1...failure. 569s Autofilling 2-5...success. 569s Autofilling 3-1...success. 569s Autofilling 3-2...success. 569s Autofilling 3-3...success. 569s Autofilling 3-4...success. 569s Autofilling 3-5 (first way)...success. 569s Autofilling 3-5 (second way)...success. 569s The two ways of autofilling 3-5 agree. 569s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 569s Autofilling 4-1...success. 569s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 569s Attempting automerge of 4-5...failure. 569s Attempting automerge of 4-2...failure. 569s Attempting automerge of 9-1...failure. 569s Attempting automerge of 5-1...failure. 569s Previous HEAD position was c21441d c⇒5 569s Switched to branch 'imerge/c-d' 569s Auto-merging conflict4.txt 569s CONFLICT (content): Merge conflict in conflict4.txt 569s Automatic merge failed; fix conflicts and then commit the result. 569s 569s Original first commit: 569s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 569s Author: Loú User 569s Date: Thu Apr 7 22:13:15 2005 +0000 569s 569s c⇒1 569s 569s Original second commit: 569s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 569s Author: Loú User 569s Date: Thu Apr 7 22:13:29 2005 +0000 569s 569s d⇒6 569s 569s There was a conflict merging commit 1-6, shown above. 569s Please resolve the conflict, commit the result, then type 569s 569s git-imerge continue 569s + grep -q Traceback autofill.out 569s + git-imerge diagram --frontier 569s 0 5 9 569s | | | 569s 0 - ********** - c 569s **?.+#???? 569s *.?|#????? 569s *.?|?????? 569s *.?|?????? 569s 5 - *--+?????? 569s *#???????? 569s *????????? 569s 8 - *????????? 569s | 569s d 569s 569s Key: 569s |,-,+ = rectangles forming current merge frontier 569s * = merge done manually 569s . = merge done automatically 569s # = conflict that is currently blocking progress 569s @ = merge was blocked but has been resolved 569s ? = no merge recorded 569s 569s + grep -q There was a conflict merging autofill.out 569s + seq 0 7 569s + grep -q ==== conflict0.txt 569s + grep -q ==== conflict1.txt 569s + grep -q ==== conflict2.txt 569s + grep -q ==== conflict3.txt 569s + grep -q ==== conflict4.txt 569s + modify conflict4.txt merged version 569s + filename=conflict4.txt 569s + text=merged version 569s + echo merged version 569s + git add conflict4.txt 569s + conflict_count=2 569s + grep -q ==== conflict5.txt 569s + grep -q ==== conflict6.txt 569s + grep -q ==== conflict7.txt 569s + true 569s + git-imerge continue --no-edit 569s + tee autofill.out 569s [imerge/c-d 2bb55ef] imerge 'c-d': manual merge 1-6 569s Merge has been recorded for merge 1-6. 569s Attempting automerge of 1-8...success. 569s Autofilling 1-7...success. 569s Autofilling 1-8...success. 569s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 569s Attempting automerge of 3-8...success. 570s Autofilling 2-8...success. 570s Autofilling 3-6...success. 570s Autofilling 3-7...success. 570s Autofilling 3-8 (first way)...success. 570s Autofilling 3-8 (second way)...success. 570s The two ways of autofilling 3-8 agree. 570s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 570s Warning: you are leaving 1 commit behind, not connected to 570s any of your branches: 570s 570s cd3db2a imerge 'c-d': automatic merge 3-8 570s 570s If you want to keep it by creating a new branch, this may be a good time 570s to do so with: 570s 570s git branch cd3db2a 570s 570s Switched to branch 'imerge/c-d' 570s Auto-merging conflict1.txt 570s CONFLICT (content): Merge conflict in conflict1.txt 570s Automatic merge failed; fix conflicts and then commit the result. 570s 570s Original first commit: 570s commit a89179336bb40a4ca90903425239a9ef3ce659bd 570s Author: Loú User 570s Date: Thu Apr 7 22:13:18 2005 +0000 570s 570s c⇒4 570s 570s Original second commit: 570s commit 820b787e86e22612af7a061db842dc95e9f1d49f 570s Author: Loú User 570s Date: Thu Apr 7 22:13:25 2005 +0000 570s 570s d⇒2 570s 570s There was a conflict merging commit 4-2, shown above. 570s Please resolve the conflict, commit the result, then type 570s 570s git-imerge continue 570s + grep -q Traceback autofill.out 570s + git-imerge diagram --frontier 570s 0 5 9 570s | | | 570s 0 - ********** - c 570s **?.+#???? 570s *.?|#????? 570s *.?|?????? 570s *.?|?????? 570s 5 - *..|?????? 570s **?|?????? 570s *.?|?????? 570s 8 - *--+?????? 570s | 570s d 570s 570s Key: 570s |,-,+ = rectangles forming current merge frontier 570s * = merge done manually 570s . = merge done automatically 570s # = conflict that is currently blocking progress 570s @ = merge was blocked but has been resolved 570s ? = no merge recorded 570s 570s + grep -q There was a conflict merging autofill.out 570s + seq 0 7 570s + grep -q ==== conflict0.txt 570s + grep -q ==== conflict1.txt 570s + modify conflict1.txt merged version 570s + filename=conflict1.txt 570s + text=merged version 570s + echo merged version 570s + git add conflict1.txt 570s + conflict_count=3 570s + grep -q ==== conflict2.txt 570s + grep -q ==== conflict3.txt 570s + grep -q ==== conflict4.txt 570s + grep -q ==== conflict5.txt 570s + grep -q ==== conflict6.txt 570s + grep -q ==== conflict7.txt 570s + true 570s + git-imerge continue --no-edit 570s + tee autofill.out 570s [imerge/c-d da062b8] imerge 'c-d': manual merge 4-2 570s Merge has been recorded for merge 4-2. 570s Attempting automerge of 4-8...success. 570s Autofilling 4-3...success. 570s Autofilling 4-4...success. 570s Autofilling 4-5...success. 570s Autofilling 4-6...success. 570s Autofilling 4-7...success. 570s Autofilling 4-8...success. 570s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 570s Previous HEAD position was 53a39f2 imerge 'c-d': automatic merge 4-8 570s Switched to branch 'imerge/c-d' 570s Auto-merging conflict6.txt 570s CONFLICT (content): Merge conflict in conflict6.txt 570s Automatic merge failed; fix conflicts and then commit the result. 570s 570s Original first commit: 570s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 570s Author: Loú User 570s Date: Thu Apr 7 22:13:19 2005 +0000 570s 570s c⇒5 570s 570s Original second commit: 570s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 570s Author: Loú User 570s Date: Thu Apr 7 22:13:24 2005 +0000 570s 570s d⇒1 570s 570s There was a conflict merging commit 5-1, shown above. 570s Please resolve the conflict, commit the result, then type 570s 570s git-imerge continue 570s + grep -q Traceback autofill.out 570s + git-imerge diagram --frontier 570s 0 5 9 570s | | | 570s 0 - ********** - c 570s **?.|#???? 570s *.?.*????? 570s *.?.|????? 570s *.?.|????? 570s 5 - *...|????? 570s **?.|????? 570s *.?.|????? 570s 8 - *---+????? 570s | 570s d 570s 570s Key: 570s |,-,+ = rectangles forming current merge frontier 570s * = merge done manually 570s . = merge done automatically 570s # = conflict that is currently blocking progress 570s @ = merge was blocked but has been resolved 570s ? = no merge recorded 570s 570s + grep -q There was a conflict merging autofill.out 570s + seq 0 7 570s + grep -q ==== conflict0.txt 570s + grep -q ==== conflict1.txt 570s + grep -q ==== conflict2.txt 570s + grep -q ==== conflict3.txt 570s + grep -q ==== conflict4.txt 570s + grep -q ==== conflict5.txt 570s + grep -q ==== conflict6.txt 570s + modify conflict6.txt merged version 570s + filename=conflict6.txt 570s + text=merged version 570s + echo merged version 570s + git add conflict6.txt 570s + conflict_count=4 570s + grep -q ==== conflict7.txt 570s + true 570s + git-imerge continue --no-edit 570s + tee autofill.out 570s [imerge/c-d 37a4c10] imerge 'c-d': manual merge 5-1 570s Merge has been recorded for merge 5-1. 570s Attempting automerge of 5-8...failure. 570s Attempting automerge of 5-2...success. 570s Attempting automerge of 5-6...failure. 570s Attempting automerge of 5-4...success. 570s Attempting automerge of 5-5...failure. 570s Autofilling 5-2...success. 570s Autofilling 5-3...success. 570s Autofilling 5-4...success. 570s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 570s Attempting automerge of 5-8...failure. 570s Attempting automerge of 5-5...failure. 570s Attempting automerge of 9-4...failure. 570s Attempting automerge of 6-1...success. 570s Attempting automerge of 6-3...success. 570s Attempting automerge of 6-4...success. 571s Attempting automerge of 9-4...failure. 571s Attempting automerge of 8-4...failure. 571s Attempting automerge of 7-4...failure. 571s Attempting automerge of 7-1...success. 571s Attempting automerge of 7-3...failure. 571s Attempting automerge of 7-2...failure. 571s Attempting automerge of 9-1...success. 571s Autofilling 6-1...success. 571s Autofilling 6-2...success. 571s Autofilling 6-3...success. 571s Autofilling 6-4...success. 571s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 571s Autofilling 7-1...success. 571s Autofilling 8-1...success. 571s Autofilling 9-1...success. 571s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 571s Attempting automerge of 9-4...failure. 571s Attempting automerge of 7-2...failure. 571s Previous HEAD position was f501159 imerge 'c-d': automatic merge 7-1 571s Switched to branch 'imerge/c-d' 571s Auto-merging conflict3.txt 571s CONFLICT (content): Merge conflict in conflict3.txt 571s Automatic merge failed; fix conflicts and then commit the result. 571s 571s Original first commit: 571s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 571s Author: Loú User 571s Date: Thu Apr 7 22:13:19 2005 +0000 571s 571s c⇒5 571s 571s Original second commit: 571s commit c3e3890b9e3c756c1d8f7e345184d576739be079 571s Author: Loú User 571s Date: Thu Apr 7 22:13:28 2005 +0000 571s 571s d⇒5 571s 571s There was a conflict merging commit 5-5, shown above. 571s Please resolve the conflict, commit the result, then type 571s 571s git-imerge continue 571s + grep -q Traceback autofill.out 571s + git-imerge diagram --frontier 571s 0 5 9 571s | | | 571s 0 - ********** - c 571s **?..*.--+ 571s *.?.*.|#?? 571s *.?...|??? 571s *.?..-+??? 571s 5 - *...|#???? 571s **?.|????? 571s *.?.|????? 571s 8 - *---+????? 571s | 571s d 571s 571s Key: 571s |,-,+ = rectangles forming current merge frontier 571s * = merge done manually 571s . = merge done automatically 571s # = conflict that is currently blocking progress 571s @ = merge was blocked but has been resolved 571s ? = no merge recorded 571s 571s + grep -q There was a conflict merging autofill.out 571s + seq 0 7 571s + grep -q ==== conflict0.txt 571s + grep -q ==== conflict1.txt 571s + grep -q ==== conflict2.txt 571s + grep -q ==== conflict3.txt 571s + modify conflict3.txt merged version 571s + filename=conflict3.txt 571s + text=merged version 571s + echo merged version 571s + git add conflict3.txt 571s + conflict_count=5 571s + grep -q ==== conflict4.txt 571s + grep -q ==== conflict5.txt 571s + grep -q ==== conflict6.txt 571s + grep -q ==== conflict7.txt 571s + true 571s + git-imerge continue --no-edit 571s + tee autofill.out 571s [imerge/c-d b0d4741] imerge 'c-d': manual merge 5-5 571s Merge has been recorded for merge 5-5. 571s Attempting automerge of 5-8...success. 571s Autofilling 5-6...success. 571s Autofilling 5-7...success. 571s Autofilling 5-8...success. 571s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 571s Attempting automerge of 6-8...failure. 571s Attempting automerge of 6-5...success. 571s Attempting automerge of 6-7...failure. 571s Attempting automerge of 6-6...success. 571s Autofilling 6-5...success. 571s Autofilling 6-6...success. 571s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 571s Attempting automerge of 6-8...failure. 571s Attempting automerge of 6-7...failure. 571s Switched to branch 'imerge/c-d' 571s Auto-merging conflict5.txt 571s CONFLICT (content): Merge conflict in conflict5.txt 571s Automatic merge failed; fix conflicts and then commit the result. 571s 571s Original first commit: 571s commit a797a66a0e4b89690099557280641efeac302bcf 571s Author: Loú User 571s Date: Thu Apr 7 22:13:20 2005 +0000 571s 571s c⇒6 571s 571s Original second commit: 571s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 571s Author: Loú User 571s Date: Thu Apr 7 22:13:30 2005 +0000 571s 571s d⇒7 571s 571s There was a conflict merging commit 6-7, shown above. 571s Please resolve the conflict, commit the result, then type 571s 571s git-imerge continue 571s + grep -q Traceback autofill.out 571s + git-imerge diagram --frontier 571s 0 5 9 571s | | | 571s 0 - ********** - c 571s **?..*.--+ 571s *.?.*.|#?? 571s *.?...|??? 571s *.?...|??? 571s 5 - *....*|??? 571s **?...+??? 571s *.?..|#??? 571s 8 - *----+???? 571s | 571s d 571s 571s Key: 571s |,-,+ = rectangles forming current merge frontier 571s * = merge done manually 571s . = merge done automatically 571s # = conflict that is currently blocking progress 571s @ = merge was blocked but has been resolved 571s ? = no merge recorded 571s 571s + grep -q There was a conflict merging autofill.out 571s + seq 0 7 571s + grep -q ==== conflict0.txt 571s + grep -q ==== conflict1.txt 571s + grep -q ==== conflict2.txt 571s + grep -q ==== conflict3.txt 571s + grep -q ==== conflict4.txt 571s + grep -q ==== conflict5.txt 571s + modify conflict5.txt merged version 571s + filename=conflict5.txt 571s + text=merged version 571s + echo merged version 571s + git add conflict5.txt 571s + conflict_count=6 571s + grep -q ==== conflict6.txt 571s + grep -q ==== conflict7.txt 571s + true 571s + git-imerge continue --no-edit 571s + tee autofill.out 572s [imerge/c-d b8ffaf4] imerge 'c-d': manual merge 6-7 572s Merge has been recorded for merge 6-7. 572s Attempting automerge of 6-8...success. 572s Autofilling 6-8...success. 572s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 572s Previous HEAD position was 8d05d62 imerge 'c-d': automatic merge 6-8 572s Switched to branch 'imerge/c-d' 572s Auto-merging conflict2.txt 572s CONFLICT (content): Merge conflict in conflict2.txt 572s Automatic merge failed; fix conflicts and then commit the result. 572s 572s Original first commit: 572s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 572s Author: Loú User 572s Date: Thu Apr 7 22:13:21 2005 +0000 572s 572s c⇒7 572s 572s Original second commit: 572s commit 820b787e86e22612af7a061db842dc95e9f1d49f 572s Author: Loú User 572s Date: Thu Apr 7 22:13:25 2005 +0000 572s 572s d⇒2 572s 572s There was a conflict merging commit 7-2, shown above. 572s Please resolve the conflict, commit the result, then type 572s 572s git-imerge continue 572s + grep -q Traceback autofill.out 572s + git-imerge diagram --frontier 572s 0 5 9 572s | | | 572s 0 - ********** - c 572s **?..*.--+ 572s *.?.*.|#?? 572s *.?...|??? 572s *.?...|??? 572s 5 - *....*|??? 572s **?...|??? 572s *.?...*??? 572s 8 - *-----+??? 572s | 572s d 572s 572s Key: 572s |,-,+ = rectangles forming current merge frontier 572s * = merge done manually 572s . = merge done automatically 572s # = conflict that is currently blocking progress 572s @ = merge was blocked but has been resolved 572s ? = no merge recorded 572s 572s + grep -q There was a conflict merging autofill.out 572s + seq 0 7 572s + grep -q ==== conflict0.txt 572s + grep -q ==== conflict1.txt 572s + grep -q ==== conflict2.txt 572s + modify conflict2.txt merged version 572s + filename=conflict2.txt 572s + text=merged version 572s + echo merged version 572s + git add conflict2.txt 572s + conflict_count=7 572s + grep -q ==== conflict3.txt 572s + grep -q ==== conflict4.txt 572s + grep -q ==== conflict5.txt 572s + grep -q ==== conflict6.txt 572s + grep -q ==== conflict7.txt 572s + true 572s + git-imerge continue --no-edit 572s + tee autofill.out 572s [imerge/c-d 8eac59f] imerge 'c-d': manual merge 7-2 572s Merge has been recorded for merge 7-2. 572s Attempting automerge of 7-8...success. 572s Autofilling 7-3...success. 572s Autofilling 7-4...success. 572s Autofilling 7-5...success. 572s Autofilling 7-6...success. 572s Autofilling 7-7...success. 572s Autofilling 7-8...success. 572s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 572s Attempting automerge of 9-8...failure. 572s Attempting automerge of 8-2...success. 572s Attempting automerge of 8-6...success. 572s Attempting automerge of 8-8...success. 572s Attempting automerge of 9-8...failure. 572s Attempting automerge of 9-2...success. 572s Attempting automerge of 9-5...success. 572s Attempting automerge of 9-7...success. 572s Autofilling 8-2...success. 572s Autofilling 8-3...success. 572s Autofilling 8-4...success. 572s Autofilling 8-5...success. 572s Autofilling 8-6...success. 572s Autofilling 8-7...success. 572s Autofilling 8-8...success. 572s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 572s Autofilling 9-2...success. 572s Autofilling 9-3...success. 572s Autofilling 9-4...success. 572s Autofilling 9-5...success. 572s Autofilling 9-6...success. 572s Autofilling 9-7...success. 572s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 572s Attempting automerge of 9-8...failure. 572s Attempting automerge of 9-8...failure. 572s Switched to branch 'imerge/c-d' 572s Auto-merging conflict7.txt 572s CONFLICT (content): Merge conflict in conflict7.txt 572s Automatic merge failed; fix conflicts and then commit the result. 572s 572s Original first commit: 572s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 572s Author: Loú User 572s Date: Thu Apr 7 22:13:23 2005 +0000 572s 572s c⇒9 572s 572s Original second commit: 572s commit 67099d078100141fbe4063d46a6408200f4ff311 572s Author: Loú User 572s Date: Thu Apr 7 22:13:31 2005 +0000 572s 572s d⇒8 572s 572s There was a conflict merging commit 9-8, shown above. 572s Please resolve the conflict, commit the result, then type 572s 572s git-imerge continue 572s + grep -q Traceback autofill.out 572s + git-imerge diagram --frontier 572s 0 5 9 572s | | | 572s 0 - ********** - c 572s **?..*...| 572s *.?.*..*.| 572s *.?......| 572s *.?......| 572s 5 - *....*...| 572s **?......| 572s *.?...*..+ 572s 8 - *-------+# 572s | 572s d 572s 572s Key: 572s |,-,+ = rectangles forming current merge frontier 572s * = merge done manually 572s . = merge done automatically 572s # = conflict that is currently blocking progress 572s @ = merge was blocked but has been resolved 572s ? = no merge recorded 572s 572s + grep -q There was a conflict merging autofill.out 572s + seq 0 7 572s + grep -q ==== conflict0.txt 572s + grep -q ==== conflict1.txt 572s + grep -q ==== conflict2.txt 572s + grep -q ==== conflict3.txt 572s + grep -q ==== conflict4.txt 572s + grep -q ==== conflict5.txt 572s + grep -q ==== conflict6.txt 572s + grep -q ==== conflict7.txt 572s + modify conflict7.txt merged version 572s + filename=conflict7.txt 572s + text=merged version 572s + echo merged version 572s + git add conflict7.txt 572s + conflict_count=8 572s + true 572s + git-imerge continue --no-edit 572s + tee autofill.out 573s [imerge/c-d 81d304c] imerge 'c-d': manual merge 9-8 573s Merge has been recorded for merge 9-8. 573s Merge is complete! 573s + grep -q Traceback autofill.out 573s + git-imerge diagram --frontier 573s 0 5 9 573s | | | 573s 0 - ********** - c 573s **?..*...| 573s *.?.*..*.| 573s *.?......| 573s *.?......| 573s 5 - *....*...| 573s **?......| 573s *.?...*..| 573s 8 - *--------* 573s | 573s d 573s 573s Key: 573s |,-,+ = rectangles forming current merge frontier 573s * = merge done manually 573s . = merge done automatically 573s # = conflict that is currently blocking progress 573s @ = merge was blocked but has been resolved 573s ? = no merge recorded 573s 573s + grep -q There was a conflict merging autofill.out 573s + break 573s + test 8 -ne 8 573s + git-imerge diagram --commits 573s + cat 573s + diff -u - diagram.out 573s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 573s Merge d into c (using imerge) 573s 573s # Please enter the commit message for your changes. Lines starting 573s # with '#' will be ignored, and an empty message aborts the commit. 573s # 573s # Date: Wed Mar 27 07:48:02 2024 +0000 573s # 573s # On branch c-d-merge 573s # Changes to be committed: 573s # modified: conflict0.txt 573s # modified: conflict1.txt 573s # modified: conflict2.txt 573s # modified: conflict3.txt 573s # modified: conflict4.txt 573s # modified: conflict5.txt 573s # modified: conflict6.txt 573s # modified: conflict7.txt 573s # modified: d.txt 573s # 573s [c-d-merge e2d4a7d] Merge d into c (using imerge) 573s Date: Wed Mar 27 07:48:02 2024 +0000 573s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + local refname=c-d-merge 573s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + git rev-parse c-d-merge^{tree} 573s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + git-imerge simplify --goal=rebase --branch=c-d-rebase 573s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + local refname=c-d-rebase 573s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + git rev-parse c-d-rebase^{tree} 573s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 573s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + local refname=c-d-rebase-with-history 573s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + git rev-parse c-d-rebase-with-history^{tree} 573s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 573s + git-imerge simplify --goal=border --branch=c-d-border 574s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + local refname=c-d-border 574s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + git rev-parse c-d-border^{tree} 574s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 574s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + local refname=c-d-border-with-history 574s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + git rev-parse c-d-border-with-history^{tree} 574s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 574s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + local refname=c-d-border-with-history2 574s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + git rev-parse c-d-border-with-history2^{tree} 574s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 574s + git-imerge remove 574s py312: commands[3] /tmp/autopkgtest.eDJJFA/build.5NL/src> /bin/sh t/test-duplicated 574s + dirname t/test-duplicated 574s + cd t 574s + pwd 574s + dirname /tmp/autopkgtest.eDJJFA/build.5NL/src/t 574s + BASE=/tmp/autopkgtest.eDJJFA/build.5NL/src 574s + . /tmp/autopkgtest.eDJJFA/build.5NL/src/t/test-lib.sh 574s + GIT_IMERGE=git-imerge 574s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s + DESCRIPTION=git-imerge test repository with duplicate commits 574s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated git-imerge test repository with duplicate commits 574s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s + local description=git-imerge test repository with duplicate commits 574s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated git-imerge test repository with duplicate commits 574s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s + local description=git-imerge test repository with duplicate commits 574s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated/.git/ 574s hint: Using 'master' as the name for the initial branch. This default branch name 574s hint: is subject to change. To configure the initial branch name to use in all 574s hint: of your new repositories, which will suppress this warning, call: 574s hint: 574s hint: git config --global init.defaultBranch 574s hint: 574s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 574s hint: 'development'. The just-created branch can be renamed via this command: 574s hint: 574s hint: git branch -m 574s + echo git-imerge test repository with duplicate commits 574s + printf %s\n /*.out /*.css /*.html 574s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated/.git config user.name Loú User 574s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated/.git config user.email luser@example.com 574s + TIME=1112911993 574s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/duplicated 574s + modify a.txt 0 574s + filename=a.txt 574s + text=0 574s + echo 0 574s + git add a.txt 574s + commit -m m⇒0 574s + TIME=1112911994 574s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 574s [master (root-commit) a733afa] m⇒0 574s 1 file changed, 1 insertion(+) 574s create mode 100644 a.txt 574s + git checkout -b a -- 574s Switched to a new branch 'a' 574s + seq 3 574s + modify a.txt 1 574s + filename=a.txt 574s + text=1 574s + echo 1 574s + git add a.txt 574s + commit -m a⇒1 on branch a 574s + TIME=1112911995 574s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 574s [a 2f1f75a] a⇒1 on branch a 574s 1 file changed, 1 insertion(+), 1 deletion(-) 574s + modify a.txt 2 574s + filename=a.txt 574s + text=2 574s + echo 2 574s + git add a.txt 574s [a 4700669] a⇒2 on branch a 574s 1 file changed, 1 insertion(+), 1 deletion(-) 574s + commit -m a⇒2 on branch a 574s + TIME=1112911996 574s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 574s + modify a.txt 3 574s + filename=a.txt 574s + text=3 574s + echo 3 574s + git add a.txt 574s + commit -m a⇒3 on branch a 574s + TIME=1112911997 574s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 574s [a 621c381] a⇒3 on branch a 574s 1 file changed, 1 insertion(+), 1 deletion(-) 574s + git checkout -b b master -- 574s Switched to a new branch 'b' 574s + seq 4 574s + modify a.txt 1 574s + filename=a.txt 574s + text=1 574s + echo 1 574s + git add a.txt 574s + commit -m a⇒1 on branch b 574s + TIME=1112911998 574s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 574s [b 62a5c56] a⇒1 on branch b 574s 1 file changed, 1 insertion(+), 1 deletion(-) 574s + modify a.txt 2 574s + filename=a.txt 574s + text=2 574s + echo 2 574s + git add a.txt 574s + commit -m a⇒2 on branch b 574s + TIME=1112911999 574s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 574s [b f846281] a⇒2 on branch b 574s 1 file changed, 1 insertion(+), 1 deletion(-) 574s + modify a.txt 3 574s + filename=a.txt 574s + text=3 574s + echo 3 574s + git add a.txt 574s + commit -m a⇒3 on branch b 574s [b a4b2c2b] a⇒3 on branch b 574s 1 file changed, 1 insertion(+), 1 deletion(-) 574s + TIME=1112912000 574s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 574s + modify a.txt 4 574s + filename=a.txt 574s + text=4 574s + echo 4 574s + git add a.txt 574s + commit -m a⇒4 on branch b 574s + TIME=1112912001 574s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 574s [b 5b24553] a⇒4 on branch b 574s 1 file changed, 1 insertion(+), 1 deletion(-) 574s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 574s + git checkout a 574s Switched to branch 'a' 574s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 574s Attempting automerge of 3-4...failure. 574s Attempting automerge of 1-1...success. 574s Attempting automerge of 1-3...failure. 574s Attempting automerge of 1-2...failure. 574s Attempting automerge of 3-1...failure. 574s Attempting automerge of 2-1...failure. 574s Autofilling 1-1...success. 574s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 575s Attempting automerge of 1-4...success. 575s Autofilling 1-2...success. 575s Autofilling 1-3...success. 575s Autofilling 1-4...success. 575s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 575s Attempting automerge of 3-4...failure. 575s Attempting automerge of 2-1...success. 575s Attempting automerge of 2-3...failure. 575s Attempting automerge of 2-2...success. 575s Attempting automerge of 3-2...failure. 575s Attempting automerge of 3-1...success. 575s Autofilling 2-1...success. 575s Autofilling 2-2...success. 575s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 575s Autofilling 3-1...success. 575s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 575s Attempting automerge of 2-4...success. 575s Autofilling 2-3...success. 575s Autofilling 2-4...success. 575s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 575s Attempting automerge of 3-4...failure. 575s Attempting automerge of 3-2...success. 575s Attempting automerge of 3-4...failure. 575s Attempting automerge of 3-3...success. 575s Autofilling 3-2...success. 575s Autofilling 3-3...success. 575s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 575s Attempting automerge of 3-4...success. 575s Autofilling 3-4...success. 575s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 575s Merge is complete! 575s + git-imerge diagram --commits --frontier --html=imerge5.html 575s 0 3 575s | | 575s 0 - **** - a 575s *... 575s *... 575s *... 575s 4 - *... 575s | 575s b 575s 575s 0 3 575s | | 575s 0 - **** - a 575s *..| 575s *..| 575s *..| 575s 4 - *--+ 575s | 575s b 575s 575s Key: 575s |,-,+ = rectangles forming current merge frontier 575s * = merge done manually 575s . = merge done automatically 575s # = conflict that is currently blocking progress 575s @ = merge was blocked but has been resolved 575s ? = no merge recorded 575s 575s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 575s Merge b into a (using imerge) 575s 575s # Please enter the commit message for your changes. Lines starting 575s # with '#' will be ignored, and an empty message aborts the commit. 575s # 575s # Date: Wed Mar 27 07:48:04 2024 +0000 575s # 575s # On branch a-b-merge 575s # Changes to be committed: 575s # modified: a.txt 575s # 575s [a-b-merge a7cb525] Merge b into a (using imerge) 575s Date: Wed Mar 27 07:48:04 2024 +0000 575s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + local refname=a-b-merge 575s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + git rev-parse a-b-merge^{tree} 575s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + git-imerge simplify --goal=rebase --branch=a-b-rebase 575s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + local refname=a-b-rebase 575s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + git rev-parse a-b-rebase^{tree} 575s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 575s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + local refname=a-b-rebase-with-history 575s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + git rev-parse a-b-rebase-with-history^{tree} 575s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 575s + git-imerge simplify --goal=border --branch=a-b-border 576s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + local refname=a-b-border 576s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + git rev-parse a-b-border^{tree} 576s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 576s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + local refname=a-b-border-with-history 576s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + git rev-parse a-b-border-with-history^{tree} 576s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 576s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + local refname=a-b-border-with-history2 576s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + git rev-parse a-b-border-with-history2^{tree} 576s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 576s + git checkout a 576s Switched to branch 'a' 576s + git-imerge start --goal=full --name=a-b b 576s Attempting to merge 1-1...success. 576s Attempting to merge 1-2...success. 576s Attempting to merge 1-3...success. 576s Attempting to merge 1-4...success. 576s Attempting to merge 2-1...success. 576s Attempting to merge 2-2...success. 576s Attempting to merge 2-3...success. 576s Attempting to merge 2-4...success. 576s Attempting to merge 3-1...success. 576s Attempting to merge 3-2...success. 576s Attempting to merge 3-3...success. 576s Attempting to merge 3-4...success. 576s Merge is complete! 576s + git-imerge list 576s * a-b 576s + git-imerge diagram --commits --frontier --html=imerge6.html 576s 0 3 576s | | 576s 0 - **** - a 576s *... 576s *... 576s *... 576s 4 - *... 576s | 576s b 576s 576s 0 3 576s | | 576s 0 - **** - a 576s *..| 576s *..| 576s *..| 576s 4 - *--+ 576s | 576s b 576s 576s Key: 576s |,-,+ = rectangles forming current merge frontier 576s * = merge done manually 576s . = merge done automatically 576s # = conflict that is currently blocking progress 576s @ = merge was blocked but has been resolved 576s ? = no merge recorded 576s 576s + git-imerge finish --branch=a-b-full 577s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 577s + local refname=a-b-full 577s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 577s + git rev-parse a-b-full^{tree} 577s py312: commands[4] /tmp/autopkgtest.eDJJFA/build.5NL/src> /bin/sh t/test-flip-flop 577s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 577s + dirname t/test-flip-flop 577s + cd t 577s + pwd 577s + dirname /tmp/autopkgtest.eDJJFA/build.5NL/src/t 577s + BASE=/tmp/autopkgtest.eDJJFA/build.5NL/src 577s + . /tmp/autopkgtest.eDJJFA/build.5NL/src/t/test-lib.sh 577s + GIT_IMERGE=git-imerge 577s + flip_flop_test 1 577s + local n=1 577s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 577s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 577s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s + local description=git-imerge test repository with a commit and its revert at n=1 577s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 577s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s + local description=git-imerge test repository with a commit and its revert at n=1 577s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s hint: Using 'master' as the name for the initial branch. This default branch name 577s hint: is subject to change. To configure the initial branch name to use in all 577s hint: of your new repositories, which will suppress this warning, call: 577s hint: 577s hint: git config --global init.defaultBranch 577s hint: 577s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 577s hint: 'development'. The just-created branch can be renamed via this command: 577s hint: 577s hint: git branch -m 577s + echo git-imerge test repository with a commit and its revert at n=1 577s + printf %s\n /*.out /*.css /*.html 577s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1/.git config user.name Loú User 577s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1/.git/ 577s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 577s + TIME=1112911993 577s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-1 577s + modify a.txt 0 577s + filename=a.txt 577s + text=0 577s + echo 0 577s + git add a.txt 577s + commit -m m⇒0 577s + TIME=1112911994 577s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 577s [master (root-commit) a733afa] m⇒0 577s 1 file changed, 1 insertion(+) 577s create mode 100644 a.txt 577s + git checkout -b a -- 577s Switched to a new branch 'a' 577s + modify a.txt 1 577s + filename=a.txt 577s + text=1 577s + echo 1 577s + git add a.txt 577s + commit -m a⇒1 on branch a 577s + TIME=1112911995 577s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 577s [a 2f1f75a] a⇒1 on branch a 577s 1 file changed, 1 insertion(+), 1 deletion(-) 577s + modify a.txt 2 577s + filename=a.txt 577s + text=2 577s + echo 2 577s + git add a.txt 577s + commit -m a⇒2 on branch a 577s + TIME=1112911996 577s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 577s + modify a.txt 3 577s + filename=a.txt 577s + text=3 577s + echo 3 577s + git add a.txt 577s [a 4700669] a⇒2 on branch a 577s 1 file changed, 1 insertion(+), 1 deletion(-) 577s + commit -m a⇒3 on branch a 577s + TIME=1112911997 577s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 577s [a 621c381] a⇒3 on branch a 577s 1 file changed, 1 insertion(+), 1 deletion(-) 577s + git checkout -b b master -- 577s Switched to a new branch 'b' 577s + modify b.txt 1 577s + filename=b.txt 577s + text=1 577s + echo 1 577s + git add b.txt 577s + msg=b⇒1 577s + test 1 = 1 577s + modify a.txt X 577s + filename=a.txt 577s + text=X 577s + echo X 577s + git add a.txt 577s + msg=b⇒1 and a⇒X 577s + test 1 = 2 577s + commit -m b⇒1 and a⇒X on branch b 577s + TIME=1112911998 577s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 577s [b 044a3fa] b⇒1 and a⇒X on branch b 577s 2 files changed, 2 insertions(+), 1 deletion(-) 577s create mode 100644 b.txt 577s + modify b.txt 2 577s + filename=b.txt 577s + text=2 577s + echo 2 577s + git add b.txt 577s + msg=b⇒2 577s + test 2 = 1 577s + test 2 = 2 577s + modify a.txt 0 577s + filename=a.txt 577s + text=0 577s + echo 0 577s + git add a.txt 577s + msg=b⇒2 and a⇒0 577s + commit -m b⇒2 and a⇒0 on branch b 577s + TIME=1112911999 577s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 577s [b 7851975] b⇒2 and a⇒0 on branch b 577s 2 files changed, 2 insertions(+), 2 deletions(-) 577s + modify b.txt 3 577s + filename=b.txt 577s + text=3 577s + echo 3 577s + git add b.txt 577s + msg=b⇒3 577s + test 3 = 1 577s + test 3 = 2 577s + commit -m b⇒3 on branch b 577s + TIME=1112912000 577s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 577s [b 6fe24f0] b⇒3 on branch b 577s 1 file changed, 1 insertion(+), 1 deletion(-) 577s + modify b.txt 4 577s + filename=b.txt 577s + text=4 577s + echo 4 577s + git add b.txt 577s + msg=b⇒4 577s + test 4 = 1 577s + test 4 = 2 577s + commit -m b⇒4 on branch b 577s + TIME=1112912001 577s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 577s [b 2dc5eb7] b⇒4 on branch b 577s 1 file changed, 1 insertion(+), 1 deletion(-) 577s + test_merge b-into-a-1 a b 1-1 1-2 577s + local name=b-into-a-1 577s + local dst=a 577s + local src=b 577s + local conflict1=1-1 577s + local conflict2=1-2 577s + git checkout a 577s Switched to branch 'a' 577s + git-imerge merge --branch=b-into-a-1 b 577s + tee imerge-b-into-a-1-1.out 577s Attempting automerge of 3-4...success. 577s Autofilling 1-4...success. 577s Autofilling 2-4...success. 577s Autofilling 3-1...unexpected conflict. Backtracking... 577s Autofilling 1-4...success. 577s Autofilling 2-1...unexpected conflict. Backtracking... 577s Autofilling 1-1...unexpected conflict. Backtracking... 577s Switched to branch 'imerge/b' 577s Auto-merging a.txt 577s CONFLICT (content): Merge conflict in a.txt 577s Automatic merge failed; fix conflicts and then commit the result. 577s 577s Original first commit: 577s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 577s Author: Loú User 577s Date: Thu Apr 7 22:13:15 2005 +0000 577s 577s a⇒1 on branch a 577s 577s Original second commit: 577s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 577s Author: Loú User 577s Date: Thu Apr 7 22:13:18 2005 +0000 577s 577s b⇒1 and a⇒X on branch b 577s 577s There was a conflict merging commit 1-1, shown above. 577s Please resolve the conflict, commit the result, then type 577s 577s git-imerge continue 577s + git-imerge diagram --commits --frontier 577s 0 3 577s | | 577s 0 - **** - a 577s *#?? 577s *??? 577s *??? 577s 4 - *??? 577s | 577s b 577s 577s 0 3 577s | | 577s 0 - **** - a 577s *#?? 577s *??? 577s *??? 577s 4 - *??? 577s | 577s b 577s 577s Key: 577s |,-,+ = rectangles forming current merge frontier 577s * = merge done manually 577s . = merge done automatically 577s # = conflict that is currently blocking progress 577s @ = merge was blocked but has been resolved 577s ? = no merge recorded 577s 577s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 577s + echo 1 577s + git add a.txt 577s + git-imerge continue --no-edit 577s + tee imerge-b-into-a-1-2.out 577s [imerge/b b9f7fa4] imerge 'b': manual merge 1-1 577s Merge has been recorded for merge 1-1. 577s Attempting automerge of 1-4...failure. 577s Attempting automerge of 1-2...failure. 577s Attempting automerge of 3-1...success. 577s Autofilling 2-1...success. 577s Autofilling 3-1...success. 577s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 577s Previous HEAD position was be76676 imerge 'b': automatic merge 3-1 577s Switched to branch 'imerge/b' 577s Auto-merging a.txt 577s CONFLICT (content): Merge conflict in a.txt 577s Automatic merge failed; fix conflicts and then commit the result. 577s 577s Original first commit: 577s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 577s Author: Loú User 577s Date: Thu Apr 7 22:13:15 2005 +0000 577s 577s a⇒1 on branch a 577s 577s Original second commit: 577s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 577s Author: Loú User 577s Date: Thu Apr 7 22:13:19 2005 +0000 577s 577s b⇒2 and a⇒0 on branch b 577s 577s There was a conflict merging commit 1-2, shown above. 577s Please resolve the conflict, commit the result, then type 577s 577s git-imerge continue 577s + git-imerge diagram --commits --frontier 577s 0 3 577s | | 577s 0 - **** - a 577s **.. 577s *#?? 577s *??? 577s 4 - *??? 577s | 577s b 577s 577s 0 3 577s | | 577s 0 - **** - a 577s **-+ 577s *#?? 577s *??? 577s 4 - *??? 577s | 577s b 577s 577s Key: 577s |,-,+ = rectangles forming current merge frontier 577s * = merge done manually 577s . = merge done automatically 577s # = conflict that is currently blocking progress 577s @ = merge was blocked but has been resolved 577s ? = no merge recorded 577s 577s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 577s + echo 1 577s + git add a.txt 577s + + git-imerge continue --no-edit 577s tee imerge-b-into-a-1-3.out 578s [imerge/b 3484282] imerge 'b': manual merge 1-2 578s Merge has been recorded for merge 1-2. 578s Attempting automerge of 1-4...success. 578s Autofilling 1-3...success. 578s Autofilling 1-4...success. 578s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 578s Attempting automerge of 3-4...success. 578s Autofilling 2-4...success. 578s Autofilling 3-2...success. 578s Autofilling 3-3...success. 578s Autofilling 3-4 (first way)...success. 578s Autofilling 3-4 (second way)...success. 578s The two ways of autofilling 3-4 agree. 578s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 578s Merge is complete! 578s + grep -q Merge is complete imerge-b-into-a-1-3.out 578s + git-imerge diagram --commits --frontier 578s 0 3 578s | | 578s 0 - **** - a 578s **.. 578s **?. 578s *.?. 578s 4 - *... 578s | 578s b 578s 578s 0 3 578s | | 578s 0 - **** - a 578s **.| 578s **?| 578s *.?| 578s 4 - *--+ 578s | 578s b 578s 578s Key: 578s |,-,+ = rectangles forming current merge frontier 578s * = merge done manually 578s . = merge done automatically 578s # = conflict that is currently blocking progress 578s @ = merge was blocked but has been resolved 578s ? = no merge recorded 578s 578s + GIT_EDITOR=cat git-imerge finish 578s Merge b into a (using imerge) 578s 578s # Please enter the commit message for your changes. Lines starting 578s # with '#' will be ignored, and an empty message aborts the commit. 578s # 578s # Date: Wed Mar 27 07:48:07 2024 +0000 578s # 578s # On branch b-into-a-1 578s # Changes to be committed: 578s # new file: b.txt 578s # 578s [b-into-a-1 04f2554] Merge b into a (using imerge) 578s Date: Wed Mar 27 07:48:07 2024 +0000 578s + test_merge a-into-b-1 b a 1-1 2-1 578s + local name=a-into-b-1 578s + local dst=b 578s + local src=a 578s + local conflict1=1-1 578s + local conflict2=2-1 578s + git checkout b 578s Switched to branch 'b' 578s + + git-imerge merge --branch=a-into-b-1 a 578s tee imerge-a-into-b-1-1.out 578s Attempting automerge of 4-3...success. 578s Autofilling 1-3...unexpected conflict. Backtracking... 578s Autofilling 1-2...unexpected conflict. Backtracking... 578s Autofilling 1-1...unexpected conflict. Backtracking... 578s Switched to branch 'imerge/a' 578s Auto-merging a.txt 578s CONFLICT (content): Merge conflict in a.txt 578s Automatic merge failed; fix conflicts and then commit the result. 578s 578s Original first commit: 578s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 578s Author: Loú User 578s Date: Thu Apr 7 22:13:18 2005 +0000 578s 578s b⇒1 and a⇒X on branch b 578s 578s Original second commit: 578s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 578s Author: Loú User 578s Date: Thu Apr 7 22:13:15 2005 +0000 578s 578s a⇒1 on branch a 578s 578s There was a conflict merging commit 1-1, shown above. 578s Please resolve the conflict, commit the result, then type 578s 578s git-imerge continue 578s + git-imerge diagram --commits --frontier 578s 0 4 578s | | 578s 0 - ***** - b 578s *#??? 578s *???? 578s 3 - *???? 578s | 578s a 578s 578s 0 4 578s | | 578s 0 - ***** - b 578s *#??? 578s *???? 578s 3 - *???? 578s | 578s a 578s 578s Key: 578s |,-,+ = rectangles forming current merge frontier 578s * = merge done manually 578s . = merge done automatically 578s # = conflict that is currently blocking progress 578s @ = merge was blocked but has been resolved 578s ? = no merge recorded 578s 578s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 578s + echo 1 578s + git add a.txt 578s + + tee imerge-a-into-b-1-2.out 578s git-imerge continue --no-edit 579s [imerge/a f824719] imerge 'a': manual merge 1-1 579s Merge has been recorded for merge 1-1. 579s Attempting automerge of 1-3...success. 579s Autofilling 1-2...success. 579s Autofilling 1-3...success. 579s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 579s Attempting automerge of 4-3...failure. 579s Attempting automerge of 2-1...failure. 579s Switched to branch 'imerge/a' 579s Auto-merging a.txt 579s CONFLICT (content): Merge conflict in a.txt 579s Automatic merge failed; fix conflicts and then commit the result. 579s 579s Original first commit: 579s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 579s Author: Loú User 579s Date: Thu Apr 7 22:13:19 2005 +0000 579s 579s b⇒2 and a⇒0 on branch b 579s 579s Original second commit: 579s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 579s Author: Loú User 579s Date: Thu Apr 7 22:13:15 2005 +0000 579s 579s a⇒1 on branch a 579s 579s There was a conflict merging commit 2-1, shown above. 579s Please resolve the conflict, commit the result, then type 579s 579s git-imerge continue 579s + git-imerge diagram --commits --frontier 579s 0 4 579s | | 579s 0 - ***** - b 579s **#?? 579s *.??? 579s 3 - *.??? 579s | 579s a 579s 579s 0 4 579s | | 579s 0 - ***** - b 579s **#?? 579s *|??? 579s 3 - *+??? 579s | 579s a 579s 579s Key: 579s |,-,+ = rectangles forming current merge frontier 579s * = merge done manually 579s . = merge done automatically 579s # = conflict that is currently blocking progress 579s @ = merge was blocked but has been resolved 579s ? = no merge recorded 579s 579s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 579s + echo 1 579s + git add a.txt 579s + + tee imerge-a-into-b-1-3.out 579s git-imerge continue --no-edit 579s [imerge/a b810e81] imerge 'a': manual merge 2-1 579s Merge has been recorded for merge 2-1. 579s Attempting automerge of 2-3...success. 579s Autofilling 2-2...success. 579s Autofilling 2-3...success. 579s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 579s Attempting automerge of 4-3...success. 579s Autofilling 3-3...success. 579s Autofilling 4-1...success. 579s Autofilling 4-2...success. 579s Autofilling 4-3 (first way)...success. 579s Autofilling 4-3 (second way)...success. 579s The two ways of autofilling 4-3 agree. 579s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 579s Merge is complete! 579s + grep -q Merge is complete imerge-a-into-b-1-3.out 579s + git-imerge diagram --commits --frontier 579s 0 4 579s | | 579s 0 - ***** - b 579s ***?. 579s *..?. 579s 3 - *.... 579s | 579s a 579s 579s 0 4 579s | | 579s 0 - ***** - b 579s ***?| 579s *..?| 579s 3 - *---+ 579s | 579s a 579s 579s Key: 579s |,-,+ = rectangles forming current merge frontier 579s * = merge done manually 579s . = merge done automatically 579s # = conflict that is currently blocking progress 579s @ = merge was blocked but has been resolved 579s ? = no merge recorded 579s 579s + GIT_EDITOR=cat git-imerge finish 579s Merge a into b (using imerge) 579s 579s # Please enter the commit message for your changes. Lines starting 579s # with '#' will be ignored, and an empty message aborts the commit. 579s # 579s # Date: Wed Mar 27 07:48:08 2024 +0000 579s # 579s # On branch a-into-b-1 579s # Changes to be committed: 579s # modified: a.txt 579s # 579s [a-into-b-1 a31d56a] Merge a into b (using imerge) 579s Date: Wed Mar 27 07:48:08 2024 +0000 579s + flip_flop_test 2 579s + local n=2 579s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 579s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 579s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s + local description=git-imerge test repository with a commit and its revert at n=2 579s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 579s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s + local description=git-imerge test repository with a commit and its revert at n=2 579s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s hint: Using 'master' as the name for the initial branch. This default branch name 579s hint: is subject to change. To configure the initial branch name to use in all 579s hint: of your new repositories, which will suppress this warning, call: 579s hint: 579s hint: git config --global init.defaultBranch 579s hint: 579s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 579s hint: 'development'. The just-created branch can be renamed via this command: 579s hint: 579s hint: git branch -m 579s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2/.git/ 579s + echo git-imerge test repository with a commit and its revert at n=2 579s + printf %s\n /*.out /*.css /*.html 579s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2/.git config user.name Loú User 579s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 579s + TIME=1112911993 579s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-2 579s + modify a.txt 0 579s + filename=a.txt 579s + text=0 579s + echo 0 579s + git add a.txt 579s + commit -m m⇒0 579s + TIME=1112911994 579s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 579s [master (root-commit) a733afa] m⇒0 579s 1 file changed, 1 insertion(+) 579s create mode 100644 a.txt 579s + git checkout -b a -- 579s Switched to a new branch 'a' 579s + modify a.txt 1 579s + filename=a.txt 579s + text=1 579s + echo 1 579s + git add a.txt 579s + commit -m a⇒1 on branch a 579s + TIME=1112911995 579s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 579s [a 2f1f75a] a⇒1 on branch a 579s 1 file changed, 1 insertion(+), 1 deletion(-) 579s + modify a.txt 2 579s + filename=a.txt 579s + text=2 579s + echo 2 579s + git add a.txt 579s + commit -m a⇒2 on branch a 579s + TIME=1112911996 579s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 579s [a 4700669] a⇒2 on branch a 579s 1 file changed, 1 insertion(+), 1 deletion(-) 579s + modify a.txt 3 579s + filename=a.txt 579s + text=3 579s + echo 3 579s + git add a.txt 579s + commit -m a⇒3 on branch a 579s + TIME=1112911997 579s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 579s [a 621c381] a⇒3 on branch a 579s 1 file changed, 1 insertion(+), 1 deletion(-) 579s + git checkout -b b master -- 579s Switched to a new branch 'b' 579s + modify b.txt 1 579s + filename=b.txt 579s + text=1 579s + echo 1 579s + git add b.txt 579s + msg=b⇒1 579s + test 1 = 2 579s + test 1 = 3 579s + commit -m b⇒1 on branch b 579s + TIME=1112911998 579s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 579s [b 1f7d097] b⇒1 on branch b 579s 1 file changed, 1 insertion(+) 579s create mode 100644 b.txt 579s + modify b.txt 2 579s + filename=b.txt 579s + text=2 579s + echo 2 579s + git add b.txt 579s + msg=b⇒2 579s + test 2 = 2 579s + modify a.txt X 579s + filename=a.txt 579s + text=X 579s + echo X 579s + git add a.txt 579s + msg=b⇒2 and a⇒X 579s + test 2 = 3 579s + commit -m b⇒2 and a⇒X on branch b 579s + TIME=1112911999 579s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 579s [b 48df77d] b⇒2 and a⇒X on branch b 579s 2 files changed, 2 insertions(+), 2 deletions(-) 579s + modify b.txt 3 579s + filename=b.txt 579s + text=3 579s + echo 3 579s + git add b.txt 579s + msg=b⇒3 579s + test 3 = 2 579s + test 3 = 3 579s + modify a.txt 0 579s + filename=a.txt 579s + text=0 579s + echo 0 579s + git add a.txt 579s + msg=b⇒3 and a⇒0 579s [b f3ef019] b⇒3 and a⇒0 on branch b 579s 2 files changed, 2 insertions(+), 2 deletions(-) 579s [b 69d0c21] b⇒4 on branch b 579s 1 file changed, 1 insertion(+), 1 deletion(-) 579s + commit -m b⇒3 and a⇒0 on branch b 579s + TIME=1112912000 579s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 579s + modify b.txt 4 579s + filename=b.txt 579s + text=4 579s + echo 4 579s + git add b.txt 579s + msg=b⇒4 579s + test 4 = 2 579s + test 4 = 3 579s + commit -m b⇒4 on branch b 579s + TIME=1112912001 579s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 579s + test_merge b-into-a-2 a b 1-2 1-3 579s + local name=b-into-a-2 579s + local dst=a 579s + local src=b 579s + local conflict1=1-2 579s + local conflict2=1-3 579s + git checkout a 579s Switched to branch 'a' 579s + git-imerge merge --branch=b-into-a-2 b 579s + tee imerge-b-into-a-2-1.out 579s Attempting automerge of 3-4...success. 579s Autofilling 1-4...success. 579s Autofilling 2-4...success. 579s Autofilling 3-1...success. 579s Autofilling 3-2...unexpected conflict. Backtracking... 579s Autofilling 1-4...success. 579s Autofilling 2-1...success. 580s Autofilling 2-2...unexpected conflict. Backtracking... 580s Autofilling 1-1...success. 580s Autofilling 1-2...unexpected conflict. Backtracking... 580s Autofilling 1-1...success. 580s Autofilling 2-1...success. 580s Autofilling 3-1...success. 580s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 580s Attempting automerge of 3-4...success. 580s Autofilling 1-4...success. 580s Autofilling 2-4...success. 580s Autofilling 3-2...unexpected conflict. Backtracking... 580s Autofilling 1-4...success. 580s Autofilling 2-2...unexpected conflict. Backtracking... 580s Autofilling 1-2...unexpected conflict. Backtracking... 580s Switched to branch 'imerge/b' 580s Auto-merging a.txt 580s CONFLICT (content): Merge conflict in a.txt 580s Automatic merge failed; fix conflicts and then commit the result. 580s 580s Original first commit: 580s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 580s Author: Loú User 580s Date: Thu Apr 7 22:13:15 2005 +0000 580s 580s a⇒1 on branch a 580s 580s Original second commit: 580s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 580s Author: Loú User 580s Date: Thu Apr 7 22:13:19 2005 +0000 580s 580s b⇒2 and a⇒X on branch b 580s 580s There was a conflict merging commit 1-2, shown above. 580s Please resolve the conflict, commit the result, then type 580s 580s git-imerge continue 580s + git-imerge diagram --commits --frontier 580s 0 3 580s | | 580s 0 - **** - a 580s *... 580s *#?? 580s *??? 580s 4 - *??? 580s | 580s b 580s 580s 0 3 580s | | 580s 0 - **** - a 580s *--+ 580s *#?? 580s *??? 580s 4 - *??? 580s | 580s b 580s 580s Key: 580s |,-,+ = rectangles forming current merge frontier 580s * = merge done manually 580s . = merge done automatically 580s # = conflict that is currently blocking progress 580s @ = merge was blocked but has been resolved 580s ? = no merge recorded 580s 580s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 580s + echo 1 580s + git add a.txt 580s + + git-imerge continue --no-edit 580s tee imerge-b-into-a-2-2.out 580s [imerge/b 4ebe5b9] imerge 'b': manual merge 1-2 580s Merge has been recorded for merge 1-2. 580s Attempting automerge of 1-4...failure. 580s Attempting automerge of 1-3...failure. 580s Attempting automerge of 3-2...success. 580s Autofilling 2-2...success. 580s Autofilling 3-2...success. 580s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 580s Previous HEAD position was 6062445 imerge 'b': automatic merge 3-2 580s Switched to branch 'imerge/b' 580s Auto-merging a.txt 580s CONFLICT (content): Merge conflict in a.txt 580s Automatic merge failed; fix conflicts and then commit the result. 580s 580s Original first commit: 580s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 580s Author: Loú User 580s Date: Thu Apr 7 22:13:15 2005 +0000 580s 580s a⇒1 on branch a 580s 580s Original second commit: 580s commit f3ef01986be02ef5e40589b283c0385471ecca7d 580s Author: Loú User 580s Date: Thu Apr 7 22:13:20 2005 +0000 580s 580s b⇒3 and a⇒0 on branch b 580s 580s There was a conflict merging commit 1-3, shown above. 580s Please resolve the conflict, commit the result, then type 580s 580s git-imerge continue 580s + git-imerge diagram --commits --frontier 580s 0 3 580s | | 580s 0 - **** - a 580s *... 580s **.. 580s *#?? 580s 4 - *??? 580s | 580s b 580s 580s 0 3 580s | | 580s 0 - **** - a 580s *..| 580s **-+ 580s *#?? 580s 4 - *??? 580s | 580s b 580s 580s Key: 580s |,-,+ = rectangles forming current merge frontier 580s * = merge done manually 580s . = merge done automatically 580s # = conflict that is currently blocking progress 580s @ = merge was blocked but has been resolved 580s ? = no merge recorded 580s 580s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 580s + echo 1 580s + git add a.txt 580s + git-imerge continue --no-edit 580s + tee imerge-b-into-a-2-3.out 580s [imerge/b 53a5a61] imerge 'b': manual merge 1-3 580s Merge has been recorded for merge 1-3. 580s Attempting automerge of 1-4...success. 580s Autofilling 1-4...success. 580s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 580s Attempting automerge of 3-4...success. 580s Autofilling 2-4...success. 580s Autofilling 3-3...success. 580s Autofilling 3-4 (first way)...success. 580s Autofilling 3-4 (second way)...success. 580s The two ways of autofilling 3-4 agree. 580s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 580s Merge is complete! 580s + grep -q Merge is complete imerge-b-into-a-2-3.out 580s + git-imerge diagram --commits --frontier 580s 0 3 580s | | 580s 0 - **** - a 580s *... 580s **.. 580s **?. 580s 4 - *... 580s | 580s b 580s 580s 0 3 580s | | 580s 0 - **** - a 580s *..| 580s **.| 580s **?| 580s 4 - *--+ 580s | 580s b 580s 580s Key: 580s |,-,+ = rectangles forming current merge frontier 580s * = merge done manually 580s . = merge done automatically 580s # = conflict that is currently blocking progress 580s @ = merge was blocked but has been resolved 580s ? = no merge recorded 580s 580s + GIT_EDITOR=cat git-imerge finish 581s Merge b into a (using imerge) 581s 581s # Please enter the commit message for your changes. Lines starting 581s # with '#' will be ignored, and an empty message aborts the commit. 581s # 581s # Date: Wed Mar 27 07:48:10 2024 +0000 581s # 581s # On branch b-into-a-2 581s # Changes to be committed: 581s # new file: b.txt 581s # 581s [b-into-a-2 3b5a337] Merge b into a (using imerge) 581s Date: Wed Mar 27 07:48:10 2024 +0000 581s + test_merge a-into-b-2 b a 2-1 3-1 581s + local name=a-into-b-2 581s + local dst=b 581s + local src=a 581s + local conflict1=2-1 581s + local conflict2=3-1 581s + git checkout b 581s Switched to branch 'b' 581s + + git-imerge merge --branch=a-into-b-2 a 581s tee imerge-a-into-b-2-1.out 581s Attempting automerge of 4-3...success. 581s Autofilling 1-3...success. 581s Autofilling 2-3...unexpected conflict. Backtracking... 581s Autofilling 1-1...success. 581s Autofilling 1-2...success. 581s Autofilling 1-3...success. 581s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 581s Autofilling 2-2...unexpected conflict. Backtracking... 581s Autofilling 2-1...unexpected conflict. Backtracking... 581s Switched to branch 'imerge/a' 581s Auto-merging a.txt 581s CONFLICT (content): Merge conflict in a.txt 581s Automatic merge failed; fix conflicts and then commit the result. 581s 581s Original first commit: 581s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 581s Author: Loú User 581s Date: Thu Apr 7 22:13:19 2005 +0000 581s 581s b⇒2 and a⇒X on branch b 581s 581s Original second commit: 581s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 581s Author: Loú User 581s Date: Thu Apr 7 22:13:15 2005 +0000 581s 581s a⇒1 on branch a 581s 581s There was a conflict merging commit 2-1, shown above. 581s Please resolve the conflict, commit the result, then type 581s 581s git-imerge continue 581s + git-imerge diagram --commits --frontier 581s 0 4 581s | | 581s 0 - ***** - b 581s *.#?? 581s *.??? 581s 3 - *.??? 581s | 581s a 581s 581s 0 4 581s | | 581s 0 - ***** - b 581s *|#?? 581s *|??? 581s 3 - *+??? 581s | 581s a 581s 581s Key: 581s |,-,+ = rectangles forming current merge frontier 581s * = merge done manually 581s . = merge done automatically 581s # = conflict that is currently blocking progress 581s @ = merge was blocked but has been resolved 581s ? = no merge recorded 581s 581s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 581s + echo 1 581s + git add a.txt 581s + + git-imerge continue --no-edit 581s tee imerge-a-into-b-2-2.out 581s [imerge/a b8093b1] imerge 'a': manual merge 2-1 581s Merge has been recorded for merge 2-1. 581s Attempting automerge of 2-3...success. 581s Autofilling 2-2...success. 581s Autofilling 2-3...success. 581s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 581s Attempting automerge of 4-3...failure. 581s Attempting automerge of 3-1...failure. 581s Switched to branch 'imerge/a' 581s Auto-merging a.txt 581s CONFLICT (content): Merge conflict in a.txt 581s Automatic merge failed; fix conflicts and then commit the result. 581s 581s Original first commit: 581s commit f3ef01986be02ef5e40589b283c0385471ecca7d 581s Author: Loú User 581s Date: Thu Apr 7 22:13:20 2005 +0000 581s 581s b⇒3 and a⇒0 on branch b 581s 581s Original second commit: 581s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 581s Author: Loú User 581s Date: Thu Apr 7 22:13:15 2005 +0000 581s 581s a⇒1 on branch a 581s 581s There was a conflict merging commit 3-1, shown above. 581s Please resolve the conflict, commit the result, then type 581s 581s git-imerge continue 581s + git-imerge diagram --commits --frontier 581s 0 4 581s | | 581s 0 - ***** - b 581s *.*#? 581s *..?? 581s 3 - *..?? 581s | 581s a 581s 581s 0 4 581s | | 581s 0 - ***** - b 581s *.*#? 581s *.|?? 581s 3 - *-+?? 581s | 581s a 581s 581s Key: 581s |,-,+ = rectangles forming current merge frontier 581s * = merge done manually 581s . = merge done automatically 581s # = conflict that is currently blocking progress 581s @ = merge was blocked but has been resolved 581s ? = no merge recorded 581s 581s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 581s + echo 1 581s + git add a.txt 581s + git-imerge+ continue --no-edit 581s tee imerge-a-into-b-2-3.out 582s [imerge/a c21fcc5] imerge 'a': manual merge 3-1 582s Merge has been recorded for merge 3-1. 582s Attempting automerge of 3-3...success. 582s Autofilling 3-2...success. 582s Autofilling 3-3...success. 582s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 582s Attempting automerge of 4-3...success. 582s Autofilling 4-1...success. 582s Autofilling 4-2...success. 582s Autofilling 4-3...success. 582s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 582s Merge is complete! 582s + grep -q Merge is complete imerge-a-into-b-2-3.out 582s + git-imerge diagram --commits --frontier 582s 0 4 582s | | 582s 0 - ***** - b 582s *.**. 582s *.... 582s 3 - *.... 582s | 582s a 582s 582s 0 4 582s | | 582s 0 - ***** - b 582s *.**| 582s *...| 582s 3 - *---+ 582s | 582s a 582s 582s Key: 582s |,-,+ = rectangles forming current merge frontier 582s * = merge done manually 582s . = merge done automatically 582s # = conflict that is currently blocking progress 582s @ = merge was blocked but has been resolved 582s ? = no merge recorded 582s 582s + GIT_EDITOR=cat git-imerge finish 582s Merge a into b (using imerge) 582s 582s # Please enter the commit message for your changes. Lines starting 582s # with '#' will be ignored, and an empty message aborts the commit. 582s # 582s # Date: Wed Mar 27 07:48:11 2024 +0000 582s # 582s # On branch a-into-b-2 582s # Changes to be committed: 582s # modified: a.txt 582s # 582s [a-into-b-2 20e3552] Merge a into b (using imerge) 582s Date: Wed Mar 27 07:48:11 2024 +0000 582s + flip_flop_test 3 582s + local n=3 582s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 582s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 582s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s + local description=git-imerge test repository with a commit and its revert at n=3 582s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 582s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s + local description=git-imerge test repository with a commit and its revert at n=3 582s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s hint: Using 'master' as the name for the initial branch. This default branch name 582s hint: is subject to change. To configure the initial branch name to use in all 582s hint: of your new repositories, which will suppress this warning, call: 582s hint: 582s hint: git config --global init.defaultBranch 582s hint: 582s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 582s hint: 'development'. The just-created branch can be renamed via this command: 582s hint: 582s hint: git branch -m 582s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3/.git/ 582s + echo git-imerge test repository with a commit and its revert at n=3 582s + printf %s\n /*.out /*.css /*.html 582s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3/.git config user.name Loú User 582s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 582s + TIME=1112911993 582s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/flip-flop-3 582s + modify a.txt 0 582s + filename=a.txt 582s + text=0 582s + echo 0 582s + git add a.txt 582s + commit -m m⇒0 582s + TIME=1112911994 582s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 582s + git checkout -b a -- 582s Switched to a new branch 'a' 582s + modify a.txt 1 582s + filename=a.txt 582s + text=1 582s + echo 1 582s + git add a.txt 582s + commit -m a⇒1 on branch a 582s [master (root-commit) a733afa] m⇒0 582s 1 file changed, 1 insertion(+) 582s create mode 100644 a.txt 582s + TIME=1112911995 582s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 582s [a 2f1f75a] a⇒1 on branch a 582s 1 file changed, 1 insertion(+), 1 deletion(-) 582s + modify a.txt 2 582s + filename=a.txt 582s + text=2 582s + echo 2 582s + git add a.txt 582s + commit -m a⇒2 on branch a 582s + TIME=1112911996 582s [a 4700669] a⇒2 on branch a 582s 1 file changed, 1 insertion(+), 1 deletion(-) 582s [a 621c381] a⇒3 on branch a 582s 1 file changed, 1 insertion(+), 1 deletion(-) 582s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 582s + modify a.txt 3 582s + filename=a.txt 582s + text=3 582s + echo 3 582s + git add a.txt 582s + commit -m a⇒3 on branch a 582s + TIME=1112911997 582s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 582s + git checkout -b b master -- 582s Switched to a new branch 'b' 582s + modify b.txt 1 582s + filename=b.txt 582s + text=1 582s + echo 1 582s + git add b.txt 582s + msg=b⇒1 582s + test 1 = 3 582s + test 1 = 4 582s + commit -m b⇒1 on branch b 582s + TIME=1112911998 582s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 582s + modify b.txt 2 582s + filename=b.txt 582s + text=2 582s + echo 2 582s + git add b.txt 582s + msg=b⇒2 582s + test 2 = 3 582s + test 2 = 4 582s + commit -m b⇒2 on branch b 582s + TIME=1112911999 582s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 582s + modify b.txt 3 582s + filename=b.txt 582s [b 1f7d097] b⇒1 on branch b 582s 1 file changed, 1 insertion(+) 582s create mode 100644 b.txt 582s [b ce671e9] b⇒2 on branch b 582s 1 file changed, 1 insertion(+), 1 deletion(-) 582s + text=3 582s + echo 3 582s + git add b.txt 582s + msg=b⇒3 582s + test 3 = 3 582s + modify a.txt X 582s + filename=a.txt 582s + text=X 582s + echo X 582s + git add a.txt 582s + msg=b⇒3 and a⇒X 582s + test 3 = 4 582s + commit -m b⇒3 and a⇒X on branch b 582s + TIME=1112912000 582s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 582s + modify b.txt 4 582s + filename=b.txt 582s + text=4 582s + echo 4 582s + git add b.txt 582s + msg=b⇒4 582s + test 4 = 3 582s + test 4 = 4 582s + modify a.txt 0 582s + filename=a.txt 582s + text=0 582s + echo 0 582s + git add a.txt 582s + msg=b⇒4 and a⇒0 582s [b d40495e] b⇒3 and a⇒X on branch b 582s 2 files changed, 2 insertions(+), 2 deletions(-) 582s [b eb736f2] b⇒4 and a⇒0 on branch b 582s 2 files changed, 2 insertions(+), 2 deletions(-) 582s + commit -m b⇒4 and a⇒0 on branch b 582s + TIME=1112912001 582s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 582s + test_merge b-into-a-3 a b 1-3 1-4 582s + local name=b-into-a-3 582s + local dst=a 582s + local src=b 582s + local conflict1=1-3 582s + local conflict2=1-4 582s + git checkout a 582s Switched to branch 'a' 582s + + git-imerge merge --branch=b-into-a-3 b 582s tee imerge-b-into-a-3-1.out 582s Attempting automerge of 3-4...success. 582s Autofilling 1-4...success. 582s Autofilling 2-4...success. 582s Autofilling 3-1...success. 582s Autofilling 3-2...success. 582s Autofilling 3-3...unexpected conflict. Backtracking... 582s Autofilling 1-4...success. 582s Autofilling 2-1...success. 582s Autofilling 2-2...success. 582s Autofilling 2-3...unexpected conflict. Backtracking... 582s Autofilling 1-1...success. 582s Autofilling 1-2...success. 582s Autofilling 1-3...unexpected conflict. Backtracking... 582s Autofilling 1-2...success. 582s Autofilling 2-2...success. 582s Autofilling 3-1...success. 582s Autofilling 3-2 (first way)...success. 582s Autofilling 3-2 (second way)...success. 582s The two ways of autofilling 3-2 agree. 582s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 582s Attempting automerge of 3-4...success. 582s Autofilling 1-4...success. 582s Autofilling 2-4...success. 582s Autofilling 3-3...unexpected conflict. Backtracking... 582s Autofilling 1-4...success. 582s Autofilling 2-3...unexpected conflict. Backtracking... 582s Autofilling 1-3...unexpected conflict. Backtracking... 582s Switched to branch 'imerge/b' 582s Auto-merging a.txt 582s CONFLICT (content): Merge conflict in a.txt 582s Automatic merge failed; fix conflicts and then commit the result. 582s 582s Original first commit: 582s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 582s Author: Loú User 582s Date: Thu Apr 7 22:13:15 2005 +0000 582s 582s a⇒1 on branch a 582s 582s Original second commit: 582s commit d40495ed379f376841e517047f90b663e8c7c7e1 582s Author: Loú User 582s Date: Thu Apr 7 22:13:20 2005 +0000 582s 582s b⇒3 and a⇒X on branch b 582s 582s There was a conflict merging commit 1-3, shown above. 582s Please resolve the conflict, commit the result, then type 582s 582s git-imerge continue 582s + git-imerge diagram --commits --frontier 582s 0 3 582s | | 582s 0 - **** - a 582s *??. 582s *... 582s *#?? 582s 4 - *??? 582s | 582s b 582s 582s 0 3 582s | | 582s 0 - **** - a 582s *??| 582s *--+ 582s *#?? 582s 4 - *??? 582s | 582s b 582s 582s Key: 582s |,-,+ = rectangles forming current merge frontier 582s * = merge done manually 582s . = merge done automatically 582s # = conflict that is currently blocking progress 582s @ = merge was blocked but has been resolved 582s ? = no merge recorded 582s 583s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 583s + echo 1 583s + git add a.txt 583s + git-imerge continue --no-edit 583s + tee imerge-b-into-a-3-2.out 583s [imerge/b 0b8d1fb] imerge 'b': manual merge 1-3 583s Merge has been recorded for merge 1-3. 583s Attempting automerge of 1-4...failure. 583s Attempting automerge of 1-4...failure. 583s Attempting automerge of 3-3...success. 583s Autofilling 2-3...success. 583s Autofilling 3-3...success. 583s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 583s Previous HEAD position was 1f29bcb imerge 'b': automatic merge 3-3 583s Switched to branch 'imerge/b' 583s Auto-merging a.txt 583s CONFLICT (content): Merge conflict in a.txt 583s Automatic merge failed; fix conflicts and then commit the result. 583s 583s Original first commit: 583s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 583s Author: Loú User 583s Date: Thu Apr 7 22:13:15 2005 +0000 583s 583s a⇒1 on branch a 583s 583s Original second commit: 583s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 583s Author: Loú User 583s Date: Thu Apr 7 22:13:21 2005 +0000 583s 583s b⇒4 and a⇒0 on branch b 583s 583s There was a conflict merging commit 1-4, shown above. 583s Please resolve the conflict, commit the result, then type 583s 583s git-imerge continue 583s + git-imerge diagram --commits --frontier 583s 0 3 583s | | 583s 0 - **** - a 583s *??. 583s *... 583s **.. 583s 4 - *#?? 583s | 583s b 583s 583s 0 3 583s | | 583s 0 - **** - a 583s *??| 583s *..| 583s **-+ 583s 4 - *#?? 583s | 583s b 583s 583s Key: 583s |,-,+ = rectangles forming current merge frontier 583s * = merge done manually 583s . = merge done automatically 583s # = conflict that is currently blocking progress 583s @ = merge was blocked but has been resolved 583s ? = no merge recorded 583s 583s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 583s + echo 1 583s + git add a.txt 583s + git-imerge continue --no-edit 583s + tee imerge-b-into-a-3-3.out 583s [imerge/b 6906b76] imerge 'b': manual merge 1-4 583s Merge has been recorded for merge 1-4. 583s Attempting automerge of 3-4...success. 583s Autofilling 2-4...success. 583s Autofilling 3-4...success. 583s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 583s Merge is complete! 583s + grep -q Merge is complete imerge-b-into-a-3-3.out 583s + git-imerge diagram --commits --frontier 583s 0 3 583s | | 583s 0 - **** - a 583s *??. 583s *... 583s **.. 583s 4 - **.. 583s | 583s b 583s 583s 0 3 583s | | 583s 0 - **** - a 583s *??| 583s *..| 583s **.| 583s 4 - **-+ 583s | 583s b 583s 583s Key: 583s |,-,+ = rectangles forming current merge frontier 583s * = merge done manually 583s . = merge done automatically 583s # = conflict that is currently blocking progress 583s @ = merge was blocked but has been resolved 583s ? = no merge recorded 583s 583s + GIT_EDITOR=cat git-imerge finish 583s Merge b into a (using imerge) 583s 583s # Please enter the commit message for your changes. Lines starting 583s # with '#' will be ignored, and an empty message aborts the commit. 583s # 583s # Date: Wed Mar 27 07:48:12 2024 +0000 583s # 583s # On branch b-into-a-3 583s # Changes to be committed: 583s # new file: b.txt 583s # 583s [b-into-a-3 b33e218] Merge b into a (using imerge) 583s Date: Wed Mar 27 07:48:12 2024 +0000 583s + test_merge a-into-b-3 b a 3-1 4-1 583s + local name=a-into-b-3 583s + local dst=b 583s + local src=a 583s + local conflict1=3-1 583s + local conflict2=4-1 583s + git checkout b 583s Switched to branch 'b' 583s + + tee imerge-a-into-b-3-1.out 583s git-imerge merge --branch=a-into-b-3 a 584s Attempting automerge of 4-3...success. 584s Autofilling 1-3...success. 584s Autofilling 2-3...success. 584s Autofilling 3-3...unexpected conflict. Backtracking... 584s Autofilling 1-3...success. 584s Autofilling 2-1...success. 584s Autofilling 2-2...success. 584s Autofilling 2-3 (first way)...success. 584s Autofilling 2-3 (second way)...success. 584s The two ways of autofilling 2-3 agree. 584s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 584s Autofilling 3-2...unexpected conflict. Backtracking... 584s Autofilling 3-1...unexpected conflict. Backtracking... 584s Switched to branch 'imerge/a' 584s Auto-merging a.txt 584s CONFLICT (content): Merge conflict in a.txt 584s Automatic merge failed; fix conflicts and then commit the result. 584s 584s Original first commit: 584s commit d40495ed379f376841e517047f90b663e8c7c7e1 584s Author: Loú User 584s Date: Thu Apr 7 22:13:20 2005 +0000 584s 584s b⇒3 and a⇒X on branch b 584s 584s Original second commit: 584s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 584s Author: Loú User 584s Date: Thu Apr 7 22:13:15 2005 +0000 584s 584s a⇒1 on branch a 584s 584s There was a conflict merging commit 3-1, shown above. 584s Please resolve the conflict, commit the result, then type 584s 584s git-imerge continue 584s + git-imerge diagram --commits --frontier 584s 0 4 584s | | 584s 0 - ***** - b 584s *?.#? 584s *?.?? 584s 3 - *..?? 584s | 584s a 584s 584s 0 4 584s | | 584s 0 - ***** - b 584s *?|#? 584s *?|?? 584s 3 - *-+?? 584s | 584s a 584s 584s Key: 584s |,-,+ = rectangles forming current merge frontier 584s * = merge done manually 584s . = merge done automatically 584s # = conflict that is currently blocking progress 584s @ = merge was blocked but has been resolved 584s ? = no merge recorded 584s 584s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 584s + echo 1 584s + git add a.txt 584s + + git-imerge continue --no-edit 584s tee imerge-a-into-b-3-2.out 584s [imerge/a 34e0c95] imerge 'a': manual merge 3-1 584s Merge has been recorded for merge 3-1. 584s Attempting automerge of 3-3...success. 584s Autofilling 3-2...success. 584s Autofilling 3-3...success. 584s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 584s Attempting automerge of 4-3...failure. 584s Attempting automerge of 4-1...failure. 584s Switched to branch 'imerge/a' 584s Auto-merging a.txt 584s CONFLICT (content): Merge conflict in a.txt 584s Automatic merge failed; fix conflicts and then commit the result. 584s 584s Original first commit: 584s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 584s Author: Loú User 584s Date: Thu Apr 7 22:13:21 2005 +0000 584s 584s b⇒4 and a⇒0 on branch b 584s 584s Original second commit: 584s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 584s Author: Loú User 584s Date: Thu Apr 7 22:13:15 2005 +0000 584s 584s a⇒1 on branch a 584s 584s There was a conflict merging commit 4-1, shown above. 584s Please resolve the conflict, commit the result, then type 584s 584s git-imerge continue 584s + git-imerge diagram --commits --frontier 584s 0 4 584s | | 584s 0 - ***** - b 584s *?.*# 584s *?..? 584s 3 - *...? 584s | 584s a 584s 584s 0 4 584s | | 584s 0 - ***** - b 584s *?.*# 584s *?.|? 584s 3 - *--+? 584s | 584s a 584s 584s Key: 584s |,-,+ = rectangles forming current merge frontier 584s * = merge done manually 584s . = merge done automatically 584s # = conflict that is currently blocking progress 584s @ = merge was blocked but has been resolved 584s ? = no merge recorded 584s 584s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 584s + echo 1 584s + git add a.txt 584s + git-imerge continue --no-edit 584s + tee imerge-a-into-b-3-3.out 584s [imerge/a b64b9de] imerge 'a': manual merge 4-1 584s Merge has been recorded for merge 4-1. 584s Attempting automerge of 4-3...success. 584s Autofilling 4-2...success. 584s Autofilling 4-3...success. 584s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 584s Merge is complete! 584s + grep -q Merge is complete imerge-a-into-b-3-3.out 584s + git-imerge diagram --commits --frontier 584s 0 4 584s | | 584s 0 - ***** - b 584s *?.** 584s *?... 584s 3 - *.... 584s | 584s a 584s 584s 0 4 584s | | 584s 0 - ***** - b 584s *?.** 584s *?..| 584s 3 - *---+ 584s | 584s a 584s 584s Key: 584s |,-,+ = rectangles forming current merge frontier 584s * = merge done manually 584s . = merge done automatically 584s # = conflict that is currently blocking progress 584s @ = merge was blocked but has been resolved 584s ? = no merge recorded 584s 584s + GIT_EDITOR=cat git-imerge finish 585s Merge a into b (using imerge) 585s 585s # Please enter the commit message for your changes. Lines starting 585s # with '#' will be ignored, and an empty message aborts the commit. 585s # 585s # Date: Wed Mar 27 07:48:14 2024 +0000 585s # 585s # On branch a-into-b-3 585s # Changes to be committed: 585s # modified: a.txt 585s # 585s [a-into-b-3 3dd74a2] Merge a into b (using imerge) 585s Date: Wed Mar 27 07:48:14 2024 +0000 585s py312: commands[5] /tmp/autopkgtest.eDJJFA/build.5NL/src> /bin/sh t/test-drop 585s + dirname t/test-drop 585s + cd t 585s + pwd 585s + dirname /tmp/autopkgtest.eDJJFA/build.5NL/src/t 585s + BASE=/tmp/autopkgtest.eDJJFA/build.5NL/src 585s + . /tmp/autopkgtest.eDJJFA/build.5NL/src/t/test-lib.sh 585s + GIT_IMERGE=git-imerge 585s + TMP=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s + DESCRIPTION=git-imerge drop test repository 585s + init_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop git-imerge drop test repository 585s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s + local description=git-imerge drop test repository 585s + delete_test_repo /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop git-imerge drop test repository 585s + local path=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s + local description=git-imerge drop test repository 585s + test -d /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s + mkdir -p /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s + git init /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s hint: Using 'master' as the name for the initial branch. This default branch name 585s hint: is subject to change. To configure the initial branch name to use in all 585s hint: of your new repositories, which will suppress this warning, call: 585s hint: 585s hint: git config --global init.defaultBranch 585s hint: 585s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 585s hint: 'development'. The just-created branch can be renamed via this command: 585s hint: 585s hint: git branch -m 585s Initialized empty Git repository in /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop/.git/ 585s + echo git-imerge drop test repository 585s + printf %s\n /*.out /*.css /*.html 585s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop/.git config user.name Loú User 585s + git --git-dir=/tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop/.git config user.email luser@example.com 585s + TIME=1112911993 585s + ln -s /tmp/autopkgtest.eDJJFA/build.5NL/src/imerge.css /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s + cd /tmp/autopkgtest.eDJJFA/build.5NL/src/t/tmp/drop 585s + modify a.txt 0 585s + filename=a.txt 585s + text=0 585s + echo 0 585s + git add a.txt 585s + commit -m m⇒0 585s + TIME=1112911994 585s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 585s + seq 6 585s + modify a1.txt 1 585s [master (root-commit) a733afa] m⇒0 585s 1 file changed, 1 insertion(+) 585s create mode 100644 a.txt 585s + filename=a1.txt 585s + text=1 585s + echo 1 585s + git add a1.txt 585s + commit -m a1⇒1 585s + TIME=1112911995 585s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 585s [master 389a4ba] a1⇒1 585s 1 file changed, 1 insertion(+) 585s create mode 100644 a1.txt 585s + modify a2.txt 2 585s + filename=a2.txt 585s + text=2 585s + echo 2 585s + git add a2.txt 585s + commit -m a2⇒2 585s + TIME=1112911996 585s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 585s [master 4785218] a2⇒2 585s 1 file changed, 1 insertion(+) 585s create mode 100644 a2.txt 585s + modify a3.txt 3 585s + filename=a3.txt 585s + text=3 585s + echo 3 585s + git add a3.txt 585s + commit -m a3⇒3 585s + TIME=1112911997 585s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 585s + modify a4.txt 4 585s + filename=a4.txt 585s + text=4 585s + echo 4 585s + git add a4.txt 585s + commit -m a4⇒4 585s + TIME=1112911998 585s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 585s + modify a5.txt 5 585s + filename=a5.txt 585s + text=5 585s + echo 5 585s + git add a5.txt 585s + commit -m a5⇒5 585s + TIME=1112911999 585s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 585s + modify a6.txt 6 585s + filename=a6.txt 585s + text=6 585s + echo 6 585s + git add a6.txt 585s + commit -m a6⇒6 585s + TIME=1112912000 585s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 585s [master 34bdde3] a3⇒3 585s 1 file changed, 1 insertion(+) 585s create mode 100644 a3.txt 585s [master c793a5a] a4⇒4 585s 1 file changed, 1 insertion(+) 585s create mode 100644 a4.txt 585s [master b42f60c] a5⇒5 585s 1 file changed, 1 insertion(+) 585s create mode 100644 a5.txt 585s + git checkout -b dropped master 585s Switched to a new branch 'dropped' 585s + git-imerge drop HEAD~5..HEAD~3 585s [master 9d6aec5] a6⇒6 585s 1 file changed, 1 insertion(+) 585s create mode 100644 a6.txt 585s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 585s 585s You are in 'detached HEAD' state. You can look around, make experimental 585s changes and commit them, and you can discard any commits you make in this 585s state without impacting any branches by switching back to a branch. 585s 585s If you want to create a new branch to retain commits you create, you may 585s do so (now or later) by using -c with the switch command. Example: 585s 585s git switch -c 585s 585s Or undo this operation with: 585s 585s git switch - 585s 585s Turn off this advice by setting config variable advice.detachedHead to false 585s 585s HEAD is now at 34bdde3 a3⇒3 585s [detached HEAD 5e30544] Revert "a3⇒3" 585s Date: Wed Mar 27 07:48:14 2024 +0000 585s 1 file changed, 1 deletion(-) 585s delete mode 100644 a3.txt 585s [detached HEAD cdf6dd5] Revert "a2⇒2" 585s Date: Wed Mar 27 07:48:14 2024 +0000 585s 1 file changed, 1 deletion(-) 585s delete mode 100644 a2.txt 585s Attempting automerge of 3-2...success. 585s Autofilling 1-2...success. 585s Autofilling 2-2...success. 585s Autofilling 3-1...success. 585s Autofilling 3-2 (first way)...success. 585s Autofilling 3-2 (second way)...success. 585s The two ways of autofilling 3-2 agree. 585s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='cdf6dd5160c2576b020a2a304c270ae305b470a2', goal='drop')[0:4,0:3]. 585s Merge is complete! 585s + git-imerge diagram --commits --frontier --html=imerge-drop.html 585s 0 3 585s | | 585s 0 - **** - dropped 585s *??. 585s 2 - *... 585s | 585s cdf6dd5160c2576b020a2a304c270ae305b470a2 585s 585s 0 3 585s | | 585s 0 - **** - dropped 585s *??| 585s 2 - *--+ 585s | 585s cdf6dd5160c2576b020a2a304c270ae305b470a2 585s 585s Key: 585s |,-,+ = rectangles forming current merge frontier 585s * = merge done manually 585s . = merge done automatically 585s # = conflict that is currently blocking progress 585s @ = merge was blocked but has been resolved 585s ? = no merge recorded 585s 585s + git-imerge finish 585s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 585s + local refname=dropped 585s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 585s + git rev-parse dropped^{tree} 585s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 585s + git checkout -b reverted master 585s Switched to a new branch 'reverted' 585s + git-imerge revert HEAD~5..HEAD~3 585s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 585s 585s You are in 'detached HEAD' state. You can look around, make experimental 585s changes and commit them, and you can discard any commits you make in this 585s state without impacting any branches by switching back to a branch. 585s 585s If you want to create a new branch to retain commits you create, you may 585s do so (now or later) by using -c with the switch command. Example: 585s 585s git switch -c 585s 585s Or undo this operation with: 585s 585s git switch - 585s 585s Turn off this advice by setting config variable advice.detachedHead to false 585s 585s HEAD is now at 34bdde3 a3⇒3 585s [detached HEAD 5e30544] Revert "a3⇒3" 585s Date: Wed Mar 27 07:48:14 2024 +0000 585s 1 file changed, 1 deletion(-) 585s delete mode 100644 a3.txt 585s [detached HEAD cdf6dd5] Revert "a2⇒2" 585s Date: Wed Mar 27 07:48:14 2024 +0000 585s 1 file changed, 1 deletion(-) 585s delete mode 100644 a2.txt 585s Attempting automerge of 3-2...success. 585s Autofilling 1-2...success. 585s Autofilling 2-2...success. 585s Autofilling 3-1...success. 585s Autofilling 3-2 (first way)...success. 585s Autofilling 3-2 (second way)...success. 585s The two ways of autofilling 3-2 agree. 585s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='cdf6dd5160c2576b020a2a304c270ae305b470a2', goal='revert')[0:4,0:3]. 585s Merge is complete! 585s + git-imerge diagram --commits --frontier --html=imerge-revert.html 586s 0 3 586s | | 586s 0 - **** - reverted 586s *??. 586s 2 - *... 586s | 586s cdf6dd5160c2576b020a2a304c270ae305b470a2 586s 586s 0 3 586s | | 586s 0 - **** - reverted 586s *??| 586s 2 - *--+ 586s | 586s cdf6dd5160c2576b020a2a304c270ae305b470a2 586s 586s Key: 586s |,-,+ = rectangles forming current merge frontier 586s * = merge done manually 586s . = merge done automatically 586s # = conflict that is currently blocking progress 586s @ = merge was blocked but has been resolved 586s ? = no merge recorded 586s 586s + git-imerge finish 586s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 586s + local refname=reverted 586s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 586s + git rev-parse reverted^{tree} 586s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 586s py312: OK (66.34=setup[0.34]+cmd[3.22,44.81,6.46,2.40,7.99,1.11] seconds) 586s congratulations :) (66.48 seconds) 586s autopkgtest [07:48:15]: test pybuild-autopkgtest: -----------------------] 587s autopkgtest [07:48:16]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 587s pybuild-autopkgtest PASS 588s autopkgtest [07:48:17]: @@@@@@@@@@@@@@@@@@@@ summary 588s pybuild-autopkgtest PASS 618s Creating nova instance adt-noble-ppc64el-git-imerge-20240327-073829-juju-7f2275-prod-proposed-migration-environment-2-b63f2759-8894-41b6-8103-db5c1d29df92 from image adt/ubuntu-noble-ppc64el-server-20240325.img (UUID 2c4a456c-136a-4a3a-993e-7f82eda3b6c0)...