0s autopkgtest [04:58:49]: starting date and time: 2024-03-21 04:58:49+0000 0s autopkgtest [04:58:49]: git checkout: 4a1cd702 l/adt_testbed: don't blame the testbed for unsolvable build deps 0s autopkgtest [04:58:49]: host juju-7f2275-prod-proposed-migration-environment-4; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.b3ws2ei1/out --timeout-copy=6000 --setup-commands 'ln -s /dev/null /etc/systemd/system/bluetooth.service; printf "http_proxy=http://squid.internal:3128\nhttps_proxy=http://squid.internal:3128\nno_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\n" >> /etc/environment' --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 -- lxd -r lxd-armhf-10.145.243.226 lxd-armhf-10.145.243.226:autopkgtest/ubuntu/noble/armhf 22s autopkgtest [04:59:11]: testbed dpkg architecture: armhf 24s autopkgtest [04:59:13]: testbed apt version: 2.7.12 24s autopkgtest [04:59:13]: @@@@@@@@@@@@@@@@@@@@ test bed setup 31s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB] 31s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/universe Sources [3816 kB] 32s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/restricted Sources [6540 B] 32s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/main Sources [495 kB] 32s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/multiverse Sources [53.9 kB] 32s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main armhf Packages [624 kB] 32s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main armhf c-n-f Metadata [2492 B] 32s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/restricted armhf Packages [1372 B] 32s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/restricted armhf c-n-f Metadata [116 B] 32s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/universe armhf Packages [3712 kB] 32s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/universe armhf c-n-f Metadata [7776 B] 32s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/multiverse armhf Packages [46.3 kB] 32s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/multiverse armhf c-n-f Metadata [116 B] 34s Fetched 8881 kB in 2s (4831 kB/s) 35s Reading package lists... 43s tee: /proc/self/fd/2: Permission denied 65s Hit:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease 65s Hit:2 http://ftpmaster.internal/ubuntu noble InRelease 65s Hit:3 http://ftpmaster.internal/ubuntu noble-updates InRelease 65s Hit:4 http://ftpmaster.internal/ubuntu noble-security InRelease 66s Reading package lists... 66s Reading package lists... 67s Building dependency tree... 67s Reading state information... 68s Calculating upgrade... 68s The following packages were automatically installed and are no longer required: 68s linux-headers-6.8.0-11 python3-lib2to3 68s Use 'apt autoremove' to remove them. 68s The following packages will be REMOVED: 68s libapt-pkg6.0 libarchive13 libatm1 libcurl3-gnutls libcurl4 libdb5.3 libelf1 68s libext2fs2 libgdbm-compat4 libgdbm6 libglib2.0-0 libgnutls30 libgpgme11 68s libhogweed6 libmagic1 libnetplan0 libnettle8 libnpth0 libnvme1 libparted2 68s libpcap0.8 libperl5.38 libpng16-16 libpsl5 libreadline8 libreiserfscore0 68s libssl3 libtirpc3 libuv1 linux-headers-6.8.0-11-generic python3-distutils 68s The following NEW packages will be installed: 68s libapt-pkg6.0t64 libarchive13t64 libatm1t64 libcurl3t64-gnutls libcurl4t64 68s libdb5.3t64 libelf1t64 libext2fs2t64 libgdbm-compat4t64 libgdbm6t64 68s libglib2.0-0t64 libgnutls30t64 libgpgme11t64 libhogweed6t64 libmagic1t64 68s libnetplan1 libnettle8t64 libnpth0t64 libnvme1t64 libparted2t64 68s libpcap0.8t64 libperl5.38t64 libpng16-16t64 libpsl5t64 libreadline8t64 68s libreiserfscore0t64 libssl3t64 libtirpc3t64 libuv1t64 linux-headers-6.8.0-20 68s linux-headers-6.8.0-20-generic xdg-user-dirs 68s The following packages have been kept back: 68s multipath-tools 68s The following packages will be upgraded: 68s apparmor apt apt-utils bind9-dnsutils bind9-host bind9-libs binutils 68s binutils-arm-linux-gnueabihf binutils-common bolt bsdextrautils bsdutils 68s btrfs-progs coreutils cryptsetup-bin curl dbus dbus-bin dbus-daemon 68s dbus-session-bus-common dbus-system-bus-common dbus-user-session debianutils 68s dhcpcd-base dirmngr dmsetup dpkg dpkg-dev e2fsprogs e2fsprogs-l10n eject 68s fdisk file ftp fwupd gawk gcc-13-base gcc-14-base gir1.2-girepository-2.0 68s gir1.2-glib-2.0 gnupg gnupg-l10n gnupg-utils gpg gpg-agent gpg-wks-client 68s gpgconf gpgsm gpgv groff-base ibverbs-providers inetutils-telnet info 68s initramfs-tools initramfs-tools-bin initramfs-tools-core install-info 68s iproute2 jq keyboxd kmod kpartx krb5-locales libapparmor1 libaudit-common 68s libaudit1 libbinutils libblkid1 libblockdev-crypto3 libblockdev-fs3 68s libblockdev-loop3 libblockdev-mdraid3 libblockdev-nvme3 libblockdev-part3 68s libblockdev-swap3 libblockdev-utils3 libblockdev3 libbpf1 libbrotli1 libbsd0 68s libc-bin libc6 libcap-ng0 libcom-err2 libcryptsetup12 libctf-nobfd0 libctf0 68s libdbus-1-3 libdebconfclient0 libdevmapper1.02.1 libdpkg-perl 68s libevent-core-2.1-7 libexpat1 libfdisk1 libfido2-1 libftdi1-2 libfwupd2 68s libgcc-s1 libgirepository-1.0-1 libglib2.0-data libgssapi-krb5-2 68s libgudev-1.0-0 libgusb2 libibverbs1 libjcat1 libjq1 libjson-glib-1.0-0 68s libjson-glib-1.0-common libk5crypto3 libkmod2 libkrb5-3 libkrb5support0 68s libldap-common libldap2 liblocale-gettext-perl liblzma5 libmagic-mgc 68s libmbim-glib4 libmbim-proxy libmm-glib0 libmount1 libnghttp2-14 libnsl2 68s libnss-systemd libpam-modules libpam-modules-bin libpam-runtime 68s libpam-systemd libpam0g libplymouth5 libpolkit-agent-1-0 68s libpolkit-gobject-1-0 libpython3-stdlib libpython3.11-minimal 68s libpython3.11-stdlib libpython3.12-minimal libpython3.12-stdlib libqmi-glib5 68s libqmi-proxy libqrtr-glib0 librtmp1 libsasl2-2 libsasl2-modules 68s libsasl2-modules-db libseccomp2 libselinux1 libsemanage-common libsemanage2 68s libsframe1 libslang2 libsmartcols1 libsqlite3-0 libss2 libssh-4 libstdc++6 68s libsystemd-shared libsystemd0 libtext-charwidth-perl libtext-iconv-perl 68s libtirpc-common libudev1 libudisks2-0 libusb-1.0-0 libuuid1 libvolume-key1 68s libxml2 libxmlb2 libxmuu1 linux-headers-generic locales logsave lshw lsof 68s man-db mount mtr-tiny netplan-generator netplan.io openssh-client 68s openssh-server openssh-sftp-server openssl parted perl perl-base 68s perl-modules-5.38 pinentry-curses plymouth plymouth-theme-ubuntu-text psmisc 68s python-apt-common python3 python3-apt python3-cryptography python3-dbus 68s python3-gdbm python3-gi python3-lib2to3 python3-markupsafe python3-minimal 68s python3-netplan python3-pkg-resources python3-pyrsistent python3-setuptools 68s python3-typing-extensions python3-yaml python3.11 python3.11-minimal 68s python3.12 python3.12-minimal readline-common rsync shared-mime-info sudo 68s systemd systemd-dev systemd-resolved systemd-sysv systemd-timesyncd tcpdump 68s telnet tnftp ubuntu-pro-client ubuntu-pro-client-l10n udev udisks2 usb.ids 68s util-linux uuid-runtime vim-common vim-tiny wget xxd xz-utils zlib1g 69s 235 upgraded, 32 newly installed, 31 to remove and 1 not upgraded. 69s Need to get 106 MB of archives. 69s After this operation, 84.4 MB of additional disk space will be used. 69s Get:1 http://ftpmaster.internal/ubuntu noble-proposed/main armhf bsdutils armhf 1:2.39.3-9ubuntu2 [102 kB] 69s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gcc-14-base armhf 14-20240315-1ubuntu1 [47.0 kB] 69s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgcc-s1 armhf 14-20240315-1ubuntu1 [41.5 kB] 69s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libstdc++6 armhf 14-20240315-1ubuntu1 [714 kB] 69s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libc6 armhf 2.39-0ubuntu6 [2827 kB] 69s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libbrotli1 armhf 1.1.0-2build1 [319 kB] 69s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgssapi-krb5-2 armhf 1.20.1-5.1build3 [119 kB] 69s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libkrb5-3 armhf 1.20.1-5.1build3 [321 kB] 69s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libkrb5support0 armhf 1.20.1-5.1build3 [31.4 kB] 69s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libk5crypto3 armhf 1.20.1-5.1build3 [78.6 kB] 69s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libcom-err2 armhf 1.47.0-2.4~exp1ubuntu2 [21.9 kB] 69s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/main armhf zlib1g armhf 1:1.3.dfsg-3.1ubuntu1 [49.2 kB] 69s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/main armhf librtmp1 armhf 2.4+20151223.gitfa8646d.1-2build6 [51.3 kB] 69s Get:14 http://ftpmaster.internal/ubuntu noble-proposed/main armhf udisks2 armhf 2.10.1-6 [276 kB] 69s Get:15 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libudisks2-0 armhf 2.10.1-6 [143 kB] 69s Get:16 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblkid1 armhf 2.39.3-9ubuntu2 [160 kB] 69s Get:17 http://ftpmaster.internal/ubuntu noble-proposed/main armhf liblzma5 armhf 5.6.0-0.2 [117 kB] 69s Get:18 http://ftpmaster.internal/ubuntu noble-proposed/main armhf kmod armhf 31+20240202-2ubuntu4 [91.8 kB] 69s Get:19 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libkmod2 armhf 31+20240202-2ubuntu4 [44.9 kB] 69s Get:20 http://ftpmaster.internal/ubuntu noble-proposed/main armhf systemd-dev all 255.4-1ubuntu5 [103 kB] 69s Get:21 http://ftpmaster.internal/ubuntu noble-proposed/main armhf systemd-timesyncd armhf 255.4-1ubuntu5 [36.0 kB] 69s Get:22 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dbus-session-bus-common all 1.14.10-4ubuntu2 [80.3 kB] 69s Get:23 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libaudit-common all 1:3.1.2-2.1 [5674 B] 69s Get:24 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libcap-ng0 armhf 0.8.4-2build1 [13.5 kB] 69s Get:25 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libaudit1 armhf 1:3.1.2-2.1 [44.3 kB] 69s Get:26 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpam0g armhf 1.5.3-5ubuntu3 [62.0 kB] 69s Get:27 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libselinux1 armhf 3.5-2ubuntu1 [70.9 kB] 69s Get:28 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libcurl4t64 armhf 8.5.0-2ubuntu7 [296 kB] 69s Get:29 http://ftpmaster.internal/ubuntu noble-proposed/main armhf curl armhf 8.5.0-2ubuntu7 [219 kB] 69s Get:30 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpsl5t64 armhf 0.21.2-1.1 [55.7 kB] 69s Get:31 http://ftpmaster.internal/ubuntu noble-proposed/main armhf wget armhf 1.21.4-1ubuntu2 [317 kB] 69s Get:32 http://ftpmaster.internal/ubuntu noble-proposed/main armhf tnftp armhf 20230507-2build1 [98.6 kB] 69s Get:33 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpcap0.8t64 armhf 1.10.4-4.1ubuntu1 [137 kB] 69s Get:34 http://ftpmaster.internal/ubuntu noble-proposed/main armhf tcpdump armhf 4.99.4-3ubuntu2 [425 kB] 69s Get:35 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsystemd-shared armhf 255.4-1ubuntu5 [2009 kB] 69s Get:36 http://ftpmaster.internal/ubuntu noble-proposed/main armhf systemd-resolved armhf 255.4-1ubuntu5 [289 kB] 69s Get:37 http://ftpmaster.internal/ubuntu noble-proposed/main armhf sudo armhf 1.9.15p5-3ubuntu3 [936 kB] 70s Get:38 http://ftpmaster.internal/ubuntu noble-proposed/main armhf rsync armhf 3.2.7-1build1 [413 kB] 70s Get:39 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-cryptography armhf 41.0.7-4build2 [788 kB] 70s Get:40 http://ftpmaster.internal/ubuntu noble-proposed/main armhf openssl armhf 3.0.13-0ubuntu2 [975 kB] 70s Get:41 http://ftpmaster.internal/ubuntu noble-proposed/main armhf openssh-sftp-server armhf 1:9.6p1-3ubuntu11 [35.5 kB] 70s Get:42 http://ftpmaster.internal/ubuntu noble-proposed/main armhf openssh-client armhf 1:9.6p1-3ubuntu11 [890 kB] 70s Get:43 http://ftpmaster.internal/ubuntu noble-proposed/main armhf openssh-server armhf 1:9.6p1-3ubuntu11 [503 kB] 70s Get:44 http://ftpmaster.internal/ubuntu noble-proposed/main armhf linux-headers-6.8.0-20 all 6.8.0-20.20 [13.6 MB] 70s Get:45 http://ftpmaster.internal/ubuntu noble-proposed/main armhf linux-headers-6.8.0-20-generic armhf 6.8.0-20.20 [1287 kB] 70s Get:46 http://ftpmaster.internal/ubuntu noble-proposed/main armhf linux-headers-generic armhf 6.8.0-20.20+1 [9610 B] 70s Get:47 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libssl3t64 armhf 3.0.13-0ubuntu2 [1558 kB] 70s Get:48 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libnss-systemd armhf 255.4-1ubuntu5 [148 kB] 70s Get:49 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libudev1 armhf 255.4-1ubuntu5 [166 kB] 70s Get:50 http://ftpmaster.internal/ubuntu noble-proposed/main armhf systemd armhf 255.4-1ubuntu5 [3502 kB] 70s Get:51 http://ftpmaster.internal/ubuntu noble-proposed/main armhf udev armhf 255.4-1ubuntu5 [1852 kB] 70s Get:52 http://ftpmaster.internal/ubuntu noble-proposed/main armhf systemd-sysv armhf 255.4-1ubuntu5 [11.9 kB] 70s Get:53 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpam-systemd armhf 255.4-1ubuntu5 [216 kB] 70s Get:54 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsystemd0 armhf 255.4-1ubuntu5 [410 kB] 70s Get:55 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpam-modules-bin armhf 1.5.3-5ubuntu3 [47.0 kB] 70s Get:56 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpam-modules armhf 1.5.3-5ubuntu3 [261 kB] 70s Get:57 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpam-runtime all 1.5.3-5ubuntu3 [40.8 kB] 70s Get:58 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dbus-user-session armhf 1.14.10-4ubuntu2 [9962 B] 70s Get:59 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libapparmor1 armhf 4.0.0-beta3-0ubuntu2 [45.0 kB] 70s Get:60 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libexpat1 armhf 2.6.1-2 [65.9 kB] 70s Get:61 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dbus-system-bus-common all 1.14.10-4ubuntu2 [81.5 kB] 70s Get:62 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dbus-bin armhf 1.14.10-4ubuntu2 [37.1 kB] 70s Get:63 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dbus armhf 1.14.10-4ubuntu2 [28.1 kB] 70s Get:64 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dbus-daemon armhf 1.14.10-4ubuntu2 [109 kB] 70s Get:65 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libdbus-1-3 armhf 1.14.10-4ubuntu2 [190 kB] 70s Get:66 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libmount1 armhf 2.39.3-9ubuntu2 [171 kB] 70s Get:67 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libseccomp2 armhf 2.5.5-1ubuntu2 [49.5 kB] 70s Get:68 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libdevmapper1.02.1 armhf 2:1.02.185-3ubuntu2 [135 kB] 70s Get:69 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libuuid1 armhf 2.39.3-9ubuntu2 [34.4 kB] 70s Get:70 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libcryptsetup12 armhf 2:2.7.0-1ubuntu2 [238 kB] 70s Get:71 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libfdisk1 armhf 2.39.3-9ubuntu2 [196 kB] 70s Get:72 http://ftpmaster.internal/ubuntu noble-proposed/main armhf mount armhf 2.39.3-9ubuntu2 [134 kB] 70s Get:73 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-utils3 armhf 3.1.0-1build1 [16.9 kB] 70s Get:74 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libvolume-key1 armhf 0.3.12-7build1 [38.4 kB] 70s Get:75 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libjcat1 armhf 0.2.0-2build2 [30.4 kB] 70s Get:76 http://ftpmaster.internal/ubuntu noble-proposed/main armhf parted armhf 3.6-3.1build2 [39.4 kB] 70s Get:77 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libparted2t64 armhf 3.6-3.1build2 [143 kB] 70s Get:78 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3.12 armhf 3.12.2-4build3 [645 kB] 70s Get:79 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3.12-minimal armhf 3.12.2-4build3 [1942 kB] 70s Get:80 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpython3.12-stdlib armhf 3.12.2-4build3 [1906 kB] 70s Get:81 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpython3.12-minimal armhf 3.12.2-4build3 [816 kB] 71s Get:82 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsasl2-modules-db armhf 2.1.28+dfsg1-4ubuntu4 [19.2 kB] 71s Get:83 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3.11 armhf 3.11.8-1build4 [589 kB] 71s Get:84 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3.11-minimal armhf 3.11.8-1build4 [1795 kB] 71s Get:85 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpython3.11-stdlib armhf 3.11.8-1build4 [1810 kB] 71s Get:86 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpython3.11-minimal armhf 3.11.8-1build4 [826 kB] 71s Get:87 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsqlite3-0 armhf 3.45.1-1ubuntu1 [599 kB] 71s Get:88 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libtext-iconv-perl armhf 1.7-8build2 [12.7 kB] 71s Get:89 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libtext-charwidth-perl armhf 0.04-11build2 [8962 B] 71s Get:90 http://ftpmaster.internal/ubuntu noble-proposed/main armhf perl-modules-5.38 all 5.38.2-3.2 [3110 kB] 71s Get:91 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libdb5.3t64 armhf 5.3.28+dfsg2-5build1 [661 kB] 71s Get:92 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-gdbm armhf 3.12.2-3ubuntu2 [17.1 kB] 71s Get:93 http://ftpmaster.internal/ubuntu noble-proposed/main armhf man-db armhf 2.12.0-3build4 [1196 kB] 71s Get:94 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgdbm6t64 armhf 1.23-5.1 [30.3 kB] 71s Get:95 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgdbm-compat4t64 armhf 1.23-5.1 [6208 B] 71s Get:96 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libperl5.38t64 armhf 5.38.2-3.2 [4101 kB] 71s Get:97 http://ftpmaster.internal/ubuntu noble-proposed/main armhf perl armhf 5.38.2-3.2 [231 kB] 71s Get:98 http://ftpmaster.internal/ubuntu noble-proposed/main armhf perl-base armhf 5.38.2-3.2 [1671 kB] 71s Get:99 http://ftpmaster.internal/ubuntu noble-proposed/main armhf liblocale-gettext-perl armhf 1.07-6ubuntu3 [15.0 kB] 71s Get:100 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libnettle8t64 armhf 3.9.1-2.2 [187 kB] 71s Get:101 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libhogweed6t64 armhf 3.9.1-2.2 [187 kB] 71s Get:102 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgnutls30t64 armhf 3.8.3-1.1ubuntu2 [1046 kB] 71s Get:103 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libldap2 armhf 2.6.7+dfsg-1~exp1ubuntu6 [172 kB] 71s Get:104 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libcurl3t64-gnutls armhf 8.5.0-2ubuntu7 [290 kB] 71s Get:105 http://ftpmaster.internal/ubuntu noble-proposed/main armhf shared-mime-info armhf 2.4-1build1 [470 kB] 72s Get:106 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gir1.2-girepository-2.0 armhf 1.79.1-1ubuntu6 [24.8 kB] 72s Get:107 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gir1.2-glib-2.0 armhf 2.79.3-3ubuntu5 [182 kB] 72s Get:108 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgirepository-1.0-1 armhf 1.79.1-1ubuntu6 [106 kB] 72s Get:109 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-gi armhf 3.47.0-3build1 [219 kB] 72s Get:110 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-dbus armhf 1.3.2-5build2 [94.7 kB] 72s Get:111 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libnetplan1 armhf 1.0-1 [113 kB] 72s Get:112 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-netplan armhf 1.0-1 [22.5 kB] 72s Get:113 http://ftpmaster.internal/ubuntu noble-proposed/main armhf netplan-generator armhf 1.0-1 [58.7 kB] 72s Get:114 http://ftpmaster.internal/ubuntu noble-proposed/main armhf initramfs-tools-bin armhf 0.142ubuntu22 [20.1 kB] 72s Get:115 http://ftpmaster.internal/ubuntu noble-proposed/main armhf initramfs-tools-core all 0.142ubuntu22 [50.0 kB] 72s Get:116 http://ftpmaster.internal/ubuntu noble-proposed/main armhf initramfs-tools all 0.142ubuntu22 [9056 B] 72s Get:117 http://ftpmaster.internal/ubuntu noble-proposed/main armhf netplan.io armhf 1.0-1 [64.3 kB] 72s Get:118 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libxmlb2 armhf 0.3.15-1build1 [57.0 kB] 72s Get:119 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libqrtr-glib0 armhf 1.2.2-1ubuntu3 [15.4 kB] 72s Get:120 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libqmi-glib5 armhf 1.35.2-0ubuntu1 [908 kB] 72s Get:121 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libqmi-proxy armhf 1.35.2-0ubuntu1 [5732 B] 72s Get:122 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpolkit-agent-1-0 armhf 124-1ubuntu1 [15.3 kB] 72s Get:123 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpolkit-gobject-1-0 armhf 124-1ubuntu1 [44.1 kB] 72s Get:124 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libglib2.0-0t64 armhf 2.79.3-3ubuntu5 [1414 kB] 72s Get:125 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libfwupd2 armhf 1.9.15-1 [123 kB] 72s Get:126 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libarchive13t64 armhf 3.7.2-1.1ubuntu2 [330 kB] 72s Get:127 http://ftpmaster.internal/ubuntu noble-proposed/main armhf fwupd armhf 1.9.15-1 [4349 kB] 72s Get:128 http://ftpmaster.internal/ubuntu noble-proposed/main armhf apt-utils armhf 2.7.13ubuntu1 [210 kB] 72s Get:129 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libapt-pkg6.0t64 armhf 2.7.13ubuntu1 [986 kB] 72s Get:130 http://ftpmaster.internal/ubuntu noble-proposed/main armhf apt armhf 2.7.13ubuntu1 [1367 kB] 72s Get:131 http://ftpmaster.internal/ubuntu noble-proposed/main armhf ubuntu-pro-client-l10n armhf 31.2 [19.4 kB] 72s Get:132 http://ftpmaster.internal/ubuntu noble-proposed/main armhf ubuntu-pro-client armhf 31.2 [216 kB] 72s Get:133 http://ftpmaster.internal/ubuntu noble-proposed/main armhf keyboxd armhf 2.4.4-2ubuntu15 [111 kB] 72s Get:134 http://ftpmaster.internal/ubuntu noble/main armhf libnpth0t64 armhf 1.6-3.1 [6940 B] 72s Get:135 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gpgv armhf 2.4.4-2ubuntu15 [224 kB] 72s Get:136 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gpg armhf 2.4.4-2ubuntu15 [524 kB] 72s Get:137 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gpg-wks-client armhf 2.4.4-2ubuntu15 [87.4 kB] 72s Get:138 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gnupg-utils armhf 2.4.4-2ubuntu15 [158 kB] 72s Get:139 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gpg-agent armhf 2.4.4-2ubuntu15 [235 kB] 72s Get:140 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gpgsm armhf 2.4.4-2ubuntu15 [241 kB] 72s Get:141 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libreadline8t64 armhf 8.2-3.1 [129 kB] 72s Get:142 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gawk armhf 1:5.2.1-2build2 [415 kB] 72s Get:143 http://ftpmaster.internal/ubuntu noble-proposed/main armhf fdisk armhf 2.39.3-9ubuntu2 [135 kB] 72s Get:144 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gpgconf armhf 2.4.4-2ubuntu15 [115 kB] 72s Get:145 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dirmngr armhf 2.4.4-2ubuntu15 [346 kB] 72s Get:146 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gnupg all 2.4.4-2ubuntu15 [359 kB] 72s Get:147 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-apt armhf 2.7.6build1 [162 kB] 72s Get:148 http://ftpmaster.internal/ubuntu noble-proposed/main armhf pinentry-curses armhf 1.2.1-3ubuntu4 [36.7 kB] 72s Get:149 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-yaml armhf 6.0.1-2build1 [117 kB] 72s Get:150 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python-apt-common all 2.7.6build1 [19.8 kB] 72s Get:151 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-setuptools all 68.1.2-2ubuntu1 [396 kB] 72s Get:152 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-pkg-resources all 68.1.2-2ubuntu1 [168 kB] 72s Get:153 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dpkg armhf 1.22.6ubuntu4 [1229 kB] 72s Get:154 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-minimal armhf 3.12.2-0ubuntu1 [27.1 kB] 72s Get:155 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3 armhf 3.12.2-0ubuntu1 [24.1 kB] 72s Get:156 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpython3-stdlib armhf 3.12.2-0ubuntu1 [9802 B] 72s Get:157 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsmartcols1 armhf 2.39.3-9ubuntu2 [117 kB] 72s Get:158 http://ftpmaster.internal/ubuntu noble-proposed/main armhf bsdextrautils armhf 2.39.3-9ubuntu2 [78.7 kB] 73s Get:159 http://ftpmaster.internal/ubuntu noble-proposed/main armhf groff-base armhf 1.23.0-3build1 [946 kB] 73s Get:160 http://ftpmaster.internal/ubuntu noble-proposed/main armhf readline-common all 8.2-3.1 [56.4 kB] 73s Get:161 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgpgme11t64 armhf 1.18.0-4.1ubuntu3 [120 kB] 73s Get:162 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-crypto3 armhf 3.1.0-1build1 [20.3 kB] 73s Get:163 http://ftpmaster.internal/ubuntu noble-proposed/main armhf e2fsprogs-l10n all 1.47.0-2.4~exp1ubuntu2 [5996 B] 73s Get:164 http://ftpmaster.internal/ubuntu noble-proposed/main armhf logsave armhf 1.47.0-2.4~exp1ubuntu2 [21.9 kB] 73s Get:165 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dhcpcd-base armhf 1:10.0.6-1ubuntu2 [186 kB] 73s Get:166 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-fs3 armhf 3.1.0-1build1 [34.4 kB] 73s Get:167 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libreiserfscore0t64 armhf 1:3.6.27-7.1 [66.2 kB] 73s Get:168 http://ftpmaster.internal/ubuntu noble-proposed/main armhf btrfs-progs armhf 6.6.3-1.1build1 [852 kB] 73s Get:169 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libext2fs2t64 armhf 1.47.0-2.4~exp1ubuntu2 [201 kB] 73s Get:170 http://ftpmaster.internal/ubuntu noble-proposed/main armhf e2fsprogs armhf 1.47.0-2.4~exp1ubuntu2 [571 kB] 73s Get:171 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-loop3 armhf 3.1.0-1build1 [6502 B] 73s Get:172 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-mdraid3 armhf 3.1.0-1build1 [13.3 kB] 73s Get:173 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-nvme3 armhf 3.1.0-1build1 [17.5 kB] 73s Get:174 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libnvme1t64 armhf 1.8-3 [67.5 kB] 73s Get:175 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-part3 armhf 3.1.0-1build1 [16.4 kB] 73s Get:176 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev-swap3 armhf 3.1.0-1build1 [8894 B] 73s Get:177 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libblockdev3 armhf 3.1.0-1build1 [42.9 kB] 73s Get:178 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgudev-1.0-0 armhf 1:238-3ubuntu2 [13.6 kB] 73s Get:179 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libxml2 armhf 2.9.14+dfsg-1.3ubuntu2 [595 kB] 73s Get:180 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libbpf1 armhf 1:1.3.0-2build1 [146 kB] 73s Get:181 http://ftpmaster.internal/ubuntu noble-proposed/main armhf iproute2 armhf 6.1.0-1ubuntu5 [1060 kB] 73s Get:182 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libelf1t64 armhf 0.190-1.1build2 [49.9 kB] 73s Get:183 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libtirpc-common all 1.3.4+ds-1.1 [8018 B] 73s Get:184 http://ftpmaster.internal/ubuntu noble-proposed/main armhf lsof armhf 4.95.0-1build2 [248 kB] 73s Get:185 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libnsl2 armhf 1.3.0-3build2 [36.5 kB] 73s Get:186 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libtirpc3t64 armhf 1.3.4+ds-1.1 [73.2 kB] 73s Get:187 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libmbim-proxy armhf 1.31.2-0ubuntu2 [5748 B] 73s Get:188 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libmbim-glib4 armhf 1.31.2-0ubuntu2 [216 kB] 73s Get:189 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libjson-glib-1.0-common all 1.8.0-2build1 [4210 B] 73s Get:190 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libjson-glib-1.0-0 armhf 1.8.0-2build1 [61.2 kB] 73s Get:191 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libnghttp2-14 armhf 1.59.0-1build1 [68.1 kB] 73s Get:192 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libssh-4 armhf 0.10.6-2build1 [169 kB] 73s Get:193 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libusb-1.0-0 armhf 2:1.0.27-1 [48.7 kB] 73s Get:194 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgusb2 armhf 0.4.8-1build1 [34.6 kB] 73s Get:195 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libmm-glib0 armhf 1.23.4-0ubuntu1 [214 kB] 73s Get:196 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsasl2-2 armhf 2.1.28+dfsg1-4ubuntu4 [49.7 kB] 73s Get:197 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libibverbs1 armhf 50.0-2build1 [57.9 kB] 73s Get:198 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libfido2-1 armhf 1.14.0-1build1 [75.8 kB] 73s Get:199 http://ftpmaster.internal/ubuntu noble-proposed/main armhf coreutils armhf 9.4-3ubuntu3 [1280 kB] 73s Get:200 http://ftpmaster.internal/ubuntu noble-proposed/main armhf debianutils armhf 5.17 [88.9 kB] 73s Get:201 http://ftpmaster.internal/ubuntu noble-proposed/main armhf util-linux armhf 2.39.3-9ubuntu2 [1216 kB] 73s Get:202 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libc-bin armhf 2.39-0ubuntu6 [530 kB] 73s Get:203 http://ftpmaster.internal/ubuntu noble-proposed/main armhf file armhf 1:5.45-3 [21.1 kB] 73s Get:204 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libmagic-mgc armhf 1:5.45-3 [307 kB] 74s Get:205 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libmagic1t64 armhf 1:5.45-3 [81.4 kB] 74s Get:206 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libplymouth5 armhf 24.004.60-1ubuntu5 [140 kB] 74s Get:207 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libpng16-16t64 armhf 1.6.43-3 [166 kB] 74s Get:208 http://ftpmaster.internal/ubuntu noble-proposed/main armhf bind9-host armhf 1:9.18.24-0ubuntu3 [47.4 kB] 74s Get:209 http://ftpmaster.internal/ubuntu noble-proposed/main armhf bind9-dnsutils armhf 1:9.18.24-0ubuntu3 [149 kB] 74s Get:210 http://ftpmaster.internal/ubuntu noble-proposed/main armhf bind9-libs armhf 1:9.18.24-0ubuntu3 [1148 kB] 74s Get:211 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libuv1t64 armhf 1.48.0-1.1 [82.9 kB] 74s Get:212 http://ftpmaster.internal/ubuntu noble-proposed/main armhf uuid-runtime armhf 2.39.3-9ubuntu2 [41.7 kB] 74s Get:213 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libdebconfclient0 armhf 0.271ubuntu2 [10.8 kB] 74s Get:214 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsemanage-common all 3.5-1build4 [10.1 kB] 74s Get:215 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsemanage2 armhf 3.5-1build4 [84.5 kB] 74s Get:216 http://ftpmaster.internal/ubuntu noble-proposed/main armhf install-info armhf 7.1-3build1 [60.5 kB] 74s Get:217 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gcc-13-base armhf 13.2.0-19ubuntu1 [47.7 kB] 74s Get:218 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libss2 armhf 1.47.0-2.4~exp1ubuntu2 [14.7 kB] 74s Get:219 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dmsetup armhf 2:1.02.185-3ubuntu2 [81.1 kB] 74s Get:220 http://ftpmaster.internal/ubuntu noble-proposed/main armhf eject armhf 2.39.3-9ubuntu2 [43.2 kB] 74s Get:221 http://ftpmaster.internal/ubuntu noble-proposed/main armhf krb5-locales all 1.20.1-5.1build3 [13.8 kB] 74s Get:222 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libbsd0 armhf 0.12.1-1 [36.6 kB] 74s Get:223 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libglib2.0-data all 2.79.3-3ubuntu5 [46.6 kB] 74s Get:224 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libslang2 armhf 2.3.3-3build1 [478 kB] 74s Get:225 http://ftpmaster.internal/ubuntu noble-proposed/main armhf locales all 2.39-0ubuntu6 [4232 kB] 74s Get:226 http://ftpmaster.internal/ubuntu noble-proposed/main armhf vim-tiny armhf 2:9.1.0016-1ubuntu5 [665 kB] 74s Get:227 http://ftpmaster.internal/ubuntu noble-proposed/main armhf vim-common all 2:9.1.0016-1ubuntu5 [385 kB] 74s Get:228 http://ftpmaster.internal/ubuntu noble/main armhf xdg-user-dirs armhf 0.18-1 [17.3 kB] 74s Get:229 http://ftpmaster.internal/ubuntu noble-proposed/main armhf xxd armhf 2:9.1.0016-1ubuntu5 [62.4 kB] 74s Get:230 http://ftpmaster.internal/ubuntu noble-proposed/main armhf apparmor armhf 4.0.0-beta3-0ubuntu2 [562 kB] 74s Get:231 http://ftpmaster.internal/ubuntu noble-proposed/main armhf ftp all 20230507-2build1 [4724 B] 74s Get:232 http://ftpmaster.internal/ubuntu noble-proposed/main armhf inetutils-telnet armhf 2:2.5-3ubuntu3 [90.7 kB] 74s Get:233 http://ftpmaster.internal/ubuntu noble-proposed/main armhf info armhf 7.1-3build1 [127 kB] 74s Get:234 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libxmuu1 armhf 2:1.1.3-3build1 [8004 B] 74s Get:235 http://ftpmaster.internal/ubuntu noble-proposed/main armhf lshw armhf 02.19.git.2021.06.19.996aaad9c7-2build2 [310 kB] 74s Get:236 http://ftpmaster.internal/ubuntu noble-proposed/main armhf mtr-tiny armhf 0.95-1.1build1 [51.7 kB] 74s Get:237 http://ftpmaster.internal/ubuntu noble-proposed/main armhf plymouth-theme-ubuntu-text armhf 24.004.60-1ubuntu5 [9826 B] 74s Get:238 http://ftpmaster.internal/ubuntu noble-proposed/main armhf plymouth armhf 24.004.60-1ubuntu5 [143 kB] 74s Get:239 http://ftpmaster.internal/ubuntu noble-proposed/main armhf psmisc armhf 23.7-1 [176 kB] 74s Get:240 http://ftpmaster.internal/ubuntu noble-proposed/main armhf telnet all 0.17+2.5-3ubuntu3 [3682 B] 74s Get:241 http://ftpmaster.internal/ubuntu noble-proposed/main armhf usb.ids all 2024.03.18-1 [223 kB] 74s Get:242 http://ftpmaster.internal/ubuntu noble-proposed/main armhf xz-utils armhf 5.6.0-0.2 [271 kB] 74s Get:243 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libctf0 armhf 2.42-4ubuntu1 [87.7 kB] 74s Get:244 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libctf-nobfd0 armhf 2.42-4ubuntu1 [88.0 kB] 74s Get:245 http://ftpmaster.internal/ubuntu noble-proposed/main armhf binutils-arm-linux-gnueabihf armhf 2.42-4ubuntu1 [2925 kB] 74s Get:246 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libbinutils armhf 2.42-4ubuntu1 [464 kB] 74s Get:247 http://ftpmaster.internal/ubuntu noble-proposed/main armhf binutils armhf 2.42-4ubuntu1 [3078 B] 74s Get:248 http://ftpmaster.internal/ubuntu noble-proposed/main armhf binutils-common armhf 2.42-4ubuntu1 [217 kB] 74s Get:249 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsframe1 armhf 2.42-4ubuntu1 [13.1 kB] 74s Get:250 http://ftpmaster.internal/ubuntu noble-proposed/main armhf bolt armhf 0.9.6-2build1 [138 kB] 74s Get:251 http://ftpmaster.internal/ubuntu noble-proposed/main armhf cryptsetup-bin armhf 2:2.7.0-1ubuntu2 [214 kB] 74s Get:252 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dpkg-dev all 1.22.6ubuntu4 [1074 kB] 74s Get:253 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libdpkg-perl all 1.22.6ubuntu4 [268 kB] 74s Get:254 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gnupg-l10n all 2.4.4-2ubuntu15 [65.8 kB] 74s Get:255 http://ftpmaster.internal/ubuntu noble-proposed/main armhf ibverbs-providers armhf 50.0-2build1 [27.4 kB] 75s Get:256 http://ftpmaster.internal/ubuntu noble-proposed/main armhf jq armhf 1.7.1-3 [65.2 kB] 75s Get:257 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libjq1 armhf 1.7.1-3 [156 kB] 75s Get:258 http://ftpmaster.internal/ubuntu noble/main armhf libatm1t64 armhf 1:2.5.1-5.1 [20.0 kB] 75s Get:259 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libevent-core-2.1-7 armhf 2.1.12-stable-9build1 [82.3 kB] 75s Get:260 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libftdi1-2 armhf 1.5-6build4 [25.7 kB] 75s Get:261 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libldap-common all 2.6.7+dfsg-1~exp1ubuntu6 [31.3 kB] 75s Get:262 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libsasl2-modules armhf 2.1.28+dfsg1-4ubuntu4 [61.4 kB] 75s Get:263 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-lib2to3 all 3.12.2-3ubuntu2 [79.3 kB] 75s Get:264 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-markupsafe armhf 2.1.5-1build1 [12.1 kB] 75s Get:265 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-pyrsistent armhf 0.20.0-1build1 [53.0 kB] 75s Get:266 http://ftpmaster.internal/ubuntu noble-proposed/main armhf python3-typing-extensions all 4.10.0-1 [60.7 kB] 75s Get:267 http://ftpmaster.internal/ubuntu noble-proposed/main armhf kpartx armhf 0.9.4-5ubuntu5 [31.4 kB] 75s Preconfiguring packages ... 76s Fetched 106 MB in 6s (16.9 MB/s) 76s (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 ... 58620 files and directories currently installed.) 76s Preparing to unpack .../bsdutils_1%3a2.39.3-9ubuntu2_armhf.deb ... 76s Unpacking bsdutils (1:2.39.3-9ubuntu2) over (1:2.39.3-6ubuntu2) ... 76s Setting up bsdutils (1:2.39.3-9ubuntu2) ... 76s (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 ... 58620 files and directories currently installed.) 76s Preparing to unpack .../gcc-14-base_14-20240315-1ubuntu1_armhf.deb ... 76s Unpacking gcc-14-base:armhf (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ... 76s Setting up gcc-14-base:armhf (14-20240315-1ubuntu1) ... 76s (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 ... 58620 files and directories currently installed.) 76s Preparing to unpack .../libgcc-s1_14-20240315-1ubuntu1_armhf.deb ... 76s Unpacking libgcc-s1:armhf (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ... 76s Setting up libgcc-s1:armhf (14-20240315-1ubuntu1) ... 76s (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 ... 58620 files and directories currently installed.) 76s Preparing to unpack .../libstdc++6_14-20240315-1ubuntu1_armhf.deb ... 76s Unpacking libstdc++6:armhf (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ... 76s Setting up libstdc++6:armhf (14-20240315-1ubuntu1) ... 76s (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 ... 58620 files and directories currently installed.) 76s Preparing to unpack .../libc6_2.39-0ubuntu6_armhf.deb ... 76s Unpacking libc6:armhf (2.39-0ubuntu6) over (2.39-0ubuntu2) ... 77s Setting up libc6:armhf (2.39-0ubuntu6) ... 77s (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 ... 58620 files and directories currently installed.) 77s Preparing to unpack .../0-libbrotli1_1.1.0-2build1_armhf.deb ... 77s Unpacking libbrotli1:armhf (1.1.0-2build1) over (1.1.0-2) ... 77s Preparing to unpack .../1-libgssapi-krb5-2_1.20.1-5.1build3_armhf.deb ... 77s Unpacking libgssapi-krb5-2:armhf (1.20.1-5.1build3) over (1.20.1-5build1) ... 77s Preparing to unpack .../2-libkrb5-3_1.20.1-5.1build3_armhf.deb ... 77s Unpacking libkrb5-3:armhf (1.20.1-5.1build3) over (1.20.1-5build1) ... 77s Preparing to unpack .../3-libkrb5support0_1.20.1-5.1build3_armhf.deb ... 77s Unpacking libkrb5support0:armhf (1.20.1-5.1build3) over (1.20.1-5build1) ... 78s Preparing to unpack .../4-libk5crypto3_1.20.1-5.1build3_armhf.deb ... 78s Unpacking libk5crypto3:armhf (1.20.1-5.1build3) over (1.20.1-5build1) ... 78s Preparing to unpack .../5-libcom-err2_1.47.0-2.4~exp1ubuntu2_armhf.deb ... 78s Unpacking libcom-err2:armhf (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 78s Preparing to unpack .../6-zlib1g_1%3a1.3.dfsg-3.1ubuntu1_armhf.deb ... 78s Unpacking zlib1g:armhf (1:1.3.dfsg-3.1ubuntu1) over (1:1.3.dfsg-3ubuntu1) ... 78s Setting up zlib1g:armhf (1:1.3.dfsg-3.1ubuntu1) ... 78s (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 ... 58620 files and directories currently installed.) 78s Preparing to unpack .../librtmp1_2.4+20151223.gitfa8646d.1-2build6_armhf.deb ... 78s Unpacking librtmp1:armhf (2.4+20151223.gitfa8646d.1-2build6) over (2.4+20151223.gitfa8646d.1-2build4) ... 78s Preparing to unpack .../udisks2_2.10.1-6_armhf.deb ... 78s Unpacking udisks2 (2.10.1-6) over (2.10.1-1ubuntu2) ... 78s Preparing to unpack .../libudisks2-0_2.10.1-6_armhf.deb ... 78s Unpacking libudisks2-0:armhf (2.10.1-6) over (2.10.1-1ubuntu2) ... 78s Preparing to unpack .../libblkid1_2.39.3-9ubuntu2_armhf.deb ... 78s Unpacking libblkid1:armhf (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 78s Setting up libblkid1:armhf (2.39.3-9ubuntu2) ... 78s (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 ... 58620 files and directories currently installed.) 78s Preparing to unpack .../liblzma5_5.6.0-0.2_armhf.deb ... 78s Unpacking liblzma5:armhf (5.6.0-0.2) over (5.4.5-0.3) ... 78s Setting up liblzma5:armhf (5.6.0-0.2) ... 78s (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 ... 58620 files and directories currently installed.) 78s Preparing to unpack .../0-kmod_31+20240202-2ubuntu4_armhf.deb ... 78s Unpacking kmod (31+20240202-2ubuntu4) over (30+20230601-2ubuntu1) ... 78s dpkg: warning: unable to delete old directory '/lib/modprobe.d': Directory not empty 78s Preparing to unpack .../1-libkmod2_31+20240202-2ubuntu4_armhf.deb ... 78s Unpacking libkmod2:armhf (31+20240202-2ubuntu4) over (30+20230601-2ubuntu1) ... 78s Preparing to unpack .../2-systemd-dev_255.4-1ubuntu5_all.deb ... 78s Unpacking systemd-dev (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 78s Preparing to unpack .../3-systemd-timesyncd_255.4-1ubuntu5_armhf.deb ... 78s Unpacking systemd-timesyncd (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 78s Preparing to unpack .../4-dbus-session-bus-common_1.14.10-4ubuntu2_all.deb ... 78s Unpacking dbus-session-bus-common (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 78s Preparing to unpack .../5-libaudit-common_1%3a3.1.2-2.1_all.deb ... 78s Unpacking libaudit-common (1:3.1.2-2.1) over (1:3.1.2-2) ... 78s Setting up libaudit-common (1:3.1.2-2.1) ... 78s (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 ... 58619 files and directories currently installed.) 78s Preparing to unpack .../libcap-ng0_0.8.4-2build1_armhf.deb ... 78s Unpacking libcap-ng0:armhf (0.8.4-2build1) over (0.8.4-2) ... 78s Setting up libcap-ng0:armhf (0.8.4-2build1) ... 78s (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 ... 58619 files and directories currently installed.) 78s Preparing to unpack .../libaudit1_1%3a3.1.2-2.1_armhf.deb ... 78s Unpacking libaudit1:armhf (1:3.1.2-2.1) over (1:3.1.2-2) ... 78s Setting up libaudit1:armhf (1:3.1.2-2.1) ... 78s (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 ... 58619 files and directories currently installed.) 78s Preparing to unpack .../libpam0g_1.5.3-5ubuntu3_armhf.deb ... 78s Unpacking libpam0g:armhf (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 79s Setting up libpam0g:armhf (1.5.3-5ubuntu3) ... 79s (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 ... 58619 files and directories currently installed.) 79s Preparing to unpack .../libselinux1_3.5-2ubuntu1_armhf.deb ... 79s Unpacking libselinux1:armhf (3.5-2ubuntu1) over (3.5-2build1) ... 79s Setting up libselinux1:armhf (3.5-2ubuntu1) ... 79s dpkg: libcurl4:armhf: dependency problems, but removing anyway as you requested: 79s curl depends on libcurl4 (= 8.5.0-2ubuntu2). 79s 79s (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 ... 58619 files and directories currently installed.) 79s Removing libcurl4:armhf (8.5.0-2ubuntu2) ... 79s Selecting previously unselected package libcurl4t64:armhf. 79s (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 ... 58614 files and directories currently installed.) 79s Preparing to unpack .../libcurl4t64_8.5.0-2ubuntu7_armhf.deb ... 79s Unpacking libcurl4t64:armhf (8.5.0-2ubuntu7) ... 79s Preparing to unpack .../curl_8.5.0-2ubuntu7_armhf.deb ... 79s Unpacking curl (8.5.0-2ubuntu7) over (8.5.0-2ubuntu2) ... 79s dpkg: libpsl5:armhf: dependency problems, but removing anyway as you requested: 79s wget depends on libpsl5 (>= 0.16.0). 79s libcurl3-gnutls:armhf depends on libpsl5 (>= 0.16.0). 79s 79s (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 ... 58620 files and directories currently installed.) 79s Removing libpsl5:armhf (0.21.2-1build1) ... 79s Selecting previously unselected package libpsl5t64:armhf. 79s (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 ... 58615 files and directories currently installed.) 79s Preparing to unpack .../libpsl5t64_0.21.2-1.1_armhf.deb ... 79s Unpacking libpsl5t64:armhf (0.21.2-1.1) ... 79s Preparing to unpack .../wget_1.21.4-1ubuntu2_armhf.deb ... 79s Unpacking wget (1.21.4-1ubuntu2) over (1.21.4-1ubuntu1) ... 79s Preparing to unpack .../tnftp_20230507-2build1_armhf.deb ... 79s Unpacking tnftp (20230507-2build1) over (20230507-2) ... 79s dpkg: libpcap0.8:armhf: dependency problems, but removing anyway as you requested: 79s tcpdump depends on libpcap0.8 (>= 1.9.1). 79s 79s (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 ... 58621 files and directories currently installed.) 79s Removing libpcap0.8:armhf (1.10.4-4ubuntu3) ... 79s Selecting previously unselected package libpcap0.8t64:armhf. 79s (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 ... 58610 files and directories currently installed.) 79s Preparing to unpack .../00-libpcap0.8t64_1.10.4-4.1ubuntu1_armhf.deb ... 79s Unpacking libpcap0.8t64:armhf (1.10.4-4.1ubuntu1) ... 79s Preparing to unpack .../01-tcpdump_4.99.4-3ubuntu2_armhf.deb ... 79s Unpacking tcpdump (4.99.4-3ubuntu2) over (4.99.4-3ubuntu1) ... 79s Preparing to unpack .../02-libsystemd-shared_255.4-1ubuntu5_armhf.deb ... 79s Unpacking libsystemd-shared:armhf (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 79s Preparing to unpack .../03-systemd-resolved_255.4-1ubuntu5_armhf.deb ... 79s Unpacking systemd-resolved (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 79s Preparing to unpack .../04-sudo_1.9.15p5-3ubuntu3_armhf.deb ... 79s Unpacking sudo (1.9.15p5-3ubuntu3) over (1.9.15p5-3ubuntu1) ... 80s Preparing to unpack .../05-rsync_3.2.7-1build1_armhf.deb ... 80s Unpacking rsync (3.2.7-1build1) over (3.2.7-1) ... 80s Preparing to unpack .../06-python3-cryptography_41.0.7-4build2_armhf.deb ... 80s Unpacking python3-cryptography (41.0.7-4build2) over (41.0.7-3) ... 80s Preparing to unpack .../07-openssl_3.0.13-0ubuntu2_armhf.deb ... 80s Unpacking openssl (3.0.13-0ubuntu2) over (3.0.10-1ubuntu4) ... 80s Preparing to unpack .../08-openssh-sftp-server_1%3a9.6p1-3ubuntu11_armhf.deb ... 80s Unpacking openssh-sftp-server (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ... 80s Preparing to unpack .../09-openssh-client_1%3a9.6p1-3ubuntu11_armhf.deb ... 80s Unpacking openssh-client (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ... 80s Preparing to unpack .../10-openssh-server_1%3a9.6p1-3ubuntu11_armhf.deb ... 80s Unpacking openssh-server (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ... 80s Selecting previously unselected package linux-headers-6.8.0-20. 80s Preparing to unpack .../11-linux-headers-6.8.0-20_6.8.0-20.20_all.deb ... 80s Unpacking linux-headers-6.8.0-20 (6.8.0-20.20) ... 83s Selecting previously unselected package linux-headers-6.8.0-20-generic. 83s Preparing to unpack .../12-linux-headers-6.8.0-20-generic_6.8.0-20.20_armhf.deb ... 83s Unpacking linux-headers-6.8.0-20-generic (6.8.0-20.20) ... 84s Preparing to unpack .../13-linux-headers-generic_6.8.0-20.20+1_armhf.deb ... 84s Unpacking linux-headers-generic (6.8.0-20.20+1) over (6.8.0-11.11+1) ... 84s (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 ... 89773 files and directories currently installed.) 84s Removing linux-headers-6.8.0-11-generic (6.8.0-11.11) ... 84s dpkg: libssl3:armhf: dependency problems, but removing anyway as you requested: 84s systemd depends on libssl3 (>= 3.0.0). 84s libssh-4:armhf depends on libssl3 (>= 3.0.0). 84s libsasl2-modules:armhf depends on libssl3 (>= 3.0.0). 84s libsasl2-2:armhf depends on libssl3 (>= 3.0.0). 84s libpython3.12-minimal:armhf depends on libssl3 (>= 3.0.0). 84s libpython3.11-minimal:armhf depends on libssl3 (>= 3.0.0). 84s libnvme1 depends on libssl3 (>= 3.0.0). 84s libfido2-1:armhf depends on libssl3 (>= 3.0.0). 84s libcryptsetup12:armhf depends on libssl3 (>= 3.0.0). 84s dhcpcd-base depends on libssl3 (>= 3.0.0). 84s bind9-libs:armhf depends on libssl3 (>= 3.0.0). 84s 84s Removing libssl3:armhf (3.0.10-1ubuntu4) ... 84s Selecting previously unselected package libssl3t64:armhf. 84s (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 ... 78623 files and directories currently installed.) 84s Preparing to unpack .../libssl3t64_3.0.13-0ubuntu2_armhf.deb ... 84s Unpacking libssl3t64:armhf (3.0.13-0ubuntu2) ... 84s Setting up libssl3t64:armhf (3.0.13-0ubuntu2) ... 84s (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 ... 78636 files and directories currently installed.) 84s Preparing to unpack .../libnss-systemd_255.4-1ubuntu5_armhf.deb ... 84s Unpacking libnss-systemd:armhf (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 84s Preparing to unpack .../libudev1_255.4-1ubuntu5_armhf.deb ... 84s Unpacking libudev1:armhf (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 84s Setting up libudev1:armhf (255.4-1ubuntu5) ... 84s (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 ... 78636 files and directories currently installed.) 84s Preparing to unpack .../systemd_255.4-1ubuntu5_armhf.deb ... 84s Unpacking systemd (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 85s Preparing to unpack .../udev_255.4-1ubuntu5_armhf.deb ... 85s Unpacking udev (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 85s Preparing to unpack .../libsystemd0_255.4-1ubuntu5_armhf.deb ... 85s Unpacking libsystemd0:armhf (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 85s Setting up libsystemd0:armhf (255.4-1ubuntu5) ... 85s Setting up libkmod2:armhf (31+20240202-2ubuntu4) ... 85s Setting up libsystemd-shared:armhf (255.4-1ubuntu5) ... 85s Setting up systemd-dev (255.4-1ubuntu5) ... 85s Setting up systemd (255.4-1ubuntu5) ... 86s (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 ... 78636 files and directories currently installed.) 86s Preparing to unpack .../systemd-sysv_255.4-1ubuntu5_armhf.deb ... 86s Unpacking systemd-sysv (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 86s Preparing to unpack .../libpam-systemd_255.4-1ubuntu5_armhf.deb ... 86s Unpacking libpam-systemd:armhf (255.4-1ubuntu5) over (255.2-3ubuntu2) ... 86s Preparing to unpack .../libpam-modules-bin_1.5.3-5ubuntu3_armhf.deb ... 86s Unpacking libpam-modules-bin (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 86s Setting up libpam-modules-bin (1.5.3-5ubuntu3) ... 86s pam_namespace.service is a disabled or a static unit not running, not starting it. 86s (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 ... 78636 files and directories currently installed.) 86s Preparing to unpack .../libpam-modules_1.5.3-5ubuntu3_armhf.deb ... 86s Unpacking libpam-modules:armhf (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 86s Setting up libpam-modules:armhf (1.5.3-5ubuntu3) ... 86s Installing new version of config file /etc/security/namespace.init ... 86s (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 ... 78634 files and directories currently installed.) 86s Preparing to unpack .../libpam-runtime_1.5.3-5ubuntu3_all.deb ... 86s Unpacking libpam-runtime (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ... 86s Setting up libpam-runtime (1.5.3-5ubuntu3) ... 87s (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 ... 78634 files and directories currently installed.) 87s Preparing to unpack .../0-dbus-user-session_1.14.10-4ubuntu2_armhf.deb ... 87s Unpacking dbus-user-session (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 87s Preparing to unpack .../1-libapparmor1_4.0.0-beta3-0ubuntu2_armhf.deb ... 87s Unpacking libapparmor1:armhf (4.0.0-beta3-0ubuntu2) over (4.0.0~alpha4-0ubuntu1) ... 87s Preparing to unpack .../2-libexpat1_2.6.1-2_armhf.deb ... 87s Unpacking libexpat1:armhf (2.6.1-2) over (2.6.0-1) ... 87s Preparing to unpack .../3-dbus-system-bus-common_1.14.10-4ubuntu2_all.deb ... 87s Unpacking dbus-system-bus-common (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 87s Preparing to unpack .../4-dbus-bin_1.14.10-4ubuntu2_armhf.deb ... 87s Unpacking dbus-bin (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 87s Preparing to unpack .../5-dbus_1.14.10-4ubuntu2_armhf.deb ... 87s Unpacking dbus (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 87s Preparing to unpack .../6-dbus-daemon_1.14.10-4ubuntu2_armhf.deb ... 87s Unpacking dbus-daemon (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 87s Preparing to unpack .../7-libdbus-1-3_1.14.10-4ubuntu2_armhf.deb ... 87s Unpacking libdbus-1-3:armhf (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ... 87s Preparing to unpack .../8-libmount1_2.39.3-9ubuntu2_armhf.deb ... 87s Unpacking libmount1:armhf (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 87s Setting up libmount1:armhf (2.39.3-9ubuntu2) ... 87s (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 ... 78634 files and directories currently installed.) 87s Preparing to unpack .../libseccomp2_2.5.5-1ubuntu2_armhf.deb ... 87s Unpacking libseccomp2:armhf (2.5.5-1ubuntu2) over (2.5.5-1ubuntu1) ... 87s Setting up libseccomp2:armhf (2.5.5-1ubuntu2) ... 87s (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 ... 78634 files and directories currently installed.) 87s Preparing to unpack .../libdevmapper1.02.1_2%3a1.02.185-3ubuntu2_armhf.deb ... 87s Unpacking libdevmapper1.02.1:armhf (2:1.02.185-3ubuntu2) over (2:1.02.185-3ubuntu1) ... 87s Preparing to unpack .../libuuid1_2.39.3-9ubuntu2_armhf.deb ... 87s Unpacking libuuid1:armhf (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 87s Setting up libuuid1:armhf (2.39.3-9ubuntu2) ... 87s (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 ... 78634 files and directories currently installed.) 87s Preparing to unpack .../0-libcryptsetup12_2%3a2.7.0-1ubuntu2_armhf.deb ... 87s Unpacking libcryptsetup12:armhf (2:2.7.0-1ubuntu2) over (2:2.7.0-1ubuntu1) ... 87s Preparing to unpack .../1-libfdisk1_2.39.3-9ubuntu2_armhf.deb ... 87s Unpacking libfdisk1:armhf (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 87s Preparing to unpack .../2-mount_2.39.3-9ubuntu2_armhf.deb ... 87s Unpacking mount (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 87s Preparing to unpack .../3-libblockdev-utils3_3.1.0-1build1_armhf.deb ... 87s Unpacking libblockdev-utils3:armhf (3.1.0-1build1) over (3.1.0-1) ... 87s Preparing to unpack .../4-libvolume-key1_0.3.12-7build1_armhf.deb ... 87s Unpacking libvolume-key1:armhf (0.3.12-7build1) over (0.3.12-5build2) ... 87s Preparing to unpack .../5-libjcat1_0.2.0-2build2_armhf.deb ... 87s Unpacking libjcat1:armhf (0.2.0-2build2) over (0.2.0-2) ... 88s (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 ... 78634 files and directories currently installed.) 88s Removing libgpgme11:armhf (1.18.0-4ubuntu1) ... 88s (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 ... 78628 files and directories currently installed.) 88s Preparing to unpack .../parted_3.6-3.1build2_armhf.deb ... 88s Unpacking parted (3.6-3.1build2) over (3.6-3) ... 88s (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 ... 78628 files and directories currently installed.) 88s Removing libparted2:armhf (3.6-3) ... 88s Selecting previously unselected package libparted2t64:armhf. 88s (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 ... 78622 files and directories currently installed.) 88s Preparing to unpack .../00-libparted2t64_3.6-3.1build2_armhf.deb ... 88s Unpacking libparted2t64:armhf (3.6-3.1build2) ... 88s Preparing to unpack .../01-python3.12_3.12.2-4build3_armhf.deb ... 88s Unpacking python3.12 (3.12.2-4build3) over (3.12.2-1) ... 88s Preparing to unpack .../02-python3.12-minimal_3.12.2-4build3_armhf.deb ... 88s Unpacking python3.12-minimal (3.12.2-4build3) over (3.12.2-1) ... 88s Preparing to unpack .../03-libpython3.12-stdlib_3.12.2-4build3_armhf.deb ... 88s Unpacking libpython3.12-stdlib:armhf (3.12.2-4build3) over (3.12.2-1) ... 88s Preparing to unpack .../04-libpython3.12-minimal_3.12.2-4build3_armhf.deb ... 88s Unpacking libpython3.12-minimal:armhf (3.12.2-4build3) over (3.12.2-1) ... 88s Preparing to unpack .../05-libsasl2-modules-db_2.1.28+dfsg1-4ubuntu4_armhf.deb ... 88s Unpacking libsasl2-modules-db:armhf (2.1.28+dfsg1-4ubuntu4) over (2.1.28+dfsg1-4) ... 88s Preparing to unpack .../06-python3.11_3.11.8-1build4_armhf.deb ... 88s Unpacking python3.11 (3.11.8-1build4) over (3.11.8-1) ... 88s Preparing to unpack .../07-python3.11-minimal_3.11.8-1build4_armhf.deb ... 88s Unpacking python3.11-minimal (3.11.8-1build4) over (3.11.8-1) ... 89s Preparing to unpack .../08-libpython3.11-stdlib_3.11.8-1build4_armhf.deb ... 89s Unpacking libpython3.11-stdlib:armhf (3.11.8-1build4) over (3.11.8-1) ... 89s Preparing to unpack .../09-libpython3.11-minimal_3.11.8-1build4_armhf.deb ... 89s Unpacking libpython3.11-minimal:armhf (3.11.8-1build4) over (3.11.8-1) ... 89s Preparing to unpack .../10-libsqlite3-0_3.45.1-1ubuntu1_armhf.deb ... 89s Unpacking libsqlite3-0:armhf (3.45.1-1ubuntu1) over (3.45.1-1) ... 89s Preparing to unpack .../11-libtext-iconv-perl_1.7-8build2_armhf.deb ... 89s Unpacking libtext-iconv-perl:armhf (1.7-8build2) over (1.7-8build1) ... 89s Preparing to unpack .../12-libtext-charwidth-perl_0.04-11build2_armhf.deb ... 89s Unpacking libtext-charwidth-perl:armhf (0.04-11build2) over (0.04-11build1) ... 89s Preparing to unpack .../13-perl-modules-5.38_5.38.2-3.2_all.deb ... 89s Unpacking perl-modules-5.38 (5.38.2-3.2) over (5.38.2-3) ... 89s dpkg: libperl5.38:armhf: dependency problems, but removing anyway as you requested: 89s perl depends on libperl5.38 (= 5.38.2-3). 89s 89s (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 ... 78625 files and directories currently installed.) 89s Removing libperl5.38:armhf (5.38.2-3) ... 89s dpkg: libdb5.3:armhf: dependency problems, but removing anyway as you requested: 89s iproute2 depends on libdb5.3. 89s apt-utils depends on libdb5.3. 89s 89s Removing libdb5.3:armhf (5.3.28+dfsg2-4) ... 89s Selecting previously unselected package libdb5.3t64:armhf. 90s (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 ... 78100 files and directories currently installed.) 90s Preparing to unpack .../libdb5.3t64_5.3.28+dfsg2-5build1_armhf.deb ... 90s Unpacking libdb5.3t64:armhf (5.3.28+dfsg2-5build1) ... 90s Preparing to unpack .../python3-gdbm_3.12.2-3ubuntu2_armhf.deb ... 90s Unpacking python3-gdbm:armhf (3.12.2-3ubuntu2) over (3.11.5-1) ... 90s Preparing to unpack .../man-db_2.12.0-3build4_armhf.deb ... 90s Unpacking man-db (2.12.0-3build4) over (2.12.0-3) ... 90s (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 ... 78106 files and directories currently installed.) 90s Removing libgdbm-compat4:armhf (1.23-5) ... 90s Removing libgdbm6:armhf (1.23-5) ... 90s Selecting previously unselected package libgdbm6t64:armhf. 90s (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 ... 78096 files and directories currently installed.) 90s Preparing to unpack .../libgdbm6t64_1.23-5.1_armhf.deb ... 90s Unpacking libgdbm6t64:armhf (1.23-5.1) ... 90s Selecting previously unselected package libgdbm-compat4t64:armhf. 90s Preparing to unpack .../libgdbm-compat4t64_1.23-5.1_armhf.deb ... 90s Unpacking libgdbm-compat4t64:armhf (1.23-5.1) ... 90s Selecting previously unselected package libperl5.38t64:armhf. 90s Preparing to unpack .../libperl5.38t64_5.38.2-3.2_armhf.deb ... 90s Unpacking libperl5.38t64:armhf (5.38.2-3.2) ... 90s Preparing to unpack .../perl_5.38.2-3.2_armhf.deb ... 90s Unpacking perl (5.38.2-3.2) over (5.38.2-3) ... 90s Preparing to unpack .../perl-base_5.38.2-3.2_armhf.deb ... 90s Unpacking perl-base (5.38.2-3.2) over (5.38.2-3) ... 90s Setting up perl-base (5.38.2-3.2) ... 90s (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 ... 78627 files and directories currently installed.) 90s Preparing to unpack .../liblocale-gettext-perl_1.07-6ubuntu3_armhf.deb ... 90s Unpacking liblocale-gettext-perl (1.07-6ubuntu3) over (1.07-6build1) ... 91s dpkg: libnettle8:armhf: dependency problems, but removing anyway as you requested: 91s libhogweed6:armhf depends on libnettle8. 91s libgnutls30:armhf depends on libnettle8 (>= 3.9~). 91s libcurl3-gnutls:armhf depends on libnettle8. 91s libarchive13:armhf depends on libnettle8. 91s 91s (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 ... 78627 files and directories currently installed.) 91s Removing libnettle8:armhf (3.9.1-2) ... 91s Selecting previously unselected package libnettle8t64:armhf. 91s (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 ... 78620 files and directories currently installed.) 91s Preparing to unpack .../libnettle8t64_3.9.1-2.2_armhf.deb ... 91s Unpacking libnettle8t64:armhf (3.9.1-2.2) ... 91s Setting up libnettle8t64:armhf (3.9.1-2.2) ... 91s dpkg: libhogweed6:armhf: dependency problems, but removing anyway as you requested: 91s libgnutls30:armhf depends on libhogweed6 (>= 3.6). 91s 91s (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 ... 78628 files and directories currently installed.) 91s Removing libhogweed6:armhf (3.9.1-2) ... 91s Selecting previously unselected package libhogweed6t64:armhf. 91s (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 ... 78623 files and directories currently installed.) 91s Preparing to unpack .../libhogweed6t64_3.9.1-2.2_armhf.deb ... 91s Unpacking libhogweed6t64:armhf (3.9.1-2.2) ... 91s Setting up libhogweed6t64:armhf (3.9.1-2.2) ... 91s dpkg: libgnutls30:armhf: dependency problems, but removing anyway as you requested: 91s libldap2:armhf depends on libgnutls30 (>= 3.8.2). 91s libcurl3-gnutls:armhf depends on libgnutls30 (>= 3.8.2). 91s fwupd depends on libgnutls30 (>= 3.7.3). 91s dirmngr depends on libgnutls30 (>= 3.8.1). 91s apt depends on libgnutls30 (>= 3.8.1). 91s 91s (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 ... 78629 files and directories currently installed.) 91s Removing libgnutls30:armhf (3.8.3-1ubuntu1) ... 91s Selecting previously unselected package libgnutls30t64:armhf. 91s (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 ... 78620 files and directories currently installed.) 91s Preparing to unpack .../libgnutls30t64_3.8.3-1.1ubuntu2_armhf.deb ... 91s Unpacking libgnutls30t64:armhf (3.8.3-1.1ubuntu2) ... 91s Setting up libgnutls30t64:armhf (3.8.3-1.1ubuntu2) ... 91s (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 ... 78648 files and directories currently installed.) 91s Preparing to unpack .../libldap2_2.6.7+dfsg-1~exp1ubuntu6_armhf.deb ... 91s Unpacking libldap2:armhf (2.6.7+dfsg-1~exp1ubuntu6) over (2.6.7+dfsg-1~exp1ubuntu1) ... 91s dpkg: libcurl3-gnutls:armhf: dependency problems, but removing anyway as you requested: 91s libfwupd2:armhf depends on libcurl3-gnutls (>= 7.63.0). 91s fwupd depends on libcurl3-gnutls (>= 7.63.0). 91s 91s (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 ... 78648 files and directories currently installed.) 91s Removing libcurl3-gnutls:armhf (8.5.0-2ubuntu2) ... 91s Selecting previously unselected package libcurl3t64-gnutls:armhf. 91s (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 ... 78641 files and directories currently installed.) 91s Preparing to unpack .../00-libcurl3t64-gnutls_8.5.0-2ubuntu7_armhf.deb ... 91s Unpacking libcurl3t64-gnutls:armhf (8.5.0-2ubuntu7) ... 91s Preparing to unpack .../01-shared-mime-info_2.4-1build1_armhf.deb ... 91s Unpacking shared-mime-info (2.4-1build1) over (2.4-1) ... 91s Preparing to unpack .../02-gir1.2-girepository-2.0_1.79.1-1ubuntu6_armhf.deb ... 91s Unpacking gir1.2-girepository-2.0:armhf (1.79.1-1ubuntu6) over (1.79.1-1) ... 91s Preparing to unpack .../03-gir1.2-glib-2.0_2.79.3-3ubuntu5_armhf.deb ... 91s Unpacking gir1.2-glib-2.0:armhf (2.79.3-3ubuntu5) over (2.79.2-1~ubuntu1) ... 91s Preparing to unpack .../04-libgirepository-1.0-1_1.79.1-1ubuntu6_armhf.deb ... 91s Unpacking libgirepository-1.0-1:armhf (1.79.1-1ubuntu6) over (1.79.1-1) ... 91s Preparing to unpack .../05-python3-gi_3.47.0-3build1_armhf.deb ... 92s Unpacking python3-gi (3.47.0-3build1) over (3.47.0-3) ... 92s Preparing to unpack .../06-python3-dbus_1.3.2-5build2_armhf.deb ... 92s Unpacking python3-dbus (1.3.2-5build2) over (1.3.2-5build1) ... 92s Selecting previously unselected package libnetplan1:armhf. 92s Preparing to unpack .../07-libnetplan1_1.0-1_armhf.deb ... 92s Unpacking libnetplan1:armhf (1.0-1) ... 92s Preparing to unpack .../08-python3-netplan_1.0-1_armhf.deb ... 92s Unpacking python3-netplan (1.0-1) over (0.107.1-3) ... 92s Preparing to unpack .../09-netplan-generator_1.0-1_armhf.deb ... 92s Adding 'diversion of /lib/systemd/system-generators/netplan to /lib/systemd/system-generators/netplan.usr-is-merged by netplan-generator' 92s Unpacking netplan-generator (1.0-1) over (0.107.1-3) ... 92s Preparing to unpack .../10-initramfs-tools-bin_0.142ubuntu22_armhf.deb ... 92s Unpacking initramfs-tools-bin (0.142ubuntu22) over (0.142ubuntu20) ... 92s Preparing to unpack .../11-initramfs-tools-core_0.142ubuntu22_all.deb ... 92s Unpacking initramfs-tools-core (0.142ubuntu22) over (0.142ubuntu20) ... 92s Preparing to unpack .../12-initramfs-tools_0.142ubuntu22_all.deb ... 92s Unpacking initramfs-tools (0.142ubuntu22) over (0.142ubuntu20) ... 92s Preparing to unpack .../13-netplan.io_1.0-1_armhf.deb ... 92s Unpacking netplan.io (1.0-1) over (0.107.1-3) ... 92s Preparing to unpack .../14-libxmlb2_0.3.15-1build1_armhf.deb ... 92s Unpacking libxmlb2:armhf (0.3.15-1build1) over (0.3.15-1) ... 92s Preparing to unpack .../15-libqrtr-glib0_1.2.2-1ubuntu3_armhf.deb ... 92s Unpacking libqrtr-glib0:armhf (1.2.2-1ubuntu3) over (1.2.2-1ubuntu2) ... 92s Preparing to unpack .../16-libqmi-glib5_1.35.2-0ubuntu1_armhf.deb ... 92s Unpacking libqmi-glib5:armhf (1.35.2-0ubuntu1) over (1.34.0-2) ... 93s Preparing to unpack .../17-libqmi-proxy_1.35.2-0ubuntu1_armhf.deb ... 93s Unpacking libqmi-proxy (1.35.2-0ubuntu1) over (1.34.0-2) ... 93s Preparing to unpack .../18-libpolkit-agent-1-0_124-1ubuntu1_armhf.deb ... 93s Unpacking libpolkit-agent-1-0:armhf (124-1ubuntu1) over (124-1) ... 93s Preparing to unpack .../19-libpolkit-gobject-1-0_124-1ubuntu1_armhf.deb ... 93s Unpacking libpolkit-gobject-1-0:armhf (124-1ubuntu1) over (124-1) ... 93s (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 ... 78652 files and directories currently installed.) 93s Removing libnetplan0:armhf (0.107.1-3) ... 93s dpkg: libglib2.0-0:armhf: dependency problems, but removing anyway as you requested: 93s libmm-glib0:armhf depends on libglib2.0-0 (>= 2.62.0). 93s libmbim-proxy depends on libglib2.0-0 (>= 2.56). 93s libmbim-glib4:armhf depends on libglib2.0-0 (>= 2.56). 93s libjson-glib-1.0-0:armhf depends on libglib2.0-0 (>= 2.75.3). 93s libgusb2:armhf depends on libglib2.0-0 (>= 2.75.3). 93s libgudev-1.0-0:armhf depends on libglib2.0-0 (>= 2.38.0). 93s libfwupd2:armhf depends on libglib2.0-0 (>= 2.79.0). 93s libblockdev3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s libblockdev-swap3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s libblockdev-part3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s libblockdev-nvme3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s libblockdev-mdraid3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s libblockdev-loop3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s libblockdev-fs3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s libblockdev-crypto3:armhf depends on libglib2.0-0 (>= 2.42.2). 93s fwupd depends on libglib2.0-0 (>= 2.79.0). 93s bolt depends on libglib2.0-0 (>= 2.56.0). 93s 93s Removing libglib2.0-0:armhf (2.79.2-1~ubuntu1) ... 93s Selecting previously unselected package libglib2.0-0t64:armhf. 93s (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 ... 78623 files and directories currently installed.) 93s Preparing to unpack .../libglib2.0-0t64_2.79.3-3ubuntu5_armhf.deb ... 93s libglib2.0-0t64.preinst: Removing /var/lib/dpkg/info/libglib2.0-0:armhf.postrm to avoid loss of /usr/share/glib-2.0/schemas/gschemas.compiled... 93s removed '/var/lib/dpkg/info/libglib2.0-0:armhf.postrm' 93s Unpacking libglib2.0-0t64:armhf (2.79.3-3ubuntu5) ... 93s Preparing to unpack .../libfwupd2_1.9.15-1_armhf.deb ... 93s Unpacking libfwupd2:armhf (1.9.15-1) over (1.9.14-1) ... 93s dpkg: libarchive13:armhf: dependency problems, but removing anyway as you requested: 93s fwupd depends on libarchive13 (>= 3.2.1). 93s 93s (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 ... 78648 files and directories currently installed.) 93s Removing libarchive13:armhf (3.7.2-1ubuntu2) ... 93s Selecting previously unselected package libarchive13t64:armhf. 93s (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 ... 78642 files and directories currently installed.) 93s Preparing to unpack .../libarchive13t64_3.7.2-1.1ubuntu2_armhf.deb ... 93s Unpacking libarchive13t64:armhf (3.7.2-1.1ubuntu2) ... 93s Preparing to unpack .../fwupd_1.9.15-1_armhf.deb ... 93s Unpacking fwupd (1.9.15-1) over (1.9.14-1) ... 93s Preparing to unpack .../apt-utils_2.7.13ubuntu1_armhf.deb ... 93s Unpacking apt-utils (2.7.13ubuntu1) over (2.7.12) ... 93s dpkg: libapt-pkg6.0:armhf: dependency problems, but removing anyway as you requested: 93s ubuntu-pro-client depends on libapt-pkg6.0 (>= 1.9~). 93s python3-apt depends on libapt-pkg6.0 (>= 2.7.11). 93s apt depends on libapt-pkg6.0 (>= 2.7.12). 93s 93s (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 ... 78649 files and directories currently installed.) 93s Removing libapt-pkg6.0:armhf (2.7.12) ... 93s Selecting previously unselected package libapt-pkg6.0t64:armhf. 93s (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 ... 78600 files and directories currently installed.) 93s Preparing to unpack .../libapt-pkg6.0t64_2.7.13ubuntu1_armhf.deb ... 93s Unpacking libapt-pkg6.0t64:armhf (2.7.13ubuntu1) ... 94s Setting up libapt-pkg6.0t64:armhf (2.7.13ubuntu1) ... 94s (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 ... 78650 files and directories currently installed.) 94s Preparing to unpack .../apt_2.7.13ubuntu1_armhf.deb ... 94s Unpacking apt (2.7.13ubuntu1) over (2.7.12) ... 94s Setting up apt (2.7.13ubuntu1) ... 94s (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 ... 78650 files and directories currently installed.) 94s Preparing to unpack .../ubuntu-pro-client-l10n_31.2_armhf.deb ... 94s Unpacking ubuntu-pro-client-l10n (31.2) over (31.1) ... 94s Preparing to unpack .../ubuntu-pro-client_31.2_armhf.deb ... 95s Unpacking ubuntu-pro-client (31.2) over (31.1) ... 95s Preparing to unpack .../keyboxd_2.4.4-2ubuntu15_armhf.deb ... 95s Unpacking keyboxd (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 95s dpkg: libnpth0:armhf: dependency problems, but removing anyway as you requested: 95s gpgv depends on libnpth0 (>= 0.90). 95s gpgsm depends on libnpth0 (>= 0.90). 95s gpg-agent depends on libnpth0 (>= 0.90). 95s gpg depends on libnpth0 (>= 0.90). 95s dirmngr depends on libnpth0 (>= 0.90). 95s 95s (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 ... 78650 files and directories currently installed.) 95s Removing libnpth0:armhf (1.6-3build2) ... 95s Selecting previously unselected package libnpth0t64:armhf. 95s (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 ... 78645 files and directories currently installed.) 95s Preparing to unpack .../libnpth0t64_1.6-3.1_armhf.deb ... 95s Unpacking libnpth0t64:armhf (1.6-3.1) ... 95s Setting up libnpth0t64:armhf (1.6-3.1) ... 95s (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 ... 78651 files and directories currently installed.) 95s Preparing to unpack .../gpgv_2.4.4-2ubuntu15_armhf.deb ... 95s Unpacking gpgv (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 95s Setting up gpgv (2.4.4-2ubuntu15) ... 95s (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 ... 78651 files and directories currently installed.) 95s Preparing to unpack .../gpg_2.4.4-2ubuntu15_armhf.deb ... 95s Unpacking gpg (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 95s Preparing to unpack .../gpg-wks-client_2.4.4-2ubuntu15_armhf.deb ... 95s Unpacking gpg-wks-client (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 95s Preparing to unpack .../gnupg-utils_2.4.4-2ubuntu15_armhf.deb ... 95s Unpacking gnupg-utils (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 95s Preparing to unpack .../gpg-agent_2.4.4-2ubuntu15_armhf.deb ... 95s Unpacking gpg-agent (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 95s Preparing to unpack .../gpgsm_2.4.4-2ubuntu15_armhf.deb ... 95s Unpacking gpgsm (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 95s dpkg: libreadline8:armhf: dependency problems, but removing anyway as you requested: 95s gpgconf depends on libreadline8 (>= 6.0). 95s gawk depends on libreadline8 (>= 6.0). 95s fdisk depends on libreadline8 (>= 6.0). 95s 95s (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 ... 78651 files and directories currently installed.) 95s Removing libreadline8:armhf (8.2-3) ... 95s Selecting previously unselected package libreadline8t64:armhf. 95s (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 ... 78639 files and directories currently installed.) 95s Preparing to unpack .../libreadline8t64_8.2-3.1_armhf.deb ... 95s Adding 'diversion of /lib/arm-linux-gnueabihf/libhistory.so.8 to /lib/arm-linux-gnueabihf/libhistory.so.8.usr-is-merged by libreadline8t64' 95s Adding 'diversion of /lib/arm-linux-gnueabihf/libhistory.so.8.2 to /lib/arm-linux-gnueabihf/libhistory.so.8.2.usr-is-merged by libreadline8t64' 95s Adding 'diversion of /lib/arm-linux-gnueabihf/libreadline.so.8 to /lib/arm-linux-gnueabihf/libreadline.so.8.usr-is-merged by libreadline8t64' 95s Adding 'diversion of /lib/arm-linux-gnueabihf/libreadline.so.8.2 to /lib/arm-linux-gnueabihf/libreadline.so.8.2.usr-is-merged by libreadline8t64' 95s Unpacking libreadline8t64:armhf (8.2-3.1) ... 95s Setting up libreadline8t64:armhf (8.2-3.1) ... 96s (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 ... 78659 files and directories currently installed.) 96s Preparing to unpack .../00-gawk_1%3a5.2.1-2build2_armhf.deb ... 96s Unpacking gawk (1:5.2.1-2build2) over (1:5.2.1-2) ... 96s Preparing to unpack .../01-fdisk_2.39.3-9ubuntu2_armhf.deb ... 96s Unpacking fdisk (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 96s Preparing to unpack .../02-gpgconf_2.4.4-2ubuntu15_armhf.deb ... 96s Unpacking gpgconf (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 96s Preparing to unpack .../03-dirmngr_2.4.4-2ubuntu15_armhf.deb ... 96s Unpacking dirmngr (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 96s Preparing to unpack .../04-gnupg_2.4.4-2ubuntu15_all.deb ... 96s Unpacking gnupg (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 96s Preparing to unpack .../05-python3-apt_2.7.6build1_armhf.deb ... 96s Unpacking python3-apt (2.7.6build1) over (2.7.6) ... 96s Preparing to unpack .../06-pinentry-curses_1.2.1-3ubuntu4_armhf.deb ... 96s Unpacking pinentry-curses (1.2.1-3ubuntu4) over (1.2.1-3ubuntu1) ... 96s Preparing to unpack .../07-python3-yaml_6.0.1-2build1_armhf.deb ... 96s Unpacking python3-yaml (6.0.1-2build1) over (6.0.1-2) ... 96s Preparing to unpack .../08-python-apt-common_2.7.6build1_all.deb ... 96s Unpacking python-apt-common (2.7.6build1) over (2.7.6) ... 96s Preparing to unpack .../09-python3-setuptools_68.1.2-2ubuntu1_all.deb ... 96s Unpacking python3-setuptools (68.1.2-2ubuntu1) over (68.1.2-2) ... 96s Preparing to unpack .../10-python3-pkg-resources_68.1.2-2ubuntu1_all.deb ... 96s Unpacking python3-pkg-resources (68.1.2-2ubuntu1) over (68.1.2-2) ... 97s Preparing to unpack .../11-dpkg_1.22.6ubuntu4_armhf.deb ... 97s Unpacking dpkg (1.22.6ubuntu4) over (1.22.4ubuntu5) ... 97s Setting up dpkg (1.22.6ubuntu4) ... 97s Setting up libpython3.12-minimal:armhf (3.12.2-4build3) ... 97s Setting up libexpat1:armhf (2.6.1-2) ... 97s Setting up python3.12-minimal (3.12.2-4build3) ... 98s (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 ... 78656 files and directories currently installed.) 98s Preparing to unpack .../python3-minimal_3.12.2-0ubuntu1_armhf.deb ... 98s Unpacking python3-minimal (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ... 98s Setting up python3-minimal (3.12.2-0ubuntu1) ... 98s (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 ... 78656 files and directories currently installed.) 98s Preparing to unpack .../python3_3.12.2-0ubuntu1_armhf.deb ... 98s Unpacking python3 (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ... 99s Preparing to unpack .../libpython3-stdlib_3.12.2-0ubuntu1_armhf.deb ... 99s Unpacking libpython3-stdlib:armhf (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ... 99s Preparing to unpack .../libsmartcols1_2.39.3-9ubuntu2_armhf.deb ... 99s Unpacking libsmartcols1:armhf (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 99s Setting up libsmartcols1:armhf (2.39.3-9ubuntu2) ... 99s (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 ... 78656 files and directories currently installed.) 99s Preparing to unpack .../0-bsdextrautils_2.39.3-9ubuntu2_armhf.deb ... 99s Unpacking bsdextrautils (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 99s Preparing to unpack .../1-groff-base_1.23.0-3build1_armhf.deb ... 99s Unpacking groff-base (1.23.0-3build1) over (1.23.0-3) ... 99s Preparing to unpack .../2-readline-common_8.2-3.1_all.deb ... 99s Unpacking readline-common (8.2-3.1) over (8.2-3) ... 99s Selecting previously unselected package libgpgme11t64:armhf. 99s Preparing to unpack .../3-libgpgme11t64_1.18.0-4.1ubuntu3_armhf.deb ... 99s Unpacking libgpgme11t64:armhf (1.18.0-4.1ubuntu3) ... 99s Preparing to unpack .../4-libblockdev-crypto3_3.1.0-1build1_armhf.deb ... 99s Unpacking libblockdev-crypto3:armhf (3.1.0-1build1) over (3.1.0-1) ... 99s Preparing to unpack .../5-e2fsprogs-l10n_1.47.0-2.4~exp1ubuntu2_all.deb ... 99s Unpacking e2fsprogs-l10n (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 99s Preparing to unpack .../6-logsave_1.47.0-2.4~exp1ubuntu2_armhf.deb ... 99s Unpacking logsave (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 99s Preparing to unpack .../7-dhcpcd-base_1%3a10.0.6-1ubuntu2_armhf.deb ... 99s Unpacking dhcpcd-base (1:10.0.6-1ubuntu2) over (1:10.0.6-1ubuntu1) ... 99s Preparing to unpack .../8-libblockdev-fs3_3.1.0-1build1_armhf.deb ... 99s Unpacking libblockdev-fs3:armhf (3.1.0-1build1) over (3.1.0-1) ... 99s dpkg: libreiserfscore0: dependency problems, but removing anyway as you requested: 99s btrfs-progs depends on libreiserfscore0 (>= 1:3.6.27). 99s 99s (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 ... 78663 files and directories currently installed.) 99s Removing libreiserfscore0 (1:3.6.27-7) ... 99s Selecting previously unselected package libreiserfscore0t64. 99s (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 ... 78658 files and directories currently installed.) 99s Preparing to unpack .../libreiserfscore0t64_1%3a3.6.27-7.1_armhf.deb ... 99s Unpacking libreiserfscore0t64 (1:3.6.27-7.1) ... 99s Preparing to unpack .../btrfs-progs_6.6.3-1.1build1_armhf.deb ... 99s Unpacking btrfs-progs (6.6.3-1.1build1) over (6.6.3-1.1) ... 99s dpkg: libext2fs2:armhf: dependency problems, but removing anyway as you requested: 99s e2fsprogs depends on libext2fs2 (= 1.47.0-2ubuntu1). 99s 99s (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 ... 78664 files and directories currently installed.) 99s Removing libext2fs2:armhf (1.47.0-2ubuntu1) ... 99s Selecting previously unselected package libext2fs2t64:armhf. 99s (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 ... 78657 files and directories currently installed.) 99s Preparing to unpack .../libext2fs2t64_1.47.0-2.4~exp1ubuntu2_armhf.deb ... 99s Adding 'diversion of /lib/arm-linux-gnueabihf/libe2p.so.2 to /lib/arm-linux-gnueabihf/libe2p.so.2.usr-is-merged by libext2fs2t64' 99s Adding 'diversion of /lib/arm-linux-gnueabihf/libe2p.so.2.3 to /lib/arm-linux-gnueabihf/libe2p.so.2.3.usr-is-merged by libext2fs2t64' 99s Adding 'diversion of /lib/arm-linux-gnueabihf/libext2fs.so.2 to /lib/arm-linux-gnueabihf/libext2fs.so.2.usr-is-merged by libext2fs2t64' 99s Adding 'diversion of /lib/arm-linux-gnueabihf/libext2fs.so.2.4 to /lib/arm-linux-gnueabihf/libext2fs.so.2.4.usr-is-merged by libext2fs2t64' 99s Unpacking libext2fs2t64:armhf (1.47.0-2.4~exp1ubuntu2) ... 99s Setting up libcom-err2:armhf (1.47.0-2.4~exp1ubuntu2) ... 99s Setting up libext2fs2t64:armhf (1.47.0-2.4~exp1ubuntu2) ... 99s (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 ... 78673 files and directories currently installed.) 99s Preparing to unpack .../e2fsprogs_1.47.0-2.4~exp1ubuntu2_armhf.deb ... 99s Unpacking e2fsprogs (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 99s Preparing to unpack .../libblockdev-loop3_3.1.0-1build1_armhf.deb ... 99s Unpacking libblockdev-loop3:armhf (3.1.0-1build1) over (3.1.0-1) ... 100s Preparing to unpack .../libblockdev-mdraid3_3.1.0-1build1_armhf.deb ... 100s Unpacking libblockdev-mdraid3:armhf (3.1.0-1build1) over (3.1.0-1) ... 100s Preparing to unpack .../libblockdev-nvme3_3.1.0-1build1_armhf.deb ... 100s Unpacking libblockdev-nvme3:armhf (3.1.0-1build1) over (3.1.0-1) ... 100s (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 ... 78673 files and directories currently installed.) 100s Removing libnvme1 (1.8-2) ... 100s Selecting previously unselected package libnvme1t64. 100s (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 ... 78666 files and directories currently installed.) 100s Preparing to unpack .../0-libnvme1t64_1.8-3_armhf.deb ... 100s Unpacking libnvme1t64 (1.8-3) ... 100s Preparing to unpack .../1-libblockdev-part3_3.1.0-1build1_armhf.deb ... 100s Unpacking libblockdev-part3:armhf (3.1.0-1build1) over (3.1.0-1) ... 100s Preparing to unpack .../2-libblockdev-swap3_3.1.0-1build1_armhf.deb ... 100s Unpacking libblockdev-swap3:armhf (3.1.0-1build1) over (3.1.0-1) ... 100s Preparing to unpack .../3-libblockdev3_3.1.0-1build1_armhf.deb ... 100s Unpacking libblockdev3:armhf (3.1.0-1build1) over (3.1.0-1) ... 100s Preparing to unpack .../4-libgudev-1.0-0_1%3a238-3ubuntu2_armhf.deb ... 100s Unpacking libgudev-1.0-0:armhf (1:238-3ubuntu2) over (1:238-3) ... 100s Preparing to unpack .../5-libxml2_2.9.14+dfsg-1.3ubuntu2_armhf.deb ... 100s Unpacking libxml2:armhf (2.9.14+dfsg-1.3ubuntu2) over (2.9.14+dfsg-1.3ubuntu1) ... 100s Preparing to unpack .../6-libbpf1_1%3a1.3.0-2build1_armhf.deb ... 100s Unpacking libbpf1:armhf (1:1.3.0-2build1) over (1:1.3.0-2) ... 100s Preparing to unpack .../7-iproute2_6.1.0-1ubuntu5_armhf.deb ... 100s Unpacking iproute2 (6.1.0-1ubuntu5) over (6.1.0-1ubuntu2) ... 100s (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 ... 78674 files and directories currently installed.) 100s Removing libelf1:armhf (0.190-1) ... 100s Selecting previously unselected package libelf1t64:armhf. 100s (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 ... 78669 files and directories currently installed.) 100s Preparing to unpack .../libelf1t64_0.190-1.1build2_armhf.deb ... 100s Unpacking libelf1t64:armhf (0.190-1.1build2) ... 100s Preparing to unpack .../libtirpc-common_1.3.4+ds-1.1_all.deb ... 100s Unpacking libtirpc-common (1.3.4+ds-1.1) over (1.3.4+ds-1build1) ... 100s Preparing to unpack .../lsof_4.95.0-1build2_armhf.deb ... 100s Unpacking lsof (4.95.0-1build2) over (4.95.0-1build1) ... 100s Preparing to unpack .../libnsl2_1.3.0-3build2_armhf.deb ... 100s Unpacking libnsl2:armhf (1.3.0-3build2) over (1.3.0-3) ... 100s (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 ... 78674 files and directories currently installed.) 100s Removing libtirpc3:armhf (1.3.4+ds-1build1) ... 100s Selecting previously unselected package libtirpc3t64:armhf. 100s (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 ... 78668 files and directories currently installed.) 100s Preparing to unpack .../00-libtirpc3t64_1.3.4+ds-1.1_armhf.deb ... 100s Adding 'diversion of /lib/arm-linux-gnueabihf/libtirpc.so.3 to /lib/arm-linux-gnueabihf/libtirpc.so.3.usr-is-merged by libtirpc3t64' 100s Adding 'diversion of /lib/arm-linux-gnueabihf/libtirpc.so.3.0.0 to /lib/arm-linux-gnueabihf/libtirpc.so.3.0.0.usr-is-merged by libtirpc3t64' 100s Unpacking libtirpc3t64:armhf (1.3.4+ds-1.1) ... 100s Preparing to unpack .../01-libmbim-proxy_1.31.2-0ubuntu2_armhf.deb ... 100s Unpacking libmbim-proxy (1.31.2-0ubuntu2) over (1.30.0-1) ... 100s Preparing to unpack .../02-libmbim-glib4_1.31.2-0ubuntu2_armhf.deb ... 100s Unpacking libmbim-glib4:armhf (1.31.2-0ubuntu2) over (1.30.0-1) ... 100s Preparing to unpack .../03-libjson-glib-1.0-common_1.8.0-2build1_all.deb ... 100s Unpacking libjson-glib-1.0-common (1.8.0-2build1) over (1.8.0-2) ... 101s Preparing to unpack .../04-libjson-glib-1.0-0_1.8.0-2build1_armhf.deb ... 101s Unpacking libjson-glib-1.0-0:armhf (1.8.0-2build1) over (1.8.0-2) ... 101s Preparing to unpack .../05-libnghttp2-14_1.59.0-1build1_armhf.deb ... 101s Unpacking libnghttp2-14:armhf (1.59.0-1build1) over (1.59.0-1) ... 101s Preparing to unpack .../06-libssh-4_0.10.6-2build1_armhf.deb ... 101s Unpacking libssh-4:armhf (0.10.6-2build1) over (0.10.6-2) ... 101s Preparing to unpack .../07-libusb-1.0-0_2%3a1.0.27-1_armhf.deb ... 101s Unpacking libusb-1.0-0:armhf (2:1.0.27-1) over (2:1.0.26-1) ... 101s Preparing to unpack .../08-libgusb2_0.4.8-1build1_armhf.deb ... 101s Unpacking libgusb2:armhf (0.4.8-1build1) over (0.4.8-1) ... 101s Preparing to unpack .../09-libmm-glib0_1.23.4-0ubuntu1_armhf.deb ... 101s Unpacking libmm-glib0:armhf (1.23.4-0ubuntu1) over (1.22.0-3) ... 101s Preparing to unpack .../10-libsasl2-2_2.1.28+dfsg1-4ubuntu4_armhf.deb ... 101s Unpacking libsasl2-2:armhf (2.1.28+dfsg1-4ubuntu4) over (2.1.28+dfsg1-4) ... 101s Preparing to unpack .../11-libibverbs1_50.0-2build1_armhf.deb ... 101s Unpacking libibverbs1:armhf (50.0-2build1) over (50.0-2) ... 101s Preparing to unpack .../12-libfido2-1_1.14.0-1build1_armhf.deb ... 101s Unpacking libfido2-1:armhf (1.14.0-1build1) over (1.14.0-1) ... 101s Preparing to unpack .../13-coreutils_9.4-3ubuntu3_armhf.deb ... 101s Unpacking coreutils (9.4-3ubuntu3) over (9.4-2ubuntu4) ... 101s Setting up coreutils (9.4-3ubuntu3) ... 101s (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 ... 78679 files and directories currently installed.) 101s Preparing to unpack .../debianutils_5.17_armhf.deb ... 101s Unpacking debianutils (5.17) over (5.16) ... 101s Setting up debianutils (5.17) ... 101s (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 ... 78679 files and directories currently installed.) 101s Preparing to unpack .../util-linux_2.39.3-9ubuntu2_armhf.deb ... 101s Unpacking util-linux (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 101s Setting up util-linux (2.39.3-9ubuntu2) ... 102s fstrim.service is a disabled or a static unit not running, not starting it. 102s (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 ... 78679 files and directories currently installed.) 102s Preparing to unpack .../libc-bin_2.39-0ubuntu6_armhf.deb ... 102s Unpacking libc-bin (2.39-0ubuntu6) over (2.39-0ubuntu2) ... 102s Setting up libc-bin (2.39-0ubuntu6) ... 102s (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 ... 78679 files and directories currently installed.) 102s Removing libatm1:armhf (1:2.5.1-5) ... 103s (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 ... 78674 files and directories currently installed.) 103s Preparing to unpack .../file_1%3a5.45-3_armhf.deb ... 103s Unpacking file (1:5.45-3) over (1:5.45-2) ... 103s (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 ... 78674 files and directories currently installed.) 103s Removing libmagic1:armhf (1:5.45-2) ... 103s (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 ... 78664 files and directories currently installed.) 103s Preparing to unpack .../libmagic-mgc_1%3a5.45-3_armhf.deb ... 103s Unpacking libmagic-mgc (1:5.45-3) over (1:5.45-2) ... 103s Selecting previously unselected package libmagic1t64:armhf. 103s Preparing to unpack .../libmagic1t64_1%3a5.45-3_armhf.deb ... 103s Unpacking libmagic1t64:armhf (1:5.45-3) ... 103s Preparing to unpack .../libplymouth5_24.004.60-1ubuntu5_armhf.deb ... 103s Unpacking libplymouth5:armhf (24.004.60-1ubuntu5) over (24.004.60-1ubuntu3) ... 103s (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 ... 78675 files and directories currently installed.) 103s Removing libpng16-16:armhf (1.6.43-1) ... 103s Selecting previously unselected package libpng16-16t64:armhf. 103s (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 ... 78665 files and directories currently installed.) 103s Preparing to unpack .../libpng16-16t64_1.6.43-3_armhf.deb ... 103s Unpacking libpng16-16t64:armhf (1.6.43-3) ... 103s Preparing to unpack .../bind9-host_1%3a9.18.24-0ubuntu3_armhf.deb ... 103s Unpacking bind9-host (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ... 103s Preparing to unpack .../bind9-dnsutils_1%3a9.18.24-0ubuntu3_armhf.deb ... 103s Unpacking bind9-dnsutils (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ... 103s Preparing to unpack .../bind9-libs_1%3a9.18.24-0ubuntu3_armhf.deb ... 103s Unpacking bind9-libs:armhf (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ... 103s (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 ... 78676 files and directories currently installed.) 103s Removing libuv1:armhf (1.48.0-1) ... 103s Selecting previously unselected package libuv1t64:armhf. 103s (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 ... 78671 files and directories currently installed.) 103s Preparing to unpack .../libuv1t64_1.48.0-1.1_armhf.deb ... 103s Unpacking libuv1t64:armhf (1.48.0-1.1) ... 103s (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 ... 78677 files and directories currently installed.) 103s Removing python3-distutils (3.11.5-1) ... 103s (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 ... 78622 files and directories currently installed.) 103s Preparing to unpack .../uuid-runtime_2.39.3-9ubuntu2_armhf.deb ... 103s Unpacking uuid-runtime (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 103s Preparing to unpack .../libdebconfclient0_0.271ubuntu2_armhf.deb ... 103s Unpacking libdebconfclient0:armhf (0.271ubuntu2) over (0.271ubuntu1) ... 103s Setting up libdebconfclient0:armhf (0.271ubuntu2) ... 104s (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 ... 78622 files and directories currently installed.) 104s Preparing to unpack .../libsemanage-common_3.5-1build4_all.deb ... 104s Unpacking libsemanage-common (3.5-1build4) over (3.5-1build2) ... 104s Setting up libsemanage-common (3.5-1build4) ... 104s (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 ... 78622 files and directories currently installed.) 104s Preparing to unpack .../libsemanage2_3.5-1build4_armhf.deb ... 104s Unpacking libsemanage2:armhf (3.5-1build4) over (3.5-1build2) ... 104s Setting up libsemanage2:armhf (3.5-1build4) ... 104s (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 ... 78622 files and directories currently installed.) 104s Preparing to unpack .../install-info_7.1-3build1_armhf.deb ... 104s Unpacking install-info (7.1-3build1) over (7.1-3) ... 104s Setting up install-info (7.1-3build1) ... 104s (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 ... 78622 files and directories currently installed.) 104s Preparing to unpack .../00-gcc-13-base_13.2.0-19ubuntu1_armhf.deb ... 104s Unpacking gcc-13-base:armhf (13.2.0-19ubuntu1) over (13.2.0-17ubuntu2) ... 104s Preparing to unpack .../01-libss2_1.47.0-2.4~exp1ubuntu2_armhf.deb ... 104s Unpacking libss2:armhf (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ... 104s Preparing to unpack .../02-dmsetup_2%3a1.02.185-3ubuntu2_armhf.deb ... 104s Unpacking dmsetup (2:1.02.185-3ubuntu2) over (2:1.02.185-3ubuntu1) ... 104s Preparing to unpack .../03-eject_2.39.3-9ubuntu2_armhf.deb ... 104s Unpacking eject (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ... 104s Preparing to unpack .../04-krb5-locales_1.20.1-5.1build3_all.deb ... 104s Unpacking krb5-locales (1.20.1-5.1build3) over (1.20.1-5build1) ... 104s Preparing to unpack .../05-libbsd0_0.12.1-1_armhf.deb ... 104s Unpacking libbsd0:armhf (0.12.1-1) over (0.11.8-1) ... 104s Preparing to unpack .../06-libglib2.0-data_2.79.3-3ubuntu5_all.deb ... 104s Unpacking libglib2.0-data (2.79.3-3ubuntu5) over (2.79.2-1~ubuntu1) ... 104s Preparing to unpack .../07-libslang2_2.3.3-3build1_armhf.deb ... 104s Unpacking libslang2:armhf (2.3.3-3build1) over (2.3.3-3) ... 104s Preparing to unpack .../08-locales_2.39-0ubuntu6_all.deb ... 104s Unpacking locales (2.39-0ubuntu6) over (2.39-0ubuntu2) ... 104s Preparing to unpack .../09-vim-tiny_2%3a9.1.0016-1ubuntu5_armhf.deb ... 104s Unpacking vim-tiny (2:9.1.0016-1ubuntu5) over (2:9.1.0016-1ubuntu2) ... 104s Preparing to unpack .../10-vim-common_2%3a9.1.0016-1ubuntu5_all.deb ... 104s Unpacking vim-common (2:9.1.0016-1ubuntu5) over (2:9.1.0016-1ubuntu2) ... 105s Selecting previously unselected package xdg-user-dirs. 105s Preparing to unpack .../11-xdg-user-dirs_0.18-1_armhf.deb ... 105s Unpacking xdg-user-dirs (0.18-1) ... 105s Preparing to unpack .../12-xxd_2%3a9.1.0016-1ubuntu5_armhf.deb ... 105s Unpacking xxd (2:9.1.0016-1ubuntu5) over (2:9.1.0016-1ubuntu2) ... 105s Preparing to unpack .../13-apparmor_4.0.0-beta3-0ubuntu2_armhf.deb ... 105s Unpacking apparmor (4.0.0-beta3-0ubuntu2) over (4.0.0~alpha4-0ubuntu1) ... 106s Preparing to unpack .../14-ftp_20230507-2build1_all.deb ... 106s Unpacking ftp (20230507-2build1) over (20230507-2) ... 106s Preparing to unpack .../15-inetutils-telnet_2%3a2.5-3ubuntu3_armhf.deb ... 106s Unpacking inetutils-telnet (2:2.5-3ubuntu3) over (2:2.5-3ubuntu1) ... 106s Preparing to unpack .../16-info_7.1-3build1_armhf.deb ... 106s Unpacking info (7.1-3build1) over (7.1-3) ... 106s Preparing to unpack .../17-libxmuu1_2%3a1.1.3-3build1_armhf.deb ... 106s Unpacking libxmuu1:armhf (2:1.1.3-3build1) over (2:1.1.3-3) ... 106s Preparing to unpack .../18-lshw_02.19.git.2021.06.19.996aaad9c7-2build2_armhf.deb ... 106s Unpacking lshw (02.19.git.2021.06.19.996aaad9c7-2build2) over (02.19.git.2021.06.19.996aaad9c7-2build1) ... 106s Preparing to unpack .../19-mtr-tiny_0.95-1.1build1_armhf.deb ... 106s Unpacking mtr-tiny (0.95-1.1build1) over (0.95-1.1) ... 106s Preparing to unpack .../20-plymouth-theme-ubuntu-text_24.004.60-1ubuntu5_armhf.deb ... 106s Unpacking plymouth-theme-ubuntu-text (24.004.60-1ubuntu5) over (24.004.60-1ubuntu3) ... 106s Preparing to unpack .../21-plymouth_24.004.60-1ubuntu5_armhf.deb ... 106s Unpacking plymouth (24.004.60-1ubuntu5) over (24.004.60-1ubuntu3) ... 106s Preparing to unpack .../22-psmisc_23.7-1_armhf.deb ... 106s Unpacking psmisc (23.7-1) over (23.6-2) ... 106s Preparing to unpack .../23-telnet_0.17+2.5-3ubuntu3_all.deb ... 106s Unpacking telnet (0.17+2.5-3ubuntu3) over (0.17+2.5-3ubuntu1) ... 106s Preparing to unpack .../24-usb.ids_2024.03.18-1_all.deb ... 106s Unpacking usb.ids (2024.03.18-1) over (2024.01.30-1) ... 106s Preparing to unpack .../25-xz-utils_5.6.0-0.2_armhf.deb ... 106s Unpacking xz-utils (5.6.0-0.2) over (5.4.5-0.3) ... 106s Preparing to unpack .../26-libctf0_2.42-4ubuntu1_armhf.deb ... 106s Unpacking libctf0:armhf (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 106s Preparing to unpack .../27-libctf-nobfd0_2.42-4ubuntu1_armhf.deb ... 106s Unpacking libctf-nobfd0:armhf (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 106s Preparing to unpack .../28-binutils-arm-linux-gnueabihf_2.42-4ubuntu1_armhf.deb ... 106s Unpacking binutils-arm-linux-gnueabihf (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 107s Preparing to unpack .../29-libbinutils_2.42-4ubuntu1_armhf.deb ... 107s Unpacking libbinutils:armhf (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 107s Preparing to unpack .../30-binutils_2.42-4ubuntu1_armhf.deb ... 107s Unpacking binutils (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 107s Preparing to unpack .../31-binutils-common_2.42-4ubuntu1_armhf.deb ... 107s Unpacking binutils-common:armhf (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 107s Preparing to unpack .../32-libsframe1_2.42-4ubuntu1_armhf.deb ... 107s Unpacking libsframe1:armhf (2.42-4ubuntu1) over (2.42-3ubuntu1) ... 107s Preparing to unpack .../33-bolt_0.9.6-2build1_armhf.deb ... 107s Unpacking bolt (0.9.6-2build1) over (0.9.6-2) ... 107s Preparing to unpack .../34-cryptsetup-bin_2%3a2.7.0-1ubuntu2_armhf.deb ... 107s Unpacking cryptsetup-bin (2:2.7.0-1ubuntu2) over (2:2.7.0-1ubuntu1) ... 107s Preparing to unpack .../35-dpkg-dev_1.22.6ubuntu4_all.deb ... 107s Unpacking dpkg-dev (1.22.6ubuntu4) over (1.22.4ubuntu5) ... 107s Preparing to unpack .../36-libdpkg-perl_1.22.6ubuntu4_all.deb ... 107s Unpacking libdpkg-perl (1.22.6ubuntu4) over (1.22.4ubuntu5) ... 107s Preparing to unpack .../37-gnupg-l10n_2.4.4-2ubuntu15_all.deb ... 107s Unpacking gnupg-l10n (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ... 107s Preparing to unpack .../38-ibverbs-providers_50.0-2build1_armhf.deb ... 107s Unpacking ibverbs-providers:armhf (50.0-2build1) over (50.0-2) ... 107s Preparing to unpack .../39-jq_1.7.1-3_armhf.deb ... 107s Unpacking jq (1.7.1-3) over (1.7.1-2) ... 107s Preparing to unpack .../40-libjq1_1.7.1-3_armhf.deb ... 107s Unpacking libjq1:armhf (1.7.1-3) over (1.7.1-2) ... 107s Selecting previously unselected package libatm1t64:armhf. 107s Preparing to unpack .../41-libatm1t64_1%3a2.5.1-5.1_armhf.deb ... 107s Unpacking libatm1t64:armhf (1:2.5.1-5.1) ... 107s Preparing to unpack .../42-libevent-core-2.1-7_2.1.12-stable-9build1_armhf.deb ... 107s Unpacking libevent-core-2.1-7:armhf (2.1.12-stable-9build1) over (2.1.12-stable-9) ... 107s Preparing to unpack .../43-libftdi1-2_1.5-6build4_armhf.deb ... 107s Unpacking libftdi1-2:armhf (1.5-6build4) over (1.5-6build3) ... 107s Preparing to unpack .../44-libldap-common_2.6.7+dfsg-1~exp1ubuntu6_all.deb ... 107s Unpacking libldap-common (2.6.7+dfsg-1~exp1ubuntu6) over (2.6.7+dfsg-1~exp1ubuntu1) ... 107s Preparing to unpack .../45-libsasl2-modules_2.1.28+dfsg1-4ubuntu4_armhf.deb ... 107s Unpacking libsasl2-modules:armhf (2.1.28+dfsg1-4ubuntu4) over (2.1.28+dfsg1-4) ... 107s Preparing to unpack .../46-python3-lib2to3_3.12.2-3ubuntu2_all.deb ... 108s Unpacking python3-lib2to3 (3.12.2-3ubuntu2) over (3.11.5-1) ... 108s Preparing to unpack .../47-python3-markupsafe_2.1.5-1build1_armhf.deb ... 108s Unpacking python3-markupsafe (2.1.5-1build1) over (2.1.5-1) ... 108s Preparing to unpack .../48-python3-pyrsistent_0.20.0-1build1_armhf.deb ... 108s Unpacking python3-pyrsistent:armhf (0.20.0-1build1) over (0.20.0-1) ... 108s Preparing to unpack .../49-python3-typing-extensions_4.10.0-1_all.deb ... 108s Unpacking python3-typing-extensions (4.10.0-1) over (4.9.0-1) ... 108s Preparing to unpack .../50-kpartx_0.9.4-5ubuntu5_armhf.deb ... 108s Unpacking kpartx (0.9.4-5ubuntu5) over (0.9.4-5ubuntu3) ... 108s Setting up pinentry-curses (1.2.1-3ubuntu4) ... 108s Setting up libtext-iconv-perl:armhf (1.7-8build2) ... 108s Setting up libtext-charwidth-perl:armhf (0.04-11build2) ... 108s Setting up libibverbs1:armhf (50.0-2build1) ... 108s Setting up systemd-sysv (255.4-1ubuntu5) ... 108s Setting up libapparmor1:armhf (4.0.0-beta3-0ubuntu2) ... 108s Setting up libatm1t64:armhf (1:2.5.1-5.1) ... 108s Setting up libgdbm6t64:armhf (1.23-5.1) ... 108s Setting up bsdextrautils (2.39.3-9ubuntu2) ... 108s Setting up libgdbm-compat4t64:armhf (1.23-5.1) ... 108s Setting up xdg-user-dirs (0.18-1) ... 108s Setting up ibverbs-providers:armhf (50.0-2build1) ... 108s Setting up linux-headers-6.8.0-20 (6.8.0-20.20) ... 108s Setting up libmagic-mgc (1:5.45-3) ... 108s Setting up gawk (1:5.2.1-2build2) ... 108s Setting up psmisc (23.7-1) ... 108s Setting up libjq1:armhf (1.7.1-3) ... 108s Setting up libtirpc-common (1.3.4+ds-1.1) ... 108s Setting up libbrotli1:armhf (1.1.0-2build1) ... 108s Setting up libsqlite3-0:armhf (3.45.1-1ubuntu1) ... 108s Setting up libsasl2-modules:armhf (2.1.28+dfsg1-4ubuntu4) ... 108s Setting up libuv1t64:armhf (1.48.0-1.1) ... 108s Setting up libmagic1t64:armhf (1:5.45-3) ... 108s Setting up binutils-common:armhf (2.42-4ubuntu1) ... 108s Setting up libpsl5t64:armhf (0.21.2-1.1) ... 108s Setting up libnghttp2-14:armhf (1.59.0-1build1) ... 108s Setting up libreiserfscore0t64 (1:3.6.27-7.1) ... 108s Setting up libctf-nobfd0:armhf (2.42-4ubuntu1) ... 108s Setting up libnss-systemd:armhf (255.4-1ubuntu5) ... 108s Setting up krb5-locales (1.20.1-5.1build3) ... 108s Setting up file (1:5.45-3) ... 108s Setting up kmod (31+20240202-2ubuntu4) ... 108s Setting up lshw (02.19.git.2021.06.19.996aaad9c7-2build2) ... 108s Setting up locales (2.39-0ubuntu6) ... 109s Generating locales (this might take a while)... 111s en_US.UTF-8... done 111s Generation complete. 111s Setting up libldap-common (2.6.7+dfsg-1~exp1ubuntu6) ... 111s Setting up xxd (2:9.1.0016-1ubuntu5) ... 111s Setting up libsframe1:armhf (2.42-4ubuntu1) ... 111s Setting up libelf1t64:armhf (0.190-1.1build2) ... 111s Setting up libkrb5support0:armhf (1.20.1-5.1build3) ... 111s Setting up linux-headers-6.8.0-20-generic (6.8.0-20.20) ... 111s Setting up eject (2.39.3-9ubuntu2) ... 111s Setting up apparmor (4.0.0-beta3-0ubuntu2) ... 111s Installing new version of config file /etc/apparmor.d/abstractions/authentication ... 111s Installing new version of config file /etc/apparmor.d/abstractions/crypto ... 111s Installing new version of config file /etc/apparmor.d/abstractions/kde-open5 ... 111s Installing new version of config file /etc/apparmor.d/abstractions/openssl ... 111s Installing new version of config file /etc/apparmor.d/code ... 111s Installing new version of config file /etc/apparmor.d/firefox ... 112s apparmor_parser: Unable to replace "lsb_release". apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s apparmor_parser: Unable to replace "kmod". apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s apparmor_parser: Unable to replace "nvidia_modprobe". apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s sysctl: cannot stat /proc/sys/kernel/apparmor_restrict_unprivileged_userns: No such file or directory 112s Reloading AppArmor profiles 112s /sbin/apparmor_parser: Unable to replace "1password". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "Discord". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "MongoDB Compass". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "QtWebEngineProcess". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "brave". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "buildah". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "busybox". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "cam". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "ch-checkns". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "ch-run". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "vscode". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "chrome". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "crun". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "devhelp". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "element-desktop". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "epiphany". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "flatpak". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "firefox". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "geary". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "evolution". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "goldendict". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "ipa_verify". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "github-desktop". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "keybase". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "kchmviewer". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lc-compliance". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "loupe". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "libcamerify". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "linux-sandbox". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lxc-attach". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lxc-create". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lxc-destroy". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lxc-execute". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lxc-usernsexec". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lxc-unshare". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "mmdebstrap". /sbin/apparmor_parser: Unable to replace "msedge". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lxc-stop". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "notepadqq". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "nautilus". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "opam". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "opera". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "pageedit". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "obsidian". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "privacybrowser". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "polypane". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "qcam". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "qutebrowser". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "qmapshack". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "podman". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "rootlesskit". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "rssguard". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "runc". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "rpm". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-abort". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-apt". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-checkpackages". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-adduser". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "QtWebEngineProcess". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "plasmashell". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-createchroot". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-clean". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-hold". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-destroychroot". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-unhold". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-distupgrade". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-update". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "scide". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "signal-desktop". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "slack". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-shell". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "sbuild-upgrade". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "stress-ng". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "steam". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "systemd-coredump". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "surfshark". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "thunderbird". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "slirp4netns". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "trinity". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "toybox". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "kmod". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "nvidia_modprobe". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "tup". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "userbindmount". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "tuxedo-control-center". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "unprivileged_userns". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "uwsgi-core". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "vdens". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "virtiofsd". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "vivaldi-bin". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "lsb_release". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "wpcom". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "vpnns". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "rsyslogd". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 112s /sbin/apparmor_parser: Unable to replace "unix-chkpwd". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 112s 113s /sbin/apparmor_parser: Unable to replace "/usr/bin/man". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 113s 113s /sbin/apparmor_parser: Unable to replace "ubuntu_pro_apt_news". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 113s 113s /sbin/apparmor_parser: Unable to replace "tcpdump". /sbin/apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 113s 113s Error: At least one profile failed to load 113s Setting up libglib2.0-0t64:armhf (2.79.3-3ubuntu5) ... 113s No schema files found: doing nothing. 113s Setting up libglib2.0-data (2.79.3-3ubuntu5) ... 113s Setting up vim-common (2:9.1.0016-1ubuntu5) ... 113s Setting up gcc-13-base:armhf (13.2.0-19ubuntu1) ... 113s Setting up libqrtr-glib0:armhf (1.2.2-1ubuntu3) ... 113s Setting up libslang2:armhf (2.3.3-3build1) ... 113s Setting up libnvme1t64 (1.8-3) ... 113s Setting up mtr-tiny (0.95-1.1build1) ... 113s Setting up gnupg-l10n (2.4.4-2ubuntu15) ... 113s Setting up librtmp1:armhf (2.4+20151223.gitfa8646d.1-2build6) ... 113s Setting up libdbus-1-3:armhf (1.14.10-4ubuntu2) ... 113s Setting up xz-utils (5.6.0-0.2) ... 113s Setting up perl-modules-5.38 (5.38.2-3.2) ... 113s Setting up libblockdev-utils3:armhf (3.1.0-1build1) ... 113s Setting up libpng16-16t64:armhf (1.6.43-3) ... 113s Setting up systemd-timesyncd (255.4-1ubuntu5) ... 113s Setting up libevent-core-2.1-7:armhf (2.1.12-stable-9build1) ... 113s Setting up udev (255.4-1ubuntu5) ... 114s Setting up libss2:armhf (1.47.0-2.4~exp1ubuntu2) ... 114s Setting up usb.ids (2024.03.18-1) ... 114s Setting up sudo (1.9.15p5-3ubuntu3) ... 114s Setting up dhcpcd-base (1:10.0.6-1ubuntu2) ... 114s Setting up gir1.2-glib-2.0:armhf (2.79.3-3ubuntu5) ... 114s Setting up libk5crypto3:armhf (1.20.1-5.1build3) ... 114s Setting up logsave (1.47.0-2.4~exp1ubuntu2) ... 114s Setting up libfdisk1:armhf (2.39.3-9ubuntu2) ... 114s Setting up libdb5.3t64:armhf (5.3.28+dfsg2-5build1) ... 114s Setting up libblockdev-nvme3:armhf (3.1.0-1build1) ... 114s Setting up libdevmapper1.02.1:armhf (2:1.02.185-3ubuntu2) ... 114s Setting up libblockdev-fs3:armhf (3.1.0-1build1) ... 114s Setting up python-apt-common (2.7.6build1) ... 114s Setting up mount (2.39.3-9ubuntu2) ... 114s Setting up dmsetup (2:1.02.185-3ubuntu2) ... 114s Setting up uuid-runtime (2.39.3-9ubuntu2) ... 115s uuidd.service is a disabled or a static unit not running, not starting it. 115s Setting up libmm-glib0:armhf (1.23.4-0ubuntu1) ... 115s Setting up groff-base (1.23.0-3build1) ... 115s Setting up libplymouth5:armhf (24.004.60-1ubuntu5) ... 115s Setting up dbus-session-bus-common (1.14.10-4ubuntu2) ... 115s Setting up kpartx (0.9.4-5ubuntu5) ... 115s Setting up jq (1.7.1-3) ... 115s Setting up gpgconf (2.4.4-2ubuntu15) ... 115s Setting up libpcap0.8t64:armhf (1.10.4-4.1ubuntu1) ... 115s Setting up libcryptsetup12:armhf (2:2.7.0-1ubuntu2) ... 115s Setting up libgirepository-1.0-1:armhf (1.79.1-1ubuntu6) ... 115s Setting up libjson-glib-1.0-common (1.8.0-2build1) ... 115s Setting up libkrb5-3:armhf (1.20.1-5.1build3) ... 115s Setting up libpython3.11-minimal:armhf (3.11.8-1build4) ... 115s Setting up libusb-1.0-0:armhf (2:1.0.27-1) ... 115s Setting up libperl5.38t64:armhf (5.38.2-3.2) ... 115s Setting up tnftp (20230507-2build1) ... 115s Setting up libbinutils:armhf (2.42-4ubuntu1) ... 115s Setting up dbus-system-bus-common (1.14.10-4ubuntu2) ... 115s Setting up libfido2-1:armhf (1.14.0-1build1) ... 115s Setting up openssl (3.0.13-0ubuntu2) ... 115s Setting up libbsd0:armhf (0.12.1-1) ... 115s Setting up readline-common (8.2-3.1) ... 115s Setting up libxml2:armhf (2.9.14+dfsg-1.3ubuntu2) ... 115s Setting up libxmuu1:armhf (2:1.1.3-3build1) ... 115s Setting up dbus-bin (1.14.10-4ubuntu2) ... 115s Setting up info (7.1-3build1) ... 115s Setting up liblocale-gettext-perl (1.07-6ubuntu3) ... 115s Setting up gpg (2.4.4-2ubuntu15) ... 115s Setting up libgudev-1.0-0:armhf (1:238-3ubuntu2) ... 115s Setting up libpolkit-gobject-1-0:armhf (124-1ubuntu1) ... 115s Setting up libbpf1:armhf (1:1.3.0-2build1) ... 115s Setting up libmbim-glib4:armhf (1.31.2-0ubuntu2) ... 115s Setting up rsync (3.2.7-1build1) ... 116s rsync.service is a disabled or a static unit not running, not starting it. 116s Setting up libudisks2-0:armhf (2.10.1-6) ... 116s Setting up bolt (0.9.6-2build1) ... 116s bolt.service is a disabled or a static unit not running, not starting it. 116s Setting up gnupg-utils (2.4.4-2ubuntu15) ... 116s Setting up initramfs-tools-bin (0.142ubuntu22) ... 116s Setting up libctf0:armhf (2.42-4ubuntu1) ... 116s Setting up cryptsetup-bin (2:2.7.0-1ubuntu2) ... 116s Setting up python3.11-minimal (3.11.8-1build4) ... 117s Setting up tcpdump (4.99.4-3ubuntu2) ... 117s apparmor_parser: Unable to replace "tcpdump". apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 117s 117s Setting up apt-utils (2.7.13ubuntu1) ... 117s Setting up gpg-agent (2.4.4-2ubuntu15) ... 118s Setting up libpython3.12-stdlib:armhf (3.12.2-4build3) ... 118s Setting up libblockdev-mdraid3:armhf (3.1.0-1build1) ... 118s Setting up wget (1.21.4-1ubuntu2) ... 118s Setting up libblockdev-swap3:armhf (3.1.0-1build1) ... 118s Setting up plymouth (24.004.60-1ubuntu5) ... 118s update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults 118s update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults 118s Setting up libxmlb2:armhf (0.3.15-1build1) ... 118s Setting up btrfs-progs (6.6.3-1.1build1) ... 118s Setting up libpython3.11-stdlib:armhf (3.11.8-1build4) ... 118s Setting up python3.12 (3.12.2-4build3) ... 120s Setting up libblockdev-loop3:armhf (3.1.0-1build1) ... 120s Setting up gpgsm (2.4.4-2ubuntu15) ... 120s Setting up inetutils-telnet (2:2.5-3ubuntu3) ... 120s Setting up e2fsprogs (1.47.0-2.4~exp1ubuntu2) ... 120s update-initramfs: deferring update (trigger activated) 120s e2scrub_all.service is a disabled or a static unit not running, not starting it. 120s Setting up libparted2t64:armhf (3.6-3.1build2) ... 120s Setting up linux-headers-generic (6.8.0-20.20+1) ... 120s Setting up dbus-daemon (1.14.10-4ubuntu2) ... 120s Setting up libmbim-proxy (1.31.2-0ubuntu2) ... 120s Setting up vim-tiny (2:9.1.0016-1ubuntu5) ... 120s Setting up libnetplan1:armhf (1.0-1) ... 120s Setting up man-db (2.12.0-3build4) ... 120s Updating database of manual pages ... 122s apparmor_parser: Unable to replace "/usr/bin/man". apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 122s 122s man-db.service is a disabled or a static unit not running, not starting it. 122s Setting up libblockdev3:armhf (3.1.0-1build1) ... 122s Setting up fdisk (2.39.3-9ubuntu2) ... 122s Setting up libjson-glib-1.0-0:armhf (1.8.0-2build1) ... 122s Setting up libblockdev-part3:armhf (3.1.0-1build1) ... 122s Setting up libsasl2-modules-db:armhf (2.1.28+dfsg1-4ubuntu4) ... 122s Setting up libftdi1-2:armhf (1.5-6build4) ... 122s Setting up perl (5.38.2-3.2) ... 122s Setting up plymouth-theme-ubuntu-text (24.004.60-1ubuntu5) ... 122s update-initramfs: deferring update (trigger activated) 122s Setting up gir1.2-girepository-2.0:armhf (1.79.1-1ubuntu6) ... 122s Setting up dbus (1.14.10-4ubuntu2) ... 122s A reboot is required to replace the running dbus-daemon. 122s Please reboot the system when convenient. 122s Setting up shared-mime-info (2.4-1build1) ... 123s Setting up libgssapi-krb5-2:armhf (1.20.1-5.1build3) ... 123s Setting up ftp (20230507-2build1) ... 123s Setting up keyboxd (2.4.4-2ubuntu15) ... 123s Setting up libdpkg-perl (1.22.6ubuntu4) ... 123s Setting up libsasl2-2:armhf (2.1.28+dfsg1-4ubuntu4) ... 123s Setting up libssh-4:armhf (0.10.6-2build1) ... 123s Setting up libpam-systemd:armhf (255.4-1ubuntu5) ... 123s Setting up libpolkit-agent-1-0:armhf (124-1ubuntu1) ... 123s Setting up libgpgme11t64:armhf (1.18.0-4.1ubuntu3) ... 123s Setting up netplan-generator (1.0-1) ... 123s Removing 'diversion of /lib/systemd/system-generators/netplan to /lib/systemd/system-generators/netplan.usr-is-merged by netplan-generator' 123s Setting up initramfs-tools-core (0.142ubuntu22) ... 123s Setting up binutils-arm-linux-gnueabihf (2.42-4ubuntu1) ... 123s Setting up libarchive13t64:armhf (3.7.2-1.1ubuntu2) ... 123s Setting up libldap2:armhf (2.6.7+dfsg-1~exp1ubuntu6) ... 123s Setting up libpython3-stdlib:armhf (3.12.2-0ubuntu1) ... 123s Setting up systemd-resolved (255.4-1ubuntu5) ... 124s Setting up python3.11 (3.11.8-1build4) ... 125s Setting up telnet (0.17+2.5-3ubuntu3) ... 125s Setting up initramfs-tools (0.142ubuntu22) ... 125s update-initramfs: deferring update (trigger activated) 125s Setting up libcurl4t64:armhf (8.5.0-2ubuntu7) ... 125s Setting up bind9-libs:armhf (1:9.18.24-0ubuntu3) ... 125s Setting up libtirpc3t64:armhf (1.3.4+ds-1.1) ... 125s Setting up e2fsprogs-l10n (1.47.0-2.4~exp1ubuntu2) ... 125s Setting up iproute2 (6.1.0-1ubuntu5) ... 125s Setting up openssh-client (1:9.6p1-3ubuntu11) ... 125s Setting up libgusb2:armhf (0.4.8-1build1) ... 125s Setting up libcurl3t64-gnutls:armhf (8.5.0-2ubuntu7) ... 125s Setting up parted (3.6-3.1build2) ... 125s Setting up libqmi-glib5:armhf (1.35.2-0ubuntu1) ... 125s Setting up python3 (3.12.2-0ubuntu1) ... 126s Setting up binutils (2.42-4ubuntu1) ... 126s Setting up python3-markupsafe (2.1.5-1build1) ... 126s Setting up libjcat1:armhf (0.2.0-2build2) ... 126s Setting up dpkg-dev (1.22.6ubuntu4) ... 126s Setting up dirmngr (2.4.4-2ubuntu15) ... 126s Setting up dbus-user-session (1.14.10-4ubuntu2) ... 126s Setting up python3-cryptography (41.0.7-4build2) ... 126s Setting up python3-gi (3.47.0-3build1) ... 126s Setting up python3-typing-extensions (4.10.0-1) ... 127s Setting up lsof (4.95.0-1build2) ... 127s Setting up python3-pyrsistent:armhf (0.20.0-1build1) ... 127s Setting up libnsl2:armhf (1.3.0-3build2) ... 127s Setting up gnupg (2.4.4-2ubuntu15) ... 127s Setting up python3-netplan (1.0-1) ... 127s Setting up curl (8.5.0-2ubuntu7) ... 127s Setting up libvolume-key1:armhf (0.3.12-7build1) ... 127s Setting up bind9-host (1:9.18.24-0ubuntu3) ... 127s Setting up python3-lib2to3 (3.12.2-3ubuntu2) ... 127s Setting up python3-pkg-resources (68.1.2-2ubuntu1) ... 127s Setting up openssh-sftp-server (1:9.6p1-3ubuntu11) ... 127s Setting up python3-dbus (1.3.2-5build2) ... 127s Setting up python3-setuptools (68.1.2-2ubuntu1) ... 128s Setting up gpg-wks-client (2.4.4-2ubuntu15) ... 128s Setting up openssh-server (1:9.6p1-3ubuntu11) ... 128s Replacing config file /etc/ssh/sshd_config with new version 130s Created symlink /etc/systemd/system/ssh.service.requires/ssh.socket → /usr/lib/systemd/system/ssh.socket. 131s Setting up libblockdev-crypto3:armhf (3.1.0-1build1) ... 131s Setting up python3-gdbm:armhf (3.12.2-3ubuntu2) ... 131s Setting up python3-apt (2.7.6build1) ... 131s Setting up libfwupd2:armhf (1.9.15-1) ... 131s Setting up python3-yaml (6.0.1-2build1) ... 131s Setting up libqmi-proxy (1.35.2-0ubuntu1) ... 131s Setting up netplan.io (1.0-1) ... 131s Setting up bind9-dnsutils (1:9.18.24-0ubuntu3) ... 131s Setting up ubuntu-pro-client (31.2) ... 132s apparmor_parser: Unable to replace "ubuntu_pro_apt_news". apparmor_parser: Access denied. You need policy admin privileges to manage profiles. 132s 133s Setting up fwupd (1.9.15-1) ... 133s fwupd-offline-update.service is a disabled or a static unit not running, not starting it. 133s fwupd-refresh.service is a disabled or a static unit not running, not starting it. 134s fwupd.service is a disabled or a static unit not running, not starting it. 134s Setting up ubuntu-pro-client-l10n (31.2) ... 134s Setting up udisks2 (2.10.1-6) ... 134s vda: Failed to write 'change' to '/sys/devices/pci0000:00/0000:00:01.3/0000:04:00.0/virtio2/block/vda/uevent': Permission denied 134s vda1: Failed to write 'change' to '/sys/devices/pci0000:00/0000:00:01.3/0000:04:00.0/virtio2/block/vda/vda1/uevent': Permission denied 134s vda15: Failed to write 'change' to '/sys/devices/pci0000:00/0000:00:01.3/0000:04:00.0/virtio2/block/vda/vda15/uevent': Permission denied 134s vda2: Failed to write 'change' to '/sys/devices/pci0000:00/0000:00:01.3/0000:04:00.0/virtio2/block/vda/vda2/uevent': Permission denied 134s loop0: Failed to write 'change' to '/sys/devices/virtual/block/loop0/uevent': Permission denied 134s loop1: Failed to write 'change' to '/sys/devices/virtual/block/loop1/uevent': Permission denied 134s loop2: Failed to write 'change' to '/sys/devices/virtual/block/loop2/uevent': Permission denied 134s loop3: Failed to write 'change' to '/sys/devices/virtual/block/loop3/uevent': Permission denied 134s loop4: Failed to write 'change' to '/sys/devices/virtual/block/loop4/uevent': Permission denied 134s loop5: Failed to write 'change' to '/sys/devices/virtual/block/loop5/uevent': Permission denied 134s loop6: Failed to write 'change' to '/sys/devices/virtual/block/loop6/uevent': Permission denied 134s loop7: Failed to write 'change' to '/sys/devices/virtual/block/loop7/uevent': Permission denied 134s Processing triggers for ufw (0.36.2-5) ... 134s Processing triggers for systemd (255.4-1ubuntu5) ... 134s Processing triggers for install-info (7.1-3build1) ... 134s Processing triggers for libc-bin (2.39-0ubuntu6) ... 134s Processing triggers for initramfs-tools (0.142ubuntu22) ... 136s Reading package lists... 136s Building dependency tree... 136s Reading state information... 137s The following packages will be REMOVED: 137s linux-headers-6.8.0-11* python3-lib2to3* 137s 0 upgraded, 0 newly installed, 2 to remove and 1 not upgraded. 137s After this operation, 85.8 MB disk space will be freed. 137s (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 ... 78591 files and directories currently installed.) 137s Removing linux-headers-6.8.0-11 (6.8.0-11.11) ... 138s Removing python3-lib2to3 (3.12.2-3ubuntu2) ... 140s autopkgtest [05:01:09]: rebooting testbed after setup commands that affected boot 179s autopkgtest [05:01:48]: testbed running kernel: Linux 5.15.0-101-generic #111-Ubuntu SMP Wed Mar 6 18:01:01 UTC 2024 203s autopkgtest [05:02:12]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 213s Get:1 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (dsc) [1896 B] 213s Get:2 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 213s Get:3 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (diff) [3144 B] 213s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 213s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 213s gpgv: Can't check signature: No public key 213s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 213s autopkgtest [05:02:22]: testing package git-imerge version 1.2.0-5 215s autopkgtest [05:02:24]: build not needed 217s autopkgtest [05:02:26]: test pybuild-autopkgtest: preparing testbed 229s Reading package lists... 229s Building dependency tree... 229s Reading state information... 229s Starting pkgProblemResolver with broken count: 0 230s Starting 2 pkgProblemResolver with broken count: 0 230s Done 231s The following additional packages will be installed: 231s autoconf automake autopoint autotools-dev build-essential cpp cpp-13 231s cpp-13-arm-linux-gnueabihf cpp-arm-linux-gnueabihf debhelper debugedit 231s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 231s g++-13-arm-linux-gnueabihf g++-arm-linux-gnueabihf gcc gcc-13 231s gcc-13-arm-linux-gnueabihf gcc-arm-linux-gnueabihf gettext git git-imerge 231s git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 libc-dev-bin 231s libc6-dev libcc1-0 libcrypt-dev libdebhelper-perl libdw1t64 liberror-perl 231s libfile-stripnondeterminism-perl libgcc-13-dev libgomp1 libisl23 231s libjs-jquery libjs-sphinxdoc libjs-underscore libmpc3 libpkgconf3 231s libstdc++-13-dev libsub-override-perl libtool libubsan1 linux-libc-dev m4 231s pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest 231s python3-cachetools python3-colorama python3-distlib python3-filelock 231s python3-packaging python3-pip-whl python3-platformdirs python3-pluggy 231s python3-pyproject-api python3-setuptools-whl python3-virtualenv 231s python3-wheel python3-wheel-whl rpcsvc-proto tox 231s Suggested packages: 231s autoconf-archive gnu-standards autoconf-doc cpp-doc gcc-13-locales 231s cpp-13-doc dh-make flit python3-build python3-installer gcc-13-doc 231s gcc-multilib manpages-dev flex bison gdb gcc-doc gdb-arm-linux-gnueabihf 231s gettext-doc libasprintf-dev libgettextpo-dev git-daemon-run 231s | git-daemon-sysvinit git-doc git-email git-gui gitk gitweb git-cvs 231s git-mediawiki git-svn git-mergify-rebase mergify glibc-doc libstdc++-13-doc 231s libtool-doc gfortran | fortran95-compiler gcj-jdk m4-doc libmail-box-perl 231s Recommended packages: 231s manpages manpages-dev libc-devtools libarchive-cpio-perl javascript-common 231s libltdl-dev libmail-sendmail-perl python3-dev python3-distutils 231s The following NEW packages will be installed: 231s autoconf automake autopkgtest-satdep autopoint autotools-dev build-essential 231s cpp cpp-13 cpp-13-arm-linux-gnueabihf cpp-arm-linux-gnueabihf debhelper 231s debugedit dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 231s g++-13-arm-linux-gnueabihf g++-arm-linux-gnueabihf gcc gcc-13 231s gcc-13-arm-linux-gnueabihf gcc-arm-linux-gnueabihf gettext git git-imerge 231s git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 libc-dev-bin 231s libc6-dev libcc1-0 libcrypt-dev libdebhelper-perl libdw1t64 liberror-perl 231s libfile-stripnondeterminism-perl libgcc-13-dev libgomp1 libisl23 231s libjs-jquery libjs-sphinxdoc libjs-underscore libmpc3 libpkgconf3 231s libstdc++-13-dev libsub-override-perl libtool libubsan1 linux-libc-dev m4 231s pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest 231s python3-cachetools python3-colorama python3-distlib python3-filelock 231s python3-packaging python3-pip-whl python3-platformdirs python3-pluggy 231s python3-pyproject-api python3-setuptools-whl python3-virtualenv 231s python3-wheel python3-wheel-whl rpcsvc-proto tox 231s 0 upgraded, 74 newly installed, 0 to remove and 1 not upgraded. 231s Need to get 61.4 MB/61.4 MB of archives. 231s After this operation, 191 MB of additional disk space will be used. 231s Get:1 /tmp/autopkgtest.KmXxEo/1-autopkgtest-satdep.deb autopkgtest-satdep armhf 0 [816 B] 231s Get:2 http://ftpmaster.internal/ubuntu noble/main armhf m4 armhf 1.4.19-4 [235 kB] 231s Get:3 http://ftpmaster.internal/ubuntu noble/main armhf autoconf all 2.71-3 [339 kB] 231s Get:4 http://ftpmaster.internal/ubuntu noble/main armhf autotools-dev all 20220109.1 [44.9 kB] 231s Get:5 http://ftpmaster.internal/ubuntu noble/main armhf automake all 1:1.16.5-1.3ubuntu1 [558 kB] 231s Get:6 http://ftpmaster.internal/ubuntu noble/main armhf autopoint all 0.21-14ubuntu1 [422 kB] 231s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libc-dev-bin armhf 2.39-0ubuntu6 [19.1 kB] 231s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/main armhf linux-libc-dev armhf 6.8.0-20.20 [1555 kB] 231s Get:9 http://ftpmaster.internal/ubuntu noble/main armhf libcrypt-dev armhf 1:4.4.36-4 [136 kB] 231s Get:10 http://ftpmaster.internal/ubuntu noble/main armhf rpcsvc-proto armhf 1.4.2-0ubuntu6 [63.7 kB] 231s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libc6-dev armhf 2.39-0ubuntu6 [1351 kB] 231s Get:12 http://ftpmaster.internal/ubuntu noble/main armhf libisl23 armhf 0.26-3 [595 kB] 231s Get:13 http://ftpmaster.internal/ubuntu noble/main armhf libmpc3 armhf 1.3.1-1 [46.4 kB] 231s Get:14 http://ftpmaster.internal/ubuntu noble-proposed/main armhf cpp-13-arm-linux-gnueabihf armhf 13.2.0-19ubuntu1 [8753 kB] 232s Get:15 http://ftpmaster.internal/ubuntu noble-proposed/main armhf cpp-13 armhf 13.2.0-19ubuntu1 [1036 B] 232s Get:16 http://ftpmaster.internal/ubuntu noble/main armhf cpp-arm-linux-gnueabihf armhf 4:13.2.0-7ubuntu1 [5320 B] 232s Get:17 http://ftpmaster.internal/ubuntu noble/main armhf cpp armhf 4:13.2.0-7ubuntu1 [22.4 kB] 232s Get:18 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libcc1-0 armhf 14-20240315-1ubuntu1 [39.0 kB] 232s Get:19 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgomp1 armhf 14-20240315-1ubuntu1 [125 kB] 232s Get:20 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libatomic1 armhf 14-20240315-1ubuntu1 [7824 B] 232s Get:21 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libasan8 armhf 14-20240315-1ubuntu1 [2941 kB] 232s Get:22 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libubsan1 armhf 14-20240315-1ubuntu1 [1152 kB] 232s Get:23 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libgcc-13-dev armhf 13.2.0-19ubuntu1 [900 kB] 232s Get:24 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gcc-13-arm-linux-gnueabihf armhf 13.2.0-19ubuntu1 [16.8 MB] 232s Get:25 http://ftpmaster.internal/ubuntu noble-proposed/main armhf gcc-13 armhf 13.2.0-19ubuntu1 [448 kB] 232s Get:26 http://ftpmaster.internal/ubuntu noble/main armhf gcc-arm-linux-gnueabihf armhf 4:13.2.0-7ubuntu1 [1220 B] 232s Get:27 http://ftpmaster.internal/ubuntu noble/main armhf gcc armhf 4:13.2.0-7ubuntu1 [5022 B] 232s Get:28 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libstdc++-13-dev armhf 13.2.0-19ubuntu1 [2403 kB] 233s Get:29 http://ftpmaster.internal/ubuntu noble-proposed/main armhf g++-13-arm-linux-gnueabihf armhf 13.2.0-19ubuntu1 [9935 kB] 233s Get:30 http://ftpmaster.internal/ubuntu noble-proposed/main armhf g++-13 armhf 13.2.0-19ubuntu1 [14.5 kB] 233s Get:31 http://ftpmaster.internal/ubuntu noble/main armhf g++-arm-linux-gnueabihf armhf 4:13.2.0-7ubuntu1 [966 B] 233s Get:32 http://ftpmaster.internal/ubuntu noble/main armhf g++ armhf 4:13.2.0-7ubuntu1 [1090 B] 233s Get:33 http://ftpmaster.internal/ubuntu noble/main armhf build-essential armhf 12.10ubuntu1 [4928 B] 233s Get:34 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libdebhelper-perl all 13.14.1ubuntu5 [89.8 kB] 233s Get:35 http://ftpmaster.internal/ubuntu noble/main armhf libtool all 2.4.7-7 [166 kB] 233s Get:36 http://ftpmaster.internal/ubuntu noble/main armhf dh-autoreconf all 20 [16.1 kB] 233s Get:37 http://ftpmaster.internal/ubuntu noble/main armhf libarchive-zip-perl all 1.68-1 [90.2 kB] 233s Get:38 http://ftpmaster.internal/ubuntu noble/main armhf libsub-override-perl all 0.10-1 [10.0 kB] 233s Get:39 http://ftpmaster.internal/ubuntu noble/main armhf libfile-stripnondeterminism-perl all 1.13.1-1 [18.1 kB] 233s Get:40 http://ftpmaster.internal/ubuntu noble/main armhf dh-strip-nondeterminism all 1.13.1-1 [5362 B] 233s Get:41 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libdw1t64 armhf 0.190-1.1build2 [235 kB] 233s Get:42 http://ftpmaster.internal/ubuntu noble-proposed/main armhf debugedit armhf 1:5.0-5build1 [42.2 kB] 233s Get:43 http://ftpmaster.internal/ubuntu noble-proposed/main armhf dwz armhf 0.15-1build5 [116 kB] 233s Get:44 http://ftpmaster.internal/ubuntu noble/main armhf gettext armhf 0.21-14ubuntu1 [800 kB] 233s Get:45 http://ftpmaster.internal/ubuntu noble/main armhf intltool-debian all 0.35.0+20060710.6 [23.2 kB] 233s Get:46 http://ftpmaster.internal/ubuntu noble/main armhf po-debconf all 1.0.21+nmu1 [233 kB] 233s Get:47 http://ftpmaster.internal/ubuntu noble-proposed/main armhf debhelper all 13.14.1ubuntu5 [869 kB] 233s Get:48 http://ftpmaster.internal/ubuntu noble/universe armhf dh-python all 6.20231223ubuntu2 [111 kB] 233s Get:49 http://ftpmaster.internal/ubuntu noble/main armhf liberror-perl all 0.17029-2 [25.6 kB] 233s Get:50 http://ftpmaster.internal/ubuntu noble-proposed/main armhf git-man all 1:2.43.0-1ubuntu5 [1099 kB] 233s Get:51 http://ftpmaster.internal/ubuntu noble-proposed/main armhf git armhf 1:2.43.0-1ubuntu5 [4389 kB] 233s Get:52 http://ftpmaster.internal/ubuntu noble/universe armhf git-imerge all 1.2.0-5 [49.5 kB] 233s Get:53 http://ftpmaster.internal/ubuntu noble/main armhf libjs-jquery all 3.6.1+dfsg+~3.5.14-1 [328 kB] 233s Get:54 http://ftpmaster.internal/ubuntu noble/main armhf libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 233s Get:55 http://ftpmaster.internal/ubuntu noble-proposed/main armhf libjs-sphinxdoc all 7.2.6-5 [149 kB] 233s Get:56 http://ftpmaster.internal/ubuntu noble/main armhf libpkgconf3 armhf 1.8.1-2 [26.3 kB] 233s Get:57 http://ftpmaster.internal/ubuntu noble/main armhf pkgconf-bin armhf 1.8.1-2 [20.6 kB] 233s Get:58 http://ftpmaster.internal/ubuntu noble/main armhf pkgconf armhf 1.8.1-2 [16.7 kB] 233s Get:59 http://ftpmaster.internal/ubuntu noble/main armhf pkg-config armhf 1.8.1-2 [7170 B] 233s Get:60 http://ftpmaster.internal/ubuntu noble/universe armhf pybuild-plugin-autopkgtest all 6.20231223ubuntu2 [1760 B] 233s Get:61 http://ftpmaster.internal/ubuntu noble/main armhf python3-cachetools all 5.3.0-2 [10.6 kB] 233s Get:62 http://ftpmaster.internal/ubuntu noble/main armhf python3-colorama all 0.4.6-4 [32.1 kB] 233s Get:63 http://ftpmaster.internal/ubuntu noble/universe armhf python3-distlib all 0.3.8-1 [318 kB] 233s Get:64 http://ftpmaster.internal/ubuntu noble/universe armhf python3-filelock all 3.13.1-1 [10.8 kB] 233s Get:65 http://ftpmaster.internal/ubuntu noble/main armhf python3-packaging all 23.2-1 [40.6 kB] 233s Get:66 http://ftpmaster.internal/ubuntu noble-proposed/universe armhf python3-pip-whl all 24.0+dfsg-1ubuntu1 [1702 kB] 233s Get:67 http://ftpmaster.internal/ubuntu noble/universe armhf python3-platformdirs all 4.2.0-1 [16.1 kB] 233s Get:68 http://ftpmaster.internal/ubuntu noble/universe armhf python3-pluggy all 1.4.0-1 [20.4 kB] 233s Get:69 http://ftpmaster.internal/ubuntu noble/universe armhf python3-pyproject-api all 1.6.1-1 [50.9 kB] 233s Get:70 http://ftpmaster.internal/ubuntu noble-proposed/universe armhf python3-setuptools-whl all 68.1.2-2ubuntu1 [715 kB] 233s Get:71 http://ftpmaster.internal/ubuntu noble-proposed/universe armhf python3-wheel-whl all 0.42.0-2 [67.8 kB] 233s Get:72 http://ftpmaster.internal/ubuntu noble-proposed/universe armhf python3-virtualenv all 20.25.0+ds-2 [70.8 kB] 233s Get:73 http://ftpmaster.internal/ubuntu noble-proposed/universe armhf python3-wheel all 0.42.0-2 [53.1 kB] 233s Get:74 http://ftpmaster.internal/ubuntu noble/universe armhf tox all 4.13.0-1 [302 kB] 234s Fetched 61.4 MB in 3s (20.9 MB/s) 234s Selecting previously unselected package m4. 234s (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 ... 58434 files and directories currently installed.) 234s Preparing to unpack .../00-m4_1.4.19-4_armhf.deb ... 234s Unpacking m4 (1.4.19-4) ... 234s Selecting previously unselected package autoconf. 234s Preparing to unpack .../01-autoconf_2.71-3_all.deb ... 234s Unpacking autoconf (2.71-3) ... 234s Selecting previously unselected package autotools-dev. 234s Preparing to unpack .../02-autotools-dev_20220109.1_all.deb ... 234s Unpacking autotools-dev (20220109.1) ... 234s Selecting previously unselected package automake. 234s Preparing to unpack .../03-automake_1%3a1.16.5-1.3ubuntu1_all.deb ... 234s Unpacking automake (1:1.16.5-1.3ubuntu1) ... 234s Selecting previously unselected package autopoint. 234s Preparing to unpack .../04-autopoint_0.21-14ubuntu1_all.deb ... 234s Unpacking autopoint (0.21-14ubuntu1) ... 234s Selecting previously unselected package libc-dev-bin. 234s Preparing to unpack .../05-libc-dev-bin_2.39-0ubuntu6_armhf.deb ... 234s Unpacking libc-dev-bin (2.39-0ubuntu6) ... 234s Selecting previously unselected package linux-libc-dev:armhf. 234s Preparing to unpack .../06-linux-libc-dev_6.8.0-20.20_armhf.deb ... 234s Unpacking linux-libc-dev:armhf (6.8.0-20.20) ... 234s Selecting previously unselected package libcrypt-dev:armhf. 234s Preparing to unpack .../07-libcrypt-dev_1%3a4.4.36-4_armhf.deb ... 234s Unpacking libcrypt-dev:armhf (1:4.4.36-4) ... 234s Selecting previously unselected package rpcsvc-proto. 234s Preparing to unpack .../08-rpcsvc-proto_1.4.2-0ubuntu6_armhf.deb ... 234s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 235s Selecting previously unselected package libc6-dev:armhf. 235s Preparing to unpack .../09-libc6-dev_2.39-0ubuntu6_armhf.deb ... 235s Unpacking libc6-dev:armhf (2.39-0ubuntu6) ... 235s Selecting previously unselected package libisl23:armhf. 235s Preparing to unpack .../10-libisl23_0.26-3_armhf.deb ... 235s Unpacking libisl23:armhf (0.26-3) ... 235s Selecting previously unselected package libmpc3:armhf. 235s Preparing to unpack .../11-libmpc3_1.3.1-1_armhf.deb ... 235s Unpacking libmpc3:armhf (1.3.1-1) ... 235s Selecting previously unselected package cpp-13-arm-linux-gnueabihf. 235s Preparing to unpack .../12-cpp-13-arm-linux-gnueabihf_13.2.0-19ubuntu1_armhf.deb ... 235s Unpacking cpp-13-arm-linux-gnueabihf (13.2.0-19ubuntu1) ... 235s Selecting previously unselected package cpp-13. 235s Preparing to unpack .../13-cpp-13_13.2.0-19ubuntu1_armhf.deb ... 235s Unpacking cpp-13 (13.2.0-19ubuntu1) ... 235s Selecting previously unselected package cpp-arm-linux-gnueabihf. 235s Preparing to unpack .../14-cpp-arm-linux-gnueabihf_4%3a13.2.0-7ubuntu1_armhf.deb ... 235s Unpacking cpp-arm-linux-gnueabihf (4:13.2.0-7ubuntu1) ... 235s Selecting previously unselected package cpp. 235s Preparing to unpack .../15-cpp_4%3a13.2.0-7ubuntu1_armhf.deb ... 235s Unpacking cpp (4:13.2.0-7ubuntu1) ... 235s Selecting previously unselected package libcc1-0:armhf. 235s Preparing to unpack .../16-libcc1-0_14-20240315-1ubuntu1_armhf.deb ... 235s Unpacking libcc1-0:armhf (14-20240315-1ubuntu1) ... 235s Selecting previously unselected package libgomp1:armhf. 235s Preparing to unpack .../17-libgomp1_14-20240315-1ubuntu1_armhf.deb ... 235s Unpacking libgomp1:armhf (14-20240315-1ubuntu1) ... 235s Selecting previously unselected package libatomic1:armhf. 235s Preparing to unpack .../18-libatomic1_14-20240315-1ubuntu1_armhf.deb ... 235s Unpacking libatomic1:armhf (14-20240315-1ubuntu1) ... 235s Selecting previously unselected package libasan8:armhf. 235s Preparing to unpack .../19-libasan8_14-20240315-1ubuntu1_armhf.deb ... 235s Unpacking libasan8:armhf (14-20240315-1ubuntu1) ... 235s Selecting previously unselected package libubsan1:armhf. 235s Preparing to unpack .../20-libubsan1_14-20240315-1ubuntu1_armhf.deb ... 235s Unpacking libubsan1:armhf (14-20240315-1ubuntu1) ... 235s Selecting previously unselected package libgcc-13-dev:armhf. 235s Preparing to unpack .../21-libgcc-13-dev_13.2.0-19ubuntu1_armhf.deb ... 235s Unpacking libgcc-13-dev:armhf (13.2.0-19ubuntu1) ... 235s Selecting previously unselected package gcc-13-arm-linux-gnueabihf. 235s Preparing to unpack .../22-gcc-13-arm-linux-gnueabihf_13.2.0-19ubuntu1_armhf.deb ... 235s Unpacking gcc-13-arm-linux-gnueabihf (13.2.0-19ubuntu1) ... 236s Selecting previously unselected package gcc-13. 236s Preparing to unpack .../23-gcc-13_13.2.0-19ubuntu1_armhf.deb ... 236s Unpacking gcc-13 (13.2.0-19ubuntu1) ... 236s Selecting previously unselected package gcc-arm-linux-gnueabihf. 236s Preparing to unpack .../24-gcc-arm-linux-gnueabihf_4%3a13.2.0-7ubuntu1_armhf.deb ... 236s Unpacking gcc-arm-linux-gnueabihf (4:13.2.0-7ubuntu1) ... 236s Selecting previously unselected package gcc. 236s Preparing to unpack .../25-gcc_4%3a13.2.0-7ubuntu1_armhf.deb ... 236s Unpacking gcc (4:13.2.0-7ubuntu1) ... 236s Selecting previously unselected package libstdc++-13-dev:armhf. 236s Preparing to unpack .../26-libstdc++-13-dev_13.2.0-19ubuntu1_armhf.deb ... 236s Unpacking libstdc++-13-dev:armhf (13.2.0-19ubuntu1) ... 236s Selecting previously unselected package g++-13-arm-linux-gnueabihf. 236s Preparing to unpack .../27-g++-13-arm-linux-gnueabihf_13.2.0-19ubuntu1_armhf.deb ... 236s Unpacking g++-13-arm-linux-gnueabihf (13.2.0-19ubuntu1) ... 236s Selecting previously unselected package g++-13. 236s Preparing to unpack .../28-g++-13_13.2.0-19ubuntu1_armhf.deb ... 236s Unpacking g++-13 (13.2.0-19ubuntu1) ... 236s Selecting previously unselected package g++-arm-linux-gnueabihf. 236s Preparing to unpack .../29-g++-arm-linux-gnueabihf_4%3a13.2.0-7ubuntu1_armhf.deb ... 236s Unpacking g++-arm-linux-gnueabihf (4:13.2.0-7ubuntu1) ... 236s Selecting previously unselected package g++. 236s Preparing to unpack .../30-g++_4%3a13.2.0-7ubuntu1_armhf.deb ... 236s Unpacking g++ (4:13.2.0-7ubuntu1) ... 236s Selecting previously unselected package build-essential. 236s Preparing to unpack .../31-build-essential_12.10ubuntu1_armhf.deb ... 236s Unpacking build-essential (12.10ubuntu1) ... 236s Selecting previously unselected package libdebhelper-perl. 236s Preparing to unpack .../32-libdebhelper-perl_13.14.1ubuntu5_all.deb ... 236s Unpacking libdebhelper-perl (13.14.1ubuntu5) ... 236s Selecting previously unselected package libtool. 236s Preparing to unpack .../33-libtool_2.4.7-7_all.deb ... 236s Unpacking libtool (2.4.7-7) ... 236s Selecting previously unselected package dh-autoreconf. 236s Preparing to unpack .../34-dh-autoreconf_20_all.deb ... 236s Unpacking dh-autoreconf (20) ... 237s Selecting previously unselected package libarchive-zip-perl. 237s Preparing to unpack .../35-libarchive-zip-perl_1.68-1_all.deb ... 237s Unpacking libarchive-zip-perl (1.68-1) ... 237s Selecting previously unselected package libsub-override-perl. 237s Preparing to unpack .../36-libsub-override-perl_0.10-1_all.deb ... 237s Unpacking libsub-override-perl (0.10-1) ... 237s Selecting previously unselected package libfile-stripnondeterminism-perl. 237s Preparing to unpack .../37-libfile-stripnondeterminism-perl_1.13.1-1_all.deb ... 237s Unpacking libfile-stripnondeterminism-perl (1.13.1-1) ... 237s Selecting previously unselected package dh-strip-nondeterminism. 237s Preparing to unpack .../38-dh-strip-nondeterminism_1.13.1-1_all.deb ... 237s Unpacking dh-strip-nondeterminism (1.13.1-1) ... 237s Selecting previously unselected package libdw1t64:armhf. 237s Preparing to unpack .../39-libdw1t64_0.190-1.1build2_armhf.deb ... 237s Unpacking libdw1t64:armhf (0.190-1.1build2) ... 237s Selecting previously unselected package debugedit. 237s Preparing to unpack .../40-debugedit_1%3a5.0-5build1_armhf.deb ... 237s Unpacking debugedit (1:5.0-5build1) ... 237s Selecting previously unselected package dwz. 237s Preparing to unpack .../41-dwz_0.15-1build5_armhf.deb ... 237s Unpacking dwz (0.15-1build5) ... 237s Selecting previously unselected package gettext. 237s Preparing to unpack .../42-gettext_0.21-14ubuntu1_armhf.deb ... 237s Unpacking gettext (0.21-14ubuntu1) ... 237s Selecting previously unselected package intltool-debian. 237s Preparing to unpack .../43-intltool-debian_0.35.0+20060710.6_all.deb ... 237s Unpacking intltool-debian (0.35.0+20060710.6) ... 237s Selecting previously unselected package po-debconf. 237s Preparing to unpack .../44-po-debconf_1.0.21+nmu1_all.deb ... 237s Unpacking po-debconf (1.0.21+nmu1) ... 237s Selecting previously unselected package debhelper. 237s Preparing to unpack .../45-debhelper_13.14.1ubuntu5_all.deb ... 237s Unpacking debhelper (13.14.1ubuntu5) ... 237s Selecting previously unselected package dh-python. 237s Preparing to unpack .../46-dh-python_6.20231223ubuntu2_all.deb ... 237s Unpacking dh-python (6.20231223ubuntu2) ... 237s Selecting previously unselected package liberror-perl. 237s Preparing to unpack .../47-liberror-perl_0.17029-2_all.deb ... 237s Unpacking liberror-perl (0.17029-2) ... 237s Selecting previously unselected package git-man. 237s Preparing to unpack .../48-git-man_1%3a2.43.0-1ubuntu5_all.deb ... 237s Unpacking git-man (1:2.43.0-1ubuntu5) ... 237s Selecting previously unselected package git. 237s Preparing to unpack .../49-git_1%3a2.43.0-1ubuntu5_armhf.deb ... 237s Unpacking git (1:2.43.0-1ubuntu5) ... 237s Selecting previously unselected package git-imerge. 238s Preparing to unpack .../50-git-imerge_1.2.0-5_all.deb ... 238s Unpacking git-imerge (1.2.0-5) ... 238s Selecting previously unselected package libjs-jquery. 238s Preparing to unpack .../51-libjs-jquery_3.6.1+dfsg+~3.5.14-1_all.deb ... 238s Unpacking libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 238s Selecting previously unselected package libjs-underscore. 238s Preparing to unpack .../52-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 238s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 238s Selecting previously unselected package libjs-sphinxdoc. 238s Preparing to unpack .../53-libjs-sphinxdoc_7.2.6-5_all.deb ... 238s Unpacking libjs-sphinxdoc (7.2.6-5) ... 238s Selecting previously unselected package libpkgconf3:armhf. 238s Preparing to unpack .../54-libpkgconf3_1.8.1-2_armhf.deb ... 238s Unpacking libpkgconf3:armhf (1.8.1-2) ... 238s Selecting previously unselected package pkgconf-bin. 238s Preparing to unpack .../55-pkgconf-bin_1.8.1-2_armhf.deb ... 238s Unpacking pkgconf-bin (1.8.1-2) ... 238s Selecting previously unselected package pkgconf:armhf. 238s Preparing to unpack .../56-pkgconf_1.8.1-2_armhf.deb ... 238s Unpacking pkgconf:armhf (1.8.1-2) ... 238s Selecting previously unselected package pkg-config:armhf. 238s Preparing to unpack .../57-pkg-config_1.8.1-2_armhf.deb ... 238s Unpacking pkg-config:armhf (1.8.1-2) ... 238s Selecting previously unselected package pybuild-plugin-autopkgtest. 238s Preparing to unpack .../58-pybuild-plugin-autopkgtest_6.20231223ubuntu2_all.deb ... 238s Unpacking pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 238s Selecting previously unselected package python3-cachetools. 238s Preparing to unpack .../59-python3-cachetools_5.3.0-2_all.deb ... 238s Unpacking python3-cachetools (5.3.0-2) ... 238s Selecting previously unselected package python3-colorama. 238s Preparing to unpack .../60-python3-colorama_0.4.6-4_all.deb ... 238s Unpacking python3-colorama (0.4.6-4) ... 238s Selecting previously unselected package python3-distlib. 238s Preparing to unpack .../61-python3-distlib_0.3.8-1_all.deb ... 238s Unpacking python3-distlib (0.3.8-1) ... 238s Selecting previously unselected package python3-filelock. 238s Preparing to unpack .../62-python3-filelock_3.13.1-1_all.deb ... 238s Unpacking python3-filelock (3.13.1-1) ... 238s Selecting previously unselected package python3-packaging. 238s Preparing to unpack .../63-python3-packaging_23.2-1_all.deb ... 238s Unpacking python3-packaging (23.2-1) ... 238s Selecting previously unselected package python3-pip-whl. 238s Preparing to unpack .../64-python3-pip-whl_24.0+dfsg-1ubuntu1_all.deb ... 238s Unpacking python3-pip-whl (24.0+dfsg-1ubuntu1) ... 238s Selecting previously unselected package python3-platformdirs. 238s Preparing to unpack .../65-python3-platformdirs_4.2.0-1_all.deb ... 238s Unpacking python3-platformdirs (4.2.0-1) ... 238s Selecting previously unselected package python3-pluggy. 238s Preparing to unpack .../66-python3-pluggy_1.4.0-1_all.deb ... 238s Unpacking python3-pluggy (1.4.0-1) ... 238s Selecting previously unselected package python3-pyproject-api. 238s Preparing to unpack .../67-python3-pyproject-api_1.6.1-1_all.deb ... 238s Unpacking python3-pyproject-api (1.6.1-1) ... 238s Selecting previously unselected package python3-setuptools-whl. 238s Preparing to unpack .../68-python3-setuptools-whl_68.1.2-2ubuntu1_all.deb ... 238s Unpacking python3-setuptools-whl (68.1.2-2ubuntu1) ... 238s Selecting previously unselected package python3-wheel-whl. 238s Preparing to unpack .../69-python3-wheel-whl_0.42.0-2_all.deb ... 238s Unpacking python3-wheel-whl (0.42.0-2) ... 238s Selecting previously unselected package python3-virtualenv. 238s Preparing to unpack .../70-python3-virtualenv_20.25.0+ds-2_all.deb ... 238s Unpacking python3-virtualenv (20.25.0+ds-2) ... 238s Selecting previously unselected package python3-wheel. 238s Preparing to unpack .../71-python3-wheel_0.42.0-2_all.deb ... 238s Unpacking python3-wheel (0.42.0-2) ... 238s Selecting previously unselected package tox. 238s Preparing to unpack .../72-tox_4.13.0-1_all.deb ... 238s Unpacking tox (4.13.0-1) ... 238s Selecting previously unselected package autopkgtest-satdep. 238s Preparing to unpack .../73-1-autopkgtest-satdep.deb ... 238s Unpacking autopkgtest-satdep (0) ... 238s Setting up dh-python (6.20231223ubuntu2) ... 239s Setting up python3-setuptools-whl (68.1.2-2ubuntu1) ... 239s Setting up python3-filelock (3.13.1-1) ... 239s Setting up python3-cachetools (5.3.0-2) ... 239s Setting up python3-colorama (0.4.6-4) ... 239s Setting up python3-pip-whl (24.0+dfsg-1ubuntu1) ... 239s Setting up libarchive-zip-perl (1.68-1) ... 239s Setting up libdebhelper-perl (13.14.1ubuntu5) ... 239s Setting up linux-libc-dev:armhf (6.8.0-20.20) ... 239s Setting up m4 (1.4.19-4) ... 239s Setting up python3-distlib (0.3.8-1) ... 239s Setting up libgomp1:armhf (14-20240315-1ubuntu1) ... 239s Setting up python3-wheel (0.42.0-2) ... 239s Setting up python3-platformdirs (4.2.0-1) ... 240s Setting up libdw1t64:armhf (0.190-1.1build2) ... 240s Setting up liberror-perl (0.17029-2) ... 240s Setting up autotools-dev (20220109.1) ... 240s Setting up python3-packaging (23.2-1) ... 240s Setting up libpkgconf3:armhf (1.8.1-2) ... 240s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 240s Setting up libmpc3:armhf (1.3.1-1) ... 240s Setting up libatomic1:armhf (14-20240315-1ubuntu1) ... 240s Setting up autopoint (0.21-14ubuntu1) ... 240s Setting up pkgconf-bin (1.8.1-2) ... 240s Setting up autoconf (2.71-3) ... 240s Setting up python3-pluggy (1.4.0-1) ... 240s Setting up libubsan1:armhf (14-20240315-1ubuntu1) ... 240s Setting up dwz (0.15-1build5) ... 240s Setting up libcrypt-dev:armhf (1:4.4.36-4) ... 240s Setting up libasan8:armhf (14-20240315-1ubuntu1) ... 240s Setting up debugedit (1:5.0-5build1) ... 240s Setting up libsub-override-perl (0.10-1) ... 240s Setting up git-man (1:2.43.0-1ubuntu5) ... 240s Setting up libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 240s Setting up libisl23:armhf (0.26-3) ... 240s Setting up libc-dev-bin (2.39-0ubuntu6) ... 240s Setting up python3-wheel-whl (0.42.0-2) ... 240s Setting up libcc1-0:armhf (14-20240315-1ubuntu1) ... 240s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 240s Setting up automake (1:1.16.5-1.3ubuntu1) ... 240s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 240s Setting up libfile-stripnondeterminism-perl (1.13.1-1) ... 240s Setting up gettext (0.21-14ubuntu1) ... 240s Setting up cpp-13-arm-linux-gnueabihf (13.2.0-19ubuntu1) ... 240s Setting up python3-virtualenv (20.25.0+ds-2) ... 240s Setting up pkgconf:armhf (1.8.1-2) ... 240s Setting up intltool-debian (0.35.0+20060710.6) ... 240s Setting up pkg-config:armhf (1.8.1-2) ... 240s Setting up git (1:2.43.0-1ubuntu5) ... 240s Setting up libjs-sphinxdoc (7.2.6-5) ... 240s Setting up dh-strip-nondeterminism (1.13.1-1) ... 240s Setting up libgcc-13-dev:armhf (13.2.0-19ubuntu1) ... 240s Setting up libc6-dev:armhf (2.39-0ubuntu6) ... 240s Setting up cpp-arm-linux-gnueabihf (4:13.2.0-7ubuntu1) ... 240s Setting up libstdc++-13-dev:armhf (13.2.0-19ubuntu1) ... 240s Setting up cpp-13 (13.2.0-19ubuntu1) ... 240s Setting up po-debconf (1.0.21+nmu1) ... 240s Setting up python3-pyproject-api (1.6.1-1) ... 240s Setting up gcc-13-arm-linux-gnueabihf (13.2.0-19ubuntu1) ... 240s Setting up git-imerge (1.2.0-5) ... 240s Setting up gcc-13 (13.2.0-19ubuntu1) ... 240s Setting up cpp (4:13.2.0-7ubuntu1) ... 240s Setting up gcc-arm-linux-gnueabihf (4:13.2.0-7ubuntu1) ... 240s Setting up g++-13-arm-linux-gnueabihf (13.2.0-19ubuntu1) ... 240s Setting up g++-arm-linux-gnueabihf (4:13.2.0-7ubuntu1) ... 240s Setting up g++-13 (13.2.0-19ubuntu1) ... 240s Setting up tox (4.13.0-1) ... 241s Setting up libtool (2.4.7-7) ... 241s Setting up gcc (4:13.2.0-7ubuntu1) ... 241s Setting up dh-autoreconf (20) ... 241s Setting up g++ (4:13.2.0-7ubuntu1) ... 241s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 241s Setting up build-essential (12.10ubuntu1) ... 241s Setting up debhelper (13.14.1ubuntu5) ... 241s Setting up pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 241s Setting up autopkgtest-satdep (0) ... 241s Processing triggers for man-db (2.12.0-3build4) ... 242s Processing triggers for install-info (7.1-3build1) ... 242s Processing triggers for libc-bin (2.39-0ubuntu6) ... 255s (Reading database ... 64075 files and directories currently installed.) 255s Removing autopkgtest-satdep (0) ... 260s autopkgtest [05:03:09]: test pybuild-autopkgtest: pybuild-autopkgtest 260s autopkgtest [05:03:09]: test pybuild-autopkgtest: [----------------------- 262s pybuild-autopkgtest 263s I: pybuild base:305: cd /tmp/autopkgtest.KmXxEo/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.KmXxEo/build.2MW/src/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 263s py312: skip building and installing the package 263s py312: commands[0] /tmp/autopkgtest.KmXxEo/build.2MW/src> /bin/sh t/test-unconflicted 263s + dirname t/test-unconflicted 263s + cd t 263s + pwd 263s + dirname /tmp/autopkgtest.KmXxEo/build.2MW/src/t 263s + BASE=/tmp/autopkgtest.KmXxEo/build.2MW/src 263s + . /tmp/autopkgtest.KmXxEo/build.2MW/src/t/test-lib.sh 263s + GIT_IMERGE=git-imerge 263s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s + DESCRIPTION=git-imerge test repository without conflicts 263s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted git-imerge test repository without conflicts 263s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s + local description=git-imerge test repository without conflicts 263s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted git-imerge test repository without conflicts 263s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s + local description=git-imerge test repository without conflicts 263s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s hint: Using 'master' as the name for the initial branch. This default branch name 263s hint: is subject to change. To configure the initial branch name to use in all 263s hint: of your new repositories, which will suppress this warning, call: 263s hint: 263s hint: git config --global init.defaultBranch 263s hint: 263s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 263s hint: 'development'. The just-created branch can be renamed via this command: 263s hint: 263s hint: git branch -m 263s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted/.git/ 263s + echo git-imerge test repository without conflicts 263s + printf %s\n /*.out /*.css /*.html 263s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted/.git config user.name Loú User 263s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted/.git config user.email luser@example.com 263s + TIME=1112911993 263s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/unconflicted 263s + modify a.txt 0 263s + filename=a.txt 263s + text=0 263s + echo 0 263s + git add a.txt 263s [master (root-commit) 780ddf5] m⇒0 263s 2 files changed, 2 insertions(+) 263s create mode 100644 a.txt 263s create mode 100644 b.txt 263s [a b862e30] a⇒1 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [a dcbe282] a⇒2 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [a ecd8647] a⇒3 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify b.txt 0 263s + filename=b.txt 263s + text=0 263s + echo 0 263s + git add b.txt 263s + commit -m m⇒0 263s + TIME=1112911994 263s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 263s + git checkout -b a -- 263s Switched to a new branch 'a' 263s + seq 8 263s + modify a.txt 1 263s + filename=a.txt 263s + text=1 263s + echo 1 263s + git add a.txt 263s + commit -m a⇒1 263s + TIME=1112911995 263s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 263s + modify a.txt 2 263s + filename=a.txt 263s + text=2 263s + echo 2 263s + git add a.txt 263s + commit -m a⇒2 263s + TIME=1112911996 263s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 263s + modify a.txt 3 263s + filename=a.txt 263s + text=3 263s + echo 3 263s + git add a.txt 263s + commit -m a⇒3 263s + TIME=1112911997 263s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 263s + modify a.txt 4 263s + filename=a.txt 263s + text=4 263s + echo 4 263s + git add a.txt 263s + commit -m a⇒4 263s + TIME=1112911998 263s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 263s [a 1634bab] a⇒4 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify a.txt 5 263s + filename=a.txt 263s + text=5 263s + echo 5 263s + git add a.txt 263s + commit -m a⇒5 263s + TIME=1112911999 263s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 263s [a 909ce12] a⇒5 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify a.txt 6 263s + filename=a.txt 263s + text=6 263s + echo 6 263s + git add a.txt 263s + commit -m a⇒6 263s + TIME=1112912000 263s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 263s [a f6520bf] a⇒6 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify a.txt 7 263s + filename=a.txt 263s + text=7 263s + echo 7 263s + git add a.txt 263s + commit -m a⇒7 263s + TIME=1112912001 263s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 263s [a 6797186] a⇒7 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify a.txt 8 263s + filename=a.txt 263s + text=8 263s + echo 8 263s + git add a.txt 263s + commit -m a⇒8 263s + TIME=1112912002 263s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 263s [a 49643dd] a⇒8 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + git checkout -b b master -- 263s Switched to a new branch 'b' 263s + seq 5 263s + modify b.txt 1 263s + filename=b.txt 263s + text=1 263s + echo 1 263s + git add b.txt 263s + commit -m b⇒1 263s + TIME=1112912003 263s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 263s [b d43305b] b⇒1 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify b.txt 2 263s + filename=b.txt 263s + text=2 263s + echo 2 263s + git add b.txt 263s + commit -m b⇒2 263s + TIME=1112912004 263s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 263s [b 853ee68] b⇒2 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify b.txt 3 263s + filename=b.txt 263s + text=3 263s + echo 3 263s + git add b.txt 263s [b 03a2455] b⇒3 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + commit -m b⇒3 263s + TIME=1112912005 263s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 263s + modify b.txt 4 263s + filename=b.txt 263s + text=4 263s + echo 4 263s + git add b.txt 263s + commit -m b⇒4 263s + TIME=1112912006 263s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 263s + modify b.txt 5 263s + filename=b.txt 263s + text=5 263s + echo 5 263s + git add b.txt 263s [b 484ea85] b⇒4 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [b e22cd97] b⇒5 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + commit -m b⇒5 263s + TIME=1112912007 263s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 263s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 263s + git checkout a 263s Switched to branch 'a' 263s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 263s Attempting automerge of 8-5...success. 263s Autofilling 1-5...success. 263s Autofilling 2-5...success. 263s Autofilling 3-5...success. 263s Autofilling 4-5...success. 263s Autofilling 5-5...success. 263s Autofilling 6-5...success. 264s Autofilling 7-5...success. 264s Autofilling 8-1...success. 264s Autofilling 8-2...success. 264s Autofilling 8-3...success. 264s Autofilling 8-4...success. 264s Autofilling 8-5 (first way)...success. 264s Autofilling 8-5 (second way)...success. 264s The two ways of autofilling 8-5 agree. 264s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 264s Merge is complete! 264s + git-imerge list 264s * a-b 264s + git-imerge diagram --commits --frontier --html=imerge3.html 264s 0 5 8 264s | | | 264s 0 - ********* - a 264s *???????. 264s *???????. 264s *???????. 264s *???????. 264s 5 - *........ 264s | 264s b 264s 264s 0 5 8 264s | | | 264s 0 - ********* - a 264s *???????| 264s *???????| 264s *???????| 264s *???????| 264s 5 - *-------+ 264s | 264s b 264s 264s Key: 264s |,-,+ = rectangles forming current merge frontier 264s * = merge done manually 264s . = merge done automatically 264s # = conflict that is currently blocking progress 264s @ = merge was blocked but has been resolved 264s ? = no merge recorded 264s 264s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 264s Merge b into a (using imerge) 264s 264s # Please enter the commit message for your changes. Lines starting 264s # with '#' will be ignored, and an empty message aborts the commit. 264s # 264s # Date: Thu Mar 21 05:03:13 2024 +0000 264s # 264s # On branch a-b-merge 264s # Changes to be committed: 264s # modified: b.txt 264s # 264s [a-b-merge 51bce35] Merge b into a (using imerge) 264s Date: Thu Mar 21 05:03:13 2024 +0000 264s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 264s + local refname=a-b-merge 264s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 264s + git rev-parse a-b-merge^{tree} 264s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 264s + git-imerge simplify --goal=rebase --branch=a-b-rebase 264s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 264s + local refname=a-b-rebase 264s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 264s + git rev-parse a-b-rebase^{tree} 264s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 264s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 265s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + local refname=a-b-rebase-with-history 265s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git rev-parse a-b-rebase-with-history^{tree} 265s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git-imerge simplify --goal=border --branch=a-b-border 265s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + local refname=a-b-border 265s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git rev-parse a-b-border^{tree} 265s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 265s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + local refname=a-b-border-with-history 265s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git rev-parse a-b-border-with-history^{tree} 265s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 265s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + local refname=a-b-border-with-history2 265s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git rev-parse a-b-border-with-history2^{tree} 265s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 265s + git-imerge remove 265s + git checkout a 265s Switched to branch 'a' 265s + git-imerge start --goal=full --name=a-b b 266s Attempting to merge 1-1...success. 266s Attempting to merge 1-2...success. 266s Attempting to merge 1-3...success. 266s Attempting to merge 1-4...success. 266s Attempting to merge 1-5...success. 266s Attempting to merge 2-1...success. 266s Attempting to merge 2-2...success. 266s Attempting to merge 2-3...success. 266s Attempting to merge 2-4...success. 266s Attempting to merge 2-5...success. 266s Attempting to merge 3-1...success. 266s Attempting to merge 3-2...success. 266s Attempting to merge 3-3...success. 266s Attempting to merge 3-4...success. 266s Attempting to merge 3-5...success. 266s Attempting to merge 4-1...success. 266s Attempting to merge 4-2...success. 266s Attempting to merge 4-3...success. 266s Attempting to merge 4-4...success. 266s Attempting to merge 4-5...success. 266s Attempting to merge 5-1...success. 266s Attempting to merge 5-2...success. 266s Attempting to merge 5-3...success. 266s Attempting to merge 5-4...success. 266s Attempting to merge 5-5...success. 266s Attempting to merge 6-1...success. 266s Attempting to merge 6-2...success. 266s Attempting to merge 6-3...success. 266s Attempting to merge 6-4...success. 266s Attempting to merge 6-5...success. 266s Attempting to merge 7-1...success. 266s Attempting to merge 7-2...success. 266s Attempting to merge 7-3...success. 266s Attempting to merge 7-4...success. 266s Attempting to merge 7-5...success. 266s Attempting to merge 8-1...success. 266s Attempting to merge 8-2...success. 266s Attempting to merge 8-3...success. 266s Attempting to merge 8-4...success. 266s Attempting to merge 8-5...success. 266s Merge is complete! 267s + git-imerge list 267s * a-b 267s + git-imerge diagram --commits --frontier --html=imerge4.html 267s 0 5 8 267s | | | 267s 0 - ********* - a 267s *........ 267s *........ 267s *........ 267s *........ 267s 5 - *........ 267s | 267s b 267s 267s 0 5 8 267s | | | 267s 0 - ********* - a 267s *.......| 267s *.......| 267s *.......| 267s *.......| 267s 5 - *-------+ 267s | 267s b 267s 267s Key: 267s |,-,+ = rectangles forming current merge frontier 267s * = merge done manually 267s . = merge done automatically 267s # = conflict that is currently blocking progress 267s @ = merge was blocked but has been resolved 267s ? = no merge recorded 267s 267s + git-imerge finish --branch=a-b-full 267s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 267s + local refname=a-b-full 267s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 267s + git rev-parse a-b-full^{tree} 267s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 267s + dirname t/test-conflicted 267s + cd t 267s + pwd 267s + dirname /tmp/autopkgtest.KmXxEo/build.2MW/src/t 267s + BASE=/tmp/autopkgtest.KmXxEo/build.2MW/src 267s + . /tmp/autopkgtest.KmXxEo/build.2MW/src/t/test-lib.sh 267s + GIT_IMERGE=git-imerge 267s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + test_conflict 4-3 267s + local conflict=4-3 267s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s + DESCRIPTION=git-imerge test repository with conflict at 4-3 267s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 267s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s + local description=git-imerge test repository with conflict at 4-3 267s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 267s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s + local description=git-imerge test repository with conflict at 4-3 267s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s py312: commands[1] /tmp/autopkgtest.KmXxEo/build.2MW/src> /bin/sh t/test-conflicted 267s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s hint: Using 'master' as the name for the initial branch. This default branch name 267s hint: is subject to change. To configure the initial branch name to use in all 267s hint: of your new repositories, which will suppress this warning, call: 267s hint: 267s hint: git config --global init.defaultBranch 267s hint: 267s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 267s hint: 'development'. The just-created branch can be renamed via this command: 267s hint: 267s hint: git branch -m 267s + echo git-imerge test repository with conflict at 4-3 267s + printf %s\n /*.out /*.css /*.html 267s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3/.git config user.name Loú User 267s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 267s + TIME=1112911993 267s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3 267s + modify c.txt 0 267s + filename=c.txt 267s + text=0 267s + echo 0 267s + git add c.txt 267s + modify d.txt 0 267s + filename=d.txt 267s + text=0 267s + echo 0 267s + git add d.txt 267s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-4-3/.git/ 267s + modify conflict.txt original version 267s + filename=conflict.txt 267s + text=original version 267s + echo original version 267s + git add conflict.txt 267s + commit -m m⇒0 267s + TIME=1112911994 267s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 267s + git checkout -b c master -- 267s [master (root-commit) d70e04b] m⇒0 267s 3 files changed, 3 insertions(+) 267s create mode 100644 c.txt 267s create mode 100644 conflict.txt 267s create mode 100644 d.txt 267s Switched to a new branch 'c' 267s + seq 9 267s + modify c.txt 1 267s + filename=c.txt 267s + text=1 267s + echo 1 267s + git add c.txt 267s + commit -m c⇒1 267s + TIME=1112911995 267s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 267s [c 89e2141] c⇒1 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s [c 7c431f2] c⇒2 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s [c f02ab24] c⇒3 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + modify c.txt 2 267s + filename=c.txt 267s + text=2 267s + echo 2 267s + git add c.txt 267s + commit -m c⇒2 267s + TIME=1112911996 267s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 267s + modify c.txt 3 267s + filename=c.txt 267s + text=3 267s + echo 3 267s + git add c.txt 267s + commit -m c⇒3 267s + TIME=1112911997 267s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 267s + modify c.txt 4 267s + filename=c.txt 267s + text=4 267s + echo 4 267s + git add c.txt 267s + modify conflict.txt c version 267s + filename=conflict.txt 267s + text=c version 267s + echo c version 267s + git add conflict.txt 267s + commit -m c⇒4 267s + TIME=1112911998 267s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 267s + modify c.txt 5 267s + filename=c.txt 267s + text=5 267s + echo 5 267s + git add c.txt 267s [c 3c091de] c⇒4 267s 2 files changed, 2 insertions(+), 2 deletions(-) 267s + commit -m c⇒5 267s + TIME=1112911999 267s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 267s [c a0ac37a] c⇒5 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + modify c.txt 6 267s + filename=c.txt 267s + text=6 267s + echo 6 267s + git add c.txt 267s + commit -m c⇒6 267s + TIME=1112912000 267s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 267s + modify c.txt 7 267s + filename=c.txt 267s + text=7 267s + echo 7 267s + git add c.txt 267s [c ed9fdfa] c⇒6 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + commit -m c⇒7 267s + TIME=1112912001 267s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 267s [c 1da7bf5] c⇒7 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + modify c.txt 8 267s + filename=c.txt 267s + text=8 267s + echo 8 267s + git add c.txt 267s + commit -m c⇒8 267s + TIME=1112912002 267s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 267s [c d8de99f] c⇒8 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + modify c.txt 9 267s + filename=c.txt 267s + text=9 267s + echo 9 267s + git add c.txt 267s + commit -m c⇒9 267s + TIME=1112912003 267s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 267s + git checkout -b d master -- 267s Switched to a new branch 'd' 267s + seq 6 267s [c 9cde605] c⇒9 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + modify d.txt 1 267s + filename=d.txt 267s + text=1 267s + echo 1 267s + git add d.txt 267s + commit -m d⇒1 267s + TIME=1112912004 267s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 267s + modify d.txt 2 267s + filename=d.txt 267s + text=2 267s + echo 2 267s + git add d.txt 267s [d bd5368a] d⇒1 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + commit -m d⇒2 267s + TIME=1112912005 267s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 267s [d 93e27e6] d⇒2 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + modify d.txt 3 267s + filename=d.txt 267s + text=3 267s + echo 3 267s + git add d.txt 267s + modify conflict.txt d version 267s + filename=conflict.txt 267s + text=d version 267s + echo d version 267s + git add conflict.txt 267s + commit -m d⇒3 267s + TIME=1112912006 267s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 267s + modify d.txt 4 267s + filename=d.txt 267s + text=4 267s + echo 4 267s + git add d.txt 267s + commit -m d⇒4 267s + TIME=1112912007 267s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 267s [d 2bb1a7e] d⇒3 267s 2 files changed, 2 insertions(+), 2 deletions(-) 267s + modify d.txt 5 267s + filename=d.txt 267s + text=5 267s + echo 5 267s + git add d.txt 267s [d 81f9c80] d⇒4 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + commit -m d⇒5 267s + TIME=1112912008 267s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 267s [d 3690dde] d⇒5 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + modify d.txt 6 267s + filename=d.txt 267s + text=6 267s + echo 6 267s + git add d.txt 267s + commit -m d⇒6 267s + TIME=1112912009 267s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 267s [d 8085853] d⇒6 267s 1 file changed, 1 insertion(+), 1 deletion(-) 267s + git checkout c 267s Switched to branch 'c' 267s + git-imerge init --name=c-d d 267s + git-imerge list 267s * c-d 267s + git-imerge diagram --commits --frontier --html=imerge0.html 268s 0 5 9 268s | | | 268s 0 - ********** - c 268s *????????? 268s *????????? 268s *????????? 268s *????????? 268s 5 - *????????? 268s 6 - *????????? 268s | 268s d 268s 268s 0 5 9 268s | | | 268s 0 - ********** - c 268s *????????? 268s *????????? 268s *????????? 268s *????????? 268s 5 - *????????? 268s 6 - *????????? 268s | 268s d 268s 268s Key: 268s |,-,+ = rectangles forming current merge frontier 268s * = merge done manually 268s . = merge done automatically 268s # = conflict that is currently blocking progress 268s @ = merge was blocked but has been resolved 268s ? = no merge recorded 268s 268s + git-imerge autofill 268s + tee autofill.out 268s Attempting automerge of 9-6...failure. 268s Attempting automerge of 1-1...success. 268s Attempting automerge of 1-4...success. 268s Attempting automerge of 1-6...success. 268s Attempting automerge of 9-6...failure. 268s Attempting automerge of 5-6...failure. 268s Attempting automerge of 3-6...success. 268s Attempting automerge of 4-6...failure. 268s Attempting automerge of 4-1...success. 268s Attempting automerge of 4-4...failure. 268s Attempting automerge of 4-3...failure. 268s Attempting automerge of 4-2...success. 268s Attempting automerge of 9-2...success. 268s Autofilling 1-6...success. 268s Autofilling 2-6...success. 268s Autofilling 3-1...success. 268s Autofilling 3-2...success. 268s Autofilling 3-3...success. 268s Autofilling 3-4...success. 268s Autofilling 3-5...success. 268s Autofilling 3-6 (first way)...success. 268s Autofilling 3-6 (second way)...success. 268s The two ways of autofilling 3-6 agree. 268s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 268s Autofilling 4-2...success. 268s Autofilling 5-2...success. 268s Autofilling 6-2...success. 268s Autofilling 7-2...success. 268s Autofilling 8-2...success. 268s Autofilling 9-1...success. 268s Autofilling 9-2 (first way)...success. 268s Autofilling 9-2 (second way)...success. 268s The two ways of autofilling 9-2 agree. 268s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 268s Attempting automerge of 9-6...failure. 268s Attempting automerge of 4-3...failure. 268s HEAD is now at 9cde605 c⇒9 268s Conflict; suggest manual merge of 4-3 268s + grep -q Traceback autofill.out 268s + grep -q suggest manual merge of 4-3 autofill.out 268s + git-imerge diagram --commits --frontier --html=imerge1.html 268s 0 5 9 268s | | | 268s 0 - ********** - c 268s *??.?????. 268s *??....... 268s *??.#????? 268s *??.?????? 268s 5 - *??.?????? 268s 6 - *...?????? 268s | 268s d 268s 268s 0 5 9 268s | | | 268s 0 - ********** - c 268s *??.?????| 268s *??.-----+ 268s *??|#????? 268s *??|?????? 268s 5 - *??|?????? 268s 6 - *--+?????? 268s | 268s d 268s 268s Key: 268s |,-,+ = rectangles forming current merge frontier 268s * = merge done manually 268s . = merge done automatically 268s # = conflict that is currently blocking progress 268s @ = merge was blocked but has been resolved 268s ? = no merge recorded 268s 268s + git-imerge continue --edit 269s Switched to branch 'imerge/c-d' 269s Auto-merging conflict.txt 269s CONFLICT (content): Merge conflict in conflict.txt 269s Automatic merge failed; fix conflicts and then commit the result. 269s 269s Original first commit: 269s commit 3c091ded129a5edf9061360bab867edade996c93 269s Author: Loú User 269s Date: Thu Apr 7 22:13:18 2005 +0000 269s 269s c⇒4 269s 269s Original second commit: 269s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 269s Author: Loú User 269s Date: Thu Apr 7 22:13:26 2005 +0000 269s 269s d⇒3 269s 269s There was a conflict merging commit 4-3, shown above. 269s Please resolve the conflict, commit the result, then type 269s 269s git-imerge continue 269s + echo merged version 269s + git add conflict.txt 269s + git-imerge continue --no-edit 269s [imerge/c-d 7c614d2] imerge 'c-d': manual merge 4-3 269s Merge has been recorded for merge 4-3. 269s Attempting automerge of 4-6...success. 269s Autofilling 4-4...success. 269s Autofilling 4-5...success. 269s Autofilling 4-6...success. 269s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 269s Attempting automerge of 9-6...success. 269s Autofilling 5-6...success. 269s Autofilling 6-6...success. 269s Autofilling 7-6...success. 269s Autofilling 8-6...success. 269s Autofilling 9-3...success. 269s Autofilling 9-4...success. 269s Autofilling 9-5...success. 269s Autofilling 9-6 (first way)...success. 269s Autofilling 9-6 (second way)...success. 269s The two ways of autofilling 9-6 agree. 269s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 269s Merge is complete! 269s + git-imerge diagram --commits --frontier --html=imerge2.html 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *??.?????. 269s *??....... 269s *??.*????. 269s *??..????. 269s 5 - *??..????. 269s 6 - *......... 269s | 269s d 269s 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *??.?????| 269s *??......| 269s *??.*????| 269s *??..????| 269s 5 - *??..????| 269s 6 - *--------+ 269s | 269s d 269s 269s Key: 269s |,-,+ = rectangles forming current merge frontier 269s * = merge done manually 269s . = merge done automatically 269s # = conflict that is currently blocking progress 269s @ = merge was blocked but has been resolved 269s ? = no merge recorded 269s 269s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 269s Merge d into c (using imerge) 269s 269s # Please enter the commit message for your changes. Lines starting 269s # with '#' will be ignored, and an empty message aborts the commit. 269s # 269s # Date: Thu Mar 21 05:03:18 2024 +0000 269s # 269s # On branch c-d-merge 269s # Changes to be committed: 269s # modified: conflict.txt 269s # modified: d.txt 269s # 269s [c-d-merge e97f340] Merge d into c (using imerge) 269s Date: Thu Mar 21 05:03:18 2024 +0000 269s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 269s + local refname=c-d-merge 269s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 269s + git rev-parse c-d-merge^{tree} 269s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 269s + git-imerge simplify --goal=rebase --branch=c-d-rebase 270s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + local refname=c-d-rebase 270s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git rev-parse c-d-rebase^{tree} 270s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 270s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + local refname=c-d-rebase-with-history 270s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git rev-parse c-d-rebase-with-history^{tree} 270s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git-imerge simplify --goal=border --branch=c-d-border 270s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + local refname=c-d-border 270s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git rev-parse c-d-border^{tree} 270s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 270s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + local refname=c-d-border-with-history 270s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git rev-parse c-d-border-with-history^{tree} 270s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 271s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 271s + local refname=c-d-border-with-history2 271s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 271s + git rev-parse c-d-border-with-history2^{tree} 271s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 271s + git-imerge remove 271s + git checkout c 271s Switched to branch 'c' 271s + git-imerge start --goal=full --first-parent --name=c-d d 271s + tee start.out 271s Attempting to merge 1-1...success. 271s Attempting to merge 1-2...success. 271s Attempting to merge 1-3...success. 271s Attempting to merge 1-4...success. 271s Attempting to merge 1-5...success. 271s Attempting to merge 1-6...success. 271s Attempting to merge 2-1...success. 271s Attempting to merge 2-2...success. 271s Attempting to merge 2-3...success. 271s Attempting to merge 2-4...success. 271s Attempting to merge 2-5...success. 271s Attempting to merge 2-6...success. 271s Attempting to merge 3-1...success. 271s Attempting to merge 3-2...success. 271s Attempting to merge 3-3...success. 271s Attempting to merge 3-4...success. 271s Attempting to merge 3-5...success. 271s Attempting to merge 3-6...success. 271s Attempting to merge 4-1...success. 271s Attempting to merge 4-2...success. 271s Attempting to merge 4-3...conflict. 271s Attempting to merge 5-1...success. 271s Attempting to merge 5-2...success. 271s Attempting to merge 6-1...success. 271s Attempting to merge 6-2...success. 271s Attempting to merge 7-1...success. 271s Attempting to merge 7-2...success. 271s Attempting to merge 8-1...success. 272s Attempting to merge 8-2...success. 272s Attempting to merge 9-1...success. 272s Attempting to merge 9-2...success. 272s Previous HEAD position was a3093c1 imerge 'c-d': automatic merge 9-2 272s Switched to branch 'imerge/c-d' 272s Auto-merging conflict.txt 272s CONFLICT (content): Merge conflict in conflict.txt 272s Automatic merge failed; fix conflicts and then commit the result. 272s 272s Original first commit: 272s commit 3c091ded129a5edf9061360bab867edade996c93 272s Author: Loú User 272s Date: Thu Apr 7 22:13:18 2005 +0000 272s 272s c⇒4 272s 272s Original second commit: 272s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 272s Author: Loú User 272s Date: Thu Apr 7 22:13:26 2005 +0000 272s 272s d⇒3 272s 272s There was a conflict merging commit 4-3, shown above. 272s Please resolve the conflict, commit the result, then type 272s 272s git-imerge continue 272s + grep -q Traceback start.out 272s + grep -q suggest manual merge of 4-3 autofill.out 272s + git-imerge diagram --commits --frontier --html=imerge3.html 272s 0 5 9 272s | | | 272s 0 - ********** - c 272s *......... 272s *......... 272s *...#????? 272s *...?????? 272s 5 - *...?????? 272s 6 - *...?????? 272s | 272s d 272s 272s 0 5 9 272s | | | 272s 0 - ********** - c 272s *........| 272s *...-----+ 272s *..|#????? 272s *..|?????? 272s 5 - *..|?????? 272s 6 - *--+?????? 272s | 272s d 272s 272s Key: 272s |,-,+ = rectangles forming current merge frontier 272s * = merge done manually 272s . = merge done automatically 272s # = conflict that is currently blocking progress 272s @ = merge was blocked but has been resolved 272s ? = no merge recorded 272s 272s + echo merged version 272s + git add conflict.txt 272s + GIT_EDITOR=cat git commit 272s imerge 'c-d': manual merge 4-3 272s 272s # Conflicts: 272s # conflict.txt 272s # 272s # It looks like you may be committing a merge. 272s # If this is not correct, please run 272s # git update-ref -d MERGE_HEAD 272s # and try again. 272s 272s 272s # Please enter the commit message for your changes. Lines starting 272s # with '#' will be ignored, and an empty message aborts the commit. 272s # 272s # On branch imerge/c-d 272s # All conflicts fixed but you are still merging. 272s # 272s # Changes to be committed: 272s # modified: conflict.txt 272s # modified: d.txt 272s # 272s [imerge/c-d b64da4d] imerge 'c-d': manual merge 4-3 272s + git-imerge continue --edit 272s Merge has been recorded for merge 4-3. 272s Attempting to merge 4-4...success. 272s Attempting to merge 4-5...success. 272s Attempting to merge 4-6...success. 272s Attempting to merge 5-3...success. 272s Attempting to merge 5-4...success. 272s Attempting to merge 5-5...success. 272s Attempting to merge 5-6...success. 272s Attempting to merge 6-3...success. 272s Attempting to merge 6-4...success. 272s Attempting to merge 6-5...success. 272s Attempting to merge 6-6...success. 272s Attempting to merge 7-3...success. 272s Attempting to merge 7-4...success. 272s Attempting to merge 7-5...success. 272s Attempting to merge 7-6...success. 272s Attempting to merge 8-3...success. 272s Attempting to merge 8-4...success. 272s Attempting to merge 8-5...success. 272s Attempting to merge 8-6...success. 272s Attempting to merge 9-3...success. 272s Attempting to merge 9-4...success. 272s Attempting to merge 9-5...success. 272s Attempting to merge 9-6...success. 273s Merge is complete! 273s + git-imerge diagram --commits --frontier --html=imerge4.html 273s 0 5 9 273s | | | 273s 0 - ********** - c 273s *......... 273s *......... 273s *...*..... 273s *......... 273s 5 - *......... 273s 6 - *......... 273s | 273s d 273s 273s 0 5 9 273s | | | 273s 0 - ********** - c 273s *........| 273s *........| 273s *...*....| 273s *........| 273s 5 - *........| 273s 6 - *--------+ 273s | 273s d 273s 273s Key: 273s |,-,+ = rectangles forming current merge frontier 273s * = merge done manually 273s . = merge done automatically 273s # = conflict that is currently blocking progress 273s @ = merge was blocked but has been resolved 273s ? = no merge recorded 273s 273s + git-imerge finish --branch=c-d-full 273s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + local refname=c-d-full 273s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git rev-parse c-d-full^{tree} 273s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + test_conflict 1-1 273s + local conflict=1-1 273s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s + DESCRIPTION=git-imerge test repository with conflict at 1-1 273s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 273s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s + local description=git-imerge test repository with conflict at 1-1 273s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 273s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s + local description=git-imerge test repository with conflict at 1-1 273s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1/.git/ 273s hint: Using 'master' as the name for the initial branch. This default branch name 273s hint: is subject to change. To configure the initial branch name to use in all 273s hint: of your new repositories, which will suppress this warning, call: 273s hint: 273s hint: git config --global init.defaultBranch 273s hint: 273s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 273s hint: 'development'. The just-created branch can be renamed via this command: 273s hint: 273s hint: git branch -m 273s + echo git-imerge test repository with conflict at 1-1 273s + printf %s\n /*.out /*.css /*.html 273s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1/.git config user.name Loú User 273s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 273s + TIME=1112911993 273s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s [master (root-commit) d70e04b] m⇒0 273s 3 files changed, 3 insertions(+) 273s create mode 100644 c.txt 273s create mode 100644 conflict.txt 273s create mode 100644 d.txt 273s [c 2120f40] c⇒1 273s 2 files changed, 2 insertions(+), 2 deletions(-) 273s [c 90cc7de] c⇒2 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-1 273s + modify c.txt 0 273s + filename=c.txt 273s + text=0 273s + echo 0 273s + git add c.txt 273s + modify d.txt 0 273s + filename=d.txt 273s + text=0 273s + echo 0 273s + git add d.txt 273s + modify conflict.txt original version 273s + filename=conflict.txt 273s + text=original version 273s + echo original version 273s + git add conflict.txt 273s + commit -m m⇒0 273s + TIME=1112911994 273s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 273s + git checkout -b c master -- 273s Switched to a new branch 'c' 273s + seq 9 273s + modify c.txt 1 273s + filename=c.txt 273s + text=1 273s + echo 1 273s + git add c.txt 273s + modify conflict.txt c version 273s + filename=conflict.txt 273s + text=c version 273s + echo c version 273s + git add conflict.txt 273s + commit -m c⇒1 273s + TIME=1112911995 273s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 273s + modify c.txt 2 273s + filename=c.txt 273s + text=2 273s + echo 2 273s + git add c.txt 273s + commit -m c⇒2 273s + TIME=1112911996 273s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 273s + modify c.txt 3 273s + filename=c.txt 273s + text=3 273s + echo 3 273s + git add c.txt 273s + commit -m c⇒3 273s + TIME=1112911997 273s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 273s [c 2046ed2] c⇒3 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify c.txt 4 273s + filename=c.txt 273s + text=4 273s + echo 4 273s + git add c.txt 273s + commit -m c⇒4 273s + TIME=1112911998 273s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 273s [c 8a2cee9] c⇒4 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify c.txt 5 273s + filename=c.txt 273s + text=5 273s + echo 5 273s + git add c.txt 273s + commit -m c⇒5 273s + TIME=1112911999 273s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 273s [c ac16a05] c⇒5 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify c.txt 6 273s + filename=c.txt 273s + text=6 273s + echo 6 273s + git add c.txt 273s + commit -m c⇒6 273s + TIME=1112912000 273s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 273s [c 30dd2ae] c⇒6 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify c.txt 7 273s + filename=c.txt 273s + text=7 273s + echo 7 273s + git add c.txt 273s + commit -m c⇒7 273s + TIME=1112912001 273s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 273s [c 0883eb9] c⇒7 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify c.txt 8 273s + filename=c.txt 273s + text=8 273s + echo 8 273s + git add c.txt 273s + commit -m c⇒8 273s + TIME=1112912002 273s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 273s [c f661c06] c⇒8 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify c.txt 9 273s + filename=c.txt 273s + text=9 273s + echo 9 273s + git add c.txt 273s + commit -m c⇒9 273s + TIME=1112912003 273s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 273s [c 243e8ed] c⇒9 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + git checkout -b d master -- 273s Switched to a new branch 'd' 273s + seq 6 273s + modify d.txt 1 273s + filename=d.txt 273s + text=1 273s + echo 1 273s + git add d.txt 273s + modify conflict.txt d version 273s + filename=conflict.txt 273s + text=d version 273s + echo d version 273s + git add conflict.txt 273s + commit -m d⇒1 273s + TIME=1112912004 273s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 273s [d ac0427a] d⇒1 273s 2 files changed, 2 insertions(+), 2 deletions(-) 273s + modify d.txt 2 273s + filename=d.txt 273s + text=2 273s + echo 2 273s + git add d.txt 273s + commit -m d⇒2 273s + TIME=1112912005 273s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 273s + modify d.txt 3 273s + filename=d.txt 273s + text=3 273s [d 43c38c0] d⇒2 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + echo 3 273s + git add d.txt 273s + commit -m d⇒3 273s + TIME=1112912006 273s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 273s [d 0260058] d⇒3 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify d.txt 4 273s + filename=d.txt 273s + text=4 273s + echo 4 273s + git add d.txt 273s + commit -m d⇒4 273s + TIME=1112912007 273s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 273s [d 40fef44] d⇒4 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + modify d.txt 5 273s + filename=d.txt 273s + text=5 273s + echo 5 273s + git add d.txt 273s + commit -m d⇒5 273s + TIME=1112912008 273s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 273s + modify d.txt 6 273s + filename=d.txt 273s + text=6 273s + echo 6 273s + git add d.txt 273s + commit -m d⇒6 273s + TIME=1112912009 273s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 273s [d b080a65] d⇒5 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s [d 200ce5c] d⇒6 273s 1 file changed, 1 insertion(+), 1 deletion(-) 273s + git checkout c 273s Switched to branch 'c' 273s + git-imerge init --name=c-d d 273s + git-imerge list 273s * c-d 273s + git-imerge diagram --commits --frontier --html=imerge0.html 273s 0 5 9 273s | | | 273s 0 - ********** - c 273s *????????? 273s *????????? 273s *????????? 273s *????????? 273s 5 - *????????? 273s 6 - *????????? 273s | 273s d 273s 273s 0 5 9 273s | | | 273s 0 - ********** - c 273s *????????? 273s *????????? 273s *????????? 273s *????????? 273s 5 - *????????? 273s 6 - *????????? 273s | 273s d 273s 273s Key: 273s |,-,+ = rectangles forming current merge frontier 273s * = merge done manually 273s . = merge done automatically 273s # = conflict that is currently blocking progress 273s @ = merge was blocked but has been resolved 273s ? = no merge recorded 273s 273s + git-imerge autofill 273s + tee autofill.out 274s Attempting automerge of 9-6...failure. 274s Attempting automerge of 1-1...failure. 274s HEAD is now at 243e8ed c⇒9 274s No progress was possible; suggest manual merge of 1-1 274s + grep -q Traceback autofill.out 274s + grep -q suggest manual merge of 1-1 autofill.out 274s + git-imerge diagram --commits --frontier --html=imerge1.html 274s 0 5 9 274s | | | 274s 0 - ********** - c 274s *#???????? 274s *????????? 274s *????????? 274s *????????? 274s 5 - *????????? 274s 6 - *????????? 274s | 274s d 274s 274s 0 5 9 274s | | | 274s 0 - ********** - c 274s *#???????? 274s *????????? 274s *????????? 274s *????????? 274s 5 - *????????? 274s 6 - *????????? 274s | 274s d 274s 274s Key: 274s |,-,+ = rectangles forming current merge frontier 274s * = merge done manually 274s . = merge done automatically 274s # = conflict that is currently blocking progress 274s @ = merge was blocked but has been resolved 274s ? = no merge recorded 274s 274s + git-imerge continue --edit 274s Switched to branch 'imerge/c-d' 274s Auto-merging conflict.txt 274s CONFLICT (content): Merge conflict in conflict.txt 274s Automatic merge failed; fix conflicts and then commit the result. 274s 274s Original first commit: 274s 274s Original second commit: 274s 274s There was a conflict merging commit 1-1, shown above. 274s Please resolve the conflict, commit the result, then type 274s 274s git-imerge continue 274s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 274s Author: Loú User 274s Date: Thu Apr 7 22:13:15 2005 +0000 274s 274s c⇒1 274s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 274s Author: Loú User 274s Date: Thu Apr 7 22:13:24 2005 +0000 274s 274s d⇒1 274s + echo merged version 274s + git add conflict.txt 274s + git-imerge continue --no-edit 274s [imerge/c-d d287936] imerge 'c-d': manual merge 1-1 274s Merge has been recorded for merge 1-1. 274s Attempting automerge of 1-6...success. 274s Autofilling 1-2...success. 274s Autofilling 1-3...success. 274s Autofilling 1-4...success. 274s Autofilling 1-5...success. 274s Autofilling 1-6...success. 274s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 274s Attempting automerge of 9-6...success. 274s Autofilling 2-6...success. 274s Autofilling 3-6...success. 274s Autofilling 4-6...success. 274s Autofilling 5-6...success. 274s Autofilling 6-6...success. 274s Autofilling 7-6...success. 274s Autofilling 8-6...success. 274s Autofilling 9-1...success. 274s Autofilling 9-2...success. 274s Autofilling 9-3...success. 274s Autofilling 9-4...success. 274s Autofilling 9-5...success. 274s Autofilling 9-6 (first way)...success. 274s Autofilling 9-6 (second way)...success. 274s The two ways of autofilling 9-6 agree. 275s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 275s Merge is complete! 275s + git-imerge diagram --commits --frontier --html=imerge2.html 275s 0 5 9 275s | | | 275s 0 - ********** - c 275s **???????. 275s *.???????. 275s *.???????. 275s *.???????. 275s 5 - *.???????. 275s 6 - *......... 275s | 275s d 275s 275s 0 5 9 275s | | | 275s 0 - ********** - c 275s **???????| 275s *.???????| 275s *.???????| 275s *.???????| 275s 5 - *.???????| 275s 6 - *--------+ 275s | 275s d 275s 275s Key: 275s |,-,+ = rectangles forming current merge frontier 275s * = merge done manually 275s . = merge done automatically 275s # = conflict that is currently blocking progress 275s @ = merge was blocked but has been resolved 275s ? = no merge recorded 275s 275s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 275s Merge d into c (using imerge) 275s 275s # Please enter the commit message for your changes. Lines starting 275s # with '#' will be ignored, and an empty message aborts the commit. 275s # 275s # Date: Thu Mar 21 05:03:24 2024 +0000 275s # 275s # On branch c-d-merge 275s # Changes to be committed: 275s # modified: conflict.txt 275s # modified: d.txt 275s # 275s [c-d-merge 955e93e] Merge d into c (using imerge) 275s Date: Thu Mar 21 05:03:24 2024 +0000 275s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + local refname=c-d-merge 275s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + git rev-parse c-d-merge^{tree} 275s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + git-imerge simplify --goal=rebase --branch=c-d-rebase 275s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + local refname=c-d-rebase 275s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + git rev-parse c-d-rebase^{tree} 275s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 275s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + local refname=c-d-rebase-with-history 275s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + git rev-parse c-d-rebase-with-history^{tree} 275s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + git-imerge simplify --goal=border --branch=c-d-border 276s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + local refname=c-d-border 276s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + git rev-parse c-d-border^{tree} 276s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 276s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + local refname=c-d-border-with-history 276s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + git rev-parse c-d-border-with-history^{tree} 276s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 276s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + local refname=c-d-border-with-history2 276s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + git rev-parse c-d-border-with-history2^{tree} 276s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + git-imerge remove 276s + git checkout c 276s Switched to branch 'c' 276s + git-imerge start --goal=full --first-parent --name=c-d d 276s + tee start.out 277s Attempting to merge 1-1...conflict. 277s Switched to branch 'imerge/c-d' 277s Auto-merging conflict.txt 277s CONFLICT (content): Merge conflict in conflict.txt 277s Automatic merge failed; fix conflicts and then commit the result. 277s 277s Original first commit: 277s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 277s Author: Loú User 277s Date: Thu Apr 7 22:13:15 2005 +0000 277s 277s c⇒1 277s 277s Original second commit: 277s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 277s Author: Loú User 277s Date: Thu Apr 7 22:13:24 2005 +0000 277s 277s d⇒1 277s 277s There was a conflict merging commit 1-1, shown above. 277s Please resolve the conflict, commit the result, then type 277s 277s git-imerge continue 277s + grep -q Traceback start.out 277s + grep -q suggest manual merge of 1-1 autofill.out 277s + git-imerge diagram --commits --frontier --html=imerge3.html 277s 0 5 9 277s | | | 277s 0 - ********** - c 277s *#???????? 277s *????????? 277s *????????? 277s *????????? 277s 5 - *????????? 277s 6 - *????????? 277s | 277s d 277s 277s 0 5 9 277s | | | 277s 0 - ********** - c 277s *#???????? 277s *????????? 277s *????????? 277s *????????? 277s 5 - *????????? 277s 6 - *????????? 277s | 277s d 277s 277s Key: 277s |,-,+ = rectangles forming current merge frontier 277s * = merge done manually 277s . = merge done automatically 277s # = conflict that is currently blocking progress 277s @ = merge was blocked but has been resolved 277s ? = no merge recorded 277s 277s + echo merged version 277s + git add conflict.txt 277s + GIT_EDITOR=cat git commit 277s imerge 'c-d': manual merge 1-1 277s 277s # Conflicts: 277s # conflict.txt 277s # 277s # It looks like you may be committing a merge. 277s # If this is not correct, please run 277s # git update-ref -d MERGE_HEAD 277s # and try again. 277s 277s 277s # Please enter the commit message for your changes. Lines starting 277s # with '#' will be ignored, and an empty message aborts the commit. 277s # 277s # On branch imerge/c-d 277s # All conflicts fixed but you are still merging. 277s # 277s # Changes to be committed: 277s # modified: conflict.txt 277s # modified: d.txt 277s # 277s + git-imerge continue --edit 277s [imerge/c-d afd2472] imerge 'c-d': manual merge 1-1 277s Merge has been recorded for merge 1-1. 277s Attempting to merge 1-2...success. 277s Attempting to merge 1-3...success. 277s Attempting to merge 1-4...success. 277s Attempting to merge 1-5...success. 277s Attempting to merge 1-6...success. 277s Attempting to merge 2-1...success. 277s Attempting to merge 2-2...success. 277s Attempting to merge 2-3...success. 277s Attempting to merge 2-4...success. 277s Attempting to merge 2-5...success. 277s Attempting to merge 2-6...success. 277s Attempting to merge 3-1...success. 277s Attempting to merge 3-2...success. 277s Attempting to merge 3-3...success. 277s Attempting to merge 3-4...success. 277s Attempting to merge 3-5...success. 277s Attempting to merge 3-6...success. 277s Attempting to merge 4-1...success. 277s Attempting to merge 4-2...success. 277s Attempting to merge 4-3...success. 277s Attempting to merge 4-4...success. 277s Attempting to merge 4-5...success. 277s Attempting to merge 4-6...success. 277s Attempting to merge 5-1...success. 277s Attempting to merge 5-2...success. 277s Attempting to merge 5-3...success. 277s Attempting to merge 5-4...success. 277s Attempting to merge 5-5...success. 277s Attempting to merge 5-6...success. 277s Attempting to merge 6-1...success. 278s Attempting to merge 6-2...success. 278s Attempting to merge 6-3...success. 278s Attempting to merge 6-4...success. 278s Attempting to merge 6-5...success. 278s Attempting to merge 6-6...success. 278s Attempting to merge 7-1...success. 278s Attempting to merge 7-2...success. 278s Attempting to merge 7-3...success. 278s Attempting to merge 7-4...success. 278s Attempting to merge 7-5...success. 278s Attempting to merge 7-6...success. 278s Attempting to merge 8-1...success. 278s Attempting to merge 8-2...success. 278s Attempting to merge 8-3...success. 278s Attempting to merge 8-4...success. 278s Attempting to merge 8-5...success. 278s Attempting to merge 8-6...success. 278s Attempting to merge 9-1...success. 278s Attempting to merge 9-2...success. 278s Attempting to merge 9-3...success. 278s Attempting to merge 9-4...success. 278s Attempting to merge 9-5...success. 278s Attempting to merge 9-6...success. 278s Merge is complete! 278s + git-imerge diagram --commits --frontier --html=imerge4.html 278s 0 5 9 278s | | | 278s 0 - ********** - c 278s **........ 278s *......... 278s *......... 278s *......... 278s 5 - *......... 278s 6 - *......... 278s | 278s d 278s 278s 0 5 9 278s | | | 278s 0 - ********** - c 278s **.......| 278s *........| 278s *........| 278s *........| 278s 5 - *........| 278s 6 - *--------+ 278s | 278s d 278s 278s Key: 278s |,-,+ = rectangles forming current merge frontier 278s * = merge done manually 278s . = merge done automatically 278s # = conflict that is currently blocking progress 278s @ = merge was blocked but has been resolved 278s ? = no merge recorded 278s 278s + git-imerge finish --branch=c-d-full 278s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 278s + local refname=c-d-full 278s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 278s + git rev-parse c-d-full^{tree} 278s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 278s + test_conflict 9-1 278s + local conflict=9-1 278s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s + DESCRIPTION=git-imerge test repository with conflict at 9-1 278s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 278s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s + local description=git-imerge test repository with conflict at 9-1 278s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 278s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s + local description=git-imerge test repository with conflict at 9-1 278s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s hint: Using 'master' as the name for the initial branch. This default branch name 278s hint: is subject to change. To configure the initial branch name to use in all 278s hint: of your new repositories, which will suppress this warning, call: 278s hint: 278s hint: git config --global init.defaultBranch 278s hint: 278s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 278s hint: 'development'. The just-created branch can be renamed via this command: 278s hint: 278s hint: git branch -m 278s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1/.git/ 278s + echo git-imerge test repository with conflict at 9-1 278s + printf %s\n /*.out /*.css /*.html 278s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1/.git config user.name Loú User 278s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 278s + TIME=1112911993 278s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-1 278s + modify c.txt 0 278s + filename=c.txt 278s + text=0 278s + echo 0 278s + git add c.txt 278s + modify d.txt 0 278s + filename=d.txt 278s + text=0 278s + echo 0 278s + git add d.txt 278s + modify conflict.txt original version 278s + filename=conflict.txt 278s + text=original version 278s + echo original version 278s + git add conflict.txt 278s + commit -m m⇒0 278s + TIME=1112911994 278s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 278s [master (root-commit) d70e04b] m⇒0 278s 3 files changed, 3 insertions(+) 278s create mode 100644 c.txt 278s create mode 100644 conflict.txt 278s create mode 100644 d.txt 278s + git checkout -b c master -- 278s Switched to a new branch 'c' 278s + seq 9 278s + modify c.txt 1 278s + filename=c.txt 278s + text=1 278s + echo 1 278s + git add c.txt 278s + commit -m c⇒1 278s + TIME=1112911995 278s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 278s + modify c.txt 2 278s + filename=c.txt 278s + text=2 278s + echo 2 278s + git add c.txt 278s [c 89e2141] c⇒1 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s + commit -m c⇒2 278s + TIME=1112911996 278s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 278s [c 7c431f2] c⇒2 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s + modify c.txt 3 278s + filename=c.txt 278s + text=3 278s + echo 3 278s + git add c.txt 278s + commit -m c⇒3 278s + TIME=1112911997 278s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 278s [c f02ab24] c⇒3 278s 1 file changed, 1 insertion(+), 1 deletion(-) 278s + modify c.txt 4 278s + filename=c.txt 278s + text=4 278s + echo 4 278s + git add c.txt 278s + commit -m c⇒4 278s + TIME=1112911998 278s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 278s + modify c.txt 5 278s + filename=c.txt 278s + text=5 278s + echo 5 278s + git add c.txt 278s + commit -m c⇒5 278s + TIME=1112911999 278s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 278s [c ed9122f] c⇒4 278s 1 file changed, 1 insertion(+), 1 deletion(-) 279s [c 1d3bf09] c⇒5 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + modify c.txt 6 279s + filename=c.txt 279s + text=6 279s + echo 6 279s + git add c.txt 279s + commit -m c⇒6 279s + TIME=1112912000 279s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 279s [c f999ecd] c⇒6 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + modify c.txt 7 279s + filename=c.txt 279s + text=7 279s + echo 7 279s + git add c.txt 279s + commit -m c⇒7 279s + TIME=1112912001 279s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 279s [c 7050a8a] c⇒7 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + modify c.txt 8 279s + filename=c.txt 279s + text=8 279s + echo 8 279s + git add c.txt 279s + commit -m c⇒8 279s + TIME=1112912002 279s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 279s + modify c.txt 9 279s + filename=c.txt 279s + text=9 279s + echo 9 279s + git add c.txt 279s [c 9732e77] c⇒8 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + modify conflict.txt c version 279s + filename=conflict.txt 279s + text=c version 279s + echo c version 279s + git add conflict.txt 279s + commit -m c⇒9 279s + TIME=1112912003 279s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 279s + git checkout -b d master -- 279s Switched to a new branch 'd' 279s [c 73a5eed] c⇒9 279s 2 files changed, 2 insertions(+), 2 deletions(-) 279s + seq 6 279s + modify d.txt 1 279s + filename=d.txt 279s + text=1 279s + echo 1 279s + git add d.txt 279s + modify conflict.txt d version 279s + filename=conflict.txt 279s + text=d version 279s + echo d version 279s + git add conflict.txt 279s + commit -m d⇒1 279s + TIME=1112912004 279s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 279s [d ac0427a] d⇒1 279s 2 files changed, 2 insertions(+), 2 deletions(-) 279s + modify d.txt 2 279s + filename=d.txt 279s + text=2 279s + echo 2 279s + git add d.txt 279s + commit -m d⇒2 279s + TIME=1112912005 279s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 279s [d 43c38c0] d⇒2 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + modify d.txt 3 279s + filename=d.txt 279s + text=3 279s + echo 3 279s + git add d.txt 279s + commit -m d⇒3 279s + TIME=1112912006 279s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 279s + modify d.txt 4 279s + filename=d.txt 279s + text=4 279s + echo 4 279s + git add d.txt 279s [d 0260058] d⇒3 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + commit -m d⇒4 279s + TIME=1112912007 279s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 279s [d 40fef44] d⇒4 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + modify d.txt 5 279s + filename=d.txt 279s + text=5 279s + echo 5 279s + git add d.txt 279s + commit -m d⇒5 279s + TIME=1112912008 279s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 279s + modify d.txt 6 279s + filename=d.txt 279s + text=6 279s + echo 6 279s + git add d.txt 279s [d b080a65] d⇒5 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s + commit -m d⇒6 279s + TIME=1112912009 279s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 279s + git checkout c 279s [d 200ce5c] d⇒6 279s 1 file changed, 1 insertion(+), 1 deletion(-) 279s Switched to branch 'c' 279s + git-imerge init --name=c-d d 279s + git-imerge list 279s * c-d 279s + git-imerge diagram --commits --frontier --html=imerge0.html 279s 0 5 9 279s | | | 279s 0 - ********** - c 279s *????????? 279s *????????? 279s *????????? 279s *????????? 279s 5 - *????????? 279s 6 - *????????? 279s | 279s d 279s 279s 0 5 9 279s | | | 279s 0 - ********** - c 279s *????????? 279s *????????? 279s *????????? 279s *????????? 279s 5 - *????????? 279s 6 - *????????? 279s | 279s d 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s + git-imerge autofill 279s + tee autofill.out 279s Attempting automerge of 9-6...failure. 279s Attempting automerge of 1-1...success. 279s Attempting automerge of 1-4...success. 279s Attempting automerge of 1-6...success. 279s Attempting automerge of 9-6...failure. 279s Attempting automerge of 5-6...success. 279s Attempting automerge of 7-6...success. 279s Attempting automerge of 8-6...success. 279s Attempting automerge of 9-1...failure. 279s Autofilling 1-6...success. 279s Autofilling 2-6...success. 279s Autofilling 3-6...success. 279s Autofilling 4-6...success. 279s Autofilling 5-6...success. 279s Autofilling 6-6...success. 280s Autofilling 7-6...success. 280s Autofilling 8-1...success. 280s Autofilling 8-2...success. 280s Autofilling 8-3...success. 280s Autofilling 8-4...success. 280s Autofilling 8-5...success. 280s Autofilling 8-6 (first way)...success. 280s Autofilling 8-6 (second way)...success. 280s The two ways of autofilling 8-6 agree. 280s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 280s Attempting automerge of 9-6...failure. 280s Attempting automerge of 9-1...failure. 280s HEAD is now at 73a5eed c⇒9 280s Conflict; suggest manual merge of 9-1 280s + grep -q Traceback autofill.out 280s + grep -q suggest manual merge of 9-1 autofill.out 280s + git-imerge diagram --commits --frontier --html=imerge1.html 280s 0 5 9 280s | | | 280s 0 - ********** - c 280s *???????.# 280s *???????.? 280s *???????.? 280s *???????.? 280s 5 - *???????.? 280s 6 - *........? 280s | 280s d 280s 280s 0 5 9 280s | | | 280s 0 - ********** - c 280s *???????|# 280s *???????|? 280s *???????|? 280s *???????|? 280s 5 - *???????|? 280s 6 - *-------+? 280s | 280s d 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + git-imerge continue --edit 280s Switched to branch 'imerge/c-d' 280s Auto-merging conflict.txt 280s CONFLICT (content): Merge conflict in conflict.txt 280s Automatic merge failed; fix conflicts and then commit the result. 280s 280s Original first commit: 280s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 280s Author: Loú User 280s Date: Thu Apr 7 22:13:23 2005 +0000 280s 280s c⇒9 280s 280s Original second commit: 280s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 280s Author: Loú User 280s Date: Thu Apr 7 22:13:24 2005 +0000 280s 280s d⇒1 280s 280s There was a conflict merging commit 9-1, shown above. 280s Please resolve the conflict, commit the result, then type 280s 280s git-imerge continue 280s + echo merged version 280s + git add conflict.txt 280s + git-imerge continue --no-edit 280s [imerge/c-d 165eb17] imerge 'c-d': manual merge 9-1 280s Merge has been recorded for merge 9-1. 280s Attempting automerge of 9-6...success. 280s Autofilling 9-2...success. 280s Autofilling 9-3...success. 280s Autofilling 9-4...success. 280s Autofilling 9-5...success. 280s Autofilling 9-6...success. 280s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 280s Merge is complete! 280s + git-imerge diagram --commits --frontier --html=imerge2.html 281s 0 5 9 281s | | | 281s 0 - ********** - c 281s *???????.* 281s *???????.. 281s *???????.. 281s *???????.. 281s 5 - *???????.. 281s 6 - *......... 281s | 281s d 281s 281s 0 5 9 281s | | | 281s 0 - ********** - c 281s *???????.* 281s *???????.| 281s *???????.| 281s *???????.| 281s 5 - *???????.| 281s 6 - *--------+ 281s | 281s d 281s 281s Key: 281s |,-,+ = rectangles forming current merge frontier 281s * = merge done manually 281s . = merge done automatically 281s # = conflict that is currently blocking progress 281s @ = merge was blocked but has been resolved 281s ? = no merge recorded 281s 281s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 281s Merge d into c (using imerge) 281s 281s # Please enter the commit message for your changes. Lines starting 281s # with '#' will be ignored, and an empty message aborts the commit. 281s # 281s # Date: Thu Mar 21 05:03:30 2024 +0000 281s # 281s # On branch c-d-merge 281s # Changes to be committed: 281s # modified: conflict.txt 281s # modified: d.txt 281s # 281s [c-d-merge 9288b42] Merge d into c (using imerge) 281s Date: Thu Mar 21 05:03:30 2024 +0000 281s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + local refname=c-d-merge 281s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + git rev-parse c-d-merge^{tree} 281s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + git-imerge simplify --goal=rebase --branch=c-d-rebase 281s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + local refname=c-d-rebase 281s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + git rev-parse c-d-rebase^{tree} 281s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 281s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + local refname=c-d-rebase-with-history 281s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + git rev-parse c-d-rebase-with-history^{tree} 281s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 281s + git-imerge simplify --goal=border --branch=c-d-border 282s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + local refname=c-d-border 282s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + git rev-parse c-d-border^{tree} 282s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 282s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + local refname=c-d-border-with-history 282s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + git rev-parse c-d-border-with-history^{tree} 282s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 282s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + local refname=c-d-border-with-history2 282s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + git rev-parse c-d-border-with-history2^{tree} 282s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 282s + git-imerge remove 282s + git checkout c 282s Switched to branch 'c' 282s + + tee start.out 282s git-imerge start --goal=full --first-parent --name=c-d d 283s Attempting to merge 1-1...success. 283s Attempting to merge 1-2...success. 283s Attempting to merge 1-3...success. 283s Attempting to merge 1-4...success. 283s Attempting to merge 1-5...success. 283s Attempting to merge 1-6...success. 283s Attempting to merge 2-1...success. 283s Attempting to merge 2-2...success. 283s Attempting to merge 2-3...success. 283s Attempting to merge 2-4...success. 283s Attempting to merge 2-5...success. 283s Attempting to merge 2-6...success. 283s Attempting to merge 3-1...success. 283s Attempting to merge 3-2...success. 283s Attempting to merge 3-3...success. 283s Attempting to merge 3-4...success. 283s Attempting to merge 3-5...success. 283s Attempting to merge 3-6...success. 283s Attempting to merge 4-1...success. 283s Attempting to merge 4-2...success. 283s Attempting to merge 4-3...success. 283s Attempting to merge 4-4...success. 283s Attempting to merge 4-5...success. 283s Attempting to merge 4-6...success. 283s Attempting to merge 5-1...success. 283s Attempting to merge 5-2...success. 283s Attempting to merge 5-3...success. 283s Attempting to merge 5-4...success. 283s Attempting to merge 5-5...success. 283s Attempting to merge 5-6...success. 283s Attempting to merge 6-1...success. 283s Attempting to merge 6-2...success. 283s Attempting to merge 6-3...success. 283s Attempting to merge 6-4...success. 283s Attempting to merge 6-5...success. 283s Attempting to merge 6-6...success. 283s Attempting to merge 7-1...success. 283s Attempting to merge 7-2...success. 283s Attempting to merge 7-3...success. 283s Attempting to merge 7-4...success. 283s Attempting to merge 7-5...success. 283s Attempting to merge 7-6...success. 283s Attempting to merge 8-1...success. 283s Attempting to merge 8-2...success. 283s Attempting to merge 8-3...success. 284s Attempting to merge 8-4...success. 284s Attempting to merge 8-5...success. 284s Attempting to merge 8-6...success. 284s Attempting to merge 9-1...conflict. 284s Switched to branch 'imerge/c-d' 284s Auto-merging conflict.txt 284s CONFLICT (content): Merge conflict in conflict.txt 284s Automatic merge failed; fix conflicts and then commit the result. 284s 284s Original first commit: 284s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 284s Author: Loú User 284s Date: Thu Apr 7 22:13:23 2005 +0000 284s 284s c⇒9 284s 284s Original second commit: 284s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 284s Author: Loú User 284s Date: Thu Apr 7 22:13:24 2005 +0000 284s 284s d⇒1 284s 284s There was a conflict merging commit 9-1, shown above. 284s Please resolve the conflict, commit the result, then type 284s 284s git-imerge continue 284s + grep -q Traceback start.out 284s + grep -q suggest manual merge of 9-1 autofill.out 284s + git-imerge diagram --commits --frontier --html=imerge3.html 284s 0 5 9 284s | | | 284s 0 - ********** - c 284s *........# 284s *........? 284s *........? 284s *........? 284s 5 - *........? 284s 6 - *........? 284s | 284s d 284s 284s 0 5 9 284s | | | 284s 0 - ********** - c 284s *.......|# 284s *.......|? 284s *.......|? 284s *.......|? 284s 5 - *.......|? 284s 6 - *-------+? 284s | 284s d 284s 284s Key: 284s |,-,+ = rectangles forming current merge frontier 284s * = merge done manually 284s . = merge done automatically 284s # = conflict that is currently blocking progress 284s @ = merge was blocked but has been resolved 284s ? = no merge recorded 284s 284s + echo merged version 284s + git add conflict.txt 284s + GIT_EDITOR=cat git commit 284s imerge 'c-d': manual merge 9-1 284s 284s # Conflicts: 284s # conflict.txt 284s # 284s # It looks like you may be committing a merge. 284s # If this is not correct, please run 284s # git update-ref -d MERGE_HEAD 284s # and try again. 284s 284s 284s # Please enter the commit message for your changes. Lines starting 284s # with '#' will be ignored, and an empty message aborts the commit. 284s # 284s # On branch imerge/c-d 284s # All conflicts fixed but you are still merging. 284s # 284s # Changes to be committed: 284s # modified: conflict.txt 284s # modified: d.txt 284s # 284s + git-imerge continue --edit 284s [imerge/c-d 6350ed5] imerge 'c-d': manual merge 9-1 284s Merge has been recorded for merge 9-1. 284s Attempting to merge 9-2...success. 284s Attempting to merge 9-3...success. 284s Attempting to merge 9-4...success. 284s Attempting to merge 9-5...success. 284s Attempting to merge 9-6...success. 284s Merge is complete! 284s + git-imerge diagram --commits --frontier --html=imerge4.html 284s 0 5 9 284s | | | 284s 0 - ********** - c 284s *........* 284s *......... 284s *......... 284s *......... 284s 5 - *......... 284s 6 - *......... 284s | 284s d 284s 284s 0 5 9 284s | | | 284s 0 - ********** - c 284s *........* 284s *........| 284s *........| 284s *........| 284s 5 - *........| 284s 6 - *--------+ 284s | 284s d 284s 284s Key: 284s |,-,+ = rectangles forming current merge frontier 284s * = merge done manually 284s . = merge done automatically 284s # = conflict that is currently blocking progress 284s @ = merge was blocked but has been resolved 284s ? = no merge recorded 284s 284s + git-imerge finish --branch=c-d-full 284s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 284s + local refname=c-d-full 284s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 284s + git rev-parse c-d-full^{tree} 284s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 284s + test_conflict 1-6 284s + local conflict=1-6 284s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s + DESCRIPTION=git-imerge test repository with conflict at 1-6 284s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 284s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s + local description=git-imerge test repository with conflict at 1-6 284s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 284s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s + local description=git-imerge test repository with conflict at 1-6 284s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s hint: Using 'master' as the name for the initial branch. This default branch name 284s hint: is subject to change. To configure the initial branch name to use in all 284s hint: of your new repositories, which will suppress this warning, call: 284s hint: 284s hint: git config --global init.defaultBranch 284s hint: 284s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 284s hint: 'development'. The just-created branch can be renamed via this command: 284s hint: 284s hint: git branch -m 284s + echo git-imerge test repository with conflict at 1-6 284s + printf %s\n /*.out /*.css /*.html 284s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6/.git config user.name Loú User 284s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 284s + TIME=1112911993 284s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6 284s + modify c.txt 0 284s + filename=c.txt 284s + text=0 284s + echo 0 284s + git add c.txt 284s + modify d.txt 0 284s + filename=d.txt 284s + text=0 284s + echo 0 284s + git add d.txt 284s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-6/.git/ 284s [master (root-commit) d70e04b] m⇒0 284s 3 files changed, 3 insertions(+) 284s create mode 100644 c.txt 284s create mode 100644 conflict.txt 284s create mode 100644 d.txt 285s [c 2120f40] c⇒1 285s 2 files changed, 2 insertions(+), 2 deletions(-) 285s + modify conflict.txt original version 285s + filename=conflict.txt 285s + text=original version 285s + echo original version 285s + git add conflict.txt 285s + commit -m m⇒0 285s + TIME=1112911994 285s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 285s + git checkout -b c master -- 285s Switched to a new branch 'c' 285s + seq 9 285s + modify c.txt 1 285s + filename=c.txt 285s + text=1 285s + echo 1 285s + git add c.txt 285s + modify conflict.txt c version 285s + filename=conflict.txt 285s + text=c version 285s + echo c version 285s + git add conflict.txt 285s + commit -m c⇒1 285s + TIME=1112911995 285s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 285s + modify c.txt 2 285s + filename=c.txt 285s + text=2 285s + echo 2 285s + git add c.txt 285s + commit -m c⇒2 285s + TIME=1112911996 285s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 285s + modify c.txt 3 285s + filename=c.txt 285s + text=3 285s + echo 3 285s + git add c.txt 285s + commit -m c⇒3 285s + TIME=1112911997 285s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 285s + modify c.txt 4 285s + filename=c.txt 285s + text=4 285s + echo 4 285s + git add c.txt 285s + commit -m c⇒4 285s + TIME=1112911998 285s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 285s + modify c.txt 5 285s + filename=c.txt 285s + text=5 285s + echo 5 285s + git add c.txt 285s + commit -m c⇒5 285s + TIME=1112911999 285s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 285s [c 90cc7de] c⇒2 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [c 2046ed2] c⇒3 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [c 8a2cee9] c⇒4 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [c ac16a05] c⇒5 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [c 30dd2ae] c⇒6 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [c 0883eb9] c⇒7 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [c f661c06] c⇒8 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [c 243e8ed] c⇒9 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [d bd5368a] d⇒1 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [d 93e27e6] d⇒2 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [d 133f385] d⇒3 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [d 586472a] d⇒4 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [d 9522207] d⇒5 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [d f7e451a] d⇒6 285s 2 files changed, 2 insertions(+), 2 deletions(-) 285s + modify c.txt 6 285s + filename=c.txt 285s + text=6 285s + echo 6 285s + git add c.txt 285s + commit -m c⇒6 285s + TIME=1112912000 285s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 285s + modify c.txt 7 285s + filename=c.txt 285s + text=7 285s + echo 7 285s + git add c.txt 285s + commit -m c⇒7 285s + TIME=1112912001 285s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 285s + modify c.txt 8 285s + filename=c.txt 285s + text=8 285s + echo 8 285s + git add c.txt 285s + commit -m c⇒8 285s + TIME=1112912002 285s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 285s + modify c.txt 9 285s + filename=c.txt 285s + text=9 285s + echo 9 285s + git add c.txt 285s + commit -m c⇒9 285s + TIME=1112912003 285s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 285s + git checkout -b d master -- 285s Switched to a new branch 'd' 285s + seq 6 285s + modify d.txt 1 285s + filename=d.txt 285s + text=1 285s + echo 1 285s + git add d.txt 285s + commit -m d⇒1 285s + TIME=1112912004 285s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 285s + modify d.txt 2 285s + filename=d.txt 285s + text=2 285s + echo 2 285s + git add d.txt 285s + commit -m d⇒2 285s + TIME=1112912005 285s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 285s + modify d.txt 3 285s + filename=d.txt 285s + text=3 285s + echo 3 285s + git add d.txt 285s + commit -m d⇒3 285s + TIME=1112912006 285s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 285s + modify d.txt 4 285s + filename=d.txt 285s + text=4 285s + echo 4 285s + git add d.txt 285s + commit -m d⇒4 285s + TIME=1112912007 285s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 285s + modify d.txt 5 285s + filename=d.txt 285s + text=5 285s + echo 5 285s + git add d.txt 285s + commit -m d⇒5 285s + TIME=1112912008 285s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 285s + modify d.txt 6 285s + filename=d.txt 285s + text=6 285s + echo 6 285s + git add d.txt 285s + modify conflict.txt d version 285s + filename=conflict.txt 285s + text=d version 285s + echo d version 285s + git add conflict.txt 285s + commit -m d⇒6 285s + TIME=1112912009 285s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 285s + git checkout c 285s Switched to branch 'c' 285s + git-imerge init --name=c-d d 285s + git-imerge list 285s * c-d 285s + git-imerge diagram --commits --frontier --html=imerge0.html 285s 0 5 9 285s | | | 285s 0 - ********** - c 285s *????????? 285s *????????? 285s *????????? 285s *????????? 285s 5 - *????????? 285s 6 - *????????? 285s | 285s d 285s 285s 0 5 9 285s | | | 285s 0 - ********** - c 285s *????????? 285s *????????? 285s *????????? 285s *????????? 285s 5 - *????????? 285s 6 - *????????? 285s | 285s d 285s 285s Key: 285s |,-,+ = rectangles forming current merge frontier 285s * = merge done manually 285s . = merge done automatically 285s # = conflict that is currently blocking progress 285s @ = merge was blocked but has been resolved 285s ? = no merge recorded 285s 285s + git-imerge autofill 285s + tee autofill.out 285s Attempting automerge of 9-6...failure. 285s Attempting automerge of 1-1...success. 285s Attempting automerge of 1-4...success. 285s Attempting automerge of 1-6...failure. 285s Attempting automerge of 1-5...success. 285s Attempting automerge of 9-5...success. 285s Autofilling 1-5...success. 285s Autofilling 2-5...success. 285s Autofilling 3-5...success. 285s Autofilling 4-5...success. 285s Autofilling 5-5...success. 285s Autofilling 6-5...success. 285s Autofilling 7-5...success. 285s Autofilling 8-5...success. 285s Autofilling 9-1...success. 285s Autofilling 9-2...success. 285s Autofilling 9-3...success. 285s Autofilling 9-4...success. 285s Autofilling 9-5 (first way)...success. 285s Autofilling 9-5 (second way)...success. 285s The two ways of autofilling 9-5 agree. 285s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 286s Attempting automerge of 9-6...failure. 286s Attempting automerge of 1-6...failure. 286s HEAD is now at 243e8ed c⇒9 286s Conflict; suggest manual merge of 1-6 286s + grep -q Traceback autofill.out 286s + grep -q suggest manual merge of 1-6 autofill.out 286s + git-imerge diagram --commits --frontier --html=imerge1.html 286s 0 5 9 286s | | | 286s 0 - ********** - c 286s *????????. 286s *????????. 286s *????????. 286s *????????. 286s 5 - *......... 286s 6 - *#???????? 286s | 286s d 286s 286s 0 5 9 286s | | | 286s 0 - ********** - c 286s *????????| 286s *????????| 286s *????????| 286s *????????| 286s 5 - *--------+ 286s 6 - *#???????? 286s | 286s d 286s 286s Key: 286s |,-,+ = rectangles forming current merge frontier 286s * = merge done manually 286s . = merge done automatically 286s # = conflict that is currently blocking progress 286s @ = merge was blocked but has been resolved 286s ? = no merge recorded 286s 286s + git-imerge continue --edit 286s Switched to branch 'imerge/c-d' 286s Auto-merging conflict.txt 286s CONFLICT (content): Merge conflict in conflict.txt 286s Automatic merge failed; fix conflicts and then commit the result. 286s 286s Original first commit: 286s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 286s Author: Loú User 286s Date: Thu Apr 7 22:13:15 2005 +0000 286s 286s c⇒1 286s 286s Original second commit: 286s commit f7e451a6c9656dda15641a9fbc591a602f158692 286s Author: Loú User 286s Date: Thu Apr 7 22:13:29 2005 +0000 286s 286s d⇒6 286s 286s There was a conflict merging commit 1-6, shown above. 286s Please resolve the conflict, commit the result, then type 286s 286s git-imerge continue 286s + echo merged version 286s + git add conflict.txt 286s + git-imerge continue --no-edit 286s [imerge/c-d 77aceaf] imerge 'c-d': manual merge 1-6 286s Merge has been recorded for merge 1-6. 286s Attempting automerge of 9-6...success. 286s Autofilling 2-6...success. 286s Autofilling 3-6...success. 286s Autofilling 4-6...success. 286s Autofilling 5-6...success. 286s Autofilling 6-6...success. 286s Autofilling 7-6...success. 286s Autofilling 8-6...success. 286s Autofilling 9-6...success. 286s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 286s Merge is complete! 286s + git-imerge diagram --commits --frontier --html=imerge2.html 286s 0 5 9 286s | | | 286s 0 - ********** - c 286s *????????. 286s *????????. 286s *????????. 286s *????????. 286s 5 - *......... 286s 6 - **........ 286s | 286s d 286s 286s 0 5 9 286s | | | 286s 0 - ********** - c 286s *????????| 286s *????????| 286s *????????| 286s *????????| 286s 5 - *........| 286s 6 - **-------+ 286s | 286s d 286s 286s Key: 286s |,-,+ = rectangles forming current merge frontier 286s * = merge done manually 286s . = merge done automatically 286s # = conflict that is currently blocking progress 286s @ = merge was blocked but has been resolved 286s ? = no merge recorded 286s 286s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 286s Merge d into c (using imerge) 286s 286s # Please enter the commit message for your changes. Lines starting 286s # with '#' will be ignored, and an empty message aborts the commit. 286s # 286s # Date: Thu Mar 21 05:03:35 2024 +0000 286s # 286s # On branch c-d-merge 286s # Changes to be committed: 286s # modified: conflict.txt 286s # modified: d.txt 286s # 287s [c-d-merge 0b396f0] Merge d into c (using imerge) 287s Date: Thu Mar 21 05:03:35 2024 +0000 287s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + local refname=c-d-merge 287s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git rev-parse c-d-merge^{tree} 287s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git-imerge simplify --goal=rebase --branch=c-d-rebase 287s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + local refname=c-d-rebase 287s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git rev-parse c-d-rebase^{tree} 287s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 287s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + local refname=c-d-rebase-with-history 287s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git rev-parse c-d-rebase-with-history^{tree} 287s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git-imerge simplify --goal=border --branch=c-d-border 287s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + local refname=c-d-border 287s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git rev-parse c-d-border^{tree} 287s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 287s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + local refname=c-d-border-with-history 287s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git rev-parse c-d-border-with-history^{tree} 287s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 287s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 288s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 288s + local refname=c-d-border-with-history2 288s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 288s + git rev-parse c-d-border-with-history2^{tree} 288s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 288s + git-imerge remove 288s + git checkout c 288s Switched to branch 'c' 288s + git-imerge start --goal=full --first-parent --name=c-d d 288s + tee start.out 288s Attempting to merge 1-1...success. 288s Attempting to merge 1-2...success. 288s Attempting to merge 1-3...success. 288s Attempting to merge 1-4...success. 288s Attempting to merge 1-5...success. 288s Attempting to merge 1-6...conflict. 288s Attempting to merge 2-1...success. 288s Attempting to merge 2-2...success. 288s Attempting to merge 2-3...success. 288s Attempting to merge 2-4...success. 288s Attempting to merge 2-5...success. 288s Attempting to merge 3-1...success. 288s Attempting to merge 3-2...success. 288s Attempting to merge 3-3...success. 288s Attempting to merge 3-4...success. 288s Attempting to merge 3-5...success. 288s Attempting to merge 4-1...success. 289s Attempting to merge 4-2...success. 289s Attempting to merge 4-3...success. 289s Attempting to merge 4-4...success. 289s Attempting to merge 4-5...success. 289s Attempting to merge 5-1...success. 289s Attempting to merge 5-2...success. 289s Attempting to merge 5-3...success. 289s Attempting to merge 5-4...success. 289s Attempting to merge 5-5...success. 289s Attempting to merge 6-1...success. 289s Attempting to merge 6-2...success. 289s Attempting to merge 6-3...success. 289s Attempting to merge 6-4...success. 289s Attempting to merge 6-5...success. 289s Attempting to merge 7-1...success. 289s Attempting to merge 7-2...success. 289s Attempting to merge 7-3...success. 289s Attempting to merge 7-4...success. 289s Attempting to merge 7-5...success. 289s Attempting to merge 8-1...success. 289s Attempting to merge 8-2...success. 289s Attempting to merge 8-3...success. 289s Attempting to merge 8-4...success. 289s Attempting to merge 8-5...success. 289s Attempting to merge 9-1...success. 289s Attempting to merge 9-2...success. 289s Attempting to merge 9-3...success. 289s Attempting to merge 9-4...success. 289s Attempting to merge 9-5...success. 289s Previous HEAD position was ed4b122 imerge 'c-d': automatic merge 9-5 289s Switched to branch 'imerge/c-d' 289s Auto-merging conflict.txt 289s CONFLICT (content): Merge conflict in conflict.txt 289s Automatic merge failed; fix conflicts and then commit the result. 289s 289s Original first commit: 289s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 289s Author: Loú User 289s Date: Thu Apr 7 22:13:15 2005 +0000 289s 289s c⇒1 289s 289s Original second commit: 289s commit f7e451a6c9656dda15641a9fbc591a602f158692 289s Author: Loú User 289s Date: Thu Apr 7 22:13:29 2005 +0000 289s 289s d⇒6 289s + grep -q Traceback start.out 289s + grep -q suggest manual merge of 1-6 autofill.out 289s + git-imerge diagram --commits --frontier --html=imerge3.html 289s 289s There was a conflict merging commit 1-6, shown above. 289s Please resolve the conflict, commit the result, then type 289s 289s git-imerge continue 289s 0 5 9 289s | | | 289s 0 - ********** - c 289s *......... 289s *......... 289s *......... 289s *......... 289s 5 - *......... 289s 6 - *#???????? 289s | 289s d 289s 289s 0 5 9 289s | | | 289s 0 - ********** - c 289s *........| 289s *........| 289s *........| 289s *........| 289s 5 - *--------+ 289s 6 - *#???????? 289s | 289s d 289s 289s Key: 289s |,-,+ = rectangles forming current merge frontier 289s * = merge done manually 289s . = merge done automatically 289s # = conflict that is currently blocking progress 289s @ = merge was blocked but has been resolved 289s ? = no merge recorded 289s 289s + echo merged version 289s + git add conflict.txt 289s + GIT_EDITOR=cat git commit 289s imerge 'c-d': manual merge 1-6 289s 289s # Conflicts: 289s # conflict.txt 289s # 289s # It looks like you may be committing a merge. 289s # If this is not correct, please run 289s # git update-ref -d MERGE_HEAD 289s # and try again. 289s 289s 289s # Please enter the commit message for your changes. Lines starting 289s # with '#' will be ignored, and an empty message aborts the commit. 289s # 289s # On branch imerge/c-d 289s # All conflicts fixed but you are still merging. 289s # 289s # Changes to be committed: 289s # modified: conflict.txt 289s # modified: d.txt 289s # 289s [imerge/c-d bb04926] imerge 'c-d': manual merge 1-6 289s + git-imerge continue --edit 289s Merge has been recorded for merge 1-6. 290s Attempting to merge 2-6...success. 290s Attempting to merge 3-6...success. 290s Attempting to merge 4-6...success. 290s Attempting to merge 5-6...success. 290s Attempting to merge 6-6...success. 290s Attempting to merge 7-6...success. 290s Attempting to merge 8-6...success. 290s Attempting to merge 9-6...success. 290s Merge is complete! 290s + git-imerge diagram --commits --frontier --html=imerge4.html 290s 0 5 9 290s | | | 290s 0 - ********** - c 290s *......... 290s *......... 290s *......... 290s *......... 290s 5 - *......... 290s 6 - **........ 290s | 290s d 290s 290s 0 5 9 290s | | | 290s 0 - ********** - c 290s *........| 290s *........| 290s *........| 290s *........| 290s 5 - *........| 290s 6 - **-------+ 290s | 290s d 290s 290s Key: 290s |,-,+ = rectangles forming current merge frontier 290s * = merge done manually 290s . = merge done automatically 290s # = conflict that is currently blocking progress 290s @ = merge was blocked but has been resolved 290s ? = no merge recorded 290s 290s + git-imerge finish --branch=c-d-full 290s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 290s + local refname=c-d-full 290s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 290s + git rev-parse c-d-full^{tree} 290s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 290s + test_conflict 9-6 290s + local conflict=9-6 290s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s + DESCRIPTION=git-imerge test repository with conflict at 9-6 290s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 290s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s + local description=git-imerge test repository with conflict at 9-6 290s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 290s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s + local description=git-imerge test repository with conflict at 9-6 290s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s hint: Using 'master' as the name for the initial branch. This default branch name 290s hint: is subject to change. To configure the initial branch name to use in all 290s hint: of your new repositories, which will suppress this warning, call: 290s hint: 290s hint: git config --global init.defaultBranch 290s hint: 290s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 290s hint: 'development'. The just-created branch can be renamed via this command: 290s hint: 290s hint: git branch -m 290s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6/.git/ 290s + echo git-imerge test repository with conflict at 9-6 290s + printf %s\n /*.out /*.css /*.html 290s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6/.git config user.name Loú User 290s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 290s + TIME=1112911993 290s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-6 290s + modify c.txt 0 290s + filename=c.txt 290s + text=0 290s + echo 0 290s + git add c.txt 290s + modify d.txt 0 290s + filename=d.txt 290s + text=0 290s + echo 0 290s + git add d.txt 290s [master (root-commit) d70e04b] m⇒0 290s 3 files changed, 3 insertions(+) 290s create mode 100644 c.txt 290s create mode 100644 conflict.txt 290s create mode 100644 d.txt 290s [c 89e2141] c⇒1 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s [c 7c431f2] c⇒2 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s [c f02ab24] c⇒3 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s [c ed9122f] c⇒4 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify conflict.txt original version 290s + filename=conflict.txt 290s + text=original version 290s + echo original version 290s + git add conflict.txt 290s + commit -m m⇒0 290s + TIME=1112911994 290s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 290s + git checkout -b c master -- 290s Switched to a new branch 'c' 290s + seq 9 290s + modify c.txt 1 290s + filename=c.txt 290s + text=1 290s + echo 1 290s + git add c.txt 290s + commit -m c⇒1 290s + TIME=1112911995 290s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 290s + modify c.txt 2 290s + filename=c.txt 290s + text=2 290s + echo 2 290s + git add c.txt 290s + commit -m c⇒2 290s + TIME=1112911996 290s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 290s + modify c.txt 3 290s + filename=c.txt 290s + text=3 290s + echo 3 290s + git add c.txt 290s + commit -m c⇒3 290s + TIME=1112911997 290s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 290s + modify c.txt 4 290s + filename=c.txt 290s + text=4 290s + echo 4 290s + git add c.txt 290s + commit -m c⇒4 290s + TIME=1112911998 290s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 290s + modify c.txt 5 290s + filename=c.txt 290s + text=5 290s + echo 5 290s + git add c.txt 290s + commit -m c⇒5 290s + TIME=1112911999 290s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 290s [c 1d3bf09] c⇒5 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify c.txt 6 290s + filename=c.txt 290s + text=6 290s + echo 6 290s + git add c.txt 290s + commit -m c⇒6 290s + TIME=1112912000 290s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 290s [c f999ecd] c⇒6 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify c.txt 7 290s + filename=c.txt 290s + text=7 290s + echo 7 290s + git add c.txt 290s + commit -m c⇒7 290s + TIME=1112912001 290s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 290s + modify c.txt 8 290s + filename=c.txt 290s + text=8 290s + echo 8 290s + git add c.txt 290s [c 7050a8a] c⇒7 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + commit -m c⇒8 290s + TIME=1112912002 290s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 290s [c 9732e77] c⇒8 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify c.txt 9 290s + filename=c.txt 290s + text=9 290s + echo 9 290s + git add c.txt 290s + modify conflict.txt c version 290s + filename=conflict.txt 290s + text=c version 290s + echo c version 290s + git add conflict.txt 290s + commit -m c⇒9 290s + TIME=1112912003 290s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 290s [c 73a5eed] c⇒9 290s 2 files changed, 2 insertions(+), 2 deletions(-) 290s + git checkout -b d master -- 290s Switched to a new branch 'd' 290s + seq 6 290s [d bd5368a] d⇒1 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify d.txt 1 290s + filename=d.txt 290s + text=1 290s + echo 1 290s + git add d.txt 290s + commit -m d⇒1 290s + TIME=1112912004 290s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 290s + modify d.txt 2 290s + filename=d.txt 290s + text=2 290s + echo 2 290s + git add d.txt 290s + commit -m d⇒2 290s + TIME=1112912005 290s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 290s + modify d.txt 3 290s + filename=d.txt 290s + text=3 290s + echo 3 290s + git add d.txt 290s + commit -m d⇒3 290s + TIME=1112912006 290s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 290s [d 93e27e6] d⇒2 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify d.txt 4 290s + filename=d.txt 290s + text=4 290s + echo 4 290s + git add d.txt 290s + commit -m d⇒4 290s + TIME=1112912007 290s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 290s [d 133f385] d⇒3 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify d.txt 5 290s + filename=d.txt 290s + text=5 290s + echo 5 290s + git add d.txt 290s + commit -m d⇒5 290s + TIME=1112912008 290s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 290s [d 586472a] d⇒4 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify d.txt 6 290s + filename=d.txt 290s + text=6 290s + echo 6 290s + git add d.txt 290s + modify conflict.txt d version 290s + filename=conflict.txt 290s + text=d version 290s + echo d version 290s + git add conflict.txt 290s [d 9522207] d⇒5 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + commit -m d⇒6 290s + TIME=1112912009 290s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 290s [d f7e451a] d⇒6 290s 2 files changed, 2 insertions(+), 2 deletions(-) 290s + git checkout c 290s Switched to branch 'c' 290s + git-imerge init --name=c-d d 290s + git-imerge list 291s * c-d 291s + git-imerge diagram --commits --frontier --html=imerge0.html 291s 0 5 9 291s | | | 291s 0 - ********** - c 291s *????????? 291s *????????? 291s *????????? 291s *????????? 291s 5 - *????????? 291s 6 - *????????? 291s | 291s d 291s 291s 0 5 9 291s | | | 291s 0 - ********** - c 291s *????????? 291s *????????? 291s *????????? 291s *????????? 291s 5 - *????????? 291s 6 - *????????? 291s | 291s d 291s 291s Key: 291s |,-,+ = rectangles forming current merge frontier 291s * = merge done manually 291s . = merge done automatically 291s # = conflict that is currently blocking progress 291s @ = merge was blocked but has been resolved 291s ? = no merge recorded 291s 291s + git-imerge autofill 291s + tee autofill.out 291s Attempting automerge of 9-6...failure. 291s Attempting automerge of 1-1...success. 291s Attempting automerge of 1-4...success. 291s Attempting automerge of 1-6...success. 291s Attempting automerge of 9-6...failure. 291s Attempting automerge of 5-6...success. 291s Attempting automerge of 7-6...success. 291s Attempting automerge of 8-6...success. 291s Attempting automerge of 9-1...success. 291s Attempting automerge of 9-4...success. 291s Attempting automerge of 9-5...success. 291s Autofilling 1-6...success. 291s Autofilling 2-6...success. 291s Autofilling 3-6...success. 291s Autofilling 4-6...success. 291s Autofilling 5-6...success. 291s Autofilling 6-6...success. 291s Autofilling 7-6...success. 291s Autofilling 8-1...success. 291s Autofilling 8-2...success. 291s Autofilling 8-3...success. 291s Autofilling 8-4...success. 291s Autofilling 8-5...success. 291s Autofilling 8-6 (first way)...success. 291s Autofilling 8-6 (second way)...success. 291s The two ways of autofilling 8-6 agree. 291s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 291s Autofilling 9-1...success. 291s Autofilling 9-2...success. 291s Autofilling 9-3...success. 291s Autofilling 9-4...success. 291s Autofilling 9-5...success. 291s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 291s Attempting automerge of 9-6...failure. 291s Attempting automerge of 9-6...failure. 291s HEAD is now at 73a5eed c⇒9 291s Conflict; suggest manual merge of 9-6 291s + grep -q Traceback autofill.out 291s + grep -q suggest manual merge of 9-6 autofill.out 291s + git-imerge diagram --commits --frontier --html=imerge1.html 292s 0 5 9 292s | | | 292s 0 - ********** - c 292s *???????.. 292s *???????.. 292s *???????.. 292s *???????.. 292s 5 - *???????.. 292s 6 - *........# 292s | 292s d 292s 292s 0 5 9 292s | | | 292s 0 - ********** - c 292s *???????.| 292s *???????.| 292s *???????.| 292s *???????.| 292s 5 - *???????.+ 292s 6 - *-------+# 292s | 292s d 292s 292s Key: 292s |,-,+ = rectangles forming current merge frontier 292s * = merge done manually 292s . = merge done automatically 292s # = conflict that is currently blocking progress 292s @ = merge was blocked but has been resolved 292s ? = no merge recorded 292s 292s + git-imerge continue --edit 292s Switched to branch 'imerge/c-d' 292s 292s Original first commit: 292s Auto-merging conflict.txt 292s CONFLICT (content): Merge conflict in conflict.txt 292s Automatic merge failed; fix conflicts and then commit the result. 292s 292s Original second commit: 292s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 292s Author: Loú User 292s Date: Thu Apr 7 22:13:23 2005 +0000 292s 292s c⇒9 292s commit f7e451a6c9656dda15641a9fbc591a602f158692 292s Author: Loú User 292s Date: Thu Apr 7 22:13:29 2005 +0000 292s 292s d⇒6 292s 292s There was a conflict merging commit 9-6, shown above. 292s Please resolve the conflict, commit the result, then type 292s 292s git-imerge continue 292s + echo merged version 292s + git add conflict.txt 292s + git-imerge continue --no-edit 292s [imerge/c-d bbe96d3] imerge 'c-d': manual merge 9-6 292s Merge has been recorded for merge 9-6. 292s Merge is complete! 292s + git-imerge diagram --commits --frontier --html=imerge2.html 292s 0 5 9 292s | | | 292s 0 - ********** - c 292s *???????.. 292s *???????.. 292s *???????.. 292s *???????.. 292s 5 - *???????.. 292s 6 - *........* 292s | 292s d 292s 292s 0 5 9 292s | | | 292s 0 - ********** - c 292s *???????.| 292s *???????.| 292s *???????.| 292s *???????.| 292s 5 - *???????.| 292s 6 - *--------* 292s | 292s d 292s 292s Key: 292s |,-,+ = rectangles forming current merge frontier 292s * = merge done manually 292s . = merge done automatically 292s # = conflict that is currently blocking progress 292s @ = merge was blocked but has been resolved 292s ? = no merge recorded 292s 292s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 292s Merge d into c (using imerge) 292s 292s # Please enter the commit message for your changes. Lines starting 292s # with '#' will be ignored, and an empty message aborts the commit. 292s # 292s # Date: Thu Mar 21 05:03:41 2024 +0000 292s # 292s # On branch c-d-merge 292s # Changes to be committed: 292s # modified: conflict.txt 292s # modified: d.txt 292s # 292s [c-d-merge e916940] Merge d into c (using imerge) 292s Date: Thu Mar 21 05:03:41 2024 +0000 292s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 292s + local refname=c-d-merge 292s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 292s + git rev-parse c-d-merge^{tree} 292s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 292s + git-imerge simplify --goal=rebase --branch=c-d-rebase 292s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 292s + local refname=c-d-rebase 292s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 292s + git rev-parse c-d-rebase^{tree} 292s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 292s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 293s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + local refname=c-d-rebase-with-history 293s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git rev-parse c-d-rebase-with-history^{tree} 293s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git-imerge simplify --goal=border --branch=c-d-border 293s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + local refname=c-d-border 293s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git rev-parse c-d-border^{tree} 293s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 293s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + local refname=c-d-border-with-history 293s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git rev-parse c-d-border-with-history^{tree} 293s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 293s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + local refname=c-d-border-with-history2 293s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git rev-parse c-d-border-with-history2^{tree} 293s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 293s + git-imerge remove 294s + git checkout c 294s Switched to branch 'c' 294s + git-imerge start --goal=full --first-parent --name=c-d d 294s + tee start.out 294s Attempting to merge 1-1...success. 294s Attempting to merge 1-2...success. 294s Attempting to merge 1-3...success. 294s Attempting to merge 1-4...success. 294s Attempting to merge 1-5...success. 294s Attempting to merge 1-6...success. 294s Attempting to merge 2-1...success. 294s Attempting to merge 2-2...success. 294s Attempting to merge 2-3...success. 294s Attempting to merge 2-4...success. 294s Attempting to merge 2-5...success. 294s Attempting to merge 2-6...success. 294s Attempting to merge 3-1...success. 294s Attempting to merge 3-2...success. 294s Attempting to merge 3-3...success. 294s Attempting to merge 3-4...success. 294s Attempting to merge 3-5...success. 294s Attempting to merge 3-6...success. 294s Attempting to merge 4-1...success. 294s Attempting to merge 4-2...success. 294s Attempting to merge 4-3...success. 294s Attempting to merge 4-4...success. 294s Attempting to merge 4-5...success. 294s Attempting to merge 4-6...success. 294s Attempting to merge 5-1...success. 294s Attempting to merge 5-2...success. 294s Attempting to merge 5-3...success. 294s Attempting to merge 5-4...success. 294s Attempting to merge 5-5...success. 294s Attempting to merge 5-6...success. 294s Attempting to merge 6-1...success. 294s Attempting to merge 6-2...success. 294s Attempting to merge 6-3...success. 294s Attempting to merge 6-4...success. 294s Attempting to merge 6-5...success. 294s Attempting to merge 6-6...success. 295s Attempting to merge 7-1...success. 295s Attempting to merge 7-2...success. 295s Attempting to merge 7-3...success. 295s Attempting to merge 7-4...success. 295s Attempting to merge 7-5...success. 295s Attempting to merge 7-6...success. 295s Attempting to merge 8-1...success. 295s Attempting to merge 8-2...success. 295s Attempting to merge 8-3...success. 295s Attempting to merge 8-4...success. 295s Attempting to merge 8-5...success. 295s Attempting to merge 8-6...success. 295s Attempting to merge 9-1...success. 295s Attempting to merge 9-2...success. 295s Attempting to merge 9-3...success. 295s Attempting to merge 9-4...success. 295s Attempting to merge 9-5...success. 295s Attempting to merge 9-6...conflict. 295s Switched to branch 'imerge/c-d' 295s Auto-merging conflict.txt 295s CONFLICT (content): Merge conflict in conflict.txt 295s Automatic merge failed; fix conflicts and then commit the result. 295s 295s Original first commit: 295s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 295s Author: Loú User 295s Date: Thu Apr 7 22:13:23 2005 +0000 295s 295s c⇒9 295s 295s Original second commit: 295s commit f7e451a6c9656dda15641a9fbc591a602f158692 295s Author: Loú User 295s Date: Thu Apr 7 22:13:29 2005 +0000 295s 295s d⇒6 295s 295s There was a conflict merging commit 9-6, shown above. 295s Please resolve the conflict, commit the result, then type 295s 295s git-imerge continue 295s + grep -q Traceback start.out 295s + grep -q suggest manual merge of 9-6 autofill.out 295s + git-imerge diagram --commits --frontier --html=imerge3.html 295s 0 5 9 295s | | | 295s 0 - ********** - c 295s *......... 295s *......... 295s *......... 295s *......... 295s 5 - *......... 295s 6 - *........# 295s | 295s d 295s 295s 0 5 9 295s | | | 295s 0 - ********** - c 295s *........| 295s *........| 295s *........| 295s *........| 295s 5 - *........+ 295s 6 - *-------+# 295s | 295s d 295s 295s Key: 295s |,-,+ = rectangles forming current merge frontier 295s * = merge done manually 295s . = merge done automatically 295s # = conflict that is currently blocking progress 295s @ = merge was blocked but has been resolved 295s ? = no merge recorded 295s 295s + echo merged version 295s + git add conflict.txt 295s + GIT_EDITOR=cat git commit 295s imerge 'c-d': manual merge 9-6 295s 295s # Conflicts: 295s # conflict.txt 295s # 295s # It looks like you may be committing a merge. 295s # If this is not correct, please run 295s # git update-ref -d MERGE_HEAD 295s # and try again. 295s 295s 295s # Please enter the commit message for your changes. Lines starting 295s # with '#' will be ignored, and an empty message aborts the commit. 295s # 295s # On branch imerge/c-d 295s # All conflicts fixed but you are still merging. 295s # 295s # Changes to be committed: 295s # modified: conflict.txt 295s # modified: d.txt 295s # 295s [imerge/c-d a88ff41] imerge 'c-d': manual merge 9-6 295s + git-imerge continue --edit 295s Merge has been recorded for merge 9-6. 295s Merge is complete! 295s + git-imerge diagram --commits --frontier --html=imerge4.html 295s 0 5 9 295s | | | 295s 0 - ********** - c 295s *......... 295s *......... 295s *......... 295s *......... 295s 5 - *......... 295s 6 - *........* 295s | 295s d 295s 295s 0 5 9 295s | | | 295s 0 - ********** - c 295s *........| 295s *........| 295s *........| 295s *........| 295s 5 - *........| 295s 6 - *--------* 295s | 295s d 295s 295s Key: 295s |,-,+ = rectangles forming current merge frontier 295s * = merge done manually 295s . = merge done automatically 295s # = conflict that is currently blocking progress 295s @ = merge was blocked but has been resolved 295s ? = no merge recorded 295s 295s + git-imerge finish --branch=c-d-full 296s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 296s + local refname=c-d-full 296s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 296s + git rev-parse c-d-full^{tree} 296s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 296s + test_conflict 1-2 296s + local conflict=1-2 296s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s + DESCRIPTION=git-imerge test repository with conflict at 1-2 296s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 296s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s + local description=git-imerge test repository with conflict at 1-2 296s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 296s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s + local description=git-imerge test repository with conflict at 1-2 296s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s hint: Using 'master' as the name for the initial branch. This default branch name 296s hint: is subject to change. To configure the initial branch name to use in all 296s hint: of your new repositories, which will suppress this warning, call: 296s hint: 296s hint: git config --global init.defaultBranch 296s hint: 296s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 296s hint: 'development'. The just-created branch can be renamed via this command: 296s hint: 296s hint: git branch -m 296s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2/.git/ 296s + echo git-imerge test repository with conflict at 1-2 296s + printf %s\n /*.out /*.css /*.html 296s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2/.git config user.name Loú User 296s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 296s + TIME=1112911993 296s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s [master (root-commit) d70e04b] m⇒0 296s 3 files changed, 3 insertions(+) 296s create mode 100644 c.txt 296s create mode 100644 conflict.txt 296s create mode 100644 d.txt 296s [c 2120f40] c⇒1 296s 2 files changed, 2 insertions(+), 2 deletions(-) 296s [c 90cc7de] c⇒2 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s [c 2046ed2] c⇒3 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s [c 8a2cee9] c⇒4 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-1-2 296s + modify c.txt 0 296s + filename=c.txt 296s + text=0 296s + echo 0 296s + git add c.txt 296s + modify d.txt 0 296s + filename=d.txt 296s + text=0 296s + echo 0 296s + git add d.txt 296s + modify conflict.txt original version 296s + filename=conflict.txt 296s + text=original version 296s + echo original version 296s + git add conflict.txt 296s + commit -m m⇒0 296s + TIME=1112911994 296s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 296s + git checkout -b c master -- 296s Switched to a new branch 'c' 296s + seq 9 296s + modify c.txt 1 296s + filename=c.txt 296s + text=1 296s + echo 1 296s + git add c.txt 296s + modify conflict.txt c version 296s + filename=conflict.txt 296s + text=c version 296s + echo c version 296s + git add conflict.txt 296s + commit -m c⇒1 296s + TIME=1112911995 296s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 296s + modify c.txt 2 296s + filename=c.txt 296s + text=2 296s + echo 2 296s + git add c.txt 296s + commit -m c⇒2 296s + TIME=1112911996 296s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 296s + modify c.txt 3 296s + filename=c.txt 296s + text=3 296s + echo 3 296s + git add c.txt 296s + commit -m c⇒3 296s + TIME=1112911997 296s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 296s + modify c.txt 4 296s + filename=c.txt 296s + text=4 296s + echo 4 296s + git add c.txt 296s + commit -m c⇒4 296s + TIME=1112911998 296s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 296s + modify c.txt 5 296s + filename=c.txt 296s + text=5 296s + echo 5 296s + git add c.txt 296s + commit -m c⇒5 296s + TIME=1112911999 296s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 296s + modify c.txt 6 296s + filename=c.txt 296s + text=6 296s + echo 6 296s [c ac16a05] c⇒5 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + git add c.txt 296s + commit -m c⇒6 296s + TIME=1112912000 296s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 296s + modify c.txt 7 296s + filename=c.txt 296s + text=7 296s + echo 7 296s [c 30dd2ae] c⇒6 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + git add c.txt 296s + commit -m c⇒7 296s + TIME=1112912001 296s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 296s [c 0883eb9] c⇒7 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify c.txt 8 296s + filename=c.txt 296s + text=8 296s + echo 8 296s + git add c.txt 296s + commit -m c⇒8 296s + TIME=1112912002 296s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 296s [c f661c06] c⇒8 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify c.txt 9 296s + filename=c.txt 296s + text=9 296s + echo 9 296s + git add c.txt 296s + commit -m c⇒9 296s + TIME=1112912003 296s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 296s [c 243e8ed] c⇒9 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + git checkout -b d master -- 296s Switched to a new branch 'd' 296s + seq 6 296s + modify d.txt 1 296s + filename=d.txt 296s + text=1 296s + echo 1 296s + git add d.txt 296s [d bd5368a] d⇒1 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s [d 69efde8] d⇒2 296s 2 files changed, 2 insertions(+), 2 deletions(-) 296s + commit -m d⇒1 296s + TIME=1112912004 296s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 296s + modify d.txt 2 296s + filename=d.txt 296s + text=2 296s + echo 2 296s + git add d.txt 296s + modify conflict.txt d version 296s + filename=conflict.txt 296s + text=d version 296s + echo d version 296s + git add conflict.txt 296s + commit -m d⇒2 296s + TIME=1112912005 296s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 296s + modify d.txt 3 296s + filename=d.txt 296s + text=3 296s + echo 3 296s + git add d.txt 296s + commit -m d⇒3 296s + TIME=1112912006 296s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 296s [d 3169557] d⇒3 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify d.txt 4 296s + filename=d.txt 296s + text=4 296s + echo 4 296s + git add d.txt 296s + commit -m d⇒4 296s + TIME=1112912007 296s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 296s [d 86c8052] d⇒4 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify d.txt 5 296s + filename=d.txt 296s + text=5 296s + echo 5 296s + git add d.txt 296s + commit -m d⇒5 296s + TIME=1112912008 296s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 296s [d 1700773] d⇒5 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify d.txt 6 296s + filename=d.txt 296s + text=6 296s + echo 6 296s + git add d.txt 296s + commit -m d⇒6 296s + TIME=1112912009 296s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 296s [d df2e493] d⇒6 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + git checkout c 296s Switched to branch 'c' 296s + git-imerge init --name=c-d d 296s + git-imerge list 296s * c-d 296s + git-imerge diagram --commits --frontier --html=imerge0.html 296s 0 5 9 296s | | | 296s 0 - ********** - c 296s *????????? 296s *????????? 296s *????????? 296s *????????? 296s 5 - *????????? 296s 6 - *????????? 296s | 296s d 296s 296s 0 5 9 296s | | | 296s 0 - ********** - c 296s *????????? 296s *????????? 296s *????????? 296s *????????? 296s 5 - *????????? 296s 6 - *????????? 296s | 296s d 296s 296s Key: 296s |,-,+ = rectangles forming current merge frontier 296s * = merge done manually 296s . = merge done automatically 296s # = conflict that is currently blocking progress 296s @ = merge was blocked but has been resolved 296s ? = no merge recorded 296s 296s + git-imerge autofill 296s + tee autofill.out 296s Attempting automerge of 9-6...failure. 296s Attempting automerge of 1-1...success. 296s Attempting automerge of 1-4...failure. 296s Attempting automerge of 1-3...failure. 296s Attempting automerge of 1-2...failure. 296s Attempting automerge of 9-1...success. 296s Autofilling 1-1...success. 296s Autofilling 2-1...success. 296s Autofilling 3-1...success. 296s Autofilling 4-1...success. 296s Autofilling 5-1...success. 296s Autofilling 6-1...success. 296s Autofilling 7-1...success. 296s Autofilling 8-1...success. 297s Autofilling 9-1...success. 297s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 297s Attempting automerge of 9-6...failure. 297s Attempting automerge of 1-2...failure. 297s HEAD is now at 243e8ed c⇒9 297s Conflict; suggest manual merge of 1-2 297s + grep -q Traceback autofill.out 297s + grep -q suggest manual merge of 1-2 autofill.out 297s + git-imerge diagram --commits --frontier --html=imerge1.html 297s 0 5 9 297s | | | 297s 0 - ********** - c 297s *......... 297s *#???????? 297s *????????? 297s *????????? 297s 5 - *????????? 297s 6 - *????????? 297s | 297s d 297s 297s 0 5 9 297s | | | 297s 0 - ********** - c 297s *--------+ 297s *#???????? 297s *????????? 297s *????????? 297s 5 - *????????? 297s 6 - *????????? 297s | 297s d 297s 297s Key: 297s |,-,+ = rectangles forming current merge frontier 297s * = merge done manually 297s . = merge done automatically 297s # = conflict that is currently blocking progress 297s @ = merge was blocked but has been resolved 297s ? = no merge recorded 297s 297s + git-imerge continue --edit 297s Switched to branch 'imerge/c-d' 297s Auto-merging conflict.txt 297s CONFLICT (content): Merge conflict in conflict.txt 297s Automatic merge failed; fix conflicts and then commit the result. 297s 297s Original first commit: 297s 297s Original second commit: 297s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 297s Author: Loú User 297s Date: Thu Apr 7 22:13:15 2005 +0000 297s 297s c⇒1 297s commit 69efde8f66d581a765a3909ffacb9f895f95c345 297s Author: Loú User 297s Date: Thu Apr 7 22:13:25 2005 +0000 297s 297s d⇒2 297s 297s There was a conflict merging commit 1-2, shown above. 297s Please resolve the conflict, commit the result, then type 297s 297s git-imerge continue 297s + echo merged version 297s + git add conflict.txt 297s + git-imerge continue --no-edit 297s [imerge/c-d e84db3a] imerge 'c-d': manual merge 1-2 297s Merge has been recorded for merge 1-2. 297s Attempting automerge of 1-6...success. 297s Autofilling 1-3...success. 297s Autofilling 1-4...success. 297s Autofilling 1-5...success. 297s Autofilling 1-6...success. 297s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 297s Attempting automerge of 9-6...success. 297s Autofilling 2-6...success. 297s Autofilling 3-6...success. 297s Autofilling 4-6...success. 297s Autofilling 5-6...success. 297s Autofilling 6-6...success. 297s Autofilling 7-6...success. 297s Autofilling 8-6...success. 297s Autofilling 9-2...success. 297s Autofilling 9-3...success. 297s Autofilling 9-4...success. 297s Autofilling 9-5...success. 297s Autofilling 9-6 (first way)...success. 297s Autofilling 9-6 (second way)...success. 297s The two ways of autofilling 9-6 agree. 297s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 297s Merge is complete! 297s + git-imerge diagram --commits --frontier --html=imerge2.html 298s 0 5 9 298s | | | 298s 0 - ********** - c 298s *......... 298s **???????. 298s *.???????. 298s *.???????. 298s 5 - *.???????. 298s 6 - *......... 298s | 298s d 298s 298s 0 5 9 298s | | | 298s 0 - ********** - c 298s *........| 298s **???????| 298s *.???????| 298s *.???????| 298s 5 - *.???????| 298s 6 - *--------+ 298s | 298s d 298s 298s Key: 298s |,-,+ = rectangles forming current merge frontier 298s * = merge done manually 298s . = merge done automatically 298s # = conflict that is currently blocking progress 298s @ = merge was blocked but has been resolved 298s ? = no merge recorded 298s 298s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 298s Merge d into c (using imerge) 298s 298s # Please enter the commit message for your changes. Lines starting 298s # with '#' will be ignored, and an empty message aborts the commit. 298s # 298s # Date: Thu Mar 21 05:03:47 2024 +0000 298s # 298s # On branch c-d-merge 298s # Changes to be committed: 298s # modified: conflict.txt 298s # modified: d.txt 298s # 298s [c-d-merge 437d232] Merge d into c (using imerge) 298s Date: Thu Mar 21 05:03:47 2024 +0000 298s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + local refname=c-d-merge 298s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + git rev-parse c-d-merge^{tree} 298s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + git-imerge simplify --goal=rebase --branch=c-d-rebase 298s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + local refname=c-d-rebase 298s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + git rev-parse c-d-rebase^{tree} 298s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 298s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + local refname=c-d-rebase-with-history 298s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + git rev-parse c-d-rebase-with-history^{tree} 298s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 298s + git-imerge simplify --goal=border --branch=c-d-border 299s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + local refname=c-d-border 299s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + git rev-parse c-d-border^{tree} 299s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 299s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + local refname=c-d-border-with-history 299s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + git rev-parse c-d-border-with-history^{tree} 299s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 299s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + local refname=c-d-border-with-history2 299s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + git rev-parse c-d-border-with-history2^{tree} 299s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 299s + git-imerge remove 299s + git checkout c 299s Switched to branch 'c' 299s + + tee start.out 299s git-imerge start --goal=full --first-parent --name=c-d d 299s Attempting to merge 1-1...success. 299s Attempting to merge 1-2...conflict. 299s Attempting to merge 2-1...success. 299s Attempting to merge 3-1...success. 299s Attempting to merge 4-1...success. 299s Attempting to merge 5-1...success. 300s Attempting to merge 6-1...success. 300s Attempting to merge 7-1...success. 300s Attempting to merge 8-1...success. 300s Attempting to merge 9-1...success. 300s Previous HEAD position was f3a9fdb imerge 'c-d': automatic merge 9-1 300s Switched to branch 'imerge/c-d' 300s Auto-merging conflict.txt 300s CONFLICT (content): Merge conflict in conflict.txt 300s Automatic merge failed; fix conflicts and then commit the result. 300s 300s Original first commit: 300s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 300s Author: Loú User 300s Date: Thu Apr 7 22:13:15 2005 +0000 300s 300s c⇒1 300s 300s Original second commit: 300s commit 69efde8f66d581a765a3909ffacb9f895f95c345 300s Author: Loú User 300s Date: Thu Apr 7 22:13:25 2005 +0000 300s 300s d⇒2 300s 300s There was a conflict merging commit 1-2, shown above. 300s Please resolve the conflict, commit the result, then type 300s 300s git-imerge continue 300s + grep -q Traceback start.out 300s + grep -q suggest manual merge of 1-2 autofill.out 300s + git-imerge diagram --commits --frontier --html=imerge3.html 300s 0 5 9 300s | | | 300s 0 - ********** - c 300s *......... 300s *#???????? 300s *????????? 300s *????????? 300s 5 - *????????? 300s 6 - *????????? 300s | 300s d 300s 300s 0 5 9 300s | | | 300s 0 - ********** - c 300s *--------+ 300s *#???????? 300s *????????? 300s *????????? 300s 5 - *????????? 300s 6 - *????????? 300s | 300s d 300s 300s Key: 300s |,-,+ = rectangles forming current merge frontier 300s * = merge done manually 300s . = merge done automatically 300s # = conflict that is currently blocking progress 300s @ = merge was blocked but has been resolved 300s ? = no merge recorded 300s 300s + echo merged version 300s + git add conflict.txt 300s + GIT_EDITOR=cat git commit 300s imerge 'c-d': manual merge 1-2 300s 300s # Conflicts: 300s # conflict.txt 300s # 300s # It looks like you may be committing a merge. 300s # If this is not correct, please run 300s # git update-ref -d MERGE_HEAD 300s # and try again. 300s 300s 300s # Please enter the commit message for your changes. Lines starting 300s # with '#' will be ignored, and an empty message aborts the commit. 300s # 300s # On branch imerge/c-d 300s # All conflicts fixed but you are still merging. 300s # 300s # Changes to be committed: 300s # modified: conflict.txt 300s # modified: d.txt 300s # 300s + git-imerge continue --edit 300s [imerge/c-d 2c83622] imerge 'c-d': manual merge 1-2 300s Merge has been recorded for merge 1-2. 300s Attempting to merge 1-3...success. 300s Attempting to merge 1-4...success. 300s Attempting to merge 1-5...success. 300s Attempting to merge 1-6...success. 300s Attempting to merge 2-2...success. 300s Attempting to merge 2-3...success. 300s Attempting to merge 2-4...success. 300s Attempting to merge 2-5...success. 300s Attempting to merge 2-6...success. 300s Attempting to merge 3-2...success. 300s Attempting to merge 3-3...success. 300s Attempting to merge 3-4...success. 300s Attempting to merge 3-5...success. 300s Attempting to merge 3-6...success. 300s Attempting to merge 4-2...success. 300s Attempting to merge 4-3...success. 300s Attempting to merge 4-4...success. 300s Attempting to merge 4-5...success. 300s Attempting to merge 4-6...success. 300s Attempting to merge 5-2...success. 300s Attempting to merge 5-3...success. 301s Attempting to merge 5-4...success. 301s Attempting to merge 5-5...success. 301s Attempting to merge 5-6...success. 301s Attempting to merge 6-2...success. 301s Attempting to merge 6-3...success. 301s Attempting to merge 6-4...success. 301s Attempting to merge 6-5...success. 301s Attempting to merge 6-6...success. 301s Attempting to merge 7-2...success. 301s Attempting to merge 7-3...success. 301s Attempting to merge 7-4...success. 301s Attempting to merge 7-5...success. 301s Attempting to merge 7-6...success. 301s Attempting to merge 8-2...success. 301s Attempting to merge 8-3...success. 301s Attempting to merge 8-4...success. 301s Attempting to merge 8-5...success. 301s Attempting to merge 8-6...success. 301s Attempting to merge 9-2...success. 301s Attempting to merge 9-3...success. 301s Attempting to merge 9-4...success. 301s Attempting to merge 9-5...success. 301s Attempting to merge 9-6...success. 301s Merge is complete! 301s + git-imerge diagram --commits --frontier --html=imerge4.html 301s 0 5 9 301s | | | 301s 0 - ********** - c 301s *......... 301s **........ 301s *......... 301s *......... 301s 5 - *......... 301s 6 - *......... 301s | 301s d 301s 301s 0 5 9 301s | | | 301s 0 - ********** - c 301s *........| 301s **.......| 301s *........| 301s *........| 301s 5 - *........| 301s 6 - *--------+ 301s | 301s d 301s 301s Key: 301s |,-,+ = rectangles forming current merge frontier 301s * = merge done manually 301s . = merge done automatically 301s # = conflict that is currently blocking progress 301s @ = merge was blocked but has been resolved 301s ? = no merge recorded 301s 301s + git-imerge finish --branch=c-d-full 301s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 301s + local refname=c-d-full 301s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 301s + git rev-parse c-d-full^{tree} 301s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 301s + test_conflict 9-5 301s + local conflict=9-5 301s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s + DESCRIPTION=git-imerge test repository with conflict at 9-5 301s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 301s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s + local description=git-imerge test repository with conflict at 9-5 301s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 301s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s + local description=git-imerge test repository with conflict at 9-5 301s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s hint: Using 'master' as the name for the initial branch. This default branch name 301s hint: is subject to change. To configure the initial branch name to use in all 301s hint: of your new repositories, which will suppress this warning, call: 301s hint: 301s hint: git config --global init.defaultBranch 301s hint: 301s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 301s hint: 'development'. The just-created branch can be renamed via this command: 301s hint: 301s hint: git branch -m 301s + echo git-imerge test repository with conflict at 9-5 301s + printf %s\n /*.out /*.css /*.html 301s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5/.git config user.name Loú User 301s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5/.git/ 301s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 301s + TIME=1112911993 301s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-9-5 301s + modify c.txt 0 301s + filename=c.txt 301s + text=0 301s + echo 0 301s + git add c.txt 301s + modify d.txt 0 301s + filename=d.txt 301s + text=0 301s + echo 0 301s + git add d.txt 301s [master (root-commit) d70e04b] m⇒0 301s 3 files changed, 3 insertions(+) 301s create mode 100644 c.txt 301s create mode 100644 conflict.txt 301s create mode 100644 d.txt 301s [c 89e2141] c⇒1 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s [c 7c431f2] c⇒2 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s [c f02ab24] c⇒3 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s [c ed9122f] c⇒4 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s + modify conflict.txt original version 301s + filename=conflict.txt 301s + text=original version 301s + echo original version 301s + git add conflict.txt 301s + commit -m m⇒0 301s + TIME=1112911994 301s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 301s + git checkout -b c master -- 301s Switched to a new branch 'c' 301s + seq 9 301s + modify c.txt 1 301s + filename=c.txt 301s + text=1 301s + echo 1 301s + git add c.txt 301s + commit -m c⇒1 301s + TIME=1112911995 301s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 301s + modify c.txt 2 301s + filename=c.txt 301s + text=2 301s + echo 2 301s + git add c.txt 301s + commit -m c⇒2 301s + TIME=1112911996 301s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 301s + modify c.txt 3 301s + filename=c.txt 301s + text=3 301s + echo 3 301s + git add c.txt 301s + commit -m c⇒3 301s + TIME=1112911997 301s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 301s + modify c.txt 4 301s + filename=c.txt 301s + text=4 301s + echo 4 301s + git add c.txt 301s + commit -m c⇒4 301s + TIME=1112911998 301s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 301s + modify c.txt 5 301s + filename=c.txt 301s + text=5 301s + echo 5 301s + git add c.txt 301s + commit -m c⇒5 301s + TIME=1112911999 301s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 301s + modify c.txt 6 301s + filename=c.txt 301s + text=6 301s + echo 6 301s + git add c.txt 301s [c 1d3bf09] c⇒5 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s + commit -m c⇒6 301s + TIME=1112912000 301s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 301s [c f999ecd] c⇒6 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s [c 7050a8a] c⇒7 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s + modify c.txt 7 301s + filename=c.txt 301s + text=7 301s + echo 7 301s + git add c.txt 301s + commit -m c⇒7 301s + TIME=1112912001 301s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 301s + modify c.txt 8 301s + filename=c.txt 301s + text=8 301s + echo 8 301s + git add c.txt 301s + commit -m c⇒8 301s + TIME=1112912002 301s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 301s + modify c.txt 9 301s + filename=c.txt 301s + text=9 301s + echo 9 301s + git add c.txt 301s [c 9732e77] c⇒8 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s + modify conflict.txt c version 301s + filename=conflict.txt 301s + text=c version 301s + echo c version 301s + git add conflict.txt 301s + commit -m c⇒9 301s + TIME=1112912003 301s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 301s + git checkout -b d master -- 301s [c 73a5eed] c⇒9 301s 2 files changed, 2 insertions(+), 2 deletions(-) 301s Switched to a new branch 'd' 301s + seq 6 301s + modify d.txt 1 301s + filename=d.txt 301s + text=1 301s + echo 1 301s + git add d.txt 301s [d bd5368a] d⇒1 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s [d 93e27e6] d⇒2 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s + commit -m d⇒1 301s + TIME=1112912004 301s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 301s + modify d.txt 2 301s + filename=d.txt 301s + text=2 301s + echo 2 301s + git add d.txt 301s + commit -m d⇒2 301s + TIME=1112912005 301s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 301s + modify d.txt 3 301s + filename=d.txt 301s + text=3 301s + echo 3 301s + git add d.txt 301s + commit -m d⇒3 301s + TIME=1112912006 301s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 301s [d 133f385] d⇒3 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s + modify d.txt 4 301s + filename=d.txt 301s + text=4 301s + echo 4 301s + git add d.txt 301s + commit -m d⇒4 301s + TIME=1112912007 301s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 301s [d 586472a] d⇒4 301s 1 file changed, 1 insertion(+), 1 deletion(-) 301s + modify d.txt 5 301s + filename=d.txt 301s + text=5 301s + echo 5 301s + git add d.txt 301s + modify conflict.txt d version 301s + filename=conflict.txt 301s + text=d version 302s + echo d version 302s + git add conflict.txt 302s + commit -m d⇒5 302s + TIME=1112912008 302s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 302s [d 0a6f956] d⇒5 302s 2 files changed, 2 insertions(+), 2 deletions(-) 302s + modify d.txt 6 302s + filename=d.txt 302s + text=6 302s + echo 6 302s + git add d.txt 302s + commit -m d⇒6 302s + TIME=1112912009 302s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 302s [d bfb30f0] d⇒6 302s 1 file changed, 1 insertion(+), 1 deletion(-) 302s + git checkout c 302s Switched to branch 'c' 302s + git-imerge init --name=c-d d 302s + git-imerge list 302s * c-d 302s + git-imerge diagram --commits --frontier --html=imerge0.html 302s 0 5 9 302s | | | 302s 0 - ********** - c 302s *????????? 302s *????????? 302s *????????? 302s *????????? 302s 5 - *????????? 302s 6 - *????????? 302s | 302s d 302s 302s 0 5 9 302s | | | 302s 0 - ********** - c 302s *????????? 302s *????????? 302s *????????? 302s *????????? 302s 5 - *????????? 302s 6 - *????????? 302s | 302s d 302s 302s Key: 302s |,-,+ = rectangles forming current merge frontier 302s * = merge done manually 302s . = merge done automatically 302s # = conflict that is currently blocking progress 302s @ = merge was blocked but has been resolved 302s ? = no merge recorded 302s 302s + git-imerge autofill 302s + tee autofill.out 302s Attempting automerge of 9-6...failure. 302s Attempting automerge of 1-1...success. 302s Attempting automerge of 1-4...success. 302s Attempting automerge of 1-6...success. 302s Attempting automerge of 9-6...failure. 302s Attempting automerge of 5-6...success. 302s Attempting automerge of 7-6...success. 302s Attempting automerge of 8-6...success. 302s Attempting automerge of 9-1...success. 302s Attempting automerge of 9-4...success. 302s Attempting automerge of 9-5...failure. 302s Autofilling 1-6...success. 302s Autofilling 2-6...success. 302s Autofilling 3-6...success. 302s Autofilling 4-6...success. 302s Autofilling 5-6...success. 302s Autofilling 6-6...success. 302s Autofilling 7-6...success. 302s Autofilling 8-1...success. 302s Autofilling 8-2...success. 302s Autofilling 8-3...success. 302s Autofilling 8-4...success. 302s Autofilling 8-5...success. 302s Autofilling 8-6 (first way)...success. 302s Autofilling 8-6 (second way)...success. 303s The two ways of autofilling 8-6 agree. 303s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 303s Autofilling 9-1...success. 303s Autofilling 9-2...success. 303s Autofilling 9-3...success. 303s Autofilling 9-4...success. 303s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 303s Attempting automerge of 9-6...failure. 303s Attempting automerge of 9-5...failure. 303s HEAD is now at 73a5eed c⇒9 303s Conflict; suggest manual merge of 9-5 303s + grep -q Traceback autofill.out 303s + grep -q suggest manual merge of 9-5 autofill.out 303s + git-imerge diagram --commits --frontier --html=imerge1.html 303s 0 5 9 303s | | | 303s 0 - ********** - c 303s *???????.. 303s *???????.. 303s *???????.. 303s *???????.. 303s 5 - *???????.# 303s 6 - *........? 303s | 303s d 303s 303s 0 5 9 303s | | | 303s 0 - ********** - c 303s *???????.| 303s *???????.| 303s *???????.| 303s *???????.+ 303s 5 - *???????|# 303s 6 - *-------+? 303s | 303s d 303s 303s Key: 303s |,-,+ = rectangles forming current merge frontier 303s * = merge done manually 303s . = merge done automatically 303s # = conflict that is currently blocking progress 303s @ = merge was blocked but has been resolved 303s ? = no merge recorded 303s 303s + git-imerge continue --edit 303s Switched to branch 'imerge/c-d' 303s Auto-merging conflict.txt 303s CONFLICT (content): Merge conflict in conflict.txt 303s Automatic merge failed; fix conflicts and then commit the result. 303s 303s Original first commit: 303s 303s Original second commit: 303s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 303s Author: Loú User 303s Date: Thu Apr 7 22:13:23 2005 +0000 303s 303s c⇒9 303s 303s There was a conflict merging commit 9-5, shown above. 303s Please resolve the conflict, commit the result, then type 303s 303s git-imerge continue 303s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 303s Author: Loú User 303s Date: Thu Apr 7 22:13:28 2005 +0000 303s 303s d⇒5 303s + echo merged version 303s + git add conflict.txt 303s + git-imerge continue --no-edit 303s [imerge/c-d 1424da0] imerge 'c-d': manual merge 9-5 303s Merge has been recorded for merge 9-5. 303s Attempting automerge of 9-6...success. 303s Autofilling 9-6...success. 303s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 303s Merge is complete! 303s + git-imerge diagram --commits --frontier --html=imerge2.html 303s 0 5 9 303s | | | 303s 0 - ********** - c 303s *???????.. 303s *???????.. 303s *???????.. 303s *???????.. 303s 5 - *???????.* 303s 6 - *......... 303s | 303s d 303s 303s 0 5 9 303s | | | 303s 0 - ********** - c 303s *???????.| 303s *???????.| 303s *???????.| 303s *???????.| 303s 5 - *???????.* 303s 6 - *--------+ 303s | 303s d 303s 303s Key: 303s |,-,+ = rectangles forming current merge frontier 303s * = merge done manually 303s . = merge done automatically 303s # = conflict that is currently blocking progress 303s @ = merge was blocked but has been resolved 303s ? = no merge recorded 303s 303s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 303s Merge d into c (using imerge) 303s 303s # Please enter the commit message for your changes. Lines starting 303s # with '#' will be ignored, and an empty message aborts the commit. 303s # 303s # Date: Thu Mar 21 05:03:52 2024 +0000 303s # 303s # On branch c-d-merge 303s # Changes to be committed: 303s # modified: conflict.txt 303s # modified: d.txt 303s # 303s [c-d-merge a7c98fb] Merge d into c (using imerge) 303s Date: Thu Mar 21 05:03:52 2024 +0000 303s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 303s + local refname=c-d-merge 303s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 303s + git rev-parse c-d-merge^{tree} 303s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 303s + git-imerge simplify --goal=rebase --branch=c-d-rebase 304s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + local refname=c-d-rebase 304s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + git rev-parse c-d-rebase^{tree} 304s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 304s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + local refname=c-d-rebase-with-history 304s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + git rev-parse c-d-rebase-with-history^{tree} 304s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + git-imerge simplify --goal=border --branch=c-d-border 304s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + local refname=c-d-border 304s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + git rev-parse c-d-border^{tree} 304s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 304s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 305s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 305s + local refname=c-d-border-with-history 305s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 305s + git rev-parse c-d-border-with-history^{tree} 305s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 305s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 305s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 305s + local refname=c-d-border-with-history2 305s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 305s + git rev-parse c-d-border-with-history2^{tree} 305s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 305s + git-imerge remove 305s + git checkout c 305s Switched to branch 'c' 305s + git-imerge start --goal=full --first-parent --name=c-d d 305s + tee start.out 305s Attempting to merge 1-1...success. 305s Attempting to merge 1-2...success. 305s Attempting to merge 1-3...success. 305s Attempting to merge 1-4...success. 305s Attempting to merge 1-5...success. 305s Attempting to merge 1-6...success. 305s Attempting to merge 2-1...success. 305s Attempting to merge 2-2...success. 305s Attempting to merge 2-3...success. 305s Attempting to merge 2-4...success. 305s Attempting to merge 2-5...success. 305s Attempting to merge 2-6...success. 305s Attempting to merge 3-1...success. 305s Attempting to merge 3-2...success. 305s Attempting to merge 3-3...success. 305s Attempting to merge 3-4...success. 305s Attempting to merge 3-5...success. 305s Attempting to merge 3-6...success. 305s Attempting to merge 4-1...success. 305s Attempting to merge 4-2...success. 306s Attempting to merge 4-3...success. 306s Attempting to merge 4-4...success. 306s Attempting to merge 4-5...success. 306s Attempting to merge 4-6...success. 306s Attempting to merge 5-1...success. 306s Attempting to merge 5-2...success. 306s Attempting to merge 5-3...success. 306s Attempting to merge 5-4...success. 306s Attempting to merge 5-5...success. 306s Attempting to merge 5-6...success. 306s Attempting to merge 6-1...success. 306s Attempting to merge 6-2...success. 306s Attempting to merge 6-3...success. 306s Attempting to merge 6-4...success. 306s Attempting to merge 6-5...success. 306s Attempting to merge 6-6...success. 306s Attempting to merge 7-1...success. 306s Attempting to merge 7-2...success. 306s Attempting to merge 7-3...success. 306s Attempting to merge 7-4...success. 306s Attempting to merge 7-5...success. 306s Attempting to merge 7-6...success. 306s Attempting to merge 8-1...success. 306s Attempting to merge 8-2...success. 306s Attempting to merge 8-3...success. 306s Attempting to merge 8-4...success. 306s Attempting to merge 8-5...success. 306s Attempting to merge 8-6...success. 306s Attempting to merge 9-1...success. 306s Attempting to merge 9-2...success. 306s Attempting to merge 9-3...success. 306s Attempting to merge 9-4...success. 306s Attempting to merge 9-5...conflict. 306s Switched to branch 'imerge/c-d' 306s Auto-merging conflict.txt 306s CONFLICT (content): Merge conflict in conflict.txt 306s Automatic merge failed; fix conflicts and then commit the result. 306s 306s Original first commit: 306s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 306s Author: Loú User 306s Date: Thu Apr 7 22:13:23 2005 +0000 306s 306s c⇒9 306s 306s Original second commit: 306s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 306s Author: Loú User 306s Date: Thu Apr 7 22:13:28 2005 +0000 306s 306s d⇒5 306s 306s There was a conflict merging commit 9-5, shown above. 306s Please resolve the conflict, commit the result, then type 306s 306s git-imerge continue 306s + grep -q Traceback start.out 306s + grep -q suggest manual merge of 9-5 autofill.out 306s + git-imerge diagram --commits --frontier --html=imerge3.html 306s 0 5 9 306s | | | 306s 0 - ********** - c 306s *......... 306s *......... 306s *......... 306s *......... 306s 5 - *........# 306s 6 - *........? 306s | 306s d 306s 306s 0 5 9 306s | | | 306s 0 - ********** - c 306s *........| 306s *........| 306s *........| 306s *........+ 306s 5 - *.......|# 306s 6 - *-------+? 306s | 306s d 306s 306s Key: 306s |,-,+ = rectangles forming current merge frontier 306s * = merge done manually 306s . = merge done automatically 306s # = conflict that is currently blocking progress 306s @ = merge was blocked but has been resolved 306s ? = no merge recorded 306s 306s + echo merged version 306s + git add conflict.txt 306s + GIT_EDITOR=cat git commit 306s imerge 'c-d': manual merge 9-5 306s 306s # Conflicts: 306s # conflict.txt 306s # 306s # It looks like you may be committing a merge. 306s # If this is not correct, please run 306s # git update-ref -d MERGE_HEAD 306s # and try again. 306s 306s 306s # Please enter the commit message for your changes. Lines starting 306s # with '#' will be ignored, and an empty message aborts the commit. 306s # 306s # On branch imerge/c-d 306s # All conflicts fixed but you are still merging. 306s # 306s # Changes to be committed: 306s # modified: conflict.txt 306s # modified: d.txt 306s # 306s [imerge/c-d 77ab6bc] imerge 'c-d': manual merge 9-5 306s + git-imerge continue --edit 307s Merge has been recorded for merge 9-5. 307s Attempting to merge 9-6...success. 307s Merge is complete! 307s + git-imerge diagram --commits --frontier --html=imerge4.html 307s 0 5 9 307s | | | 307s 0 - ********** - c 307s *......... 307s *......... 307s *......... 307s *......... 307s 5 - *........* 307s 6 - *......... 307s | 307s d 307s 307s 0 5 9 307s | | | 307s 0 - ********** - c 307s *........| 307s *........| 307s *........| 307s *........| 307s 5 - *........* 307s 6 - *--------+ 307s | 307s d 307s 307s Key: 307s |,-,+ = rectangles forming current merge frontier 307s * = merge done manually 307s . = merge done automatically 307s # = conflict that is currently blocking progress 307s @ = merge was blocked but has been resolved 307s ? = no merge recorded 307s 307s + git-imerge finish --branch=c-d-full 307s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 307s + local refname=c-d-full 307s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 307s + git rev-parse c-d-full^{tree} 307s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 307s + test_conflict 5-1 307s + local conflict=5-1 307s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s + DESCRIPTION=git-imerge test repository with conflict at 5-1 307s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 307s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s + local description=git-imerge test repository with conflict at 5-1 307s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 307s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s + local description=git-imerge test repository with conflict at 5-1 307s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s hint: Using 'master' as the name for the initial branch. This default branch name 307s hint: is subject to change. To configure the initial branch name to use in all 307s hint: of your new repositories, which will suppress this warning, call: 307s hint: 307s hint: git config --global init.defaultBranch 307s hint: 307s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 307s hint: 'development'. The just-created branch can be renamed via this command: 307s hint: 307s hint: git branch -m 307s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1/.git/ 307s + echo git-imerge test repository with conflict at 5-1 307s + printf %s\n /*.out /*.css /*.html 307s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1/.git config user.name Loú User 307s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 307s + TIME=1112911993 307s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s [master (root-commit) d70e04b] m⇒0 307s 3 files changed, 3 insertions(+) 307s create mode 100644 c.txt 307s create mode 100644 conflict.txt 307s create mode 100644 d.txt 307s [c 89e2141] c⇒1 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s [c 7c431f2] c⇒2 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s [c f02ab24] c⇒3 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s [c ed9122f] c⇒4 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-5-1 307s + modify c.txt 0 307s + filename=c.txt 307s + text=0 307s + echo 0 307s + git add c.txt 307s + modify d.txt 0 307s + filename=d.txt 307s + text=0 307s + echo 0 307s + git add d.txt 307s + modify conflict.txt original version 307s + filename=conflict.txt 307s + text=original version 307s + echo original version 307s + git add conflict.txt 307s + commit -m m⇒0 307s + TIME=1112911994 307s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 307s + git checkout -b c master -- 307s Switched to a new branch 'c' 307s + seq 9 307s + modify c.txt 1 307s + filename=c.txt 307s + text=1 307s + echo 1 307s + git add c.txt 307s + commit -m c⇒1 307s + TIME=1112911995 307s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 307s + modify c.txt 2 307s + filename=c.txt 307s + text=2 307s + echo 2 307s + git add c.txt 307s + commit -m c⇒2 307s + TIME=1112911996 307s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 307s + modify c.txt 3 307s + filename=c.txt 307s + text=3 307s + echo 3 307s + git add c.txt 307s + commit -m c⇒3 307s + TIME=1112911997 307s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 307s + modify c.txt 4 307s + filename=c.txt 307s + text=4 307s + echo 4 307s + git add c.txt 307s + commit -m c⇒4 307s + TIME=1112911998 307s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 307s + modify c.txt 5 307s + filename=c.txt 307s + text=5 307s + echo 5 307s + git add c.txt 307s + modify conflict.txt c version 307s + filename=conflict.txt 307s + text=c version 307s + echo c version 307s + git add conflict.txt 307s + commit -m c⇒5 307s + TIME=1112911999 307s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 307s + modify c.txt 6 307s + filename=c.txt 307s + text=6 307s + echo 6 307s + git add c.txt 307s [c 7e31f25] c⇒5 307s 2 files changed, 2 insertions(+), 2 deletions(-) 307s + commit -m c⇒6 307s + TIME=1112912000 307s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 307s [c df3c57a] c⇒6 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + modify c.txt 7 307s + filename=c.txt 307s + text=7 307s + echo 7 307s + git add c.txt 307s + commit -m c⇒7 307s + TIME=1112912001 307s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 307s + modify c.txt 8 307s + filename=c.txt 307s + text=8 307s + echo 8 307s + git add c.txt 307s [c ea32d81] c⇒7 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + commit -m c⇒8 307s + TIME=1112912002 307s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 307s + modify c.txt 9 307s + filename=c.txt 307s + text=9 307s + echo 9 307s + git add c.txt 307s + commit -m c⇒9 307s + TIME=1112912003 307s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 307s [c 44473d6] c⇒8 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s [c d8d80cf] c⇒9 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + git checkout -b d master -- 307s Switched to a new branch 'd' 307s + seq 6 307s + modify d.txt 1 307s + filename=d.txt 307s + text=1 307s + echo 1 307s + git add d.txt 307s + modify conflict.txt d version 307s + filename=conflict.txt 307s + text=d version 307s + echo d version 307s + git add conflict.txt 307s [d ac0427a] d⇒1 307s 2 files changed, 2 insertions(+), 2 deletions(-) 307s [d 43c38c0] d⇒2 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s [d 0260058] d⇒3 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + commit -m d⇒1 307s + TIME=1112912004 307s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 307s + modify d.txt 2 307s + filename=d.txt 307s + text=2 307s + echo 2 307s + git add d.txt 307s + commit -m d⇒2 307s + TIME=1112912005 307s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 307s + modify d.txt 3 307s + filename=d.txt 307s + text=3 307s + echo 3 307s + git add d.txt 307s + commit -m d⇒3 307s + TIME=1112912006 307s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 307s + modify d.txt 4 307s + filename=d.txt 307s + text=4 307s + echo 4 307s + git add d.txt 307s + commit -m d⇒4 307s + TIME=1112912007 307s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 307s + modify d.txt 5 307s + filename=d.txt 307s + text=5 307s + echo 5 307s + git add d.txt 307s [d 40fef44] d⇒4 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + commit -m d⇒5 307s + TIME=1112912008 307s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 307s [d b080a65] d⇒5 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + modify d.txt 6 307s + filename=d.txt 307s + text=6 307s + echo 6 307s + git add d.txt 307s + commit -m d⇒6 307s + TIME=1112912009 307s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 307s [d 200ce5c] d⇒6 307s 1 file changed, 1 insertion(+), 1 deletion(-) 307s + git checkout c 307s Switched to branch 'c' 307s + git-imerge init --name=c-d d 307s + git-imerge list 307s * c-d 307s + git-imerge diagram --commits --frontier --html=imerge0.html 308s 0 5 9 308s | | | 308s 0 - ********** - c 308s *????????? 308s *????????? 308s *????????? 308s *????????? 308s 5 - *????????? 308s 6 - *????????? 308s | 308s d 308s 308s 0 5 9 308s | | | 308s 0 - ********** - c 308s *????????? 308s *????????? 308s *????????? 308s *????????? 308s 5 - *????????? 308s 6 - *????????? 308s | 308s d 308s 308s Key: 308s |,-,+ = rectangles forming current merge frontier 308s * = merge done manually 308s . = merge done automatically 308s # = conflict that is currently blocking progress 308s @ = merge was blocked but has been resolved 308s ? = no merge recorded 308s 308s + + tee autofill.out 308s git-imerge autofill 308s Attempting automerge of 9-6...failure. 308s Attempting automerge of 1-1...success. 308s Attempting automerge of 1-4...success. 308s Attempting automerge of 1-6...success. 308s Attempting automerge of 9-6...failure. 308s Attempting automerge of 5-6...failure. 308s Attempting automerge of 3-6...success. 308s Attempting automerge of 4-6...success. 308s Attempting automerge of 5-1...failure. 308s Autofilling 1-6...success. 308s Autofilling 2-6...success. 308s Autofilling 3-6...success. 308s Autofilling 4-1...success. 308s Autofilling 4-2...success. 308s Autofilling 4-3...success. 308s Autofilling 4-4...success. 308s Autofilling 4-5...success. 308s Autofilling 4-6 (first way)...success. 308s Autofilling 4-6 (second way)...success. 308s The two ways of autofilling 4-6 agree. 308s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 308s Attempting automerge of 9-6...failure. 308s Attempting automerge of 5-1...failure. 308s HEAD is now at d8d80cf c⇒9 308s Conflict; suggest manual merge of 5-1 308s + grep -q Traceback autofill.out 308s + grep -q suggest manual merge of 5-1 autofill.out 308s + git-imerge diagram --commits --frontier --html=imerge1.html 308s 0 5 9 308s | | | 308s 0 - ********** - c 308s *???.#???? 308s *???.????? 308s *???.????? 308s *???.????? 308s 5 - *???.????? 308s 6 - *....????? 308s | 308s d 308s 308s 0 5 9 308s | | | 308s 0 - ********** - c 308s *???|#???? 308s *???|????? 308s *???|????? 308s *???|????? 308s 5 - *???|????? 308s 6 - *---+????? 308s | 308s d 308s 308s Key: 308s |,-,+ = rectangles forming current merge frontier 308s * = merge done manually 308s . = merge done automatically 308s # = conflict that is currently blocking progress 308s @ = merge was blocked but has been resolved 308s ? = no merge recorded 308s 308s + git-imerge continue --edit 308s Switched to branch 'imerge/c-d' 308s 308s Original first commit: 308s Auto-merging conflict.txt 308s CONFLICT (content): Merge conflict in conflict.txt 308s Automatic merge failed; fix conflicts and then commit the result. 308s commit 7e31f254c318decc434628f023dac0703f3d2b9e 308s Author: Loú User 308s Date: Thu Apr 7 22:13:19 2005 +0000 308s 308s c⇒5 308s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 308s Author: Loú User 308s Date: Thu Apr 7 22:13:24 2005 +0000 308s 308s d⇒1 308s 308s Original second commit: 308s 308s There was a conflict merging commit 5-1, shown above. 308s Please resolve the conflict, commit the result, then type 308s 308s git-imerge continue 308s + echo merged version 308s + git add conflict.txt 308s + git-imerge continue --no-edit 309s [imerge/c-d 4426d6a] imerge 'c-d': manual merge 5-1 309s Merge has been recorded for merge 5-1. 309s Attempting automerge of 5-6...success. 309s Autofilling 5-2...success. 309s Autofilling 5-3...success. 309s Autofilling 5-4...success. 309s Autofilling 5-5...success. 309s Autofilling 5-6...success. 309s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 309s Attempting automerge of 9-6...success. 309s Autofilling 6-6...success. 309s Autofilling 7-6...success. 309s Autofilling 8-6...success. 309s Autofilling 9-1...success. 309s Autofilling 9-2...success. 309s Autofilling 9-3...success. 309s Autofilling 9-4...success. 309s Autofilling 9-5...success. 309s Autofilling 9-6 (first way)...success. 309s Autofilling 9-6 (second way)...success. 309s The two ways of autofilling 9-6 agree. 309s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 309s Merge is complete! 309s + git-imerge diagram --commits --frontier --html=imerge2.html 309s 0 5 9 309s | | | 309s 0 - ********** - c 309s *???.*???. 309s *???..???. 309s *???..???. 309s *???..???. 309s 5 - *???..???. 309s 6 - *......... 309s | 309s d 309s 309s 0 5 9 309s | | | 309s 0 - ********** - c 309s *???.*???| 309s *???..???| 309s *???..???| 309s *???..???| 309s 5 - *???..???| 309s 6 - *--------+ 309s | 309s d 309s 309s Key: 309s |,-,+ = rectangles forming current merge frontier 309s * = merge done manually 309s . = merge done automatically 309s # = conflict that is currently blocking progress 309s @ = merge was blocked but has been resolved 309s ? = no merge recorded 309s 309s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 309s Merge d into c (using imerge) 309s 309s # Please enter the commit message for your changes. Lines starting 309s # with '#' will be ignored, and an empty message aborts the commit. 309s # 309s # Date: Thu Mar 21 05:03:58 2024 +0000 309s # 309s # On branch c-d-merge 309s # Changes to be committed: 309s # modified: conflict.txt 309s # modified: d.txt 309s # 309s [c-d-merge 81e9b5b] Merge d into c (using imerge) 309s Date: Thu Mar 21 05:03:58 2024 +0000 309s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 309s + local refname=c-d-merge 309s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 309s + git rev-parse c-d-merge^{tree} 309s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 309s + git-imerge simplify --goal=rebase --branch=c-d-rebase 309s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 309s + local refname=c-d-rebase 309s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 309s + git rev-parse c-d-rebase^{tree} 309s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 309s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 310s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + local refname=c-d-rebase-with-history 310s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git rev-parse c-d-rebase-with-history^{tree} 310s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git-imerge simplify --goal=border --branch=c-d-border 310s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + local refname=c-d-border 310s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git rev-parse c-d-border^{tree} 310s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 310s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + local refname=c-d-border-with-history 310s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git rev-parse c-d-border-with-history^{tree} 310s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 310s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + local refname=c-d-border-with-history2 310s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git rev-parse c-d-border-with-history2^{tree} 310s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 310s + git-imerge remove 311s + git checkout c 311s Switched to branch 'c' 311s + git-imerge start --goal=full --first-parent --name=c-d d 311s + tee start.out 311s Attempting to merge 1-1...success. 311s Attempting to merge 1-2...success. 311s Attempting to merge 1-3...success. 311s Attempting to merge 1-4...success. 311s Attempting to merge 1-5...success. 311s Attempting to merge 1-6...success. 311s Attempting to merge 2-1...success. 311s Attempting to merge 2-2...success. 311s Attempting to merge 2-3...success. 311s Attempting to merge 2-4...success. 311s Attempting to merge 2-5...success. 311s Attempting to merge 2-6...success. 311s Attempting to merge 3-1...success. 311s Attempting to merge 3-2...success. 311s Attempting to merge 3-3...success. 311s Attempting to merge 3-4...success. 311s Attempting to merge 3-5...success. 311s Attempting to merge 3-6...success. 311s Attempting to merge 4-1...success. 311s Attempting to merge 4-2...success. 311s Attempting to merge 4-3...success. 311s Attempting to merge 4-4...success. 311s Attempting to merge 4-5...success. 311s Attempting to merge 4-6...success. 311s Attempting to merge 5-1...conflict. 311s Switched to branch 'imerge/c-d' 311s Auto-merging conflict.txt 311s CONFLICT (content): Merge conflict in conflict.txt 311s Automatic merge failed; fix conflicts and then commit the result. 311s 311s Original first commit: 311s commit 7e31f254c318decc434628f023dac0703f3d2b9e 311s Author: Loú User 311s Date: Thu Apr 7 22:13:19 2005 +0000 311s 311s c⇒5 311s 311s Original second commit: 311s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 311s Author: Loú User 311s Date: Thu Apr 7 22:13:24 2005 +0000 311s 311s d⇒1 311s 311s There was a conflict merging commit 5-1, shown above. 311s Please resolve the conflict, commit the result, then type 311s 311s git-imerge continue 311s + grep -q Traceback start.out 311s + grep -q suggest manual merge of 5-1 autofill.out 311s + git-imerge diagram --commits --frontier --html=imerge3.html 311s 0 5 9 311s | | | 311s 0 - ********** - c 311s *....#???? 311s *....????? 311s *....????? 311s *....????? 311s 5 - *....????? 311s 6 - *....????? 311s | 311s d 311s 311s 0 5 9 311s | | | 311s 0 - ********** - c 311s *...|#???? 311s *...|????? 311s *...|????? 311s *...|????? 311s 5 - *...|????? 311s 6 - *---+????? 311s | 311s d 311s 311s Key: 311s |,-,+ = rectangles forming current merge frontier 311s * = merge done manually 311s . = merge done automatically 311s # = conflict that is currently blocking progress 311s @ = merge was blocked but has been resolved 311s ? = no merge recorded 311s 311s + echo merged version 311s + git add conflict.txt 311s + GIT_EDITOR=cat git commit 311s imerge 'c-d': manual merge 5-1 311s 311s # Conflicts: 311s # conflict.txt 311s # 311s # It looks like you may be committing a merge. 311s # If this is not correct, please run 311s # git update-ref -d MERGE_HEAD 311s # and try again. 311s 311s 311s # Please enter the commit message for your changes. Lines starting 311s # with '#' will be ignored, and an empty message aborts the commit. 311s # 311s # On branch imerge/c-d 311s # All conflicts fixed but you are still merging. 311s # 311s # Changes to be committed: 311s # modified: conflict.txt 311s # modified: d.txt 311s # 311s [imerge/c-d ccd36fd] imerge 'c-d': manual merge 5-1 311s + git-imerge continue --edit 312s Merge has been recorded for merge 5-1. 312s Attempting to merge 5-2...success. 312s Attempting to merge 5-3...success. 312s Attempting to merge 5-4...success. 312s Attempting to merge 5-5...success. 312s Attempting to merge 5-6...success. 312s Attempting to merge 6-1...success. 312s Attempting to merge 6-2...success. 312s Attempting to merge 6-3...success. 312s Attempting to merge 6-4...success. 312s Attempting to merge 6-5...success. 312s Attempting to merge 6-6...success. 312s Attempting to merge 7-1...success. 312s Attempting to merge 7-2...success. 312s Attempting to merge 7-3...success. 312s Attempting to merge 7-4...success. 312s Attempting to merge 7-5...success. 312s Attempting to merge 7-6...success. 312s Attempting to merge 8-1...success. 312s Attempting to merge 8-2...success. 312s Attempting to merge 8-3...success. 312s Attempting to merge 8-4...success. 312s Attempting to merge 8-5...success. 312s Attempting to merge 8-6...success. 312s Attempting to merge 9-1...success. 312s Attempting to merge 9-2...success. 312s Attempting to merge 9-3...success. 312s Attempting to merge 9-4...success. 312s Attempting to merge 9-5...success. 312s Attempting to merge 9-6...success. 312s Merge is complete! 312s + git-imerge diagram --commits --frontier --html=imerge4.html 313s 0 5 9 313s | | | 313s 0 - ********** - c 313s *....*.... 313s *......... 313s *......... 313s *......... 313s 5 - *......... 313s 6 - *......... 313s | 313s d 313s 313s 0 5 9 313s | | | 313s 0 - ********** - c 313s *....*...| 313s *........| 313s *........| 313s *........| 313s 5 - *........| 313s 6 - *--------+ 313s | 313s d 313s 313s Key: 313s |,-,+ = rectangles forming current merge frontier 313s * = merge done manually 313s . = merge done automatically 313s # = conflict that is currently blocking progress 313s @ = merge was blocked but has been resolved 313s ? = no merge recorded 313s 313s + git-imerge finish --branch=c-d-full 313s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 313s + local refname=c-d-full 313s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 313s + git rev-parse c-d-full^{tree} 313s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 313s + test_conflict 6-6 313s + local conflict=6-6 313s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s + DESCRIPTION=git-imerge test repository with conflict at 6-6 313s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 313s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s + local description=git-imerge test repository with conflict at 6-6 313s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 313s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s + local description=git-imerge test repository with conflict at 6-6 313s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6/.git/ 313s hint: Using 'master' as the name for the initial branch. This default branch name 313s hint: is subject to change. To configure the initial branch name to use in all 313s hint: of your new repositories, which will suppress this warning, call: 313s hint: 313s hint: git config --global init.defaultBranch 313s hint: 313s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 313s hint: 'development'. The just-created branch can be renamed via this command: 313s hint: 313s hint: git branch -m 313s + echo git-imerge test repository with conflict at 6-6 313s + printf %s\n /*.out /*.css /*.html 313s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6/.git config user.name Loú User 313s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 313s + TIME=1112911993 313s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/conflicted-6-6 313s + modify c.txt 0 313s + filename=c.txt 313s + text=0 313s + echo 0 313s + git add c.txt 313s [master (root-commit) d70e04b] m⇒0 313s 3 files changed, 3 insertions(+) 313s create mode 100644 c.txt 313s create mode 100644 conflict.txt 313s create mode 100644 d.txt 313s [c 89e2141] c⇒1 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s [c 7c431f2] c⇒2 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s [c f02ab24] c⇒3 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s [c ed9122f] c⇒4 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify d.txt 0 313s + filename=d.txt 313s + text=0 313s + echo 0 313s + git add d.txt 313s + modify conflict.txt original version 313s + filename=conflict.txt 313s + text=original version 313s + echo original version 313s + git add conflict.txt 313s + commit -m m⇒0 313s + TIME=1112911994 313s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 313s + git checkout -b c master -- 313s Switched to a new branch 'c' 313s + seq 9 313s + modify c.txt 1 313s + filename=c.txt 313s + text=1 313s + echo 1 313s + git add c.txt 313s + commit -m c⇒1 313s + TIME=1112911995 313s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 313s + modify c.txt 2 313s + filename=c.txt 313s + text=2 313s + echo 2 313s + git add c.txt 313s + commit -m c⇒2 313s + TIME=1112911996 313s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 313s + modify c.txt 3 313s + filename=c.txt 313s + text=3 313s + echo 3 313s + git add c.txt 313s + commit -m c⇒3 313s + TIME=1112911997 313s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 313s + modify c.txt 4 313s + filename=c.txt 313s + text=4 313s + echo 4 313s + git add c.txt 313s + commit -m c⇒4 313s + TIME=1112911998 313s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 313s + modify c.txt 5 313s + filename=c.txt 313s + text=5 313s + echo 5 313s + git add c.txt 313s + commit -m c⇒5 313s + TIME=1112911999 313s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 313s [c 1d3bf09] c⇒5 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify c.txt 6 313s + filename=c.txt 313s + text=6 313s + echo 6 313s + git add c.txt 313s + modify conflict.txt c version 313s + filename=conflict.txt 313s + text=c version 313s + echo c version 313s + git add conflict.txt 313s + commit -m c⇒6 313s + TIME=1112912000 313s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 313s + modify c.txt 7 313s + filename=c.txt 313s + text=7 313s [c fe4fed8] c⇒6 313s 2 files changed, 2 insertions(+), 2 deletions(-) 313s + echo 7 313s + git add c.txt 313s + commit -m c⇒7 313s + TIME=1112912001 313s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 313s [c ec255ea] c⇒7 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify c.txt 8 313s + filename=c.txt 313s + text=8 313s + echo 8 313s + git add c.txt 313s + commit -m c⇒8 313s + TIME=1112912002 313s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 313s + modify c.txt 9 313s + filename=c.txt 313s + text=9 313s + echo 9 313s + git add c.txt 313s [c 7459ac3] c⇒8 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + commit -m c⇒9 313s + TIME=1112912003 313s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 313s + git checkout -b d master -- 313s [c 70408c8] c⇒9 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s Switched to a new branch 'd' 313s + seq 6 313s + modify d.txt 1 313s + filename=d.txt 313s + text=1 313s + echo 1 313s + git add d.txt 313s + commit -m d⇒1 313s + TIME=1112912004 313s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 313s [d bd5368a] d⇒1 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify d.txt 2 313s + filename=d.txt 313s + text=2 313s + echo 2 313s + git add d.txt 313s + commit -m d⇒2 313s + TIME=1112912005 313s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 313s [d 93e27e6] d⇒2 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify d.txt 3 313s + filename=d.txt 313s + text=3 313s + echo 3 313s + git add d.txt 313s + commit -m d⇒3 313s + TIME=1112912006 313s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 313s [d 133f385] d⇒3 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify d.txt 4 313s + filename=d.txt 313s + text=4 313s + echo 4 313s + git add d.txt 313s + commit -m d⇒4 313s + TIME=1112912007 313s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 313s [d 586472a] d⇒4 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify d.txt 5 313s + filename=d.txt 313s + text=5 313s + echo 5 313s + git add d.txt 313s + commit -m d⇒5 313s + TIME=1112912008 313s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 313s [d 9522207] d⇒5 313s 1 file changed, 1 insertion(+), 1 deletion(-) 313s + modify d.txt 6 313s + filename=d.txt 313s + text=6 313s + echo 6 313s + git add d.txt 313s + modify conflict.txt d version 313s + filename=conflict.txt 313s + text=d version 313s + echo d version 313s + git add conflict.txt 313s + commit -m d⇒6 313s + TIME=1112912009 313s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 313s [d f7e451a] d⇒6 313s 2 files changed, 2 insertions(+), 2 deletions(-) 313s + git checkout c 313s Switched to branch 'c' 313s + git-imerge init --name=c-d d 313s + git-imerge list 313s * c-d 313s + git-imerge diagram --commits --frontier --html=imerge0.html 313s 0 5 9 313s | | | 313s 0 - ********** - c 313s *????????? 313s *????????? 313s *????????? 313s *????????? 313s 5 - *????????? 313s 6 - *????????? 313s | 313s d 313s 313s 0 5 9 313s | | | 313s 0 - ********** - c 313s *????????? 313s *????????? 313s *????????? 313s *????????? 313s 5 - *????????? 313s 6 - *????????? 313s | 313s d 313s 313s Key: 313s |,-,+ = rectangles forming current merge frontier 313s * = merge done manually 313s . = merge done automatically 313s # = conflict that is currently blocking progress 313s @ = merge was blocked but has been resolved 313s ? = no merge recorded 313s 313s + + tee autofill.out 313s git-imerge autofill 313s Attempting automerge of 9-6...failure. 313s Attempting automerge of 1-1...success. 313s Attempting automerge of 1-4...success. 313s Attempting automerge of 1-6...success. 313s Attempting automerge of 9-6...failure. 313s Attempting automerge of 5-6...success. 313s Attempting automerge of 7-6...failure. 313s Attempting automerge of 6-6...failure. 314s Attempting automerge of 6-1...success. 314s Attempting automerge of 6-4...success. 314s Attempting automerge of 6-5...success. 314s Attempting automerge of 9-5...success. 314s Autofilling 1-6...success. 314s Autofilling 2-6...success. 314s Autofilling 3-6...success. 314s Autofilling 4-6...success. 314s Autofilling 5-1...success. 314s Autofilling 5-2...success. 314s Autofilling 5-3...success. 314s Autofilling 5-4...success. 314s Autofilling 5-5...success. 314s Autofilling 5-6 (first way)...success. 314s Autofilling 5-6 (second way)...success. 314s The two ways of autofilling 5-6 agree. 314s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 314s Autofilling 6-5...success. 314s Autofilling 7-5...success. 314s Autofilling 8-5...success. 314s Autofilling 9-1...success. 314s Autofilling 9-2...success. 314s Autofilling 9-3...success. 314s Autofilling 9-4...success. 314s Autofilling 9-5 (first way)...success. 314s Autofilling 9-5 (second way)...success. 314s The two ways of autofilling 9-5 agree. 314s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 314s Attempting automerge of 9-6...failure. 314s Attempting automerge of 6-6...failure. 314s HEAD is now at 70408c8 c⇒9 314s Conflict; suggest manual merge of 6-6 314s + grep -q Traceback autofill.out 314s + grep -q suggest manual merge of 6-6 autofill.out 314s + git-imerge diagram --commits --frontier --html=imerge1.html 314s 0 5 9 314s | | | 314s 0 - ********** - c 314s *????.???. 314s *????.???. 314s *????.???. 314s *????.???. 314s 5 - *????..... 314s 6 - *.....#??? 314s | 314s d 314s 314s 0 5 9 314s | | | 314s 0 - ********** - c 314s *????.???| 314s *????.???| 314s *????.???| 314s *????.???| 314s 5 - *????.---+ 314s 6 - *----+#??? 314s | 314s d 314s 314s Key: 314s |,-,+ = rectangles forming current merge frontier 314s * = merge done manually 314s . = merge done automatically 314s # = conflict that is currently blocking progress 314s @ = merge was blocked but has been resolved 314s ? = no merge recorded 314s 314s + git-imerge continue --edit 314s Switched to branch 'imerge/c-d' 314s Auto-merging conflict.txt 314s CONFLICT (content): Merge conflict in conflict.txt 314s Automatic merge failed; fix conflicts and then commit the result. 314s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 314s Author: Loú User 314s Date: Thu Apr 7 22:13:20 2005 +0000 314s 314s c⇒6 314s commit f7e451a6c9656dda15641a9fbc591a602f158692 314s Author: Loú User 314s Date: Thu Apr 7 22:13:29 2005 +0000 314s 314s d⇒6 314s 314s Original first commit: 314s 314s Original second commit: 314s 314s There was a conflict merging commit 6-6, shown above. 314s Please resolve the conflict, commit the result, then type 314s 314s git-imerge continue 314s + echo merged version 314s + git add conflict.txt 314s + git-imerge continue --no-edit 314s [imerge/c-d 97844bf] imerge 'c-d': manual merge 6-6 314s Merge has been recorded for merge 6-6. 314s Attempting automerge of 9-6...success. 314s Autofilling 7-6...success. 314s Autofilling 8-6...success. 314s Autofilling 9-6...success. 314s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 315s Merge is complete! 315s + git-imerge diagram --commits --frontier --html=imerge2.html 315s 0 5 9 315s | | | 315s 0 - ********** - c 315s *????.???. 315s *????.???. 315s *????.???. 315s *????.???. 315s 5 - *????..... 315s 6 - *.....*... 315s | 315s d 315s 315s 0 5 9 315s | | | 315s 0 - ********** - c 315s *????.???| 315s *????.???| 315s *????.???| 315s *????.???| 315s 5 - *????....| 315s 6 - *-----*--+ 315s | 315s d 315s 315s Key: 315s |,-,+ = rectangles forming current merge frontier 315s * = merge done manually 315s . = merge done automatically 315s # = conflict that is currently blocking progress 315s @ = merge was blocked but has been resolved 315s ? = no merge recorded 315s 315s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 315s Merge d into c (using imerge) 315s 315s # Please enter the commit message for your changes. Lines starting 315s # with '#' will be ignored, and an empty message aborts the commit. 315s # 315s # Date: Thu Mar 21 05:04:04 2024 +0000 315s # 315s # On branch c-d-merge 315s # Changes to be committed: 315s # modified: conflict.txt 315s # modified: d.txt 315s # 315s [c-d-merge 9c2860c] Merge d into c (using imerge) 315s Date: Thu Mar 21 05:04:04 2024 +0000 315s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + local refname=c-d-merge 315s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + git rev-parse c-d-merge^{tree} 315s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + git-imerge simplify --goal=rebase --branch=c-d-rebase 315s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + local refname=c-d-rebase 315s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + git rev-parse c-d-rebase^{tree} 315s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 315s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + local refname=c-d-rebase-with-history 315s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + git rev-parse c-d-rebase-with-history^{tree} 315s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + git-imerge simplify --goal=border --branch=c-d-border 315s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + local refname=c-d-border 315s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 315s + git rev-parse c-d-border^{tree} 316s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 316s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 316s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 316s + local refname=c-d-border-with-history 316s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 316s + git rev-parse c-d-border-with-history^{tree} 316s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 316s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 316s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 316s + local refname=c-d-border-with-history2 316s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 316s + git rev-parse c-d-border-with-history2^{tree} 316s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 316s + git-imerge remove 316s + git checkout c 316s Switched to branch 'c' 316s + git-imerge start --goal=full --first-parent --name=c-d d 316s + tee start.out 316s Attempting to merge 1-1...success. 316s Attempting to merge 1-2...success. 316s Attempting to merge 1-3...success. 316s Attempting to merge 1-4...success. 316s Attempting to merge 1-5...success. 316s Attempting to merge 1-6...success. 317s Attempting to merge 2-1...success. 317s Attempting to merge 2-2...success. 317s Attempting to merge 2-3...success. 317s Attempting to merge 2-4...success. 317s Attempting to merge 2-5...success. 317s Attempting to merge 2-6...success. 317s Attempting to merge 3-1...success. 317s Attempting to merge 3-2...success. 317s Attempting to merge 3-3...success. 317s Attempting to merge 3-4...success. 317s Attempting to merge 3-5...success. 317s Attempting to merge 3-6...success. 317s Attempting to merge 4-1...success. 317s Attempting to merge 4-2...success. 317s Attempting to merge 4-3...success. 317s Attempting to merge 4-4...success. 317s Attempting to merge 4-5...success. 317s Attempting to merge 4-6...success. 317s Attempting to merge 5-1...success. 317s Attempting to merge 5-2...success. 317s Attempting to merge 5-3...success. 317s Attempting to merge 5-4...success. 317s Attempting to merge 5-5...success. 317s Attempting to merge 5-6...success. 317s Attempting to merge 6-1...success. 317s Attempting to merge 6-2...success. 317s Attempting to merge 6-3...success. 317s Attempting to merge 6-4...success. 317s Attempting to merge 6-5...success. 317s Attempting to merge 6-6...conflict. 317s Attempting to merge 7-1...success. 317s Attempting to merge 7-2...success. 317s Attempting to merge 7-3...success. 317s Attempting to merge 7-4...success. 317s Attempting to merge 7-5...success. 317s Attempting to merge 8-1...success. 317s Attempting to merge 8-2...success. 317s Attempting to merge 8-3...success. 317s Attempting to merge 8-4...success. 317s Attempting to merge 8-5...success. 317s Attempting to merge 9-1...success. 317s Attempting to merge 9-2...success. 317s Attempting to merge 9-3...success. 317s Attempting to merge 9-4...success. 317s Attempting to merge 9-5...success. 317s Previous HEAD position was dcfc7d2 imerge 'c-d': automatic merge 9-5 317s Switched to branch 'imerge/c-d' 317s Auto-merging conflict.txt 317s CONFLICT (content): Merge conflict in conflict.txt 317s Automatic merge failed; fix conflicts and then commit the result. 317s 317s Original first commit: 317s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 317s Author: Loú User 317s Date: Thu Apr 7 22:13:20 2005 +0000 317s 317s c⇒6 317s 317s Original second commit: 317s commit f7e451a6c9656dda15641a9fbc591a602f158692 317s Author: Loú User 317s Date: Thu Apr 7 22:13:29 2005 +0000 317s 317s d⇒6 317s 317s There was a conflict merging commit 6-6, shown above. 317s Please resolve the conflict, commit the result, then type 317s 317s git-imerge continue 317s + grep -q Traceback start.out 317s + grep -q suggest manual merge of 6-6 autofill.out 317s + git-imerge diagram --commits --frontier --html=imerge3.html 318s 0 5 9 318s | | | 318s 0 - ********** - c 318s *......... 318s *......... 318s *......... 318s *......... 318s 5 - *......... 318s 6 - *.....#??? 318s | 318s d 318s 318s 0 5 9 318s | | | 318s 0 - ********** - c 318s *........| 318s *........| 318s *........| 318s *........| 318s 5 - *.....---+ 318s 6 - *----+#??? 318s | 318s d 318s 318s Key: 318s |,-,+ = rectangles forming current merge frontier 318s * = merge done manually 318s . = merge done automatically 318s # = conflict that is currently blocking progress 318s @ = merge was blocked but has been resolved 318s ? = no merge recorded 318s 318s + echo merged version 318s + git add conflict.txt 318s + GIT_EDITOR=cat git commit 318s imerge 'c-d': manual merge 6-6 318s 318s # Conflicts: 318s # conflict.txt 318s # 318s # It looks like you may be committing a merge. 318s # If this is not correct, please run 318s # git update-ref -d MERGE_HEAD 318s # and try again. 318s 318s 318s # Please enter the commit message for your changes. Lines starting 318s # with '#' will be ignored, and an empty message aborts the commit. 318s # 318s # On branch imerge/c-d 318s # All conflicts fixed but you are still merging. 318s # 318s # Changes to be committed: 318s # modified: conflict.txt 318s # modified: d.txt 318s # 318s [imerge/c-d 914825f] imerge 'c-d': manual merge 6-6 318s + git-imerge continue --edit 318s Merge has been recorded for merge 6-6. 318s Attempting to merge 7-6...success. 318s Attempting to merge 8-6...success. 318s Attempting to merge 9-6...success. 318s Merge is complete! 318s + git-imerge diagram --commits --frontier --html=imerge4.html 318s 0 5 9 318s | | | 318s 0 - ********** - c 318s *......... 318s *......... 318s *......... 318s *......... 318s 5 - *......... 318s 6 - *.....*... 318s | 318s d 318s 318s 0 5 9 318s | | | 318s 0 - ********** - c 318s *........| 318s *........| 318s *........| 318s *........| 318s 5 - *........| 318s 6 - *-----*--+ 318s | 318s d 318s 318s Key: 318s |,-,+ = rectangles forming current merge frontier 318s * = merge done manually 318s . = merge done automatically 318s # = conflict that is currently blocking progress 318s @ = merge was blocked but has been resolved 318s ? = no merge recorded 318s 318s + git-imerge finish --branch=c-d-full 318s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 318s + local refname=c-d-full 318s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 318s + git rev-parse c-d-full^{tree} 318s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 318s py312: commands[2] /tmp/autopkgtest.KmXxEo/build.2MW/src> /bin/sh t/test-really-conflicted 318s + dirname t/test-really-conflicted 318s + cd t 318s + pwd 318s + dirname /tmp/autopkgtest.KmXxEo/build.2MW/src/t 318s + BASE=/tmp/autopkgtest.KmXxEo/build.2MW/src 318s + . /tmp/autopkgtest.KmXxEo/build.2MW/src/t/test-lib.sh 318s + GIT_IMERGE=git-imerge 318s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s + DESCRIPTION=git-imerge test repository with multiple conflicts 318s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 318s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s + local description=git-imerge test repository with multiple conflicts 318s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 318s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s + local description=git-imerge test repository with multiple conflicts 318s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted/.git/ 318s hint: Using 'master' as the name for the initial branch. This default branch name 318s hint: is subject to change. To configure the initial branch name to use in all 318s hint: of your new repositories, which will suppress this warning, call: 318s hint: 318s hint: git config --global init.defaultBranch 318s hint: 318s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 318s hint: 'development'. The just-created branch can be renamed via this command: 318s hint: 318s hint: git branch -m 318s + echo git-imerge test repository with multiple conflicts 318s [master (root-commit) 8e21fbd] m⇒0 318s 10 files changed, 10 insertions(+) 318s create mode 100644 c.txt 318s create mode 100644 conflict0.txt 318s create mode 100644 conflict1.txt 318s create mode 100644 conflict2.txt 318s create mode 100644 conflict3.txt 318s create mode 100644 conflict4.txt 318s create mode 100644 conflict5.txt 318s create mode 100644 conflict6.txt 318s create mode 100644 conflict7.txt 318s create mode 100644 d.txt 318s [c 4e6007a] c⇒1 318s 3 files changed, 3 insertions(+), 3 deletions(-) 318s [c c2b7c49] c⇒2 318s 1 file changed, 1 insertion(+), 1 deletion(-) 318s + printf %s\n /*.out /*.css /*.html 318s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted/.git config user.name Loú User 318s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted/.git config user.email luser@example.com 318s + TIME=1112911993 318s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/really-conflicted 318s + modify c.txt 0 318s + filename=c.txt 318s + text=0 318s + echo 0 318s + git add c.txt 318s + modify d.txt 0 318s + filename=d.txt 318s + text=0 318s + echo 0 318s + git add d.txt 318s + seq 0 7 318s + modify conflict0.txt original version 318s + filename=conflict0.txt 318s + text=original version 318s + echo original version 318s + git add conflict0.txt 318s + modify conflict1.txt original version 318s + filename=conflict1.txt 318s + text=original version 318s + echo original version 318s + git add conflict1.txt 318s + modify conflict2.txt original version 318s + filename=conflict2.txt 318s + text=original version 318s + echo original version 318s + git add conflict2.txt 318s + modify conflict3.txt original version 318s + filename=conflict3.txt 318s + text=original version 318s + echo original version 318s + git add conflict3.txt 318s + modify conflict4.txt original version 318s + filename=conflict4.txt 318s + text=original version 318s + echo original version 318s + git add conflict4.txt 318s + modify conflict5.txt original version 318s + filename=conflict5.txt 318s + text=original version 318s + echo original version 318s + git add conflict5.txt 318s + modify conflict6.txt original version 318s + filename=conflict6.txt 318s + text=original version 318s + echo original version 318s + git add conflict6.txt 318s + modify conflict7.txt original version 318s + filename=conflict7.txt 318s + text=original version 318s + echo original version 318s + git add conflict7.txt 318s + commit -m m⇒0 318s + TIME=1112911994 318s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 318s + git checkout -b c master -- 318s Switched to a new branch 'c' 318s + modify c.txt 1 318s + filename=c.txt 318s + text=1 318s + echo 1 318s + git add c.txt 318s + modify conflict0.txt c version 318s + filename=conflict0.txt 318s + text=c version 318s + echo c version 318s + git add conflict0.txt 318s + modify conflict4.txt c version 318s + filename=conflict4.txt 318s + text=c version 318s + echo c version 318s + git add conflict4.txt 318s + commit -m c⇒1 318s + TIME=1112911995 318s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 318s + modify c.txt 2 318s + filename=c.txt 318s + text=2 318s + echo 2 318s + git add c.txt 318s + commit -m c⇒2 318s + TIME=1112911996 318s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 318s + modify c.txt 3 318s + filename=c.txt 318s + text=3 318s + echo 3 318s + git add c.txt 318s + commit -m c⇒3 318s + TIME=1112911997 318s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 318s [c 42ad55a] c⇒3 318s 1 file changed, 1 insertion(+), 1 deletion(-) 318s + modify c.txt 4 318s + filename=c.txt 318s + text=4 318s + echo 4 318s + git add c.txt 318s + modify conflict1.txt c version 318s + filename=conflict1.txt 318s + text=c version 318s + echo c version 318s + git add conflict1.txt 318s + commit -m c⇒4 318s + TIME=1112911998 318s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 318s + modify c.txt 5 318s + filename=c.txt 318s + text=5 318s + echo 5 318s + git add c.txt 318s [c a891793] c⇒4 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s + modify conflict3.txt c version 318s + filename=conflict3.txt 318s + text=c version 318s + echo c version 318s + git add conflict3.txt 318s + modify conflict6.txt c version 318s + filename=conflict6.txt 318s + text=c version 318s + echo c version 318s + git add conflict6.txt 318s + commit -m c⇒5 318s + TIME=1112911999 318s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 318s [c c21441d] c⇒5 318s 3 files changed, 3 insertions(+), 3 deletions(-) 318s + modify c.txt 6 318s + filename=c.txt 318s + text=6 318s + echo 6 318s + git add c.txt 318s + modify conflict5.txt c version 318s + filename=conflict5.txt 318s + text=c version 318s [c a797a66] c⇒6 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s [c c0e1537] c⇒7 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s [c 9f3e7c8] c⇒8 318s 1 file changed, 1 insertion(+), 1 deletion(-) 318s + echo c version 318s + git add conflict5.txt 318s + commit -m c⇒6 318s + TIME=1112912000 318s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 318s + modify c.txt 7 318s + filename=c.txt 318s + text=7 318s + echo 7 318s + git add c.txt 318s + modify conflict2.txt c version 318s + filename=conflict2.txt 318s + text=c version 318s + echo c version 318s + git add conflict2.txt 318s + commit -m c⇒7 318s + TIME=1112912001 318s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 318s + modify c.txt 8 318s + filename=c.txt 318s + text=8 318s + echo 8 318s + git add c.txt 318s + commit -m c⇒8 318s + TIME=1112912002 318s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 318s + modify c.txt 9 318s + filename=c.txt 318s + text=9 318s + echo 9 318s + git add c.txt 318s + modify conflict7.txt c version 318s + filename=conflict7.txt 318s + text=c version 318s + echo c version 318s + git add conflict7.txt 318s + commit -m c⇒9 318s + TIME=1112912003 318s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 318s [c ccbfccb] c⇒9 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s + git checkout -b d master -- 318s Switched to a new branch 'd' 318s + modify d.txt 1 318s + filename=d.txt 318s + text=1 318s + echo 1 318s + git add d.txt 318s + modify conflict0.txt d version 318s + filename=conflict0.txt 318s + text=d version 318s + echo d version 318s + git add conflict0.txt 318s + modify conflict6.txt d version 318s + filename=conflict6.txt 318s + text=d version 318s + echo d version 318s + git add conflict6.txt 318s + commit -m d⇒1 318s + TIME=1112912004 318s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 318s [d 8c3c065] d⇒1 318s 3 files changed, 3 insertions(+), 3 deletions(-) 318s + modify d.txt 2 318s + filename=d.txt 318s + text=2 318s + echo 2 318s + git add d.txt 318s + modify conflict1.txt d version 318s + filename=conflict1.txt 318s + text=d version 318s + echo d version 318s + git add conflict1.txt 318s + modify conflict2.txt d version 318s + filename=conflict2.txt 318s + text=d version 318s + echo d version 318s + git add conflict2.txt 318s + commit -m d⇒2 318s + TIME=1112912005 318s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 318s + modify d.txt 3 318s + filename=d.txt 318s + text=3 318s + echo 3 318s + git add d.txt 318s [d 820b787] d⇒2 318s 3 files changed, 3 insertions(+), 3 deletions(-) 318s + commit -m d⇒3 318s + TIME=1112912006 318s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 318s [d 821c792] d⇒3 318s 1 file changed, 1 insertion(+), 1 deletion(-) 318s + modify d.txt 4 318s + filename=d.txt 318s + text=4 318s + echo 4 318s + git add d.txt 318s + commit -m d⇒4 318s + TIME=1112912007 318s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 318s + modify d.txt 5 318s + filename=d.txt 318s + text=5 318s + echo 5 318s + git add d.txt 318s [d c2a1456] d⇒4 318s 1 file changed, 1 insertion(+), 1 deletion(-) 318s + modify conflict3.txt d version 318s + filename=conflict3.txt 318s + text=d version 318s + echo d version 318s + git add conflict3.txt 318s + commit -m d⇒5 318s + TIME=1112912008 318s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 318s [d c3e3890] d⇒5 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s + modify d.txt 6 318s + filename=d.txt 318s + text=6 318s + echo 6 318s + git add d.txt 318s + modify conflict4.txt d version 318s + filename=conflict4.txt 318s + text=d version 318s + echo d version 318s + git add conflict4.txt 318s + commit -m d⇒6 318s + TIME=1112912009 318s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 318s [d b2f5c5e] d⇒6 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s + modify d.txt 7 318s + filename=d.txt 318s + text=7 318s + echo 7 318s + git add d.txt 318s + modify conflict5.txt d version 318s + filename=conflict5.txt 318s + text=d version 318s + echo d version 318s + git add conflict5.txt 318s + commit -m d⇒7 318s + TIME=1112912010 318s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 318s + modify d.txt 8 318s + filename=d.txt 318s + text=8 318s + echo 8 318s + git add d.txt 318s [d 892af56] d⇒7 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s + modify conflict7.txt d version 318s + filename=conflict7.txt 318s + text=d version 318s + echo d version 318s + git add conflict7.txt 318s + commit -m d⇒8 318s + TIME=1112912011 318s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 318s [d 67099d0] d⇒8 318s 2 files changed, 2 insertions(+), 2 deletions(-) 318s + git checkout c 318s Switched to branch 'c' 318s + git-imerge init --name=c-d d 319s + git-imerge diagram --commits --frontier 319s 0 5 9 319s | | | 319s 0 - ********** - c 319s *????????? 319s *????????? 319s *????????? 319s *????????? 319s 5 - *????????? 319s *????????? 319s *????????? 319s 8 - *????????? 319s | 319s d 319s 319s 0 5 9 319s | | | 319s 0 - ********** - c 319s *????????? 319s *????????? 319s *????????? 319s *????????? 319s 5 - *????????? 319s *????????? 319s *????????? 319s 8 - *????????? 319s | 319s d 319s 319s Key: 319s |,-,+ = rectangles forming current merge frontier 319s * = merge done manually 319s . = merge done automatically 319s # = conflict that is currently blocking progress 319s @ = merge was blocked but has been resolved 319s ? = no merge recorded 319s 319s + conflict_count=0 319s + true 319s + + git-imerge continue --no-edit 319s tee autofill.out 319s Attempting automerge of 9-8...failure. 319s Attempting automerge of 1-1...failure. 319s Switched to branch 'imerge/c-d' 319s Auto-merging conflict0.txt 319s CONFLICT (content): Merge conflict in conflict0.txt 319s Automatic merge failed; fix conflicts and then commit the result. 319s 319s Original first commit: 319s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 319s Author: Loú User 319s Date: Thu Apr 7 22:13:15 2005 +0000 319s 319s c⇒1 319s 319s Original second commit: 319s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 319s Author: Loú User 319s Date: Thu Apr 7 22:13:24 2005 +0000 319s 319s d⇒1 319s 319s There was a conflict merging commit 1-1, shown above. 319s Please resolve the conflict, commit the result, then type 319s 319s git-imerge continue 319s + grep -q Traceback autofill.out 319s + git-imerge diagram --frontier 319s 0 5 9 319s | | | 319s 0 - ********** - c 319s *#???????? 319s *????????? 319s *????????? 319s *????????? 319s 5 - *????????? 319s *????????? 319s *????????? 319s 8 - *????????? 319s | 319s d 319s 319s Key: 319s |,-,+ = rectangles forming current merge frontier 319s * = merge done manually 319s . = merge done automatically 319s # = conflict that is currently blocking progress 319s @ = merge was blocked but has been resolved 319s ? = no merge recorded 319s 319s + grep -q There was a conflict merging autofill.out 319s + seq 0 7 319s + grep -q ==== conflict0.txt 319s + modify conflict0.txt merged version 319s + filename=conflict0.txt 319s + text=merged version 319s + echo merged version 319s + git add conflict0.txt 319s + conflict_count=1 319s + grep -q ==== conflict1.txt 319s + grep -q ==== conflict2.txt 319s + grep -q ==== conflict3.txt 319s + grep -q ==== conflict4.txt 319s + grep -q ==== conflict5.txt 319s + grep -q ==== conflict6.txt 319s + grep -q ==== conflict7.txt 319s + true 319s + git-imerge continue --no-edit 319s + tee autofill.out 319s [imerge/c-d 24b6940] imerge 'c-d': manual merge 1-1 319s Merge has been recorded for merge 1-1. 319s Attempting automerge of 1-8...failure. 319s Attempting automerge of 1-2...success. 319s Attempting automerge of 1-6...failure. 319s Attempting automerge of 1-4...success. 319s Attempting automerge of 1-5...success. 319s Autofilling 1-2...success. 319s Autofilling 1-3...success. 319s Autofilling 1-4...success. 319s Autofilling 1-5...success. 319s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 319s Attempting automerge of 1-8...failure. 319s Attempting automerge of 1-6...failure. 319s Attempting automerge of 9-5...failure. 319s Attempting automerge of 2-1...success. 319s Attempting automerge of 2-4...success. 319s Attempting automerge of 2-5...success. 319s Attempting automerge of 9-5...failure. 319s Attempting automerge of 6-5...failure. 320s Attempting automerge of 4-5...failure. 320s Attempting automerge of 3-5...success. 320s Attempting automerge of 4-1...success. 320s Attempting automerge of 4-3...failure. 320s Attempting automerge of 4-2...failure. 320s Attempting automerge of 9-1...failure. 320s Attempting automerge of 7-1...failure. 320s Attempting automerge of 6-1...failure. 320s Attempting automerge of 5-1...failure. 320s Autofilling 2-5...success. 320s Autofilling 3-1...success. 320s Autofilling 3-2...success. 320s Autofilling 3-3...success. 320s Autofilling 3-4...success. 320s Autofilling 3-5 (first way)...success. 320s Autofilling 3-5 (second way)...success. 320s The two ways of autofilling 3-5 agree. 320s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 320s Autofilling 4-1...success. 320s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 320s Attempting automerge of 4-5...failure. 320s Attempting automerge of 4-2...failure. 320s Attempting automerge of 9-1...failure. 320s Attempting automerge of 5-1...failure. 320s Previous HEAD position was c21441d c⇒5 320s Switched to branch 'imerge/c-d' 320s Auto-merging conflict4.txt 320s CONFLICT (content): Merge conflict in conflict4.txt 320s Automatic merge failed; fix conflicts and then commit the result. 320s 320s Original first commit: 320s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 320s Author: Loú User 320s Date: Thu Apr 7 22:13:15 2005 +0000 320s 320s c⇒1 320s 320s Original second commit: 320s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 320s Author: Loú User 320s Date: Thu Apr 7 22:13:29 2005 +0000 320s 320s d⇒6 320s 320s There was a conflict merging commit 1-6, shown above. 320s Please resolve the conflict, commit the result, then type 320s 320s git-imerge continue 320s + grep -q Traceback autofill.out 320s + git-imerge diagram --frontier 320s 0 5 9 320s | | | 320s 0 - ********** - c 320s **?.+#???? 320s *.?|#????? 320s *.?|?????? 320s *.?|?????? 320s 5 - *--+?????? 320s *#???????? 320s *????????? 320s 8 - *????????? 320s | 320s d 320s 320s Key: 320s |,-,+ = rectangles forming current merge frontier 320s * = merge done manually 320s . = merge done automatically 320s # = conflict that is currently blocking progress 320s @ = merge was blocked but has been resolved 320s ? = no merge recorded 320s 320s + grep -q There was a conflict merging autofill.out 320s + seq 0 7 320s + grep -q ==== conflict0.txt 320s + grep -q ==== conflict1.txt 320s + grep -q ==== conflict2.txt 320s + grep -q ==== conflict3.txt 320s + grep -q ==== conflict4.txt 320s + modify conflict4.txt merged version 320s + filename=conflict4.txt 320s + text=merged version 320s + echo merged version 320s + git add conflict4.txt 320s + conflict_count=2 320s + grep -q ==== conflict5.txt 320s + grep -q ==== conflict6.txt 320s + grep -q ==== conflict7.txt 320s + true 320s + git-imerge continue --no-edit 320s + tee autofill.out 320s [imerge/c-d d732759] imerge 'c-d': manual merge 1-6 320s Merge has been recorded for merge 1-6. 320s Attempting automerge of 1-8...success. 320s Autofilling 1-7...success. 320s Autofilling 1-8...success. 320s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 320s Attempting automerge of 3-8...success. 320s Autofilling 2-8...success. 320s Autofilling 3-6...success. 320s Autofilling 3-7...success. 320s Autofilling 3-8 (first way)...success. 320s Autofilling 3-8 (second way)...success. 320s The two ways of autofilling 3-8 agree. 320s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 320s Warning: you are leaving 1 commit behind, not connected to 320s any of your branches: 320s 320s 51e08c6 imerge 'c-d': automatic merge 3-8 320s 320s If you want to keep it by creating a new branch, this may be a good time 320s to do so with: 320s 320s git branch 51e08c6 320s 320s Switched to branch 'imerge/c-d' 320s Auto-merging conflict1.txt 320s CONFLICT (content): Merge conflict in conflict1.txt 320s Automatic merge failed; fix conflicts and then commit the result. 320s 320s Original first commit: 320s commit a89179336bb40a4ca90903425239a9ef3ce659bd 320s Author: Loú User 320s Date: Thu Apr 7 22:13:18 2005 +0000 320s 320s c⇒4 320s 320s Original second commit: 320s commit 820b787e86e22612af7a061db842dc95e9f1d49f 320s Author: Loú User 320s Date: Thu Apr 7 22:13:25 2005 +0000 320s 320s d⇒2 320s 320s There was a conflict merging commit 4-2, shown above. 320s Please resolve the conflict, commit the result, then type 320s 320s git-imerge continue 320s + grep -q Traceback autofill.out 320s + git-imerge diagram --frontier 321s 0 5 9 321s | | | 321s 0 - ********** - c 321s **?.+#???? 321s *.?|#????? 321s *.?|?????? 321s *.?|?????? 321s 5 - *..|?????? 321s **?|?????? 321s *.?|?????? 321s 8 - *--+?????? 321s | 321s d 321s 321s Key: 321s |,-,+ = rectangles forming current merge frontier 321s * = merge done manually 321s . = merge done automatically 321s # = conflict that is currently blocking progress 321s @ = merge was blocked but has been resolved 321s ? = no merge recorded 321s 321s + grep -q There was a conflict merging autofill.out 321s + seq 0 7 321s + grep -q ==== conflict0.txt 321s + grep -q ==== conflict1.txt 321s + modify conflict1.txt merged version 321s + filename=conflict1.txt 321s + text=merged version 321s + echo merged version 321s + git add conflict1.txt 321s + conflict_count=3 321s + grep -q ==== conflict2.txt 321s + grep -q ==== conflict3.txt 321s + grep -q ==== conflict4.txt 321s + grep -q ==== conflict5.txt 321s + grep -q ==== conflict6.txt 321s + grep -q ==== conflict7.txt 321s + true 321s + git-imerge continue --no-edit 321s + tee autofill.out 321s [imerge/c-d 7d1330d] imerge 'c-d': manual merge 4-2 321s Merge has been recorded for merge 4-2. 321s Attempting automerge of 4-8...success. 321s Autofilling 4-3...success. 321s Autofilling 4-4...success. 321s Autofilling 4-5...success. 321s Autofilling 4-6...success. 321s Autofilling 4-7...success. 321s Autofilling 4-8...success. 321s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 321s Previous HEAD position was 28be9fa imerge 'c-d': automatic merge 4-8 321s Switched to branch 'imerge/c-d' 321s Auto-merging conflict6.txt 321s CONFLICT (content): Merge conflict in conflict6.txt 321s Automatic merge failed; fix conflicts and then commit the result. 321s 321s Original first commit: 321s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 321s Author: Loú User 321s Date: Thu Apr 7 22:13:19 2005 +0000 321s 321s c⇒5 321s 321s Original second commit: 321s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 321s Author: Loú User 321s Date: Thu Apr 7 22:13:24 2005 +0000 321s 321s d⇒1 321s 321s There was a conflict merging commit 5-1, shown above. 321s Please resolve the conflict, commit the result, then type 321s 321s git-imerge continue 321s + grep -q Traceback autofill.out 321s + git-imerge diagram --frontier 321s 0 5 9 321s | | | 321s 0 - ********** - c 321s **?.|#???? 321s *.?.*????? 321s *.?.|????? 321s *.?.|????? 321s 5 - *...|????? 321s **?.|????? 321s *.?.|????? 321s 8 - *---+????? 321s | 321s d 321s 321s Key: 321s |,-,+ = rectangles forming current merge frontier 321s * = merge done manually 321s . = merge done automatically 321s # = conflict that is currently blocking progress 321s @ = merge was blocked but has been resolved 321s ? = no merge recorded 321s 321s + grep -q There was a conflict merging autofill.out 321s + seq 0 7 321s + grep -q ==== conflict0.txt 321s + grep -q ==== conflict1.txt 321s + grep -q ==== conflict2.txt 321s + grep -q ==== conflict3.txt 321s + grep -q ==== conflict4.txt 321s + grep -q ==== conflict5.txt 321s + grep -q ==== conflict6.txt 321s + modify conflict6.txt merged version 321s + filename=conflict6.txt 321s + text=merged version 321s + echo merged version 321s + git add conflict6.txt 321s + conflict_count=4 321s + grep -q ==== conflict7.txt 321s + true 321s + git-imerge continue --no-edit 321s + tee autofill.out 321s [imerge/c-d 9cb46d7] imerge 'c-d': manual merge 5-1 321s Merge has been recorded for merge 5-1. 321s Attempting automerge of 5-8...failure. 321s Attempting automerge of 5-2...success. 321s Attempting automerge of 5-6...failure. 321s Attempting automerge of 5-4...success. 321s Attempting automerge of 5-5...failure. 321s Autofilling 5-2...success. 321s Autofilling 5-3...success. 321s Autofilling 5-4...success. 321s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 321s Attempting automerge of 5-8...failure. 321s Attempting automerge of 5-5...failure. 321s Attempting automerge of 9-4...failure. 321s Attempting automerge of 6-1...success. 321s Attempting automerge of 6-3...success. 321s Attempting automerge of 6-4...success. 321s Attempting automerge of 9-4...failure. 321s Attempting automerge of 8-4...failure. 321s Attempting automerge of 7-4...failure. 321s Attempting automerge of 7-1...success. 322s Attempting automerge of 7-3...failure. 322s Attempting automerge of 7-2...failure. 322s Attempting automerge of 9-1...success. 322s Autofilling 6-1...success. 322s Autofilling 6-2...success. 322s Autofilling 6-3...success. 322s Autofilling 6-4...success. 322s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 322s Autofilling 7-1...success. 322s Autofilling 8-1...success. 322s Autofilling 9-1...success. 322s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 322s Attempting automerge of 9-4...failure. 322s Attempting automerge of 7-2...failure. 322s Previous HEAD position was c8fac5e imerge 'c-d': automatic merge 7-1 322s Switched to branch 'imerge/c-d' 322s Auto-merging conflict3.txt 322s CONFLICT (content): Merge conflict in conflict3.txt 322s Automatic merge failed; fix conflicts and then commit the result. 322s 322s Original first commit: 322s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 322s Author: Loú User 322s Date: Thu Apr 7 22:13:19 2005 +0000 322s 322s c⇒5 322s 322s Original second commit: 322s commit c3e3890b9e3c756c1d8f7e345184d576739be079 322s Author: Loú User 322s Date: Thu Apr 7 22:13:28 2005 +0000 322s 322s d⇒5 322s 322s There was a conflict merging commit 5-5, shown above. 322s Please resolve the conflict, commit the result, then type 322s 322s git-imerge continue 322s + grep -q Traceback autofill.out 322s + git-imerge diagram --frontier 322s 0 5 9 322s | | | 322s 0 - ********** - c 322s **?..*.--+ 322s *.?.*.|#?? 322s *.?...|??? 322s *.?..-+??? 322s 5 - *...|#???? 322s **?.|????? 322s *.?.|????? 322s 8 - *---+????? 322s | 322s d 322s 322s Key: 322s |,-,+ = rectangles forming current merge frontier 322s * = merge done manually 322s . = merge done automatically 322s # = conflict that is currently blocking progress 322s @ = merge was blocked but has been resolved 322s ? = no merge recorded 322s 322s + grep -q There was a conflict merging autofill.out 322s + seq 0 7 322s + grep -q ==== conflict0.txt 322s + grep -q ==== conflict1.txt 322s + grep -q ==== conflict2.txt 322s + grep -q ==== conflict3.txt 322s + modify conflict3.txt merged version 322s + filename=conflict3.txt 322s + text=merged version 322s + echo merged version 322s + git add conflict3.txt 322s + conflict_count=5 322s + grep -q ==== conflict4.txt 322s + grep -q ==== conflict5.txt 322s + grep -q ==== conflict6.txt 322s + grep -q ==== conflict7.txt 322s + true 322s + git-imerge continue --no-edit 322s + tee autofill.out 322s [imerge/c-d c0cb485] imerge 'c-d': manual merge 5-5 322s Merge has been recorded for merge 5-5. 322s Attempting automerge of 5-8...success. 322s Autofilling 5-6...success. 322s Autofilling 5-7...success. 322s Autofilling 5-8...success. 322s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 322s Attempting automerge of 6-8...failure. 322s Attempting automerge of 6-5...success. 322s Attempting automerge of 6-7...failure. 322s Attempting automerge of 6-6...success. 322s Autofilling 6-5...success. 322s Autofilling 6-6...success. 322s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 322s Attempting automerge of 6-8...failure. 322s Attempting automerge of 6-7...failure. 322s Switched to branch 'imerge/c-d' 322s Auto-merging conflict5.txt 322s CONFLICT (content): Merge conflict in conflict5.txt 322s Automatic merge failed; fix conflicts and then commit the result. 322s 322s Original first commit: 322s commit a797a66a0e4b89690099557280641efeac302bcf 322s Author: Loú User 322s Date: Thu Apr 7 22:13:20 2005 +0000 322s 322s c⇒6 322s 322s Original second commit: 322s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 322s Author: Loú User 322s Date: Thu Apr 7 22:13:30 2005 +0000 322s 322s d⇒7 322s 322s There was a conflict merging commit 6-7, shown above. 322s Please resolve the conflict, commit the result, then type 322s 322s git-imerge continue 322s + grep -q Traceback autofill.out 322s + git-imerge diagram --frontier 323s 0 5 9 323s | | | 323s 0 - ********** - c 323s **?..*.--+ 323s *.?.*.|#?? 323s *.?...|??? 323s *.?...|??? 323s 5 - *....*|??? 323s **?...+??? 323s *.?..|#??? 323s 8 - *----+???? 323s | 323s d 323s 323s Key: 323s |,-,+ = rectangles forming current merge frontier 323s * = merge done manually 323s . = merge done automatically 323s # = conflict that is currently blocking progress 323s @ = merge was blocked but has been resolved 323s ? = no merge recorded 323s 323s + grep -q There was a conflict merging autofill.out 323s + seq 0 7 323s + grep -q ==== conflict0.txt 323s + grep -q ==== conflict1.txt 323s + grep -q ==== conflict2.txt 323s + grep -q ==== conflict3.txt 323s + grep -q ==== conflict4.txt 323s + grep -q ==== conflict5.txt 323s + modify conflict5.txt merged version 323s + filename=conflict5.txt 323s + text=merged version 323s + echo merged version 323s + git add conflict5.txt 323s + conflict_count=6 323s + grep -q ==== conflict6.txt 323s + grep -q ==== conflict7.txt 323s + true 323s + git-imerge continue --no-edit 323s + tee autofill.out 323s [imerge/c-d dc662a6] imerge 'c-d': manual merge 6-7 323s Merge has been recorded for merge 6-7. 323s Attempting automerge of 6-8...success. 323s Autofilling 6-8...success. 323s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 323s Previous HEAD position was a24822a imerge 'c-d': automatic merge 6-8 323s Switched to branch 'imerge/c-d' 323s Auto-merging conflict2.txt 323s CONFLICT (content): Merge conflict in conflict2.txt 323s Automatic merge failed; fix conflicts and then commit the result. 323s 323s Original first commit: 323s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 323s Author: Loú User 323s Date: Thu Apr 7 22:13:21 2005 +0000 323s 323s c⇒7 323s 323s Original second commit: 323s commit 820b787e86e22612af7a061db842dc95e9f1d49f 323s Author: Loú User 323s Date: Thu Apr 7 22:13:25 2005 +0000 323s 323s d⇒2 323s 323s There was a conflict merging commit 7-2, shown above. 323s Please resolve the conflict, commit the result, then type 323s 323s git-imerge continue 323s + grep -q Traceback autofill.out 323s + git-imerge diagram --frontier 323s 0 5 9 323s | | | 323s 0 - ********** - c 323s **?..*.--+ 323s *.?.*.|#?? 323s *.?...|??? 323s *.?...|??? 323s 5 - *....*|??? 323s **?...|??? 323s *.?...*??? 323s 8 - *-----+??? 323s | 323s d 323s 323s Key: 323s |,-,+ = rectangles forming current merge frontier 323s * = merge done manually 323s . = merge done automatically 323s # = conflict that is currently blocking progress 323s @ = merge was blocked but has been resolved 323s ? = no merge recorded 323s 323s + grep -q There was a conflict merging autofill.out 323s + seq 0 7 323s + grep -q ==== conflict0.txt 323s + grep -q ==== conflict1.txt 323s + grep -q ==== conflict2.txt 323s + modify conflict2.txt merged version 323s + filename=conflict2.txt 323s + text=merged version 323s + echo merged version 323s + git add conflict2.txt 323s + conflict_count=7 323s + grep -q ==== conflict3.txt 323s + grep -q ==== conflict4.txt 323s + grep -q ==== conflict5.txt 323s + grep -q ==== conflict6.txt 323s + grep -q ==== conflict7.txt 323s + true 323s + git-imerge continue --no-edit 323s + tee autofill.out 323s [imerge/c-d 5ae7a2b] imerge 'c-d': manual merge 7-2 323s Merge has been recorded for merge 7-2. 323s Attempting automerge of 7-8...success. 323s Autofilling 7-3...success. 323s Autofilling 7-4...success. 323s Autofilling 7-5...success. 323s Autofilling 7-6...success. 323s Autofilling 7-7...success. 323s Autofilling 7-8...success. 323s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 323s Attempting automerge of 9-8...failure. 323s Attempting automerge of 8-2...success. 323s Attempting automerge of 8-6...success. 323s Attempting automerge of 8-8...success. 323s Attempting automerge of 9-8...failure. 323s Attempting automerge of 9-2...success. 323s Attempting automerge of 9-5...success. 323s Attempting automerge of 9-7...success. 323s Autofilling 8-2...success. 323s Autofilling 8-3...success. 323s Autofilling 8-4...success. 323s Autofilling 8-5...success. 323s Autofilling 8-6...success. 323s Autofilling 8-7...success. 323s Autofilling 8-8...success. 323s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 323s Autofilling 9-2...success. 323s Autofilling 9-3...success. 323s Autofilling 9-4...success. 323s Autofilling 9-5...success. 323s Autofilling 9-6...success. 324s Autofilling 9-7...success. 324s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 324s Attempting automerge of 9-8...failure. 324s Attempting automerge of 9-8...failure. 324s Switched to branch 'imerge/c-d' 324s Auto-merging conflict7.txt 324s CONFLICT (content): Merge conflict in conflict7.txt 324s Automatic merge failed; fix conflicts and then commit the result. 324s 324s Original first commit: 324s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 324s Author: Loú User 324s Date: Thu Apr 7 22:13:23 2005 +0000 324s 324s c⇒9 324s 324s Original second commit: 324s commit 67099d078100141fbe4063d46a6408200f4ff311 324s Author: Loú User 324s Date: Thu Apr 7 22:13:31 2005 +0000 324s 324s d⇒8 324s 324s There was a conflict merging commit 9-8, shown above. 324s Please resolve the conflict, commit the result, then type 324s 324s git-imerge continue 324s + grep -q Traceback autofill.out 324s + git-imerge diagram --frontier 324s 0 5 9 324s | | | 324s 0 - ********** - c 324s **?..*...| 324s *.?.*..*.| 324s *.?......| 324s *.?......| 324s 5 - *....*...| 324s **?......| 324s *.?...*..+ 324s 8 - *-------+# 324s | 324s d 324s 324s Key: 324s |,-,+ = rectangles forming current merge frontier 324s * = merge done manually 324s . = merge done automatically 324s # = conflict that is currently blocking progress 324s @ = merge was blocked but has been resolved 324s ? = no merge recorded 324s 324s + grep -q There was a conflict merging autofill.out 324s + seq 0 7 324s + grep -q ==== conflict0.txt 324s + grep -q ==== conflict1.txt 324s + grep -q ==== conflict2.txt 324s + grep -q ==== conflict3.txt 324s + grep -q ==== conflict4.txt 324s + grep -q ==== conflict5.txt 324s + grep -q ==== conflict6.txt 324s + grep -q ==== conflict7.txt 324s + modify conflict7.txt merged version 324s + filename=conflict7.txt 324s + text=merged version 324s + echo merged version 324s + git add conflict7.txt 324s + conflict_count=8 324s + true 324s + git-imerge continue --no-edit 324s + tee autofill.out 324s [imerge/c-d 3fcd64f] imerge 'c-d': manual merge 9-8 324s Merge has been recorded for merge 9-8. 324s Merge is complete! 324s + grep -q Traceback autofill.out 324s + git-imerge diagram --frontier 324s 0 5 9 324s | | | 324s 0 - ********** - c 324s **?..*...| 324s *.?.*..*.| 324s *.?......| 324s *.?......| 324s 5 - *....*...| 324s **?......| 324s *.?...*..| 324s 8 - *--------* 324s | 324s d 324s 324s Key: 324s |,-,+ = rectangles forming current merge frontier 324s * = merge done manually 324s . = merge done automatically 324s # = conflict that is currently blocking progress 324s @ = merge was blocked but has been resolved 324s ? = no merge recorded 324s 324s + grep -q There was a conflict merging autofill.out 324s + break 324s + test 8 -ne 8 324s + git-imerge diagram --commits 324s + cat 324s + diff -u - diagram.out 324s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 324s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 324s Merge d into c (using imerge) 324s 324s # Please enter the commit message for your changes. Lines starting 324s # with '#' will be ignored, and an empty message aborts the commit. 324s # 324s # Date: Thu Mar 21 05:04:13 2024 +0000 324s # 324s # On branch c-d-merge 324s # Changes to be committed: 324s # modified: conflict0.txt 324s # modified: conflict1.txt 324s # modified: conflict2.txt 324s # modified: conflict3.txt 324s # modified: conflict4.txt 324s # modified: conflict5.txt 324s # modified: conflict6.txt 324s # modified: conflict7.txt 324s # modified: d.txt 324s # 324s [c-d-merge 9c750b6] Merge d into c (using imerge) 324s Date: Thu Mar 21 05:04:13 2024 +0000 324s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 324s + local refname=c-d-merge 324s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 324s + git rev-parse c-d-merge^{tree} 324s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 324s + git-imerge simplify --goal=rebase --branch=c-d-rebase 325s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + local refname=c-d-rebase 325s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git rev-parse c-d-rebase^{tree} 325s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 325s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + local refname=c-d-rebase-with-history 325s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git rev-parse c-d-rebase-with-history^{tree} 325s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git-imerge simplify --goal=border --branch=c-d-border 325s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + local refname=c-d-border 325s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git rev-parse c-d-border^{tree} 325s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 325s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + local refname=c-d-border-with-history 325s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git rev-parse c-d-border-with-history^{tree} 325s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 325s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 326s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 326s + local refname=c-d-border-with-history2 326s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 326s + git rev-parse c-d-border-with-history2^{tree} 326s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 326s + git-imerge remove 326s py312: commands[3] /tmp/autopkgtest.KmXxEo/build.2MW/src> /bin/sh t/test-duplicated 326s + dirname t/test-duplicated 326s + cd t 326s + pwd 326s + dirname /tmp/autopkgtest.KmXxEo/build.2MW/src/t 326s + BASE=/tmp/autopkgtest.KmXxEo/build.2MW/src 326s + . /tmp/autopkgtest.KmXxEo/build.2MW/src/t/test-lib.sh 326s + GIT_IMERGE=git-imerge 326s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s + DESCRIPTION=git-imerge test repository with duplicate commits 326s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated git-imerge test repository with duplicate commits 326s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s + local description=git-imerge test repository with duplicate commits 326s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated git-imerge test repository with duplicate commits 326s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s + local description=git-imerge test repository with duplicate commits 326s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s hint: Using 'master' as the name for the initial branch. This default branch name 326s hint: is subject to change. To configure the initial branch name to use in all 326s hint: of your new repositories, which will suppress this warning, call: 326s hint: 326s hint: git config --global init.defaultBranch 326s hint: 326s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 326s hint: 'development'. The just-created branch can be renamed via this command: 326s hint: 326s hint: git branch -m 326s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated/.git/ 326s + echo git-imerge test repository with duplicate commits 326s + printf %s\n /*.out /*.css /*.html 326s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated/.git config user.name Loú User 326s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated/.git config user.email luser@example.com 326s + TIME=1112911993 326s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/duplicated 326s + modify a.txt 0 326s + filename=a.txt 326s [master (root-commit) a733afa] m⇒0 326s 1 file changed, 1 insertion(+) 326s create mode 100644 a.txt 326s [a 2f1f75a] a⇒1 on branch a 326s 1 file changed, 1 insertion(+), 1 deletion(-) 326s [a 4700669] a⇒2 on branch a 326s 1 file changed, 1 insertion(+), 1 deletion(-) 326s [a 621c381] a⇒3 on branch a 326s 1 file changed, 1 insertion(+), 1 deletion(-) 326s [b 62a5c56] a⇒1 on branch b 326s 1 file changed, 1 insertion(+), 1 deletion(-) 326s + text=0 326s + echo 0 326s + git add a.txt 326s + commit -m m⇒0 326s + TIME=1112911994 326s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 326s + git checkout -b a -- 326s Switched to a new branch 'a' 326s + seq 3 326s + modify a.txt 1 326s + filename=a.txt 326s + text=1 326s + echo 1 326s + git add a.txt 326s + commit -m a⇒1 on branch a 326s + TIME=1112911995 326s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 326s + modify a.txt 2 326s + filename=a.txt 326s + text=2 326s + echo 2 326s + git add a.txt 326s + commit -m a⇒2 on branch a 326s + TIME=1112911996 326s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 326s + modify a.txt 3 326s + filename=a.txt 326s + text=3 326s + echo 3 326s + git add a.txt 326s + commit -m a⇒3 on branch a 326s + TIME=1112911997 326s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 326s + git checkout -b b master -- 326s Switched to a new branch 'b' 326s + seq 4 326s + modify a.txt 1 326s + filename=a.txt 326s + text=1 326s + echo 1 326s + git add a.txt 326s + commit -m a⇒1 on branch b 326s + TIME=1112911998 326s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 326s + modify a.txt 2 326s + filename=a.txt 326s + text=2 326s + echo 2 326s + git add a.txt 326s + commit -m a⇒2 on branch b 326s + TIME=1112911999 326s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 326s + modify a.txt 3 326s + filename=a.txt 326s + text=3 326s [b f846281] a⇒2 on branch b 326s 1 file changed, 1 insertion(+), 1 deletion(-) 326s + echo 3 326s + git add a.txt 326s + commit -m a⇒3 on branch b 326s + TIME=1112912000 326s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 326s [b a4b2c2b] a⇒3 on branch b 326s 1 file changed, 1 insertion(+), 1 deletion(-) 326s + modify a.txt 4 326s + filename=a.txt 326s + text=4 326s + echo 4 326s + git add a.txt 326s + commit -m a⇒4 on branch b 326s + TIME=1112912001 326s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 326s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 326s + git checkout a 326s [b 5b24553] a⇒4 on branch b 326s 1 file changed, 1 insertion(+), 1 deletion(-) 326s Switched to branch 'a' 326s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 326s Attempting automerge of 3-4...failure. 326s Attempting automerge of 1-1...success. 326s Attempting automerge of 1-3...failure. 326s Attempting automerge of 1-2...failure. 326s Attempting automerge of 3-1...failure. 326s Attempting automerge of 2-1...failure. 326s Autofilling 1-1...success. 326s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 326s Attempting automerge of 1-4...success. 326s Autofilling 1-2...success. 326s Autofilling 1-3...success. 326s Autofilling 1-4...success. 326s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 326s Attempting automerge of 3-4...failure. 326s Attempting automerge of 2-1...success. 326s Attempting automerge of 2-3...failure. 326s Attempting automerge of 2-2...success. 326s Attempting automerge of 3-2...failure. 326s Attempting automerge of 3-1...success. 326s Autofilling 2-1...success. 326s Autofilling 2-2...success. 326s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 326s Autofilling 3-1...success. 326s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 326s Attempting automerge of 2-4...success. 326s Autofilling 2-3...success. 326s Autofilling 2-4...success. 326s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 326s Attempting automerge of 3-4...failure. 326s Attempting automerge of 3-2...success. 326s Attempting automerge of 3-4...failure. 326s Attempting automerge of 3-3...success. 327s Autofilling 3-2...success. 327s Autofilling 3-3...success. 327s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 327s Attempting automerge of 3-4...success. 327s Autofilling 3-4...success. 327s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 327s Merge is complete! 327s + git-imerge diagram --commits --frontier --html=imerge5.html 327s 0 3 327s | | 327s 0 - **** - a 327s *... 327s *... 327s *... 327s 4 - *... 327s | 327s b 327s 327s 0 3 327s | | 327s 0 - **** - a 327s *..| 327s *..| 327s *..| 327s 4 - *--+ 327s | 327s b 327s 327s Key: 327s |,-,+ = rectangles forming current merge frontier 327s * = merge done manually 327s . = merge done automatically 327s # = conflict that is currently blocking progress 327s @ = merge was blocked but has been resolved 327s ? = no merge recorded 327s 327s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 327s Merge b into a (using imerge) 327s 327s # Please enter the commit message for your changes. Lines starting 327s # with '#' will be ignored, and an empty message aborts the commit. 327s # 327s # Date: Thu Mar 21 05:04:16 2024 +0000 327s # 327s # On branch a-b-merge 327s # Changes to be committed: 327s # modified: a.txt 327s # 327s [a-b-merge 667c951] Merge b into a (using imerge) 327s Date: Thu Mar 21 05:04:16 2024 +0000 327s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + local refname=a-b-merge 327s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git rev-parse a-b-merge^{tree} 327s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git-imerge simplify --goal=rebase --branch=a-b-rebase 327s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + local refname=a-b-rebase 327s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git rev-parse a-b-rebase^{tree} 327s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 327s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + local refname=a-b-rebase-with-history 327s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git rev-parse a-b-rebase-with-history^{tree} 327s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git-imerge simplify --goal=border --branch=a-b-border 327s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + local refname=a-b-border 327s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git rev-parse a-b-border^{tree} 327s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 327s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 328s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 328s + local refname=a-b-border-with-history 328s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 328s + git rev-parse a-b-border-with-history^{tree} 328s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 328s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 328s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 328s + local refname=a-b-border-with-history2 328s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 328s + git rev-parse a-b-border-with-history2^{tree} 328s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 328s + git checkout a 328s Switched to branch 'a' 328s + git-imerge start --goal=full --name=a-b b 328s Attempting to merge 1-1...success. 328s Attempting to merge 1-2...success. 328s Attempting to merge 1-3...success. 328s Attempting to merge 1-4...success. 328s Attempting to merge 2-1...success. 328s Attempting to merge 2-2...success. 328s Attempting to merge 2-3...success. 328s Attempting to merge 2-4...success. 328s Attempting to merge 3-1...success. 328s Attempting to merge 3-2...success. 328s Attempting to merge 3-3...success. 328s Attempting to merge 3-4...success. 328s Merge is complete! 328s + git-imerge list 328s * a-b 328s + git-imerge diagram --commits --frontier --html=imerge6.html 329s 0 3 329s | | 329s 0 - **** - a 329s *... 329s *... 329s *... 329s 4 - *... 329s | 329s b 329s 329s 0 3 329s | | 329s 0 - **** - a 329s *..| 329s *..| 329s *..| 329s 4 - *--+ 329s | 329s b 329s 329s Key: 329s |,-,+ = rectangles forming current merge frontier 329s * = merge done manually 329s . = merge done automatically 329s # = conflict that is currently blocking progress 329s @ = merge was blocked but has been resolved 329s ? = no merge recorded 329s 329s + git-imerge finish --branch=a-b-full 329s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 329s + local refname=a-b-full 329s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 329s + git rev-parse a-b-full^{tree} 329s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 329s py312: commands[4] /tmp/autopkgtest.KmXxEo/build.2MW/src> /bin/sh t/test-flip-flop 329s + dirname t/test-flip-flop 329s + cd t 329s + pwd 329s + dirname /tmp/autopkgtest.KmXxEo/build.2MW/src/t 329s + BASE=/tmp/autopkgtest.KmXxEo/build.2MW/src 329s + . /tmp/autopkgtest.KmXxEo/build.2MW/src/t/test-lib.sh 329s + GIT_IMERGE=git-imerge 329s + flip_flop_test 1 329s + local n=1 329s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 329s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 329s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s + local description=git-imerge test repository with a commit and its revert at n=1 329s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 329s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s + local description=git-imerge test repository with a commit and its revert at n=1 329s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s hint: Using 'master' as the name for the initial branch. This default branch name 329s hint: is subject to change. To configure the initial branch name to use in all 329s hint: of your new repositories, which will suppress this warning, call: 329s hint: 329s hint: git config --global init.defaultBranch 329s hint: 329s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 329s hint: 'development'. The just-created branch can be renamed via this command: 329s hint: 329s hint: git branch -m 329s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1/.git/ 329s + echo git-imerge test repository with a commit and its revert at n=1 329s + printf %s\n /*.out /*.css /*.html 329s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1/.git config user.name Loú User 329s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 329s + TIME=1112911993 329s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-1 329s + modify a.txt 0 329s + filename=a.txt 329s + text=0 329s + echo 0 329s + git add a.txt 329s + commit -m m⇒0 329s + TIME=1112911994 329s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 329s [master (root-commit) a733afa] m⇒0 329s 1 file changed, 1 insertion(+) 329s create mode 100644 a.txt 329s + git checkout -b a -- 329s Switched to a new branch 'a' 329s + modify a.txt 1 329s + filename=a.txt 329s + text=1 329s + echo 1 329s + git add a.txt 329s + commit -m a⇒1 on branch a 329s + TIME=1112911995 329s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 329s [a 2f1f75a] a⇒1 on branch a 329s 1 file changed, 1 insertion(+), 1 deletion(-) 329s + modify a.txt 2 329s + filename=a.txt 329s + text=2 329s + echo 2 329s + git add a.txt 329s + commit -m a⇒2 on branch a 329s + TIME=1112911996 329s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 329s [a 4700669] a⇒2 on branch a 329s 1 file changed, 1 insertion(+), 1 deletion(-) 329s + modify a.txt 3 329s + filename=a.txt 329s + text=3 329s + echo 3 329s + git add a.txt 329s + commit -m a⇒3 on branch a 329s + TIME=1112911997 329s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 329s + git checkout -b b master -- 329s [a 621c381] a⇒3 on branch a 329s 1 file changed, 1 insertion(+), 1 deletion(-) 329s Switched to a new branch 'b' 329s + modify b.txt 1 329s + filename=b.txt 329s + text=1 329s + echo 1 329s + git add b.txt 329s + msg=b⇒1 329s + test 1 = 1 329s + modify a.txt X 329s + filename=a.txt 329s + text=X 329s + echo X 329s + git add a.txt 329s + msg=b⇒1 and a⇒X 329s + test 1 = 2 329s + commit -m b⇒1 and a⇒X on branch b 329s + TIME=1112911998 329s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 329s [b 044a3fa] b⇒1 and a⇒X on branch b 329s 2 files changed, 2 insertions(+), 1 deletion(-) 329s create mode 100644 b.txt 329s + modify b.txt 2 329s + filename=b.txt 329s + text=2 329s + echo 2 329s + git add b.txt 329s + msg=b⇒2 329s + test 2 = 1 329s + test 2 = 2 329s + modify a.txt 0 329s + filename=a.txt 329s + text=0 329s + echo 0 329s + git add a.txt 329s + msg=b⇒2 and a⇒0 329s + commit -m b⇒2 and a⇒0 on branch b 329s + TIME=1112911999 329s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 329s [b 7851975] b⇒2 and a⇒0 on branch b 329s 2 files changed, 2 insertions(+), 2 deletions(-) 329s + modify b.txt 3 329s + filename=b.txt 329s + text=3 329s + echo 3 329s + git add b.txt 329s + msg=b⇒3 329s + test 3 = 1 329s + test 3 = 2 329s + commit -m b⇒3 on branch b 329s + TIME=1112912000 329s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 329s [b 6fe24f0] b⇒3 on branch b 329s 1 file changed, 1 insertion(+), 1 deletion(-) 329s + modify b.txt 4 329s + filename=b.txt 329s + text=4 329s + echo 4 329s + git add b.txt 329s + msg=b⇒4 329s + test 4 = 1 329s + test 4 = 2 329s + commit -m b⇒4 on branch b 329s + TIME=1112912001 329s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 329s [b 2dc5eb7] b⇒4 on branch b 329s 1 file changed, 1 insertion(+), 1 deletion(-) 329s + test_merge b-into-a-1 a b 1-1 1-2 329s + local name=b-into-a-1 329s + local dst=a 329s + local src=b 329s + local conflict1=1-1 329s + local conflict2=1-2 329s + git checkout a 329s Switched to branch 'a' 329s + git-imerge merge --branch=b-into-a-1 b 329s + tee imerge-b-into-a-1-1.out 329s Attempting automerge of 3-4...success. 329s Autofilling 1-4...success. 329s Autofilling 2-4...success. 329s Autofilling 3-1...unexpected conflict. Backtracking... 329s Autofilling 1-4...success. 329s Autofilling 2-1...unexpected conflict. Backtracking... 329s Autofilling 1-1...unexpected conflict. Backtracking... 329s Switched to branch 'imerge/b' 329s Auto-merging a.txt 329s CONFLICT (content): Merge conflict in a.txt 329s Automatic merge failed; fix conflicts and then commit the result. 329s 329s Original first commit: 329s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 329s Author: Loú User 329s Date: Thu Apr 7 22:13:15 2005 +0000 329s 329s a⇒1 on branch a 329s 329s Original second commit: 329s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 329s Author: Loú User 329s Date: Thu Apr 7 22:13:18 2005 +0000 329s 329s b⇒1 and a⇒X on branch b 329s 329s There was a conflict merging commit 1-1, shown above. 329s Please resolve the conflict, commit the result, then type 329s 329s git-imerge continue 329s + git-imerge diagram --commits --frontier 329s 0 3 329s | | 329s 0 - **** - a 329s *#?? 329s *??? 329s *??? 329s 4 - *??? 329s | 329s b 329s 329s 0 3 329s | | 329s 0 - **** - a 329s *#?? 329s *??? 329s *??? 329s 4 - *??? 329s | 329s b 329s 329s Key: 329s |,-,+ = rectangles forming current merge frontier 329s * = merge done manually 329s . = merge done automatically 329s # = conflict that is currently blocking progress 329s @ = merge was blocked but has been resolved 329s ? = no merge recorded 329s 329s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 329s + echo 1 329s + git add a.txt 329s + git-imerge continue --no-edit 329s + tee imerge-b-into-a-1-2.out 329s [imerge/b 4a05627] imerge 'b': manual merge 1-1 329s Merge has been recorded for merge 1-1. 329s Attempting automerge of 1-4...failure. 329s Attempting automerge of 1-2...failure. 329s Attempting automerge of 3-1...success. 329s Autofilling 2-1...success. 329s Autofilling 3-1...success. 329s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 329s Previous HEAD position was e5e564c imerge 'b': automatic merge 3-1 329s Switched to branch 'imerge/b' 329s Auto-merging a.txt 329s CONFLICT (content): Merge conflict in a.txt 329s Automatic merge failed; fix conflicts and then commit the result. 329s 329s Original first commit: 329s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 329s Author: Loú User 329s Date: Thu Apr 7 22:13:15 2005 +0000 329s 329s a⇒1 on branch a 329s 329s Original second commit: 329s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 329s Author: Loú User 329s Date: Thu Apr 7 22:13:19 2005 +0000 329s 329s b⇒2 and a⇒0 on branch b 329s 329s There was a conflict merging commit 1-2, shown above. 329s Please resolve the conflict, commit the result, then type 329s 329s git-imerge continue 330s + git-imerge diagram --commits --frontier 330s 0 3 330s | | 330s 0 - **** - a 330s **.. 330s *#?? 330s *??? 330s 4 - *??? 330s | 330s b 330s 330s 0 3 330s | | 330s 0 - **** - a 330s **-+ 330s *#?? 330s *??? 330s 4 - *??? 330s | 330s b 330s 330s Key: 330s |,-,+ = rectangles forming current merge frontier 330s * = merge done manually 330s . = merge done automatically 330s # = conflict that is currently blocking progress 330s @ = merge was blocked but has been resolved 330s ? = no merge recorded 330s 330s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 330s + echo 1 330s + git add a.txt 330s + + tee imerge-b-into-a-1-3.out 330s git-imerge continue --no-edit 330s [imerge/b 1a62eb5] imerge 'b': manual merge 1-2 330s Merge has been recorded for merge 1-2. 330s Attempting automerge of 1-4...success. 330s Autofilling 1-3...success. 330s Autofilling 1-4...success. 330s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 330s Attempting automerge of 3-4...success. 330s Autofilling 2-4...success. 330s Autofilling 3-2...success. 330s Autofilling 3-3...success. 330s Autofilling 3-4 (first way)...success. 330s Autofilling 3-4 (second way)...success. 330s The two ways of autofilling 3-4 agree. 330s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 330s Merge is complete! 330s + grep -q Merge is complete imerge-b-into-a-1-3.out 330s + git-imerge diagram --commits --frontier 330s 0 3 330s | | 330s 0 - **** - a 330s **.. 330s **?. 330s *.?. 330s 4 - *... 330s | 330s b 330s 330s 0 3 330s | | 330s 0 - **** - a 330s **.| 330s **?| 330s *.?| 330s 4 - *--+ 330s | 330s b 330s 330s Key: 330s |,-,+ = rectangles forming current merge frontier 330s * = merge done manually 330s . = merge done automatically 330s # = conflict that is currently blocking progress 330s @ = merge was blocked but has been resolved 330s ? = no merge recorded 330s 330s + GIT_EDITOR=cat git-imerge finish 330s Merge b into a (using imerge) 330s 330s # Please enter the commit message for your changes. Lines starting 330s # with '#' will be ignored, and an empty message aborts the commit. 330s # 330s # Date: Thu Mar 21 05:04:19 2024 +0000 330s # 330s # On branch b-into-a-1 330s # Changes to be committed: 330s # new file: b.txt 330s # 330s [b-into-a-1 45f4beb] Merge b into a (using imerge) 330s Date: Thu Mar 21 05:04:19 2024 +0000 330s + test_merge a-into-b-1 b a 1-1 2-1 330s + local name=a-into-b-1 330s + local dst=b 330s + local src=a 330s + local conflict1=1-1 330s + local conflict2=2-1 330s + git checkout b 330s Switched to branch 'b' 330s + git-imerge merge --branch=a-into-b-1 a 330s + tee imerge-a-into-b-1-1.out 331s Attempting automerge of 4-3...success. 331s Autofilling 1-3...unexpected conflict. Backtracking... 331s Autofilling 1-2...unexpected conflict. Backtracking... 331s Autofilling 1-1...unexpected conflict. Backtracking... 331s Switched to branch 'imerge/a' 331s Auto-merging a.txt 331s CONFLICT (content): Merge conflict in a.txt 331s Automatic merge failed; fix conflicts and then commit the result. 331s 331s Original first commit: 331s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 331s Author: Loú User 331s Date: Thu Apr 7 22:13:18 2005 +0000 331s 331s b⇒1 and a⇒X on branch b 331s 331s Original second commit: 331s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 331s Author: Loú User 331s Date: Thu Apr 7 22:13:15 2005 +0000 331s 331s a⇒1 on branch a 331s 331s There was a conflict merging commit 1-1, shown above. 331s Please resolve the conflict, commit the result, then type 331s 331s git-imerge continue 331s + git-imerge diagram --commits --frontier 331s 0 4 331s | | 331s 0 - ***** - b 331s *#??? 331s *???? 331s 3 - *???? 331s | 331s a 331s 331s 0 4 331s | | 331s 0 - ***** - b 331s *#??? 331s *???? 331s 3 - *???? 331s | 331s a 331s 331s Key: 331s |,-,+ = rectangles forming current merge frontier 331s * = merge done manually 331s . = merge done automatically 331s # = conflict that is currently blocking progress 331s @ = merge was blocked but has been resolved 331s ? = no merge recorded 331s 331s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 331s + echo 1 331s + git add a.txt 331s + git-imerge continue --no-edit 331s + tee imerge-a-into-b-1-2.out 331s [imerge/a 5b80a4c] imerge 'a': manual merge 1-1 331s Merge has been recorded for merge 1-1. 331s Attempting automerge of 1-3...success. 331s Autofilling 1-2...success. 331s Autofilling 1-3...success. 331s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 331s Attempting automerge of 4-3...failure. 331s Attempting automerge of 2-1...failure. 331s Switched to branch 'imerge/a' 331s Auto-merging a.txt 331s CONFLICT (content): Merge conflict in a.txt 331s Automatic merge failed; fix conflicts and then commit the result. 331s 331s Original first commit: 331s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 331s Author: Loú User 331s Date: Thu Apr 7 22:13:19 2005 +0000 331s 331s b⇒2 and a⇒0 on branch b 331s 331s Original second commit: 331s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 331s Author: Loú User 331s Date: Thu Apr 7 22:13:15 2005 +0000 331s 331s a⇒1 on branch a 331s 331s There was a conflict merging commit 2-1, shown above. 331s Please resolve the conflict, commit the result, then type 331s 331s git-imerge continue 331s + git-imerge diagram --commits --frontier 331s 0 4 331s | | 331s 0 - ***** - b 331s **#?? 331s *.??? 331s 3 - *.??? 331s | 331s a 331s 331s 0 4 331s | | 331s 0 - ***** - b 331s **#?? 331s *|??? 331s 3 - *+??? 331s | 331s a 331s 331s Key: 331s |,-,+ = rectangles forming current merge frontier 331s * = merge done manually 331s . = merge done automatically 331s # = conflict that is currently blocking progress 331s @ = merge was blocked but has been resolved 331s ? = no merge recorded 331s 331s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 331s + echo 1 331s + git add a.txt 331s + git-imerge continue --no-edit 331s + tee imerge-a-into-b-1-3.out 331s [imerge/a dcb8bae] imerge 'a': manual merge 2-1 331s Merge has been recorded for merge 2-1. 331s Attempting automerge of 2-3...success. 331s Autofilling 2-2...success. 331s Autofilling 2-3...success. 331s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 331s Attempting automerge of 4-3...success. 331s Autofilling 3-3...success. 331s Autofilling 4-1...success. 331s Autofilling 4-2...success. 331s Autofilling 4-3 (first way)...success. 331s Autofilling 4-3 (second way)...success. 331s The two ways of autofilling 4-3 agree. 331s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 331s Merge is complete! 332s + grep -q Merge is complete imerge-a-into-b-1-3.out 332s + git-imerge diagram --commits --frontier 332s 0 4 332s | | 332s 0 - ***** - b 332s ***?. 332s *..?. 332s 3 - *.... 332s | 332s a 332s 332s 0 4 332s | | 332s 0 - ***** - b 332s ***?| 332s *..?| 332s 3 - *---+ 332s | 332s a 332s 332s Key: 332s |,-,+ = rectangles forming current merge frontier 332s * = merge done manually 332s . = merge done automatically 332s # = conflict that is currently blocking progress 332s @ = merge was blocked but has been resolved 332s ? = no merge recorded 332s 332s + GIT_EDITOR=cat git-imerge finish 332s Merge a into b (using imerge) 332s 332s # Please enter the commit message for your changes. Lines starting 332s # with '#' will be ignored, and an empty message aborts the commit. 332s # 332s # Date: Thu Mar 21 05:04:21 2024 +0000 332s # 332s # On branch a-into-b-1 332s # Changes to be committed: 332s # modified: a.txt 332s # 332s [a-into-b-1 afbc4b6] Merge a into b (using imerge) 332s Date: Thu Mar 21 05:04:21 2024 +0000 332s + flip_flop_test 2 332s + local n=2 332s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 332s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 332s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s + local description=git-imerge test repository with a commit and its revert at n=2 332s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 332s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s + local description=git-imerge test repository with a commit and its revert at n=2 332s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s hint: Using 'master' as the name for the initial branch. This default branch name 332s hint: is subject to change. To configure the initial branch name to use in all 332s hint: of your new repositories, which will suppress this warning, call: 332s hint: 332s hint: git config --global init.defaultBranch 332s hint: 332s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 332s hint: 'development'. The just-created branch can be renamed via this command: 332s hint: 332s hint: git branch -m 332s + echo git-imerge test repository with a commit and its revert at n=2 332s + printf %s\n /*.out /*.css /*.html 332s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2/.git config user.name Loú User 332s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2/.git/ 332s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 332s + TIME=1112911993 332s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-2 332s + modify a.txt 0 332s + filename=a.txt 332s + text=0 332s + echo 0 332s + git add a.txt 332s [master (root-commit) a733afa] m⇒0 332s 1 file changed, 1 insertion(+) 332s create mode 100644 a.txt 332s + commit -m m⇒0 332s + TIME=1112911994 332s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 332s [a 2f1f75a] a⇒1 on branch a 332s 1 file changed, 1 insertion(+), 1 deletion(-) 332s [a 4700669] a⇒2 on branch a 332s 1 file changed, 1 insertion(+), 1 deletion(-) 332s [a 621c381] a⇒3 on branch a 332s 1 file changed, 1 insertion(+), 1 deletion(-) 332s [b 1f7d097] b⇒1 on branch b 332s 1 file changed, 1 insertion(+) 332s create mode 100644 b.txt 332s [b 48df77d] b⇒2 and a⇒X on branch b 332s 2 files changed, 2 insertions(+), 2 deletions(-) 332s + git checkout -b a -- 332s Switched to a new branch 'a' 332s + modify a.txt 1 332s + filename=a.txt 332s + text=1 332s + echo 1 332s + git add a.txt 332s + commit -m a⇒1 on branch a 332s + TIME=1112911995 332s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 332s + modify a.txt 2 332s + filename=a.txt 332s + text=2 332s + echo 2 332s + git add a.txt 332s + commit -m a⇒2 on branch a 332s + TIME=1112911996 332s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 332s + modify a.txt 3 332s + filename=a.txt 332s + text=3 332s + echo 3 332s + git add a.txt 332s + commit -m a⇒3 on branch a 332s + TIME=1112911997 332s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 332s + git checkout -b b master -- 332s Switched to a new branch 'b' 332s + modify b.txt 1 332s + filename=b.txt 332s + text=1 332s + echo 1 332s + git add b.txt 332s + msg=b⇒1 332s + test 1 = 2 332s + test 1 = 3 332s + commit -m b⇒1 on branch b 332s + TIME=1112911998 332s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 332s + modify b.txt 2 332s + filename=b.txt 332s + text=2 332s + echo 2 332s + git add b.txt 332s + msg=b⇒2 332s + test 2 = 2 332s + modify a.txt X 332s + filename=a.txt 332s + text=X 332s + echo X 332s + git add a.txt 332s + msg=b⇒2 and a⇒X 332s + test 2 = 3 332s + commit -m b⇒2 and a⇒X on branch b 332s + TIME=1112911999 332s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 332s + modify b.txt 3 332s + filename=b.txt 332s + text=3 332s + echo 3 332s + git add b.txt 332s + msg=b⇒3 332s + test 3 = 2 332s + test 3 = 3 332s + modify a.txt 0 332s + filename=a.txt 332s + text=0 332s + echo 0 332s + git add a.txt 332s + msg=b⇒3 and a⇒0 332s + commit -m b⇒3 and a⇒0 on branch b 332s + TIME=1112912000 332s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 332s [b f3ef019] b⇒3 and a⇒0 on branch b 332s 2 files changed, 2 insertions(+), 2 deletions(-) 332s + modify b.txt 4 332s + filename=b.txt 332s + text=4 332s + echo 4 332s + git add b.txt 332s + msg=b⇒4 332s + test 4 = 2 332s + test 4 = 3 332s + commit -m b⇒4 on branch b 332s + TIME=1112912001 332s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 332s + test_merge b-into-a-2 a b 1-2 1-3 332s + local name=b-into-a-2 332s + local dst=a 332s + local src=b 332s + local conflict1=1-2 332s + local conflict2=1-3 332s + git checkout a 332s Switched to branch 'a' 332s + git-imerge merge --branch=b-into-a-2 b 332s + tee imerge-b-into-a-2-1.out 332s [b 69d0c21] b⇒4 on branch b 332s 1 file changed, 1 insertion(+), 1 deletion(-) 332s Attempting automerge of 3-4...success. 332s Autofilling 1-4...success. 332s Autofilling 2-4...success. 332s Autofilling 3-1...success. 332s Autofilling 3-2...unexpected conflict. Backtracking... 332s Autofilling 1-4...success. 332s Autofilling 2-1...success. 332s Autofilling 2-2...unexpected conflict. Backtracking... 332s Autofilling 1-1...success. 332s Autofilling 1-2...unexpected conflict. Backtracking... 332s Autofilling 1-1...success. 332s Autofilling 2-1...success. 332s Autofilling 3-1...success. 332s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 332s Attempting automerge of 3-4...success. 332s Autofilling 1-4...success. 332s Autofilling 2-4...success. 332s Autofilling 3-2...unexpected conflict. Backtracking... 332s Autofilling 1-4...success. 332s Autofilling 2-2...unexpected conflict. Backtracking... 332s Autofilling 1-2...unexpected conflict. Backtracking... 332s Switched to branch 'imerge/b' 332s Auto-merging a.txt 332s CONFLICT (content): Merge conflict in a.txt 332s Automatic merge failed; fix conflicts and then commit the result. 332s 332s Original first commit: 332s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 332s Author: Loú User 332s Date: Thu Apr 7 22:13:15 2005 +0000 332s 332s a⇒1 on branch a 332s 332s Original second commit: 332s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 332s Author: Loú User 332s Date: Thu Apr 7 22:13:19 2005 +0000 332s 332s b⇒2 and a⇒X on branch b 332s 332s There was a conflict merging commit 1-2, shown above. 332s Please resolve the conflict, commit the result, then type 332s 332s git-imerge continue 332s + git-imerge diagram --commits --frontier 332s 0 3 332s | | 332s 0 - **** - a 332s *... 332s *#?? 332s *??? 332s 4 - *??? 332s | 332s b 332s 332s 0 3 332s | | 332s 0 - **** - a 332s *--+ 332s *#?? 332s *??? 332s 4 - *??? 332s | 332s b 332s 332s Key: 332s |,-,+ = rectangles forming current merge frontier 332s * = merge done manually 332s . = merge done automatically 332s # = conflict that is currently blocking progress 332s @ = merge was blocked but has been resolved 332s ? = no merge recorded 332s 332s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 332s + echo 1 332s + git add a.txt 332s + git-imerge continue --no-edit 332s + tee imerge-b-into-a-2-2.out 333s [imerge/b 38e7298] imerge 'b': manual merge 1-2 333s Merge has been recorded for merge 1-2. 333s Attempting automerge of 1-4...failure. 333s Attempting automerge of 1-3...failure. 333s Attempting automerge of 3-2...success. 333s Autofilling 2-2...success. 333s Autofilling 3-2...success. 333s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 333s Previous HEAD position was 1bfda38 imerge 'b': automatic merge 3-2 333s Switched to branch 'imerge/b' 333s Auto-merging a.txt 333s CONFLICT (content): Merge conflict in a.txt 333s Automatic merge failed; fix conflicts and then commit the result. 333s 333s Original first commit: 333s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 333s Author: Loú User 333s Date: Thu Apr 7 22:13:15 2005 +0000 333s 333s a⇒1 on branch a 333s 333s Original second commit: 333s commit f3ef01986be02ef5e40589b283c0385471ecca7d 333s Author: Loú User 333s Date: Thu Apr 7 22:13:20 2005 +0000 333s 333s b⇒3 and a⇒0 on branch b 333s 333s There was a conflict merging commit 1-3, shown above. 333s Please resolve the conflict, commit the result, then type 333s 333s git-imerge continue 333s + git-imerge diagram --commits --frontier 333s 0 3 333s | | 333s 0 - **** - a 333s *... 333s **.. 333s *#?? 333s 4 - *??? 333s | 333s b 333s 333s 0 3 333s | | 333s 0 - **** - a 333s *..| 333s **-+ 333s *#?? 333s 4 - *??? 333s | 333s b 333s 333s Key: 333s |,-,+ = rectangles forming current merge frontier 333s * = merge done manually 333s . = merge done automatically 333s # = conflict that is currently blocking progress 333s @ = merge was blocked but has been resolved 333s ? = no merge recorded 333s 333s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 333s + echo 1 333s + git add a.txt 333s + git-imerge continue+ --no-edit 333s tee imerge-b-into-a-2-3.out 333s [imerge/b fe19134] imerge 'b': manual merge 1-3 333s Merge has been recorded for merge 1-3. 333s Attempting automerge of 1-4...success. 333s Autofilling 1-4...success. 333s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 333s Attempting automerge of 3-4...success. 333s Autofilling 2-4...success. 333s Autofilling 3-3...success. 333s Autofilling 3-4 (first way)...success. 333s Autofilling 3-4 (second way)...success. 333s The two ways of autofilling 3-4 agree. 333s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 333s Merge is complete! 333s + grep -q Merge is complete imerge-b-into-a-2-3.out 333s + git-imerge diagram --commits --frontier 333s 0 3 333s | | 333s 0 - **** - a 333s *... 333s **.. 333s **?. 333s 4 - *... 333s | 333s b 333s 333s 0 3 333s | | 333s 0 - **** - a 333s *..| 333s **.| 333s **?| 333s 4 - *--+ 333s | 333s b 333s 333s Key: 333s |,-,+ = rectangles forming current merge frontier 333s * = merge done manually 333s . = merge done automatically 333s # = conflict that is currently blocking progress 333s @ = merge was blocked but has been resolved 333s ? = no merge recorded 333s 333s + GIT_EDITOR=cat git-imerge finish 333s Merge b into a (using imerge) 333s 333s # Please enter the commit message for your changes. Lines starting 333s # with '#' will be ignored, and an empty message aborts the commit. 333s # 333s # Date: Thu Mar 21 05:04:22 2024 +0000 333s # 333s # On branch b-into-a-2 333s # Changes to be committed: 333s # new file: b.txt 333s # 333s [b-into-a-2 dff1d1b] Merge b into a (using imerge) 333s Date: Thu Mar 21 05:04:22 2024 +0000 333s + test_merge a-into-b-2 b a 2-1 3-1 333s + local name=a-into-b-2 333s + local dst=b 333s + local src=a 333s + local conflict1=2-1 333s + local conflict2=3-1 333s + git checkout b 333s Switched to branch 'b' 333s + git-imerge merge --branch=a-into-b-2 a 333s + tee imerge-a-into-b-2-1.out 334s Attempting automerge of 4-3...success. 334s Autofilling 1-3...success. 334s Autofilling 2-3...unexpected conflict. Backtracking... 334s Autofilling 1-1...success. 334s Autofilling 1-2...success. 334s Autofilling 1-3...success. 334s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 334s Autofilling 2-2...unexpected conflict. Backtracking... 334s Autofilling 2-1...unexpected conflict. Backtracking... 334s Switched to branch 'imerge/a' 334s Auto-merging a.txt 334s CONFLICT (content): Merge conflict in a.txt 334s Automatic merge failed; fix conflicts and then commit the result. 334s 334s Original first commit: 334s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 334s Author: Loú User 334s Date: Thu Apr 7 22:13:19 2005 +0000 334s 334s b⇒2 and a⇒X on branch b 334s 334s Original second commit: 334s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 334s Author: Loú User 334s Date: Thu Apr 7 22:13:15 2005 +0000 334s 334s a⇒1 on branch a 334s 334s There was a conflict merging commit 2-1, shown above. 334s Please resolve the conflict, commit the result, then type 334s 334s git-imerge continue 334s + git-imerge diagram --commits --frontier 334s 0 4 334s | | 334s 0 - ***** - b 334s *.#?? 334s *.??? 334s 3 - *.??? 334s | 334s a 334s 334s 0 4 334s | | 334s 0 - ***** - b 334s *|#?? 334s *|??? 334s 3 - *+??? 334s | 334s a 334s 334s Key: 334s |,-,+ = rectangles forming current merge frontier 334s * = merge done manually 334s . = merge done automatically 334s # = conflict that is currently blocking progress 334s @ = merge was blocked but has been resolved 334s ? = no merge recorded 334s 334s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 334s + echo 1 334s + git add a.txt 334s + + tee imerge-a-into-b-2-2.out 334s git-imerge continue --no-edit 334s [imerge/a 466404b] imerge 'a': manual merge 2-1 334s Merge has been recorded for merge 2-1. 334s Attempting automerge of 2-3...success. 334s Autofilling 2-2...success. 334s Autofilling 2-3...success. 334s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 334s Attempting automerge of 4-3...failure. 334s Attempting automerge of 3-1...failure. 334s Switched to branch 'imerge/a' 334s Auto-merging a.txt 334s CONFLICT (content): Merge conflict in a.txt 334s Automatic merge failed; fix conflicts and then commit the result. 334s 334s Original first commit: 334s commit f3ef01986be02ef5e40589b283c0385471ecca7d 334s Author: Loú User 334s Date: Thu Apr 7 22:13:20 2005 +0000 334s 334s b⇒3 and a⇒0 on branch b 334s 334s Original second commit: 334s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 334s Author: Loú User 334s Date: Thu Apr 7 22:13:15 2005 +0000 334s 334s a⇒1 on branch a 334s 334s There was a conflict merging commit 3-1, shown above. 334s Please resolve the conflict, commit the result, then type 334s 334s git-imerge continue 334s + git-imerge diagram --commits --frontier 334s 0 4 334s | | 334s 0 - ***** - b 334s *.*#? 334s *..?? 334s 3 - *..?? 334s | 334s a 334s 334s 0 4 334s | | 334s 0 - ***** - b 334s *.*#? 334s *.|?? 334s 3 - *-+?? 334s | 334s a 334s 334s Key: 334s |,-,+ = rectangles forming current merge frontier 334s * = merge done manually 334s . = merge done automatically 334s # = conflict that is currently blocking progress 334s @ = merge was blocked but has been resolved 334s ? = no merge recorded 334s 334s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 334s + echo 1 334s + git add a.txt 334s + + tee imerge-a-into-b-2-3.out 334s git-imerge continue --no-edit 335s [imerge/a 14dae4d] imerge 'a': manual merge 3-1 335s Merge has been recorded for merge 3-1. 335s Attempting automerge of 3-3...success. 335s Autofilling 3-2...success. 335s Autofilling 3-3...success. 335s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 335s Attempting automerge of 4-3...success. 335s Autofilling 4-1...success. 335s Autofilling 4-2...success. 335s Autofilling 4-3...success. 335s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 335s Merge is complete! 335s + grep -q Merge is complete imerge-a-into-b-2-3.out 335s + git-imerge diagram --commits --frontier 335s 0 4 335s | | 335s 0 - ***** - b 335s *.**. 335s *.... 335s 3 - *.... 335s | 335s a 335s 335s 0 4 335s | | 335s 0 - ***** - b 335s *.**| 335s *...| 335s 3 - *---+ 335s | 335s a 335s 335s Key: 335s |,-,+ = rectangles forming current merge frontier 335s * = merge done manually 335s . = merge done automatically 335s # = conflict that is currently blocking progress 335s @ = merge was blocked but has been resolved 335s ? = no merge recorded 335s 335s + GIT_EDITOR=cat git-imerge finish 335s Merge a into b (using imerge) 335s 335s # Please enter the commit message for your changes. Lines starting 335s # with '#' will be ignored, and an empty message aborts the commit. 335s # 335s # Date: Thu Mar 21 05:04:24 2024 +0000 335s # 335s # On branch a-into-b-2 335s # Changes to be committed: 335s # modified: a.txt 335s # 335s [a-into-b-2 0d2dc06] Merge a into b (using imerge) 335s Date: Thu Mar 21 05:04:24 2024 +0000 335s + flip_flop_test 3 335s + local n=3 335s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 335s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 335s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s + local description=git-imerge test repository with a commit and its revert at n=3 335s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 335s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s + local description=git-imerge test repository with a commit and its revert at n=3 335s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s hint: Using 'master' as the name for the initial branch. This default branch name 335s hint: is subject to change. To configure the initial branch name to use in all 335s hint: of your new repositories, which will suppress this warning, call: 335s hint: 335s hint: git config --global init.defaultBranch 335s hint: 335s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 335s hint: 'development'. The just-created branch can be renamed via this command: 335s hint: 335s hint: git branch -m 335s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3/.git/ 335s + echo git-imerge test repository with a commit and its revert at n=3 335s + printf %s\n /*.out /*.css /*.html 335s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3/.git config user.name Loú User 335s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 335s + TIME=1112911993 335s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/flip-flop-3 335s + modify a.txt 0 335s + filename=a.txt 335s + text=0 335s + echo 0 335s + git add a.txt 335s [master (root-commit) a733afa] m⇒0 335s 1 file changed, 1 insertion(+) 335s create mode 100644 a.txt 335s [a 2f1f75a] a⇒1 on branch a 335s 1 file changed, 1 insertion(+), 1 deletion(-) 335s [a 4700669] a⇒2 on branch a 335s 1 file changed, 1 insertion(+), 1 deletion(-) 335s [a 621c381] a⇒3 on branch a 335s 1 file changed, 1 insertion(+), 1 deletion(-) 335s [b 1f7d097] b⇒1 on branch b 335s 1 file changed, 1 insertion(+) 335s create mode 100644 b.txt 335s [b ce671e9] b⇒2 on branch b 335s 1 file changed, 1 insertion(+), 1 deletion(-) 335s + commit -m m⇒0 335s + TIME=1112911994 335s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 335s + git checkout -b a -- 335s Switched to a new branch 'a' 335s + modify a.txt 1 335s + filename=a.txt 335s + text=1 335s + echo 1 335s + git add a.txt 335s + commit -m a⇒1 on branch a 335s + TIME=1112911995 335s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 335s + modify a.txt 2 335s + filename=a.txt 335s + text=2 335s + echo 2 335s + git add a.txt 335s + commit -m a⇒2 on branch a 335s + TIME=1112911996 335s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 335s + modify a.txt 3 335s + filename=a.txt 335s + text=3 335s + echo 3 335s + git add a.txt 335s + commit -m a⇒3 on branch a 335s + TIME=1112911997 335s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 335s + git checkout -b b master -- 335s Switched to a new branch 'b' 335s + modify b.txt 1 335s + filename=b.txt 335s + text=1 335s + echo 1 335s + git add b.txt 335s + msg=b⇒1 335s + test 1 = 3 335s + test 1 = 4 335s + commit -m b⇒1 on branch b 335s + TIME=1112911998 335s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 335s + modify b.txt 2 335s + filename=b.txt 335s + text=2 335s + echo 2 335s + git add b.txt 335s + msg=b⇒2 335s + test 2 = 3 335s + test 2 = 4 335s + commit -m b⇒2 on branch b 335s + TIME=1112911999 335s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 335s + modify b.txt 3 335s + filename=b.txt 335s + text=3 335s + echo 3 335s + git add b.txt 335s + msg=b⇒3 335s + test 3 = 3 335s + modify a.txt X 335s + filename=a.txt 335s + text=X 335s + echo X 335s + git add a.txt 335s + msg=b⇒3 and a⇒X 335s + test 3 = 4 335s + commit -m b⇒3 and a⇒X on branch b 335s + TIME=1112912000 335s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 335s [b d40495e] b⇒3 and a⇒X on branch b 335s 2 files changed, 2 insertions(+), 2 deletions(-) 335s + modify b.txt 4 335s + filename=b.txt 335s + text=4 335s + echo 4 335s + git add b.txt 335s + msg=b⇒4 335s + test 4 = 3 335s + test 4 = 4 335s + modify a.txt 0 335s + filename=a.txt 335s + text=0 335s + echo 0 335s + git add a.txt 335s + msg=b⇒4 and a⇒0 335s + commit -m b⇒4 and a⇒0 on branch b 335s + TIME=1112912001 335s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 335s [b eb736f2] b⇒4 and a⇒0 on branch b 335s 2 files changed, 2 insertions(+), 2 deletions(-) 335s + test_merge b-into-a-3 a b 1-3 1-4 335s + local name=b-into-a-3 335s + local dst=a 335s + local src=b 335s + local conflict1=1-3 335s + local conflict2=1-4 335s + git checkout a 335s Switched to branch 'a' 335s + + tee imerge-b-into-a-3-1.out 335s git-imerge merge --branch=b-into-a-3 b 335s Attempting automerge of 3-4...success. 335s Autofilling 1-4...success. 335s Autofilling 2-4...success. 335s Autofilling 3-1...success. 335s Autofilling 3-2...success. 335s Autofilling 3-3...unexpected conflict. Backtracking... 335s Autofilling 1-4...success. 335s Autofilling 2-1...success. 335s Autofilling 2-2...success. 335s Autofilling 2-3...unexpected conflict. Backtracking... 335s Autofilling 1-1...success. 335s Autofilling 1-2...success. 335s Autofilling 1-3...unexpected conflict. Backtracking... 335s Autofilling 1-2...success. 335s Autofilling 2-2...success. 336s Autofilling 3-1...success. 336s Autofilling 3-2 (first way)...success. 336s Autofilling 3-2 (second way)...success. 336s The two ways of autofilling 3-2 agree. 336s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 336s Attempting automerge of 3-4...success. 336s Autofilling 1-4...success. 336s Autofilling 2-4...success. 336s Autofilling 3-3...unexpected conflict. Backtracking... 336s Autofilling 1-4...success. 336s Autofilling 2-3...unexpected conflict. Backtracking... 336s Autofilling 1-3...unexpected conflict. Backtracking... 336s Switched to branch 'imerge/b' 336s Auto-merging a.txt 336s CONFLICT (content): Merge conflict in a.txt 336s Automatic merge failed; fix conflicts and then commit the result. 336s 336s Original first commit: 336s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 336s Author: Loú User 336s Date: Thu Apr 7 22:13:15 2005 +0000 336s 336s a⇒1 on branch a 336s 336s Original second commit: 336s commit d40495ed379f376841e517047f90b663e8c7c7e1 336s Author: Loú User 336s Date: Thu Apr 7 22:13:20 2005 +0000 336s 336s b⇒3 and a⇒X on branch b 336s 336s There was a conflict merging commit 1-3, shown above. 336s Please resolve the conflict, commit the result, then type 336s 336s git-imerge continue 336s + git-imerge diagram --commits --frontier 336s 0 3 336s | | 336s 0 - **** - a 336s *??. 336s *... 336s *#?? 336s 4 - *??? 336s | 336s b 336s 336s 0 3 336s | | 336s 0 - **** - a 336s *??| 336s *--+ 336s *#?? 336s 4 - *??? 336s | 336s b 336s 336s Key: 336s |,-,+ = rectangles forming current merge frontier 336s * = merge done manually 336s . = merge done automatically 336s # = conflict that is currently blocking progress 336s @ = merge was blocked but has been resolved 336s ? = no merge recorded 336s 336s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 336s + echo 1 336s + git add a.txt 336s + + tee imerge-b-into-a-3-2.out 336s git-imerge continue --no-edit 336s [imerge/b d8e5cc7] imerge 'b': manual merge 1-3 336s Merge has been recorded for merge 1-3. 336s Attempting automerge of 1-4...failure. 336s Attempting automerge of 1-4...failure. 336s Attempting automerge of 3-3...success. 336s Autofilling 2-3...success. 336s Autofilling 3-3...success. 336s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 336s Previous HEAD position was b84848c imerge 'b': automatic merge 3-3 336s Switched to branch 'imerge/b' 336s Auto-merging a.txt 336s CONFLICT (content): Merge conflict in a.txt 336s Automatic merge failed; fix conflicts and then commit the result. 336s 336s Original first commit: 336s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 336s Author: Loú User 336s Date: Thu Apr 7 22:13:15 2005 +0000 336s 336s a⇒1 on branch a 336s 336s Original second commit: 336s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 336s Author: Loú User 336s Date: Thu Apr 7 22:13:21 2005 +0000 336s 336s b⇒4 and a⇒0 on branch b 336s 336s There was a conflict merging commit 1-4, shown above. 336s Please resolve the conflict, commit the result, then type 336s 336s git-imerge continue 336s + git-imerge diagram --commits --frontier 336s 0 3 336s | | 336s 0 - **** - a 336s *??. 336s *... 336s **.. 336s 4 - *#?? 336s | 336s b 336s 336s 0 3 336s | | 336s 0 - **** - a 336s *??| 336s *..| 336s **-+ 336s 4 - *#?? 336s | 336s b 336s 336s Key: 336s |,-,+ = rectangles forming current merge frontier 336s * = merge done manually 336s . = merge done automatically 336s # = conflict that is currently blocking progress 336s @ = merge was blocked but has been resolved 336s ? = no merge recorded 336s 336s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 336s + echo 1 336s + git add a.txt 336s + + git-imerge continue --no-edit 336s tee imerge-b-into-a-3-3.out 336s [imerge/b 973e204] imerge 'b': manual merge 1-4 336s Merge has been recorded for merge 1-4. 336s Attempting automerge of 3-4...success. 337s Autofilling 2-4...success. 337s Autofilling 3-4...success. 337s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 337s Merge is complete! 337s + grep -q Merge is complete imerge-b-into-a-3-3.out 337s + git-imerge diagram --commits --frontier 337s 0 3 337s | | 337s 0 - **** - a 337s *??. 337s *... 337s **.. 337s 4 - **.. 337s | 337s b 337s 337s 0 3 337s | | 337s 0 - **** - a 337s *??| 337s *..| 337s **.| 337s 4 - **-+ 337s | 337s b 337s 337s Key: 337s |,-,+ = rectangles forming current merge frontier 337s * = merge done manually 337s . = merge done automatically 337s # = conflict that is currently blocking progress 337s @ = merge was blocked but has been resolved 337s ? = no merge recorded 337s 337s + GIT_EDITOR=cat git-imerge finish 337s Merge b into a (using imerge) 337s 337s # Please enter the commit message for your changes. Lines starting 337s # with '#' will be ignored, and an empty message aborts the commit. 337s # 337s # Date: Thu Mar 21 05:04:26 2024 +0000 337s # 337s # On branch b-into-a-3 337s # Changes to be committed: 337s # new file: b.txt 337s # 337s [b-into-a-3 69a77ac] Merge b into a (using imerge) 337s Date: Thu Mar 21 05:04:26 2024 +0000 337s + test_merge a-into-b-3 b a 3-1 4-1 337s + local name=a-into-b-3 337s + local dst=b 337s + local src=a 337s + local conflict1=3-1 337s + local conflict2=4-1 337s + git checkout b 337s Switched to branch 'b' 337s + git-imerge merge --branch=a-into-b-3 a 337s + tee imerge-a-into-b-3-1.out 337s Attempting automerge of 4-3...success. 337s Autofilling 1-3...success. 337s Autofilling 2-3...success. 337s Autofilling 3-3...unexpected conflict. Backtracking... 337s Autofilling 1-3...success. 337s Autofilling 2-1...success. 337s Autofilling 2-2...success. 337s Autofilling 2-3 (first way)...success. 337s Autofilling 2-3 (second way)...success. 337s The two ways of autofilling 2-3 agree. 337s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 337s Autofilling 3-2...unexpected conflict. Backtracking... 337s Autofilling 3-1...unexpected conflict. Backtracking... 337s Switched to branch 'imerge/a' 337s Auto-merging a.txt 337s CONFLICT (content): Merge conflict in a.txt 337s Automatic merge failed; fix conflicts and then commit the result. 337s 337s Original first commit: 337s commit d40495ed379f376841e517047f90b663e8c7c7e1 337s Author: Loú User 337s Date: Thu Apr 7 22:13:20 2005 +0000 337s 337s b⇒3 and a⇒X on branch b 337s 337s Original second commit: 337s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 337s Author: Loú User 337s Date: Thu Apr 7 22:13:15 2005 +0000 337s 337s a⇒1 on branch a 337s 337s There was a conflict merging commit 3-1, shown above. 337s Please resolve the conflict, commit the result, then type 337s 337s git-imerge continue 337s + git-imerge diagram --commits --frontier 337s 0 4 337s | | 337s 0 - ***** - b 337s *?.#? 337s *?.?? 337s 3 - *..?? 337s | 337s a 337s 337s 0 4 337s | | 337s 0 - ***** - b 337s *?|#? 337s *?|?? 337s 3 - *-+?? 337s | 337s a 337s 337s Key: 337s |,-,+ = rectangles forming current merge frontier 337s * = merge done manually 337s . = merge done automatically 337s # = conflict that is currently blocking progress 337s @ = merge was blocked but has been resolved 337s ? = no merge recorded 337s 337s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 337s + echo 1 337s + git add a.txt 337s + git-imerge continue --no-edit 337s + tee imerge-a-into-b-3-2.out 338s [imerge/a 14bf89f] imerge 'a': manual merge 3-1 338s Merge has been recorded for merge 3-1. 338s Attempting automerge of 3-3...success. 338s Autofilling 3-2...success. 338s Autofilling 3-3...success. 338s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 338s Attempting automerge of 4-3...failure. 338s Attempting automerge of 4-1...failure. 338s Switched to branch 'imerge/a' 338s Auto-merging a.txt 338s CONFLICT (content): Merge conflict in a.txt 338s Automatic merge failed; fix conflicts and then commit the result. 338s 338s Original first commit: 338s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 338s Author: Loú User 338s Date: Thu Apr 7 22:13:21 2005 +0000 338s 338s b⇒4 and a⇒0 on branch b 338s 338s Original second commit: 338s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 338s Author: Loú User 338s Date: Thu Apr 7 22:13:15 2005 +0000 338s 338s a⇒1 on branch a 338s 338s There was a conflict merging commit 4-1, shown above. 338s Please resolve the conflict, commit the result, then type 338s 338s git-imerge continue 338s + git-imerge diagram --commits --frontier 338s 0 4 338s | | 338s 0 - ***** - b 338s *?.*# 338s *?..? 338s 3 - *...? 338s | 338s a 338s 338s 0 4 338s | | 338s 0 - ***** - b 338s *?.*# 338s *?.|? 338s 3 - *--+? 338s | 338s a 338s 338s Key: 338s |,-,+ = rectangles forming current merge frontier 338s * = merge done manually 338s . = merge done automatically 338s # = conflict that is currently blocking progress 338s @ = merge was blocked but has been resolved 338s ? = no merge recorded 338s 338s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 338s + echo 1 338s + git add a.txt 338s + git-imerge continue --no-edit 338s + tee imerge-a-into-b-3-3.out 338s [imerge/a 954daa3] imerge 'a': manual merge 4-1 338s Merge has been recorded for merge 4-1. 338s Attempting automerge of 4-3...success. 338s Autofilling 4-2...success. 338s Autofilling 4-3...success. 338s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 338s Merge is complete! 338s + grep -q Merge is complete imerge-a-into-b-3-3.out 338s + git-imerge diagram --commits --frontier 338s 0 4 338s | | 338s 0 - ***** - b 338s *?.** 338s *?... 338s 3 - *.... 338s | 338s a 338s 338s 0 4 338s | | 338s 0 - ***** - b 338s *?.** 338s *?..| 338s 3 - *---+ 338s | 338s a 338s 338s Key: 338s |,-,+ = rectangles forming current merge frontier 338s * = merge done manually 338s . = merge done automatically 338s # = conflict that is currently blocking progress 338s @ = merge was blocked but has been resolved 338s ? = no merge recorded 338s 338s + GIT_EDITOR=cat git-imerge finish 338s Merge a into b (using imerge) 338s 338s # Please enter the commit message for your changes. Lines starting 338s # with '#' will be ignored, and an empty message aborts the commit. 338s # 338s # Date: Thu Mar 21 05:04:27 2024 +0000 338s # 338s # On branch a-into-b-3 338s # Changes to be committed: 338s # modified: a.txt 338s # 338s [a-into-b-3 b16a8ff] Merge a into b (using imerge) 338s Date: Thu Mar 21 05:04:27 2024 +0000 338s py312: commands[5] /tmp/autopkgtest.KmXxEo/build.2MW/src> /bin/sh t/test-drop 338s + dirname t/test-drop 338s + cd t 338s + pwd 338s + dirname /tmp/autopkgtest.KmXxEo/build.2MW/src/t 338s + BASE=/tmp/autopkgtest.KmXxEo/build.2MW/src 338s + . /tmp/autopkgtest.KmXxEo/build.2MW/src/t/test-lib.sh 338s + GIT_IMERGE=git-imerge 338s + TMP=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s + DESCRIPTION=git-imerge drop test repository 338s + init_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop git-imerge drop test repository 338s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s + local description=git-imerge drop test repository 338s + delete_test_repo /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop git-imerge drop test repository 338s + local path=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s + local description=git-imerge drop test repository 338s + test -d /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s + mkdir -p /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s + git init /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s hint: Using 'master' as the name for the initial branch. This default branch name 338s hint: is subject to change. To configure the initial branch name to use in all 338s hint: of your new repositories, which will suppress this warning, call: 338s hint: 338s hint: git config --global init.defaultBranch 338s hint: 338s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 338s hint: 'development'. The just-created branch can be renamed via this command: 338s hint: 338s hint: git branch -m 338s + echo git-imerge drop test repository 338s + printf %s\n /*.out /*.css /*.html 338s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop/.git config user.name Loú User 338s Initialized empty Git repository in /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop/.git/ 338s + git --git-dir=/tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop/.git config user.email luser@example.com 338s + TIME=1112911993 338s + ln -s /tmp/autopkgtest.KmXxEo/build.2MW/src/imerge.css /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s + cd /tmp/autopkgtest.KmXxEo/build.2MW/src/t/tmp/drop 338s [master (root-commit) a733afa] m⇒0 338s 1 file changed, 1 insertion(+) 338s create mode 100644 a.txt 338s [master 389a4ba] a1⇒1 338s 1 file changed, 1 insertion(+) 338s create mode 100644 a1.txt 338s [master 4785218] a2⇒2 338s 1 file changed, 1 insertion(+) 338s create mode 100644 a2.txt 338s [master 34bdde3] a3⇒3 338s 1 file changed, 1 insertion(+) 338s create mode 100644 a3.txt 338s [master c793a5a] a4⇒4 338s 1 file changed, 1 insertion(+) 338s create mode 100644 a4.txt 338s [master b42f60c] a5⇒5 338s 1 file changed, 1 insertion(+) 338s create mode 100644 a5.txt 338s + modify a.txt 0 338s + filename=a.txt 338s + text=0 338s + echo 0 338s + git add a.txt 338s + commit -m m⇒0 338s + TIME=1112911994 338s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 338s + seq 6 338s + modify a1.txt 1 338s + filename=a1.txt 338s + text=1 338s + echo 1 338s + git add a1.txt 338s + commit -m a1⇒1 338s + TIME=1112911995 338s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 338s + modify a2.txt 2 338s + filename=a2.txt 338s + text=2 338s + echo 2 338s + git add a2.txt 338s + commit -m a2⇒2 338s + TIME=1112911996 338s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 338s + modify a3.txt 3 338s + filename=a3.txt 338s + text=3 338s + echo 3 338s + git add a3.txt 338s + commit -m a3⇒3 338s + TIME=1112911997 338s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 338s + modify a4.txt 4 338s + filename=a4.txt 338s + text=4 338s + echo 4 338s + git add a4.txt 338s + commit -m a4⇒4 338s + TIME=1112911998 338s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 338s + modify a5.txt 5 338s + filename=a5.txt 338s + text=5 338s + echo 5 338s + git add a5.txt 338s + commit -m a5⇒5 338s + TIME=1112911999 338s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 338s + modify a6.txt 6 338s + filename=a6.txt 338s + text=6 338s + echo 6 338s + git add a6.txt 338s + commit -m a6⇒6 338s + TIME=1112912000 338s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 338s + git checkout -b dropped master 338s Switched to a new branch 'dropped' 338s + git-imerge drop HEAD~5..HEAD~3 338s [master 9d6aec5] a6⇒6 338s 1 file changed, 1 insertion(+) 338s create mode 100644 a6.txt 339s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 339s 339s You are in 'detached HEAD' state. You can look around, make experimental 339s changes and commit them, and you can discard any commits you make in this 339s state without impacting any branches by switching back to a branch. 339s 339s If you want to create a new branch to retain commits you create, you may 339s do so (now or later) by using -c with the switch command. Example: 339s 339s git switch -c 339s 339s Or undo this operation with: 339s 339s git switch - 339s 339s Turn off this advice by setting config variable advice.detachedHead to false 339s 339s HEAD is now at 34bdde3 a3⇒3 339s [detached HEAD 16e372d] Revert "a3⇒3" 339s Date: Thu Mar 21 05:04:28 2024 +0000 339s 1 file changed, 1 deletion(-) 339s delete mode 100644 a3.txt 339s [detached HEAD b44b8ee] Revert "a2⇒2" 339s Date: Thu Mar 21 05:04:28 2024 +0000 339s 1 file changed, 1 deletion(-) 339s delete mode 100644 a2.txt 339s Attempting automerge of 3-2...success. 339s Autofilling 1-2...success. 339s Autofilling 2-2...success. 339s Autofilling 3-1...success. 339s Autofilling 3-2 (first way)...success. 339s Autofilling 3-2 (second way)...success. 339s The two ways of autofilling 3-2 agree. 339s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='b44b8eee74db5cc075c1dd079ddcbc33f64a0166', goal='drop')[0:4,0:3]. 339s Merge is complete! 339s + git-imerge diagram --commits --frontier --html=imerge-drop.html 339s 0 3 339s | | 339s 0 - **** - dropped 339s *??. 339s 2 - *... 339s | 339s b44b8eee74db5cc075c1dd079ddcbc33f64a0166 339s 339s 0 3 339s | | 339s 0 - **** - dropped 339s *??| 339s 2 - *--+ 339s | 339s b44b8eee74db5cc075c1dd079ddcbc33f64a0166 339s 339s Key: 339s |,-,+ = rectangles forming current merge frontier 339s * = merge done manually 339s . = merge done automatically 339s # = conflict that is currently blocking progress 339s @ = merge was blocked but has been resolved 339s ? = no merge recorded 339s 339s + git-imerge finish 339s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 339s + local refname=dropped 339s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 339s + git rev-parse dropped^{tree} 339s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 339s + git checkout -b reverted master 339s Switched to a new branch 'reverted' 339s + git-imerge revert HEAD~5..HEAD~3 339s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 339s 339s You are in 'detached HEAD' state. You can look around, make experimental 339s changes and commit them, and you can discard any commits you make in this 339s state without impacting any branches by switching back to a branch. 339s 339s If you want to create a new branch to retain commits you create, you may 339s do so (now or later) by using -c with the switch command. Example: 339s 339s git switch -c 339s 339s Or undo this operation with: 339s 339s git switch - 339s 339s Turn off this advice by setting config variable advice.detachedHead to false 339s 339s HEAD is now at 34bdde3 a3⇒3 339s [detached HEAD 16e372d] Revert "a3⇒3" 339s Date: Thu Mar 21 05:04:28 2024 +0000 339s 1 file changed, 1 deletion(-) 339s delete mode 100644 a3.txt 339s [detached HEAD b44b8ee] Revert "a2⇒2" 339s Date: Thu Mar 21 05:04:28 2024 +0000 339s 1 file changed, 1 deletion(-) 339s delete mode 100644 a2.txt 339s Attempting automerge of 3-2...success. 339s Autofilling 1-2...success. 339s Autofilling 2-2...success. 339s Autofilling 3-1...success. 339s Autofilling 3-2 (first way)...success. 339s Autofilling 3-2 (second way)...success. 339s The two ways of autofilling 3-2 agree. 339s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='b44b8eee74db5cc075c1dd079ddcbc33f64a0166', goal='revert')[0:4,0:3]. 339s Merge is complete! 339s + git-imerge diagram --commits --frontier --html=imerge-revert.html 340s 0 3 340s | | 340s 0 - **** - reverted 340s *??. 340s 2 - *... 340s | 340s b44b8eee74db5cc075c1dd079ddcbc33f64a0166 340s 340s 0 3 340s | | 340s 0 - **** - reverted 340s *??| 340s 2 - *--+ 340s | 340s b44b8eee74db5cc075c1dd079ddcbc33f64a0166 340s 340s Key: 340s |,-,+ = rectangles forming current merge frontier 340s * = merge done manually 340s . = merge done automatically 340s # = conflict that is currently blocking progress 340s @ = merge was blocked but has been resolved 340s ? = no merge recorded 340s 340s + git-imerge finish 340s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 340s + local refname=reverted 340s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 340s + git rev-parse reverted^{tree} 340s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 340s py312: OK (76.91=setup[0.25]+cmd[3.90,51.25,7.66,2.85,9.63,1.36] seconds) 340s congratulations :) (77.02 seconds) 340s autopkgtest [05:04:29]: test pybuild-autopkgtest: -----------------------] 344s pybuild-autopkgtest PASS 344s autopkgtest [05:04:33]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 348s autopkgtest [05:04:37]: @@@@@@@@@@@@@@@@@@@@ summary 348s pybuild-autopkgtest PASS