1s autopkgtest [02:50:20]: starting date and time: 2024-03-27 02:50:20+0000
  1s autopkgtest [02:50:20]: git checkout: 4a1cd702 l/adt_testbed: don't blame the testbed for unsolvable build deps
  1s autopkgtest [02:50:20]: host juju-7f2275-prod-proposed-migration-environment-3; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.t2vs18wy/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed --apt-upgrade git-imerge --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=python3-defaults/3.12.2-0ubuntu1 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-3@bos02-s390x-12.secgroup --name adt-noble-s390x-git-imerge-20240327-025019-juju-7f2275-prod-proposed-migration-environment-3-93b96a9a-3ac1-4c77-9d55-4d571a06cf6d --image adt/ubuntu-noble-s390x-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-3 --net-id=net_prod-proposed-migration -e TERM=linux -e ''"'"'http_proxy=http://squid.internal:3128'"'"'' -e ''"'"'https_proxy=http://squid.internal:3128'"'"'' -e ''"'"'no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com'"'"'' --mirror=http://ftpmaster.internal/ubuntu/
172s autopkgtest [02:53:11]: testbed dpkg architecture: s390x
172s autopkgtest [02:53:11]: testbed apt version: 2.7.12
172s autopkgtest [02:53:11]: @@@@@@@@@@@@@@@@@@@@ test bed setup
173s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB]
174s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/main Sources [497 kB]
174s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/universe Sources [3984 kB]
174s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/restricted Sources [8504 B]
174s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/multiverse Sources [55.4 kB]
174s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main s390x Packages [694 kB]
174s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main s390x c-n-f Metadata [3032 B]
174s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/restricted s390x Packages [1372 B]
174s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/restricted s390x c-n-f Metadata [116 B]
174s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x Packages [4122 kB]
175s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x c-n-f Metadata [7292 B]
175s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/multiverse s390x Packages [48.3 kB]
175s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/multiverse s390x c-n-f Metadata [116 B]
177s Fetched 9539 kB in 3s (3608 kB/s)
177s Reading package lists...
178s Reading package lists...
179s Building dependency tree...
179s Reading state information...
179s Calculating upgrade...
179s The following packages will be upgraded:
179s   psmisc
179s 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
179s Need to get 178 kB of archives.
179s After this operation, 28.7 kB disk space will be freed.
179s Get:1 http://ftpmaster.internal/ubuntu noble/main s390x psmisc s390x 23.7-1 [178 kB]
180s Fetched 178 kB in 0s (489 kB/s)
180s (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 ... 52170 files and directories currently installed.)
180s Preparing to unpack .../psmisc_23.7-1_s390x.deb ...
180s Unpacking psmisc (23.7-1) over (23.6-2) ...
180s Setting up psmisc (23.7-1) ...
180s Processing triggers for man-db (2.12.0-3) ...
180s Reading package lists...
181s Building dependency tree...
181s Reading state information...
181s 0 upgraded, 0 newly installed, 0 to remove and 244 not upgraded.
181s Hit:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease
181s Hit:2 http://ftpmaster.internal/ubuntu noble InRelease
181s Hit:3 http://ftpmaster.internal/ubuntu noble-updates InRelease
182s Hit:4 http://ftpmaster.internal/ubuntu noble-security InRelease
182s Reading package lists...
183s Reading package lists...
183s Building dependency tree...
183s Reading state information...
183s Calculating upgrade...
183s The following packages were automatically installed and are no longer required:
183s   libaio1 libnetplan0 python3-distutils python3-lib2to3
183s Use 'sudo apt autoremove' to remove them.
183s The following packages will be REMOVED:
183s   libapt-pkg6.0 libarchive13 libatm1 libcurl3-gnutls libcurl4 libdb5.3 libelf1
183s   libext2fs2 libgdbm-compat4 libgdbm6 libglib2.0-0 libgnutls30 libgpgme11
183s   libhogweed6 libmagic1 libnettle8 libnpth0 libnvme1 libparted2 libperl5.38
183s   libpng16-16 libpsl5 libreadline8 libreiserfscore0 libssl3 libtirpc3 liburcu8
183s   libuv1
183s The following NEW packages will be installed:
183s   bpfcc-tools bpftrace fontconfig-config fonts-dejavu-core fonts-dejavu-mono
183s   hwdata ieee-data libaio1t64 libapt-pkg6.0t64 libarchive13t64 libatm1t64
183s   libbpfcc libc-dev-bin libc-devtools libc6-dev libclang-cpp18 libclang1-18
183s   libcrypt-dev libcurl3t64-gnutls libcurl4t64 libdb5.3t64 libdeflate0
183s   libdw1t64 libelf1t64 libext2fs2t64 libfontconfig1 libfreetype6 libgd3
183s   libgdbm-compat4t64 libgdbm6t64 libglib2.0-0t64 libgnutls30t64 libgpgme11t64
183s   libhogweed6t64 libjbig0 libjpeg-turbo8 libjpeg8 libllvm18 libmagic1t64
183s   libnetplan1 libnettle8t64 libnpth0t64 libnvme1t64 libparted2t64
183s   libperl5.38t64 libpng16-16t64 libpsl5t64 libreadline8t64 libreiserfscore0t64
183s   libsharpyuv0 libssl3t64 libtiff6 libtirpc3t64 liburcu8t64 libuv1t64 libwebp7
183s   libxpm4 linux-headers-6.8.0-20 linux-headers-6.8.0-20-generic
183s   linux-image-6.8.0-20-generic linux-libc-dev linux-modules-6.8.0-20-generic
183s   linux-modules-extra-6.8.0-20-generic linux-tools-6.8.0-20
183s   linux-tools-6.8.0-20-generic linux-tools-common manpages manpages-dev
183s   python3-bpfcc python3-netaddr rpcsvc-proto ubuntu-kernel-accessories
183s   xdg-user-dirs
183s The following packages have been kept back:
183s   s390-tools
183s The following packages will be upgraded:
183s   apparmor apt apt-utils base-files bash bind9-dnsutils bind9-host bind9-libs
183s   binutils binutils-common binutils-s390x-linux-gnu bolt bsdextrautils
183s   bsdutils btrfs-progs coreutils cryptsetup-bin curl dbus dbus-bin dbus-daemon
183s   dbus-session-bus-common dbus-system-bus-common dbus-user-session dhcpcd-base
183s   dirmngr dmsetup dpkg dpkg-dev e2fsprogs e2fsprogs-l10n eject fdisk file ftp
183s   fwupd gawk gcc-13-base gcc-14-base gir1.2-girepository-2.0 gir1.2-glib-2.0
183s   gnupg gnupg-l10n gnupg-utils gpg gpg-agent gpg-wks-client gpgconf gpgsm gpgv
183s   groff-base ibverbs-providers inetutils-telnet info initramfs-tools
183s   initramfs-tools-bin initramfs-tools-core install-info iproute2 jq keyboxd
183s   kmod kpartx krb5-locales libapparmor1 libaudit-common libaudit1 libbinutils
183s   libblkid1 libblockdev-crypto3 libblockdev-fs3 libblockdev-loop3
183s   libblockdev-mdraid3 libblockdev-nvme3 libblockdev-part3 libblockdev-swap3
183s   libblockdev-utils3 libblockdev3 libbpf1 libbrotli1 libcap-ng0 libcom-err2
183s   libcryptsetup12 libctf-nobfd0 libctf0 libdbus-1-3 libdebconfclient0
183s   libdevmapper1.02.1 libdpkg-perl libevent-core-2.1-7 libexpat1 libfdisk1
183s   libfido2-1 libftdi1-2 libfwupd2 libgcc-s1 libgirepository-1.0-1
183s   libglib2.0-data libgssapi-krb5-2 libgudev-1.0-0 libgusb2 libibverbs1
183s   libjcat1 libjq1 libjson-glib-1.0-0 libjson-glib-1.0-common libk5crypto3
183s   libkmod2 libkrb5-3 libkrb5support0 libldap-common libldap2
183s   liblocale-gettext-perl liblzma5 libmagic-mgc libmbim-glib4 libmbim-proxy
183s   libmm-glib0 libmount1 libnghttp2-14 libnsl2 libnss-systemd libpam-modules
183s   libpam-modules-bin libpam-runtime libpam-systemd libpam0g libplymouth5
183s   libpolkit-agent-1-0 libpolkit-gobject-1-0 libproc2-0 libprotobuf-c1
183s   libpython3-stdlib libpython3.11-minimal libpython3.11-stdlib
183s   libpython3.12-minimal libpython3.12-stdlib libqmi-glib5 libqmi-proxy
183s   libqrtr-glib0 librtmp1 libsasl2-2 libsasl2-modules libsasl2-modules-db
183s   libseccomp2 libselinux1 libsemanage-common libsemanage2 libsframe1 libslang2
183s   libsmartcols1 libsqlite3-0 libss2 libssh-4 libstdc++6 libsystemd-shared
183s   libsystemd0 libtext-charwidth-perl libtext-iconv-perl libtirpc-common
183s   libudev1 libudisks2-0 libusb-1.0-0 libuuid1 libvolume-key1 libxml2 libxmlb2
183s   libxmuu1 linux-generic linux-headers-generic linux-headers-virtual
183s   linux-image-generic linux-image-virtual linux-virtual logsave lshw lsof
183s   man-db motd-news-config mount mtr-tiny multipath-tools netplan-generator
183s   netplan.io openssh-client openssh-server openssh-sftp-server openssl parted
183s   perl perl-base perl-modules-5.38 pinentry-curses plymouth
183s   plymouth-theme-ubuntu-text procps python-apt-common python3 python3-apt
183s   python3-cryptography python3-dbus python3-distutils python3-gdbm python3-gi
183s   python3-lib2to3 python3-minimal python3-netplan python3-pkg-resources
183s   python3-pyrsistent python3-setuptools python3-typing-extensions python3-yaml
183s   python3.11 python3.11-minimal python3.12 python3.12-minimal readline-common
183s   rsync rsyslog s390-tools-data shared-mime-info sudo systemd systemd-dev
183s   systemd-resolved systemd-sysv systemd-timesyncd tcpdump telnet tnftp
183s   ubuntu-pro-client ubuntu-pro-client-l10n udev udisks2 usb.ids util-linux
183s   uuid-runtime vim-common vim-tiny wget xxd xz-utils zlib1g
183s 243 upgraded, 73 newly installed, 28 to remove and 1 not upgraded.
183s Need to get 228 MB of archives.
183s After this operation, 524 MB of additional disk space will be used.
183s Get:1 http://ftpmaster.internal/ubuntu noble-proposed/main s390x motd-news-config all 13ubuntu8 [5098 B]
183s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/main s390x base-files s390x 13ubuntu8 [74.2 kB]
184s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/main s390x bash s390x 5.2.21-2ubuntu3 [845 kB]
184s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/main s390x bsdutils s390x 1:2.39.3-9ubuntu2 [96.1 kB]
185s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libbrotli1 s390x 1.1.0-2build1 [375 kB]
185s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgssapi-krb5-2 s390x 1.20.1-6ubuntu1 [149 kB]
185s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libkrb5-3 s390x 1.20.1-6ubuntu1 [360 kB]
185s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libkrb5support0 s390x 1.20.1-6ubuntu1 [34.6 kB]
185s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libk5crypto3 s390x 1.20.1-6ubuntu1 [90.3 kB]
185s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libcom-err2 s390x 1.47.0-2.4~exp1ubuntu2 [22.9 kB]
185s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/main s390x zlib1g s390x 1:1.3.dfsg-3.1ubuntu1 [75.7 kB]
185s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/main s390x librtmp1 s390x 2.4+20151223.gitfa8646d.1-2build6 [58.4 kB]
185s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/main s390x udisks2 s390x 2.10.1-6 [298 kB]
185s Get:14 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libudisks2-0 s390x 2.10.1-6 [179 kB]
185s Get:15 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblkid1 s390x 2.39.3-9ubuntu2 [128 kB]
186s Get:16 http://ftpmaster.internal/ubuntu noble-proposed/main s390x liblzma5 s390x 5.6.0-0.2 [137 kB]
186s Get:17 http://ftpmaster.internal/ubuntu noble-proposed/main s390x kmod s390x 31+20240202-2ubuntu4 [107 kB]
186s Get:18 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libkmod2 s390x 31+20240202-2ubuntu4 [56.3 kB]
186s Get:19 http://ftpmaster.internal/ubuntu noble-proposed/main s390x systemd-dev all 255.4-1ubuntu5 [103 kB]
186s Get:20 http://ftpmaster.internal/ubuntu noble-proposed/main s390x systemd-timesyncd s390x 255.4-1ubuntu5 [35.3 kB]
186s Get:21 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dbus-session-bus-common all 1.14.10-4ubuntu2 [80.3 kB]
186s Get:22 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libaudit-common all 1:3.1.2-2.1 [5674 B]
186s Get:23 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libcap-ng0 s390x 0.8.4-2build1 [15.7 kB]
186s Get:24 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libaudit1 s390x 1:3.1.2-2.1 [48.9 kB]
186s Get:25 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpam0g s390x 1.5.3-5ubuntu3 [69.8 kB]
186s Get:26 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libselinux1 s390x 3.5-2ubuntu1 [84.7 kB]
186s Get:27 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libcurl4t64 s390x 8.5.0-2ubuntu8 [363 kB]
186s Get:28 http://ftpmaster.internal/ubuntu noble-proposed/main s390x curl s390x 8.5.0-2ubuntu8 [227 kB]
186s Get:29 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpsl5t64 s390x 0.21.2-1.1 [57.6 kB]
186s Get:30 http://ftpmaster.internal/ubuntu noble-proposed/main s390x wget s390x 1.21.4-1ubuntu2 [351 kB]
186s Get:31 http://ftpmaster.internal/ubuntu noble-proposed/main s390x tnftp s390x 20230507-2build1 [107 kB]
186s Get:32 http://ftpmaster.internal/ubuntu noble-proposed/main s390x tcpdump s390x 4.99.4-3ubuntu2 [490 kB]
186s Get:33 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsystemd-shared s390x 255.4-1ubuntu5 [2131 kB]
187s Get:34 http://ftpmaster.internal/ubuntu noble-proposed/main s390x systemd-resolved s390x 255.4-1ubuntu5 [304 kB]
187s Get:35 http://ftpmaster.internal/ubuntu noble-proposed/main s390x sudo s390x 1.9.15p5-3ubuntu3 [968 kB]
187s Get:36 http://ftpmaster.internal/ubuntu noble-proposed/main s390x rsync s390x 3.2.7-1build1 [446 kB]
187s Get:37 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-cryptography s390x 41.0.7-4build2 [918 kB]
187s Get:38 http://ftpmaster.internal/ubuntu noble-proposed/main s390x openssl s390x 3.0.13-0ubuntu2 [1010 kB]
187s Get:39 http://ftpmaster.internal/ubuntu noble-proposed/main s390x openssh-sftp-server s390x 1:9.6p1-3ubuntu11 [39.0 kB]
187s Get:40 http://ftpmaster.internal/ubuntu noble-proposed/main s390x openssh-client s390x 1:9.6p1-3ubuntu11 [935 kB]
188s Get:41 http://ftpmaster.internal/ubuntu noble-proposed/main s390x openssh-server s390x 1:9.6p1-3ubuntu11 [529 kB]
188s Get:42 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libssh-4 s390x 0.10.6-2build1 [189 kB]
188s Get:43 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsasl2-modules s390x 2.1.28+dfsg1-5ubuntu1 [76.6 kB]
188s Get:44 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3.12 s390x 3.12.2-4build3 [645 kB]
188s Get:45 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3.12-minimal s390x 3.12.2-4build3 [2419 kB]
188s Get:46 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpython3.12-minimal s390x 3.12.2-4build3 [829 kB]
188s Get:47 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libparted2t64 s390x 3.6-3.1build2 [172 kB]
188s Get:48 http://ftpmaster.internal/ubuntu noble-proposed/main s390x parted s390x 3.6-3.1build2 [44.6 kB]
188s Get:49 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3.11 s390x 3.11.8-1build4 [589 kB]
188s Get:50 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3.11-minimal s390x 3.11.8-1build4 [2280 kB]
188s Get:51 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpython3.11-minimal s390x 3.11.8-1build4 [838 kB]
189s Get:52 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpython3.11-stdlib s390x 3.11.8-1build4 [1944 kB]
189s Get:53 http://ftpmaster.internal/ubuntu noble-proposed/main s390x shared-mime-info s390x 2.4-1build1 [474 kB]
189s Get:54 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gir1.2-girepository-2.0 s390x 1.79.1-1ubuntu6 [24.5 kB]
189s Get:55 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gir1.2-glib-2.0 s390x 2.79.3-3ubuntu5 [180 kB]
189s Get:56 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgirepository-1.0-1 s390x 1.79.1-1ubuntu6 [84.0 kB]
189s Get:57 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-gi s390x 3.47.0-3build1 [236 kB]
189s Get:58 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-dbus s390x 1.3.2-5build2 [100 kB]
189s Get:59 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libnetplan1 s390x 1.0-1 [123 kB]
189s Get:60 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-netplan s390x 1.0-1 [23.0 kB]
189s Get:61 http://ftpmaster.internal/ubuntu noble-proposed/main s390x netplan-generator s390x 1.0-1 [59.1 kB]
189s Get:62 http://ftpmaster.internal/ubuntu noble-proposed/main s390x initramfs-tools-bin s390x 0.142ubuntu23 [20.5 kB]
189s Get:63 http://ftpmaster.internal/ubuntu noble-proposed/main s390x initramfs-tools-core all 0.142ubuntu23 [50.1 kB]
189s Get:64 http://ftpmaster.internal/ubuntu noble-proposed/main s390x initramfs-tools all 0.142ubuntu23 [9058 B]
189s Get:65 http://ftpmaster.internal/ubuntu noble-proposed/main s390x netplan.io s390x 1.0-1 [65.4 kB]
189s Get:66 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libxmlb2 s390x 0.3.15-1build1 [70.6 kB]
189s Get:67 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgpgme11t64 s390x 1.18.0-4.1ubuntu3 [150 kB]
189s Get:68 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libvolume-key1 s390x 0.3.12-7build1 [40.8 kB]
189s Get:69 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libqrtr-glib0 s390x 1.2.2-1ubuntu3 [17.5 kB]
189s Get:70 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libqmi-glib5 s390x 1.35.2-0ubuntu1 [918 kB]
189s Get:71 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libqmi-proxy s390x 1.35.2-0ubuntu1 [6122 B]
189s Get:72 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpolkit-agent-1-0 s390x 124-1ubuntu1 [17.8 kB]
189s Get:73 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpolkit-gobject-1-0 s390x 124-1ubuntu1 [48.3 kB]
189s Get:74 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libmm-glib0 s390x 1.23.4-0ubuntu1 [251 kB]
189s Get:75 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libmbim-glib4 s390x 1.31.2-0ubuntu2 [238 kB]
189s Get:76 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libmbim-proxy s390x 1.31.2-0ubuntu2 [6154 B]
189s Get:77 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libjson-glib-1.0-common all 1.8.0-2build1 [4210 B]
189s Get:78 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libjson-glib-1.0-0 s390x 1.8.0-2build1 [68.4 kB]
189s Get:79 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgusb2 s390x 0.4.8-1build1 [39.0 kB]
189s Get:80 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgudev-1.0-0 s390x 1:238-3ubuntu2 [15.7 kB]
189s Get:81 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libarchive13t64 s390x 3.7.2-1.1ubuntu2 [419 kB]
189s Get:82 http://ftpmaster.internal/ubuntu noble-proposed/main s390x fwupd s390x 1.9.15-2 [4435 kB]
190s Get:83 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libcurl3t64-gnutls s390x 8.5.0-2ubuntu8 [356 kB]
190s Get:84 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libfwupd2 s390x 1.9.15-2 [136 kB]
190s Get:85 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev3 s390x 3.1.0-1build1 [52.3 kB]
190s Get:86 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-utils3 s390x 3.1.0-1build1 [19.2 kB]
190s Get:87 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-swap3 s390x 3.1.0-1build1 [7778 B]
190s Get:88 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-part3 s390x 3.1.0-1build1 [15.4 kB]
190s Get:89 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libnvme1t64 s390x 1.8-3 [78.7 kB]
190s Get:90 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-nvme3 s390x 3.1.0-1build1 [18.3 kB]
190s Get:91 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-mdraid3 s390x 3.1.0-1build1 [13.2 kB]
190s Get:92 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-loop3 s390x 3.1.0-1build1 [7138 B]
190s Get:93 http://ftpmaster.internal/ubuntu noble-proposed/main s390x e2fsprogs-l10n all 1.47.0-2.4~exp1ubuntu2 [5996 B]
190s Get:94 http://ftpmaster.internal/ubuntu noble-proposed/main s390x logsave s390x 1.47.0-2.4~exp1ubuntu2 [22.5 kB]
190s Get:95 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libext2fs2t64 s390x 1.47.0-2.4~exp1ubuntu2 [235 kB]
190s Get:96 http://ftpmaster.internal/ubuntu noble-proposed/main s390x e2fsprogs s390x 1.47.0-2.4~exp1ubuntu2 [615 kB]
190s Get:97 http://ftpmaster.internal/ubuntu noble/main s390x libreiserfscore0t64 s390x 1:3.6.27-7.1 [85.5 kB]
190s Get:98 http://ftpmaster.internal/ubuntu noble-proposed/main s390x btrfs-progs s390x 6.6.3-1.1build1 [959 kB]
190s Get:99 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-fs3 s390x 3.1.0-1build1 [36.5 kB]
190s Get:100 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libblockdev-crypto3 s390x 3.1.0-1build1 [21.6 kB]
190s Get:101 http://ftpmaster.internal/ubuntu noble-proposed/main s390x bolt s390x 0.9.6-2build1 [142 kB]
190s Get:102 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libglib2.0-0t64 s390x 2.79.3-3ubuntu5 [1566 kB]
191s Get:103 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libjcat1 s390x 0.2.0-2build2 [34.4 kB]
191s Get:104 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libldap2 s390x 2.6.7+dfsg-1~exp1ubuntu6 [202 kB]
191s Get:105 http://ftpmaster.internal/ubuntu noble-proposed/main s390x ubuntu-pro-client-l10n s390x 31.2.2 [19.4 kB]
191s Get:106 http://ftpmaster.internal/ubuntu noble-proposed/main s390x ubuntu-pro-client s390x 31.2.2 [214 kB]
191s Get:107 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gnupg-utils s390x 2.4.4-2ubuntu15 [116 kB]
191s Get:108 http://ftpmaster.internal/ubuntu noble-proposed/main s390x keyboxd s390x 2.4.4-2ubuntu15 [83.1 kB]
191s Get:109 http://ftpmaster.internal/ubuntu noble/main s390x libnpth0t64 s390x 1.6-3.1 [8148 B]
191s Get:110 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gpgv s390x 2.4.4-2ubuntu15 [165 kB]
191s Get:111 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gpg-wks-client s390x 2.4.4-2ubuntu15 [76.8 kB]
191s Get:112 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gpg-agent s390x 2.4.4-2ubuntu15 [240 kB]
191s Get:113 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gpg s390x 2.4.4-2ubuntu15 [589 kB]
191s Get:114 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dirmngr s390x 2.4.4-2ubuntu15 [340 kB]
191s Get:115 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gnupg all 2.4.4-2ubuntu15 [359 kB]
191s Get:116 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-apt s390x 2.7.7 [171 kB]
191s Get:117 http://ftpmaster.internal/ubuntu noble-proposed/main s390x apt-utils s390x 2.7.14 [214 kB]
191s Get:118 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libapt-pkg6.0t64 s390x 2.7.14 [1014 kB]
191s Get:119 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libnettle8t64 s390x 3.9.1-2.2 [210 kB]
191s Get:120 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libhogweed6t64 s390x 3.9.1-2.2 [204 kB]
191s Get:121 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgnutls30t64 s390x 3.8.3-1.1ubuntu2 [1044 kB]
191s Get:122 http://ftpmaster.internal/ubuntu noble-proposed/main s390x apt s390x 2.7.14 [1390 kB]
192s Get:123 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gpgconf s390x 2.4.4-2ubuntu15 [111 kB]
192s Get:124 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gpgsm s390x 2.4.4-2ubuntu15 [244 kB]
192s Get:125 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libreadline8t64 s390x 8.2-4 [170 kB]
192s Get:126 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gawk s390x 1:5.2.1-2build2 [496 kB]
192s Get:127 http://ftpmaster.internal/ubuntu noble-proposed/main s390x fdisk s390x 2.39.3-9ubuntu2 [124 kB]
192s Get:128 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpython3.12-stdlib s390x 3.12.2-4build3 [2046 kB]
192s Get:129 http://ftpmaster.internal/ubuntu noble-proposed/main s390x perl-base s390x 5.38.2-3.2 [1961 kB]
192s Get:130 http://ftpmaster.internal/ubuntu noble-proposed/main s390x perl-modules-5.38 all 5.38.2-3.2 [3110 kB]
192s Get:131 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-gdbm s390x 3.12.2-3ubuntu1.1 [19.0 kB]
192s Get:132 http://ftpmaster.internal/ubuntu noble-proposed/main s390x man-db s390x 2.12.0-3build4 [1246 kB]
192s Get:133 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgdbm6t64 s390x 1.23-5.1 [36.4 kB]
192s Get:134 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgdbm-compat4t64 s390x 1.23-5.1 [6880 B]
192s Get:135 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libperl5.38t64 s390x 5.38.2-3.2 [5007 kB]
192s Get:136 http://ftpmaster.internal/ubuntu noble-proposed/main s390x perl s390x 5.38.2-3.2 [231 kB]
193s Get:137 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libdb5.3t64 s390x 5.3.28+dfsg2-6 [763 kB]
193s Get:138 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsasl2-modules-db s390x 2.1.28+dfsg1-5ubuntu1 [21.1 kB]
193s Get:139 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsasl2-2 s390x 2.1.28+dfsg1-5ubuntu1 [57.8 kB]
193s Get:140 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libfido2-1 s390x 1.14.0-1build1 [81.0 kB]
193s Get:141 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libcryptsetup12 s390x 2:2.7.0-1ubuntu2 [264 kB]
193s Get:142 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dhcpcd-base s390x 1:10.0.6-1ubuntu2 [217 kB]
193s Get:143 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libuv1t64 s390x 1.48.0-1.1 [101 kB]
193s Get:144 http://ftpmaster.internal/ubuntu noble-proposed/main s390x bind9-host s390x 1:9.18.24-0ubuntu3 [50.5 kB]
193s Get:145 http://ftpmaster.internal/ubuntu noble-proposed/main s390x bind9-dnsutils s390x 1:9.18.24-0ubuntu3 [162 kB]
193s Get:146 http://ftpmaster.internal/ubuntu noble-proposed/main s390x bind9-libs s390x 1:9.18.24-0ubuntu3 [1243 kB]
193s Get:147 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libssl3t64 s390x 3.0.13-0ubuntu2 [1675 kB]
193s Get:148 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libnss-systemd s390x 255.4-1ubuntu5 [166 kB]
193s Get:149 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libudev1 s390x 255.4-1ubuntu5 [178 kB]
193s Get:150 http://ftpmaster.internal/ubuntu noble-proposed/main s390x systemd s390x 255.4-1ubuntu5 [3533 kB]
193s Get:151 http://ftpmaster.internal/ubuntu noble-proposed/main s390x udev s390x 255.4-1ubuntu5 [1887 kB]
193s Get:152 http://ftpmaster.internal/ubuntu noble-proposed/main s390x systemd-sysv s390x 255.4-1ubuntu5 [11.9 kB]
193s Get:153 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpam-systemd s390x 255.4-1ubuntu5 [242 kB]
193s Get:154 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsystemd0 s390x 255.4-1ubuntu5 [443 kB]
193s Get:155 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpam-modules-bin s390x 1.5.3-5ubuntu3 [57.4 kB]
193s Get:156 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpam-modules s390x 1.5.3-5ubuntu3 [289 kB]
193s Get:157 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpam-runtime all 1.5.3-5ubuntu3 [40.8 kB]
193s Get:158 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dbus-user-session s390x 1.14.10-4ubuntu2 [9960 B]
193s Get:159 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libapparmor1 s390x 4.0.0-beta3-0ubuntu2 [50.8 kB]
193s Get:160 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libexpat1 s390x 2.6.1-2 [94.8 kB]
193s Get:161 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dbus-system-bus-common all 1.14.10-4ubuntu2 [81.5 kB]
193s Get:162 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dbus-bin s390x 1.14.10-4ubuntu2 [41.4 kB]
193s Get:163 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dbus s390x 1.14.10-4ubuntu2 [24.3 kB]
194s Get:164 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dbus-daemon s390x 1.14.10-4ubuntu2 [118 kB]
194s Get:165 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libdbus-1-3 s390x 1.14.10-4ubuntu2 [213 kB]
194s Get:166 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libmount1 s390x 2.39.3-9ubuntu2 [138 kB]
194s Get:167 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libseccomp2 s390x 2.5.5-1ubuntu2 [53.4 kB]
194s Get:168 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libdevmapper1.02.1 s390x 2:1.02.185-3ubuntu2 [142 kB]
194s Get:169 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libuuid1 s390x 2.39.3-9ubuntu2 [35.6 kB]
194s Get:170 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libfdisk1 s390x 2.39.3-9ubuntu2 [151 kB]
194s Get:171 http://ftpmaster.internal/ubuntu noble-proposed/main s390x mount s390x 2.39.3-9ubuntu2 [119 kB]
194s Get:172 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsqlite3-0 s390x 3.45.1-1ubuntu1 [747 kB]
194s Get:173 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gcc-14-base s390x 14-20240315-1ubuntu1 [47.0 kB]
194s Get:174 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgcc-s1 s390x 14-20240315-1ubuntu1 [35.9 kB]
194s Get:175 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libstdc++6 s390x 14-20240315-1ubuntu1 [908 kB]
194s Get:176 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dpkg s390x 1.22.6ubuntu5 [1278 kB]
194s Get:177 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-minimal s390x 3.12.2-0ubuntu1 [27.1 kB]
194s Get:178 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3 s390x 3.12.2-0ubuntu1 [24.1 kB]
194s Get:179 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpython3-stdlib s390x 3.12.2-0ubuntu1 [9804 B]
194s Get:180 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsmartcols1 s390x 2.39.3-9ubuntu2 [67.9 kB]
194s Get:181 http://ftpmaster.internal/ubuntu noble-proposed/main s390x bsdextrautils s390x 2.39.3-9ubuntu2 [76.3 kB]
194s Get:182 http://ftpmaster.internal/ubuntu noble-proposed/main s390x groff-base s390x 1.23.0-3build1 [1049 kB]
194s Get:183 http://ftpmaster.internal/ubuntu noble-proposed/main s390x pinentry-curses s390x 1.2.1-3ubuntu4 [37.6 kB]
194s Get:184 http://ftpmaster.internal/ubuntu noble-proposed/main s390x readline-common all 8.2-4 [56.4 kB]
194s Get:185 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libxml2 s390x 2.9.14+dfsg-1.3ubuntu2 [818 kB]
194s Get:186 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libbpf1 s390x 1:1.3.0-2build1 [176 kB]
194s Get:187 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libelf1t64 s390x 0.190-1.1build2 [69.7 kB]
194s Get:188 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libtirpc-common all 1.3.4+ds-1.1 [8018 B]
194s Get:189 http://ftpmaster.internal/ubuntu noble-proposed/main s390x lsof s390x 4.95.0-1build2 [248 kB]
194s Get:190 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libnsl2 s390x 1.3.0-3build2 [44.1 kB]
194s Get:191 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libtirpc3t64 s390x 1.3.4+ds-1.1 [85.8 kB]
194s Get:192 http://ftpmaster.internal/ubuntu noble-proposed/main s390x iproute2 s390x 6.1.0-1ubuntu5 [1156 kB]
194s Get:193 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-yaml s390x 6.0.1-2build1 [121 kB]
194s Get:194 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libusb-1.0-0 s390x 2:1.0.27-1 [54.8 kB]
194s Get:195 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libprotobuf-c1 s390x 1.4.1-1ubuntu3 [23.4 kB]
194s Get:196 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libnghttp2-14 s390x 1.59.0-1build1 [77.8 kB]
194s Get:197 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libproc2-0 s390x 2:4.0.4-4ubuntu2 [60.1 kB]
194s Get:198 http://ftpmaster.internal/ubuntu noble-proposed/main s390x procps s390x 2:4.0.4-4ubuntu2 [724 kB]
194s Get:199 http://ftpmaster.internal/ubuntu noble-proposed/main s390x coreutils s390x 9.4-3ubuntu3 [1482 kB]
194s Get:200 http://ftpmaster.internal/ubuntu noble-proposed/main s390x util-linux s390x 2.39.3-9ubuntu2 [1143 kB]
195s Get:201 http://ftpmaster.internal/ubuntu noble-proposed/main s390x file s390x 1:5.45-3 [22.2 kB]
195s Get:202 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libmagic-mgc s390x 1:5.45-3 [305 kB]
195s Get:203 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libmagic1t64 s390x 1:5.45-3 [93.1 kB]
195s Get:204 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libplymouth5 s390x 24.004.60-1ubuntu6 [151 kB]
195s Get:205 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libpng16-16t64 s390x 1.6.43-3 [200 kB]
195s Get:206 http://ftpmaster.internal/ubuntu noble-proposed/main s390x multipath-tools s390x 0.9.4-5ubuntu6 [318 kB]
195s Get:207 http://ftpmaster.internal/ubuntu noble/main s390x liburcu8t64 s390x 0.14.0-3.1 [67.3 kB]
195s Get:208 http://ftpmaster.internal/ubuntu noble-proposed/main s390x liblocale-gettext-perl s390x 1.07-6ubuntu4 [15.8 kB]
195s Get:209 http://ftpmaster.internal/ubuntu noble-proposed/main s390x uuid-runtime s390x 2.39.3-9ubuntu2 [33.4 kB]
195s Get:210 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libdebconfclient0 s390x 0.271ubuntu2 [11.4 kB]
195s Get:211 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsemanage-common all 3.5-1build4 [10.1 kB]
195s Get:212 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsemanage2 s390x 3.5-1build4 [96.7 kB]
195s Get:213 http://ftpmaster.internal/ubuntu noble-proposed/main s390x install-info s390x 7.1-3build1 [64.5 kB]
195s Get:214 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gcc-13-base s390x 13.2.0-21ubuntu1 [48.3 kB]
195s Get:215 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libss2 s390x 1.47.0-2.4~exp1ubuntu2 [17.2 kB]
195s Get:216 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dmsetup s390x 2:1.02.185-3ubuntu2 [80.4 kB]
195s Get:217 http://ftpmaster.internal/ubuntu noble-proposed/main s390x eject s390x 2.39.3-9ubuntu2 [26.2 kB]
195s Get:218 http://ftpmaster.internal/ubuntu noble-proposed/main s390x krb5-locales all 1.20.1-6ubuntu1 [13.8 kB]
195s Get:219 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libglib2.0-data all 2.79.3-3ubuntu5 [46.6 kB]
195s Get:220 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libslang2 s390x 2.3.3-3build1 [501 kB]
195s Get:221 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libtext-charwidth-perl s390x 0.04-11build2 [9484 B]
195s Get:222 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libtext-iconv-perl s390x 1.7-8build2 [13.8 kB]
195s Get:223 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python-apt-common all 2.7.7 [19.8 kB]
195s Get:224 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-setuptools all 68.1.2-2ubuntu1 [396 kB]
195s Get:225 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-pkg-resources all 68.1.2-2ubuntu1 [168 kB]
195s Get:226 http://ftpmaster.internal/ubuntu noble-proposed/main s390x rsyslog s390x 8.2312.0-3ubuntu7 [536 kB]
195s Get:227 http://ftpmaster.internal/ubuntu noble-proposed/main s390x vim-tiny s390x 2:9.1.0016-1ubuntu6 [879 kB]
196s Get:228 http://ftpmaster.internal/ubuntu noble-proposed/main s390x vim-common all 2:9.1.0016-1ubuntu6 [385 kB]
196s Get:229 http://ftpmaster.internal/ubuntu noble/main s390x xdg-user-dirs s390x 0.18-1 [18.5 kB]
196s Get:230 http://ftpmaster.internal/ubuntu noble-proposed/main s390x xxd s390x 2:9.1.0016-1ubuntu6 [63.5 kB]
196s Get:231 http://ftpmaster.internal/ubuntu noble-proposed/main s390x apparmor s390x 4.0.0-beta3-0ubuntu2 [710 kB]
196s Get:232 http://ftpmaster.internal/ubuntu noble-proposed/main s390x ftp all 20230507-2build1 [4724 B]
196s Get:233 http://ftpmaster.internal/ubuntu noble-proposed/main s390x inetutils-telnet s390x 2:2.5-3ubuntu3 [105 kB]
196s Get:234 http://ftpmaster.internal/ubuntu noble-proposed/main s390x info s390x 7.1-3build1 [152 kB]
196s Get:235 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libxmuu1 s390x 2:1.1.3-3build1 [8860 B]
196s Get:236 http://ftpmaster.internal/ubuntu noble-proposed/main s390x lshw s390x 02.19.git.2021.06.19.996aaad9c7-2build2 [346 kB]
196s Get:237 http://ftpmaster.internal/ubuntu noble/main s390x manpages all 6.05.01-1 [1340 kB]
196s Get:238 http://ftpmaster.internal/ubuntu noble-proposed/main s390x mtr-tiny s390x 0.95-1.1build1 [57.0 kB]
196s Get:239 http://ftpmaster.internal/ubuntu noble-proposed/main s390x plymouth-theme-ubuntu-text s390x 24.004.60-1ubuntu6 [10.2 kB]
196s Get:240 http://ftpmaster.internal/ubuntu noble-proposed/main s390x plymouth s390x 24.004.60-1ubuntu6 [147 kB]
196s Get:241 http://ftpmaster.internal/ubuntu noble-proposed/main s390x telnet all 0.17+2.5-3ubuntu3 [3682 B]
196s Get:242 http://ftpmaster.internal/ubuntu noble-proposed/main s390x usb.ids all 2024.03.18-1 [223 kB]
196s Get:243 http://ftpmaster.internal/ubuntu noble-proposed/main s390x xz-utils s390x 5.6.0-0.2 [274 kB]
196s Get:244 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libctf0 s390x 2.42-4ubuntu1 [98.4 kB]
196s Get:245 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libctf-nobfd0 s390x 2.42-4ubuntu1 [100 kB]
196s Get:246 http://ftpmaster.internal/ubuntu noble-proposed/main s390x binutils-s390x-linux-gnu s390x 2.42-4ubuntu1 [2270 kB]
196s Get:247 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libbinutils s390x 2.42-4ubuntu1 [477 kB]
196s Get:248 http://ftpmaster.internal/ubuntu noble-proposed/main s390x binutils s390x 2.42-4ubuntu1 [3056 B]
196s Get:249 http://ftpmaster.internal/ubuntu noble-proposed/main s390x binutils-common s390x 2.42-4ubuntu1 [217 kB]
196s Get:250 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsframe1 s390x 2.42-4ubuntu1 [14.2 kB]
196s Get:251 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libllvm18 s390x 1:18.1.2-1ubuntu2 [33.4 MB]
198s Get:252 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libclang-cpp18 s390x 1:18.1.2-1ubuntu2 [16.1 MB]
200s Get:253 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x libbpfcc s390x 0.29.1+ds-1ubuntu4 [697 kB]
200s Get:254 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x python3-bpfcc all 0.29.1+ds-1ubuntu4 [40.2 kB]
200s Get:255 http://ftpmaster.internal/ubuntu noble/main s390x ieee-data all 20220827.1 [2113 kB]
200s Get:256 http://ftpmaster.internal/ubuntu noble/main s390x python3-netaddr all 0.8.0-2ubuntu1 [319 kB]
200s Get:257 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x bpfcc-tools all 0.29.1+ds-1ubuntu4 [687 kB]
200s Get:258 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libclang1-18 s390x 1:18.1.2-1ubuntu2 [9349 kB]
201s Get:259 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libdw1t64 s390x 0.190-1.1build2 [286 kB]
201s Get:260 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x bpftrace s390x 0.20.2-1ubuntu1 [1139 kB]
201s Get:261 http://ftpmaster.internal/ubuntu noble-proposed/main s390x cryptsetup-bin s390x 2:2.7.0-1ubuntu2 [211 kB]
201s Get:262 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dpkg-dev all 1.22.6ubuntu5 [1074 kB]
201s Get:263 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libdpkg-perl all 1.22.6ubuntu5 [269 kB]
201s Get:264 http://ftpmaster.internal/ubuntu noble/main s390x fonts-dejavu-mono all 2.37-8 [502 kB]
201s Get:265 http://ftpmaster.internal/ubuntu noble/main s390x fonts-dejavu-core all 2.37-8 [835 kB]
201s Get:266 http://ftpmaster.internal/ubuntu noble-proposed/main s390x fontconfig-config s390x 2.15.0-1.1ubuntu1 [37.4 kB]
201s Get:267 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gnupg-l10n all 2.4.4-2ubuntu15 [65.8 kB]
201s Get:268 http://ftpmaster.internal/ubuntu noble/main s390x hwdata all 0.379-1 [29.1 kB]
201s Get:269 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libibverbs1 s390x 50.0-2build1 [70.0 kB]
201s Get:270 http://ftpmaster.internal/ubuntu noble-proposed/main s390x ibverbs-providers s390x 50.0-2build1 [408 kB]
201s Get:271 http://ftpmaster.internal/ubuntu noble-proposed/main s390x jq s390x 1.7.1-3 [66.5 kB]
201s Get:272 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libjq1 s390x 1.7.1-3 [168 kB]
201s Get:273 http://ftpmaster.internal/ubuntu noble/main s390x libaio1t64 s390x 0.3.113-6 [7290 B]
201s Get:274 http://ftpmaster.internal/ubuntu noble/main s390x libatm1t64 s390x 1:2.5.1-5.1 [24.5 kB]
201s Get:275 http://ftpmaster.internal/ubuntu noble/main s390x libc-dev-bin s390x 2.39-0ubuntu6 [20.2 kB]
201s Get:276 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libfreetype6 s390x 2.13.2+dfsg-1build2 [437 kB]
201s Get:277 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libfontconfig1 s390x 2.15.0-1.1ubuntu1 [150 kB]
201s Get:278 http://ftpmaster.internal/ubuntu noble/main s390x libjpeg-turbo8 s390x 2.1.5-2ubuntu1 [128 kB]
201s Get:279 http://ftpmaster.internal/ubuntu noble/main s390x libjpeg8 s390x 8c-2ubuntu11 [2146 B]
201s Get:280 http://ftpmaster.internal/ubuntu noble/main s390x libdeflate0 s390x 1.19-1 [46.0 kB]
201s Get:281 http://ftpmaster.internal/ubuntu noble/main s390x libjbig0 s390x 2.1-6.1ubuntu1 [29.8 kB]
201s Get:282 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libsharpyuv0 s390x 1.3.2-0.4build2 [14.9 kB]
201s Get:283 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libwebp7 s390x 1.3.2-0.4build2 [207 kB]
201s Get:284 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libtiff6 s390x 4.5.1+git230720-4ubuntu1 [218 kB]
201s Get:285 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libxpm4 s390x 1:3.5.17-1build1 [41.4 kB]
201s Get:286 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgd3 s390x 2.3.3-9ubuntu3 [141 kB]
201s Get:287 http://ftpmaster.internal/ubuntu noble/main s390x libc-devtools s390x 2.39-0ubuntu6 [30.6 kB]
201s Get:288 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-libc-dev s390x 6.8.0-20.20 [1592 kB]
202s Get:289 http://ftpmaster.internal/ubuntu noble/main s390x libcrypt-dev s390x 1:4.4.36-4 [135 kB]
202s Get:290 http://ftpmaster.internal/ubuntu noble/main s390x rpcsvc-proto s390x 1.4.2-0ubuntu6 [64.7 kB]
202s Get:291 http://ftpmaster.internal/ubuntu noble/main s390x libc6-dev s390x 2.39-0ubuntu6 [1629 kB]
202s Get:292 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libevent-core-2.1-7 s390x 2.1.12-stable-9build1 [94.3 kB]
202s Get:293 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libftdi1-2 s390x 1.5-6build4 [29.3 kB]
202s Get:294 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libldap-common all 2.6.7+dfsg-1~exp1ubuntu6 [31.3 kB]
202s Get:295 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-modules-6.8.0-20-generic s390x 6.8.0-20.20 [21.0 MB]
203s Get:296 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-image-6.8.0-20-generic s390x 6.8.0-20.20 [9872 kB]
204s Get:297 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-modules-extra-6.8.0-20-generic s390x 6.8.0-20.20 [11.7 MB]
205s Get:298 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-generic s390x 6.8.0-20.20+1 [1734 B]
205s Get:299 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-image-generic s390x 6.8.0-20.20+1 [9688 B]
205s Get:300 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-virtual s390x 6.8.0-20.20+1 [1682 B]
205s Get:301 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-image-virtual s390x 6.8.0-20.20+1 [9700 B]
205s Get:302 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-headers-virtual s390x 6.8.0-20.20+1 [1642 B]
205s Get:303 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-headers-6.8.0-20 all 6.8.0-20.20 [13.6 MB]
206s Get:304 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-headers-6.8.0-20-generic s390x 6.8.0-20.20 [2579 kB]
207s Get:305 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-headers-generic s390x 6.8.0-20.20+1 [9608 B]
207s Get:306 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-tools-common all 6.8.0-20.20 [437 kB]
207s Get:307 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-tools-6.8.0-20 s390x 6.8.0-20.20 [2674 kB]
207s Get:308 http://ftpmaster.internal/ubuntu noble-proposed/main s390x linux-tools-6.8.0-20-generic s390x 6.8.0-20.20 [1724 B]
207s Get:309 http://ftpmaster.internal/ubuntu noble/main s390x manpages-dev all 6.05.01-1 [2018 kB]
207s Get:310 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-distutils all 3.12.2-3ubuntu1.1 [133 kB]
208s Get:311 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-lib2to3 all 3.12.2-3ubuntu1.1 [79.1 kB]
208s Get:312 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-pyrsistent s390x 0.20.0-1build1 [55.8 kB]
208s Get:313 http://ftpmaster.internal/ubuntu noble-proposed/main s390x python3-typing-extensions all 4.10.0-1 [60.7 kB]
208s Get:314 http://ftpmaster.internal/ubuntu noble-proposed/main s390x s390-tools-data all 2.31.0-0ubuntu3 [17.8 kB]
208s Get:315 http://ftpmaster.internal/ubuntu noble/main s390x ubuntu-kernel-accessories s390x 1.536build1 [10.5 kB]
208s Get:316 http://ftpmaster.internal/ubuntu noble-proposed/main s390x kpartx s390x 0.9.4-5ubuntu6 [32.8 kB]
208s Preconfiguring packages ...
208s Fetched 228 MB in 24s (9354 kB/s)
209s (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 ... 52167 files and directories currently installed.)
209s Preparing to unpack .../motd-news-config_13ubuntu8_all.deb ...
209s Unpacking motd-news-config (13ubuntu8) over (13ubuntu7) ...
209s Preparing to unpack .../base-files_13ubuntu8_s390x.deb ...
209s Unpacking base-files (13ubuntu8) over (13ubuntu7) ...
209s Setting up base-files (13ubuntu8) ...
209s motd-news.service is a disabled or a static unit not running, not starting it.
209s (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 ... 52167 files and directories currently installed.)
209s Preparing to unpack .../bash_5.2.21-2ubuntu3_s390x.deb ...
209s Unpacking bash (5.2.21-2ubuntu3) over (5.2.21-2ubuntu2) ...
209s Setting up bash (5.2.21-2ubuntu3) ...
209s update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode
209s (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 ... 52167 files and directories currently installed.)
209s Preparing to unpack .../bsdutils_1%3a2.39.3-9ubuntu2_s390x.deb ...
209s Unpacking bsdutils (1:2.39.3-9ubuntu2) over (1:2.39.3-6ubuntu2) ...
209s Setting up bsdutils (1:2.39.3-9ubuntu2) ...
209s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../0-libbrotli1_1.1.0-2build1_s390x.deb ...
210s Unpacking libbrotli1:s390x (1.1.0-2build1) over (1.1.0-2) ...
210s Preparing to unpack .../1-libgssapi-krb5-2_1.20.1-6ubuntu1_s390x.deb ...
210s Unpacking libgssapi-krb5-2:s390x (1.20.1-6ubuntu1) over (1.20.1-5build1) ...
210s Preparing to unpack .../2-libkrb5-3_1.20.1-6ubuntu1_s390x.deb ...
210s Unpacking libkrb5-3:s390x (1.20.1-6ubuntu1) over (1.20.1-5build1) ...
210s Preparing to unpack .../3-libkrb5support0_1.20.1-6ubuntu1_s390x.deb ...
210s Unpacking libkrb5support0:s390x (1.20.1-6ubuntu1) over (1.20.1-5build1) ...
210s Preparing to unpack .../4-libk5crypto3_1.20.1-6ubuntu1_s390x.deb ...
210s Unpacking libk5crypto3:s390x (1.20.1-6ubuntu1) over (1.20.1-5build1) ...
210s Preparing to unpack .../5-libcom-err2_1.47.0-2.4~exp1ubuntu2_s390x.deb ...
210s Unpacking libcom-err2:s390x (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ...
210s Preparing to unpack .../6-zlib1g_1%3a1.3.dfsg-3.1ubuntu1_s390x.deb ...
210s Unpacking zlib1g:s390x (1:1.3.dfsg-3.1ubuntu1) over (1:1.3.dfsg-3ubuntu1) ...
210s Setting up zlib1g:s390x (1:1.3.dfsg-3.1ubuntu1) ...
210s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../librtmp1_2.4+20151223.gitfa8646d.1-2build6_s390x.deb ...
210s Unpacking librtmp1:s390x (2.4+20151223.gitfa8646d.1-2build6) over (2.4+20151223.gitfa8646d.1-2build4) ...
210s Preparing to unpack .../udisks2_2.10.1-6_s390x.deb ...
210s Unpacking udisks2 (2.10.1-6) over (2.10.1-1ubuntu2) ...
210s Preparing to unpack .../libudisks2-0_2.10.1-6_s390x.deb ...
210s Unpacking libudisks2-0:s390x (2.10.1-6) over (2.10.1-1ubuntu2) ...
210s Preparing to unpack .../libblkid1_2.39.3-9ubuntu2_s390x.deb ...
210s Unpacking libblkid1:s390x (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
210s Setting up libblkid1:s390x (2.39.3-9ubuntu2) ...
210s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../liblzma5_5.6.0-0.2_s390x.deb ...
210s Unpacking liblzma5:s390x (5.6.0-0.2) over (5.4.5-0.3) ...
210s Setting up liblzma5:s390x (5.6.0-0.2) ...
210s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../0-kmod_31+20240202-2ubuntu4_s390x.deb ...
210s Unpacking kmod (31+20240202-2ubuntu4) over (30+20230601-2ubuntu1) ...
210s Preparing to unpack .../1-libkmod2_31+20240202-2ubuntu4_s390x.deb ...
210s Unpacking libkmod2:s390x (31+20240202-2ubuntu4) over (30+20230601-2ubuntu1) ...
210s Preparing to unpack .../2-systemd-dev_255.4-1ubuntu5_all.deb ...
210s Unpacking systemd-dev (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
210s Preparing to unpack .../3-systemd-timesyncd_255.4-1ubuntu5_s390x.deb ...
210s Unpacking systemd-timesyncd (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
210s Preparing to unpack .../4-dbus-session-bus-common_1.14.10-4ubuntu2_all.deb ...
210s Unpacking dbus-session-bus-common (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ...
210s Preparing to unpack .../5-libaudit-common_1%3a3.1.2-2.1_all.deb ...
210s Unpacking libaudit-common (1:3.1.2-2.1) over (1:3.1.2-2) ...
210s Setting up libaudit-common (1:3.1.2-2.1) ...
210s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../libcap-ng0_0.8.4-2build1_s390x.deb ...
210s Unpacking libcap-ng0:s390x (0.8.4-2build1) over (0.8.4-2) ...
210s Setting up libcap-ng0:s390x (0.8.4-2build1) ...
210s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../libaudit1_1%3a3.1.2-2.1_s390x.deb ...
210s Unpacking libaudit1:s390x (1:3.1.2-2.1) over (1:3.1.2-2) ...
210s Setting up libaudit1:s390x (1:3.1.2-2.1) ...
210s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../libpam0g_1.5.3-5ubuntu3_s390x.deb ...
210s Unpacking libpam0g:s390x (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ...
210s Setting up libpam0g:s390x (1.5.3-5ubuntu3) ...
210s (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 ... 52167 files and directories currently installed.)
210s Preparing to unpack .../libselinux1_3.5-2ubuntu1_s390x.deb ...
210s Unpacking libselinux1:s390x (3.5-2ubuntu1) over (3.5-2build1) ...
210s Setting up libselinux1:s390x (3.5-2ubuntu1) ...
210s dpkg: libcurl4:s390x: dependency problems, but removing anyway as you requested:
210s  s390-tools depends on libcurl4 (>= 7.16.2).
210s  curl depends on libcurl4 (= 8.5.0-2ubuntu2).
210s 
210s (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 ... 52167 files and directories currently installed.)
210s Removing libcurl4:s390x (8.5.0-2ubuntu2) ...
210s Selecting previously unselected package libcurl4t64:s390x.
210s (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 ... 52162 files and directories currently installed.)
210s Preparing to unpack .../libcurl4t64_8.5.0-2ubuntu8_s390x.deb ...
210s Unpacking libcurl4t64:s390x (8.5.0-2ubuntu8) ...
210s Preparing to unpack .../curl_8.5.0-2ubuntu8_s390x.deb ...
210s Unpacking curl (8.5.0-2ubuntu8) over (8.5.0-2ubuntu2) ...
210s dpkg: libpsl5:s390x: dependency problems, but removing anyway as you requested:
210s  wget depends on libpsl5 (>= 0.16.0).
210s  libcurl3-gnutls:s390x depends on libpsl5 (>= 0.16.0).
210s 
210s (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 ... 52168 files and directories currently installed.)
210s Removing libpsl5:s390x (0.21.2-1build1) ...
210s Selecting previously unselected package libpsl5t64:s390x.
210s (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 ... 52163 files and directories currently installed.)
210s Preparing to unpack .../00-libpsl5t64_0.21.2-1.1_s390x.deb ...
210s Unpacking libpsl5t64:s390x (0.21.2-1.1) ...
211s Preparing to unpack .../01-wget_1.21.4-1ubuntu2_s390x.deb ...
211s Unpacking wget (1.21.4-1ubuntu2) over (1.21.4-1ubuntu1) ...
211s Preparing to unpack .../02-tnftp_20230507-2build1_s390x.deb ...
211s Unpacking tnftp (20230507-2build1) over (20230507-2) ...
211s Preparing to unpack .../03-tcpdump_4.99.4-3ubuntu2_s390x.deb ...
211s Unpacking tcpdump (4.99.4-3ubuntu2) over (4.99.4-3ubuntu1) ...
211s Preparing to unpack .../04-libsystemd-shared_255.4-1ubuntu5_s390x.deb ...
211s Unpacking libsystemd-shared:s390x (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
211s Preparing to unpack .../05-systemd-resolved_255.4-1ubuntu5_s390x.deb ...
211s Unpacking systemd-resolved (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
211s Preparing to unpack .../06-sudo_1.9.15p5-3ubuntu3_s390x.deb ...
211s Unpacking sudo (1.9.15p5-3ubuntu3) over (1.9.15p5-3ubuntu1) ...
211s Preparing to unpack .../07-rsync_3.2.7-1build1_s390x.deb ...
211s Unpacking rsync (3.2.7-1build1) over (3.2.7-1) ...
211s Preparing to unpack .../08-python3-cryptography_41.0.7-4build2_s390x.deb ...
211s Unpacking python3-cryptography (41.0.7-4build2) over (41.0.7-3) ...
211s Preparing to unpack .../09-openssl_3.0.13-0ubuntu2_s390x.deb ...
211s Unpacking openssl (3.0.13-0ubuntu2) over (3.0.10-1ubuntu4) ...
211s Preparing to unpack .../10-openssh-sftp-server_1%3a9.6p1-3ubuntu11_s390x.deb ...
211s Unpacking openssh-sftp-server (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ...
211s Preparing to unpack .../11-openssh-client_1%3a9.6p1-3ubuntu11_s390x.deb ...
211s Unpacking openssh-client (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ...
211s Preparing to unpack .../12-openssh-server_1%3a9.6p1-3ubuntu11_s390x.deb ...
211s Unpacking openssh-server (1:9.6p1-3ubuntu11) over (1:9.6p1-3ubuntu2) ...
211s Preparing to unpack .../13-libssh-4_0.10.6-2build1_s390x.deb ...
211s Unpacking libssh-4:s390x (0.10.6-2build1) over (0.10.6-2) ...
211s Preparing to unpack .../14-libsasl2-modules_2.1.28+dfsg1-5ubuntu1_s390x.deb ...
211s Unpacking libsasl2-modules:s390x (2.1.28+dfsg1-5ubuntu1) over (2.1.28+dfsg1-4) ...
211s Preparing to unpack .../15-python3.12_3.12.2-4build3_s390x.deb ...
211s Unpacking python3.12 (3.12.2-4build3) over (3.12.2-1) ...
211s Preparing to unpack .../16-python3.12-minimal_3.12.2-4build3_s390x.deb ...
211s Unpacking python3.12-minimal (3.12.2-4build3) over (3.12.2-1) ...
211s Preparing to unpack .../17-libpython3.12-minimal_3.12.2-4build3_s390x.deb ...
211s Unpacking libpython3.12-minimal:s390x (3.12.2-4build3) over (3.12.2-1) ...
211s dpkg: libparted2:s390x: dependency problems, but removing anyway as you requested:
211s  parted depends on libparted2 (= 3.6-3).
211s 
211s (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 ... 52169 files and directories currently installed.)
211s Removing libparted2:s390x (3.6-3) ...
211s Selecting previously unselected package libparted2t64:s390x.
211s (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 ... 52163 files and directories currently installed.)
211s Preparing to unpack .../00-libparted2t64_3.6-3.1build2_s390x.deb ...
211s Unpacking libparted2t64:s390x (3.6-3.1build2) ...
211s Preparing to unpack .../01-parted_3.6-3.1build2_s390x.deb ...
212s Unpacking parted (3.6-3.1build2) over (3.6-3) ...
212s Preparing to unpack .../02-python3.11_3.11.8-1build4_s390x.deb ...
212s Unpacking python3.11 (3.11.8-1build4) over (3.11.8-1) ...
212s Preparing to unpack .../03-python3.11-minimal_3.11.8-1build4_s390x.deb ...
212s Unpacking python3.11-minimal (3.11.8-1build4) over (3.11.8-1) ...
212s Preparing to unpack .../04-libpython3.11-minimal_3.11.8-1build4_s390x.deb ...
212s Unpacking libpython3.11-minimal:s390x (3.11.8-1build4) over (3.11.8-1) ...
212s Preparing to unpack .../05-libpython3.11-stdlib_3.11.8-1build4_s390x.deb ...
212s Unpacking libpython3.11-stdlib:s390x (3.11.8-1build4) over (3.11.8-1) ...
212s Preparing to unpack .../06-shared-mime-info_2.4-1build1_s390x.deb ...
212s Unpacking shared-mime-info (2.4-1build1) over (2.4-1) ...
212s Preparing to unpack .../07-gir1.2-girepository-2.0_1.79.1-1ubuntu6_s390x.deb ...
212s Unpacking gir1.2-girepository-2.0:s390x (1.79.1-1ubuntu6) over (1.79.1-1) ...
212s Preparing to unpack .../08-gir1.2-glib-2.0_2.79.3-3ubuntu5_s390x.deb ...
212s Unpacking gir1.2-glib-2.0:s390x (2.79.3-3ubuntu5) over (2.79.2-1~ubuntu1) ...
212s Preparing to unpack .../09-libgirepository-1.0-1_1.79.1-1ubuntu6_s390x.deb ...
212s Unpacking libgirepository-1.0-1:s390x (1.79.1-1ubuntu6) over (1.79.1-1) ...
212s Preparing to unpack .../10-python3-gi_3.47.0-3build1_s390x.deb ...
212s Unpacking python3-gi (3.47.0-3build1) over (3.47.0-3) ...
212s Preparing to unpack .../11-python3-dbus_1.3.2-5build2_s390x.deb ...
212s Unpacking python3-dbus (1.3.2-5build2) over (1.3.2-5build1) ...
212s Selecting previously unselected package libnetplan1:s390x.
212s Preparing to unpack .../12-libnetplan1_1.0-1_s390x.deb ...
212s Unpacking libnetplan1:s390x (1.0-1) ...
212s Preparing to unpack .../13-python3-netplan_1.0-1_s390x.deb ...
212s Unpacking python3-netplan (1.0-1) over (0.107.1-3) ...
212s Preparing to unpack .../14-netplan-generator_1.0-1_s390x.deb ...
212s Adding 'diversion of /lib/systemd/system-generators/netplan to /lib/systemd/system-generators/netplan.usr-is-merged by netplan-generator'
212s Unpacking netplan-generator (1.0-1) over (0.107.1-3) ...
212s Preparing to unpack .../15-initramfs-tools-bin_0.142ubuntu23_s390x.deb ...
212s Unpacking initramfs-tools-bin (0.142ubuntu23) over (0.142ubuntu20) ...
212s Preparing to unpack .../16-initramfs-tools-core_0.142ubuntu23_all.deb ...
212s Unpacking initramfs-tools-core (0.142ubuntu23) over (0.142ubuntu20) ...
212s Preparing to unpack .../17-initramfs-tools_0.142ubuntu23_all.deb ...
213s Unpacking initramfs-tools (0.142ubuntu23) over (0.142ubuntu20) ...
213s Preparing to unpack .../18-netplan.io_1.0-1_s390x.deb ...
213s Unpacking netplan.io (1.0-1) over (0.107.1-3) ...
213s Preparing to unpack .../19-libxmlb2_0.3.15-1build1_s390x.deb ...
213s Unpacking libxmlb2:s390x (0.3.15-1build1) over (0.3.15-1) ...
213s dpkg: libgpgme11:s390x: dependency problems, but removing anyway as you requested:
213s  libvolume-key1:s390x depends on libgpgme11 (>= 1.4.1).
213s  libjcat1:s390x depends on libgpgme11 (>= 1.2.0).
213s 
213s (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 ... 52172 files and directories currently installed.)
213s Removing libgpgme11:s390x (1.18.0-4ubuntu1) ...
213s Selecting previously unselected package libgpgme11t64:s390x.
213s (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 ... 52166 files and directories currently installed.)
213s Preparing to unpack .../00-libgpgme11t64_1.18.0-4.1ubuntu3_s390x.deb ...
213s Unpacking libgpgme11t64:s390x (1.18.0-4.1ubuntu3) ...
213s Preparing to unpack .../01-libvolume-key1_0.3.12-7build1_s390x.deb ...
213s Unpacking libvolume-key1:s390x (0.3.12-7build1) over (0.3.12-5build2) ...
213s Preparing to unpack .../02-libqrtr-glib0_1.2.2-1ubuntu3_s390x.deb ...
213s Unpacking libqrtr-glib0:s390x (1.2.2-1ubuntu3) over (1.2.2-1ubuntu2) ...
213s Preparing to unpack .../03-libqmi-glib5_1.35.2-0ubuntu1_s390x.deb ...
213s Unpacking libqmi-glib5:s390x (1.35.2-0ubuntu1) over (1.34.0-2) ...
213s Preparing to unpack .../04-libqmi-proxy_1.35.2-0ubuntu1_s390x.deb ...
213s Unpacking libqmi-proxy (1.35.2-0ubuntu1) over (1.34.0-2) ...
213s Preparing to unpack .../05-libpolkit-agent-1-0_124-1ubuntu1_s390x.deb ...
213s Unpacking libpolkit-agent-1-0:s390x (124-1ubuntu1) over (124-1) ...
213s Preparing to unpack .../06-libpolkit-gobject-1-0_124-1ubuntu1_s390x.deb ...
213s Unpacking libpolkit-gobject-1-0:s390x (124-1ubuntu1) over (124-1) ...
213s Preparing to unpack .../07-libmm-glib0_1.23.4-0ubuntu1_s390x.deb ...
213s Unpacking libmm-glib0:s390x (1.23.4-0ubuntu1) over (1.22.0-3) ...
213s Preparing to unpack .../08-libmbim-glib4_1.31.2-0ubuntu2_s390x.deb ...
213s Unpacking libmbim-glib4:s390x (1.31.2-0ubuntu2) over (1.30.0-1) ...
213s Preparing to unpack .../09-libmbim-proxy_1.31.2-0ubuntu2_s390x.deb ...
213s Unpacking libmbim-proxy (1.31.2-0ubuntu2) over (1.30.0-1) ...
213s Preparing to unpack .../10-libjson-glib-1.0-common_1.8.0-2build1_all.deb ...
213s Unpacking libjson-glib-1.0-common (1.8.0-2build1) over (1.8.0-2) ...
213s Preparing to unpack .../11-libjson-glib-1.0-0_1.8.0-2build1_s390x.deb ...
213s Unpacking libjson-glib-1.0-0:s390x (1.8.0-2build1) over (1.8.0-2) ...
213s Preparing to unpack .../12-libgusb2_0.4.8-1build1_s390x.deb ...
213s Unpacking libgusb2:s390x (0.4.8-1build1) over (0.4.8-1) ...
213s Preparing to unpack .../13-libgudev-1.0-0_1%3a238-3ubuntu2_s390x.deb ...
213s Unpacking libgudev-1.0-0:s390x (1:238-3ubuntu2) over (1:238-3) ...
213s dpkg: libarchive13:s390x: dependency problems, but removing anyway as you requested:
213s  fwupd depends on libarchive13 (>= 3.2.1).
213s 
213s (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 ... 52173 files and directories currently installed.)
213s Removing libarchive13:s390x (3.7.2-1ubuntu2) ...
213s Selecting previously unselected package libarchive13t64:s390x.
213s (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 ... 52167 files and directories currently installed.)
213s Preparing to unpack .../libarchive13t64_3.7.2-1.1ubuntu2_s390x.deb ...
213s Unpacking libarchive13t64:s390x (3.7.2-1.1ubuntu2) ...
213s Preparing to unpack .../fwupd_1.9.15-2_s390x.deb ...
213s Unpacking fwupd (1.9.15-2) over (1.9.14-1) ...
213s dpkg: libcurl3-gnutls:s390x: dependency problems, but removing anyway as you requested:
213s  libfwupd2:s390x depends on libcurl3-gnutls (>= 7.63.0).
213s 
213s (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 ... 52174 files and directories currently installed.)
213s Removing libcurl3-gnutls:s390x (8.5.0-2ubuntu2) ...
213s Selecting previously unselected package libcurl3t64-gnutls:s390x.
213s (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 ... 52167 files and directories currently installed.)
213s Preparing to unpack .../0-libcurl3t64-gnutls_8.5.0-2ubuntu8_s390x.deb ...
213s Unpacking libcurl3t64-gnutls:s390x (8.5.0-2ubuntu8) ...
213s Preparing to unpack .../1-libfwupd2_1.9.15-2_s390x.deb ...
213s Unpacking libfwupd2:s390x (1.9.15-2) over (1.9.14-1) ...
213s Preparing to unpack .../2-libblockdev3_3.1.0-1build1_s390x.deb ...
213s Unpacking libblockdev3:s390x (3.1.0-1build1) over (3.1.0-1) ...
213s Preparing to unpack .../3-libblockdev-utils3_3.1.0-1build1_s390x.deb ...
213s Unpacking libblockdev-utils3:s390x (3.1.0-1build1) over (3.1.0-1) ...
213s Preparing to unpack .../4-libblockdev-swap3_3.1.0-1build1_s390x.deb ...
213s Unpacking libblockdev-swap3:s390x (3.1.0-1build1) over (3.1.0-1) ...
213s Preparing to unpack .../5-libblockdev-part3_3.1.0-1build1_s390x.deb ...
213s Unpacking libblockdev-part3:s390x (3.1.0-1build1) over (3.1.0-1) ...
213s dpkg: libnvme1: dependency problems, but removing anyway as you requested:
213s  libblockdev-nvme3:s390x depends on libnvme1 (>= 1.7.1).
213s 
213s (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 ... 52174 files and directories currently installed.)
213s Removing libnvme1 (1.8-2) ...
213s Selecting previously unselected package libnvme1t64.
213s (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 ... 52167 files and directories currently installed.)
213s Preparing to unpack .../0-libnvme1t64_1.8-3_s390x.deb ...
213s Unpacking libnvme1t64 (1.8-3) ...
213s Preparing to unpack .../1-libblockdev-nvme3_3.1.0-1build1_s390x.deb ...
213s Unpacking libblockdev-nvme3:s390x (3.1.0-1build1) over (3.1.0-1) ...
213s Preparing to unpack .../2-libblockdev-mdraid3_3.1.0-1build1_s390x.deb ...
213s Unpacking libblockdev-mdraid3:s390x (3.1.0-1build1) over (3.1.0-1) ...
213s Preparing to unpack .../3-libblockdev-loop3_3.1.0-1build1_s390x.deb ...
213s Unpacking libblockdev-loop3:s390x (3.1.0-1build1) over (3.1.0-1) ...
213s Preparing to unpack .../4-e2fsprogs-l10n_1.47.0-2.4~exp1ubuntu2_all.deb ...
213s Unpacking e2fsprogs-l10n (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ...
213s Preparing to unpack .../5-logsave_1.47.0-2.4~exp1ubuntu2_s390x.deb ...
213s Unpacking logsave (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ...
214s dpkg: libext2fs2:s390x: dependency problems, but removing anyway as you requested:
214s  libblockdev-fs3:s390x depends on libext2fs2 (>= 1.42.11).
214s  e2fsprogs depends on libext2fs2 (= 1.47.0-2ubuntu1).
214s  btrfs-progs depends on libext2fs2 (>= 1.42).
214s 
214s (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 ... 52175 files and directories currently installed.)
214s Removing libext2fs2:s390x (1.47.0-2ubuntu1) ...
214s Selecting previously unselected package libext2fs2t64:s390x.
214s (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 ... 52168 files and directories currently installed.)
214s Preparing to unpack .../libext2fs2t64_1.47.0-2.4~exp1ubuntu2_s390x.deb ...
214s Adding 'diversion of /lib/s390x-linux-gnu/libe2p.so.2 to /lib/s390x-linux-gnu/libe2p.so.2.usr-is-merged by libext2fs2t64'
214s Adding 'diversion of /lib/s390x-linux-gnu/libe2p.so.2.3 to /lib/s390x-linux-gnu/libe2p.so.2.3.usr-is-merged by libext2fs2t64'
214s Adding 'diversion of /lib/s390x-linux-gnu/libext2fs.so.2 to /lib/s390x-linux-gnu/libext2fs.so.2.usr-is-merged by libext2fs2t64'
214s Adding 'diversion of /lib/s390x-linux-gnu/libext2fs.so.2.4 to /lib/s390x-linux-gnu/libext2fs.so.2.4.usr-is-merged by libext2fs2t64'
214s Unpacking libext2fs2t64:s390x (1.47.0-2.4~exp1ubuntu2) ...
214s Setting up libcom-err2:s390x (1.47.0-2.4~exp1ubuntu2) ...
214s Setting up libext2fs2t64:s390x (1.47.0-2.4~exp1ubuntu2) ...
214s (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 ... 52184 files and directories currently installed.)
214s Preparing to unpack .../e2fsprogs_1.47.0-2.4~exp1ubuntu2_s390x.deb ...
214s Unpacking e2fsprogs (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ...
214s dpkg: libreiserfscore0: dependency problems, but removing anyway as you requested:
214s  btrfs-progs depends on libreiserfscore0 (>= 1:3.6.27).
214s 
214s (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 ... 52184 files and directories currently installed.)
214s Removing libreiserfscore0 (1:3.6.27-7) ...
214s Selecting previously unselected package libreiserfscore0t64.
214s (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 ... 52179 files and directories currently installed.)
214s Preparing to unpack .../libreiserfscore0t64_1%3a3.6.27-7.1_s390x.deb ...
214s Unpacking libreiserfscore0t64 (1:3.6.27-7.1) ...
214s Preparing to unpack .../btrfs-progs_6.6.3-1.1build1_s390x.deb ...
214s Unpacking btrfs-progs (6.6.3-1.1build1) over (6.6.3-1.1) ...
214s Preparing to unpack .../libblockdev-fs3_3.1.0-1build1_s390x.deb ...
214s Unpacking libblockdev-fs3:s390x (3.1.0-1build1) over (3.1.0-1) ...
214s Preparing to unpack .../libblockdev-crypto3_3.1.0-1build1_s390x.deb ...
214s Unpacking libblockdev-crypto3:s390x (3.1.0-1build1) over (3.1.0-1) ...
214s Preparing to unpack .../bolt_0.9.6-2build1_s390x.deb ...
214s Unpacking bolt (0.9.6-2build1) over (0.9.6-2) ...
214s dpkg: libglib2.0-0:s390x: dependency problems, but removing anyway as you requested:
214s  s390-tools depends on libglib2.0-0 (>= 2.77.0).
214s  libnetplan0:s390x depends on libglib2.0-0 (>= 2.75.3).
214s  libjcat1:s390x depends on libglib2.0-0 (>= 2.75.3).
214s 
214s (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 ... 52185 files and directories currently installed.)
214s Removing libglib2.0-0:s390x (2.79.2-1~ubuntu1) ...
214s Selecting previously unselected package libglib2.0-0t64:s390x.
214s (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 ... 52160 files and directories currently installed.)
214s Preparing to unpack .../0-libglib2.0-0t64_2.79.3-3ubuntu5_s390x.deb ...
214s libglib2.0-0t64.preinst: Removing /var/lib/dpkg/info/libglib2.0-0:s390x.postrm to avoid loss of /usr/share/glib-2.0/schemas/gschemas.compiled...
214s removed '/var/lib/dpkg/info/libglib2.0-0:s390x.postrm'
214s Unpacking libglib2.0-0t64:s390x (2.79.3-3ubuntu5) ...
214s Preparing to unpack .../1-libjcat1_0.2.0-2build2_s390x.deb ...
214s Unpacking libjcat1:s390x (0.2.0-2build2) over (0.2.0-2) ...
214s Preparing to unpack .../2-libldap2_2.6.7+dfsg-1~exp1ubuntu6_s390x.deb ...
214s Unpacking libldap2:s390x (2.6.7+dfsg-1~exp1ubuntu6) over (2.6.7+dfsg-1~exp1ubuntu1) ...
214s Preparing to unpack .../3-ubuntu-pro-client-l10n_31.2.2_s390x.deb ...
214s Unpacking ubuntu-pro-client-l10n (31.2.2) over (31.1) ...
214s Preparing to unpack .../4-ubuntu-pro-client_31.2.2_s390x.deb ...
214s Unpacking ubuntu-pro-client (31.2.2) over (31.1) ...
214s Preparing to unpack .../5-gnupg-utils_2.4.4-2ubuntu15_s390x.deb ...
214s Unpacking gnupg-utils (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
214s Preparing to unpack .../6-keyboxd_2.4.4-2ubuntu15_s390x.deb ...
214s Unpacking keyboxd (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
214s dpkg: libnpth0:s390x: dependency problems, but removing anyway as you requested:
214s  gpgv depends on libnpth0 (>= 0.90).
214s  gpgsm depends on libnpth0 (>= 0.90).
214s  gpg-agent depends on libnpth0 (>= 0.90).
214s  gpg depends on libnpth0 (>= 0.90).
214s  dirmngr depends on libnpth0 (>= 0.90).
214s 
214s (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 ... 52185 files and directories currently installed.)
214s Removing libnpth0:s390x (1.6-3build2) ...
214s Selecting previously unselected package libnpth0t64:s390x.
214s (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 ... 52180 files and directories currently installed.)
214s Preparing to unpack .../libnpth0t64_1.6-3.1_s390x.deb ...
214s Unpacking libnpth0t64:s390x (1.6-3.1) ...
214s Setting up libnpth0t64:s390x (1.6-3.1) ...
214s (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 ... 52186 files and directories currently installed.)
214s Preparing to unpack .../gpgv_2.4.4-2ubuntu15_s390x.deb ...
214s Unpacking gpgv (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
214s Setting up gpgv (2.4.4-2ubuntu15) ...
214s (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 ... 52186 files and directories currently installed.)
214s Preparing to unpack .../0-gpg-wks-client_2.4.4-2ubuntu15_s390x.deb ...
214s Unpacking gpg-wks-client (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
215s Preparing to unpack .../1-gpg-agent_2.4.4-2ubuntu15_s390x.deb ...
215s Unpacking gpg-agent (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
215s Preparing to unpack .../2-gpg_2.4.4-2ubuntu15_s390x.deb ...
215s Unpacking gpg (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
215s Preparing to unpack .../3-dirmngr_2.4.4-2ubuntu15_s390x.deb ...
215s Unpacking dirmngr (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
215s Preparing to unpack .../4-gnupg_2.4.4-2ubuntu15_all.deb ...
215s Unpacking gnupg (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
215s Preparing to unpack .../5-python3-apt_2.7.7_s390x.deb ...
215s Unpacking python3-apt (2.7.7) over (2.7.6) ...
215s Preparing to unpack .../6-apt-utils_2.7.14_s390x.deb ...
215s Unpacking apt-utils (2.7.14) over (2.7.12) ...
215s dpkg: libapt-pkg6.0:s390x: dependency problems, but removing anyway as you requested:
215s  apt depends on libapt-pkg6.0 (>= 2.7.12).
215s 
215s (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 ... 52184 files and directories currently installed.)
215s Removing libapt-pkg6.0:s390x (2.7.12) ...
215s dpkg: libnettle8:s390x: dependency problems, but removing anyway as you requested:
215s  libhogweed6:s390x depends on libnettle8.
215s  libgnutls30:s390x depends on libnettle8 (>= 3.9~).
215s 
215s Removing libnettle8:s390x (3.9.1-2) ...
215s Selecting previously unselected package libapt-pkg6.0t64:s390x.
215s (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 ... 52128 files and directories currently installed.)
215s Preparing to unpack .../libapt-pkg6.0t64_2.7.14_s390x.deb ...
215s Unpacking libapt-pkg6.0t64:s390x (2.7.14) ...
215s Setting up libapt-pkg6.0t64:s390x (2.7.14) ...
215s Selecting previously unselected package libnettle8t64:s390x.
215s (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 ... 52178 files and directories currently installed.)
215s Preparing to unpack .../libnettle8t64_3.9.1-2.2_s390x.deb ...
215s Unpacking libnettle8t64:s390x (3.9.1-2.2) ...
215s Setting up libnettle8t64:s390x (3.9.1-2.2) ...
215s dpkg: libhogweed6:s390x: dependency problems, but removing anyway as you requested:
215s  libgnutls30:s390x depends on libhogweed6 (>= 3.6).
215s 
215s (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 ... 52186 files and directories currently installed.)
215s Removing libhogweed6:s390x (3.9.1-2) ...
215s Selecting previously unselected package libhogweed6t64:s390x.
215s (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 ... 52181 files and directories currently installed.)
215s Preparing to unpack .../libhogweed6t64_3.9.1-2.2_s390x.deb ...
215s Unpacking libhogweed6t64:s390x (3.9.1-2.2) ...
215s Setting up libhogweed6t64:s390x (3.9.1-2.2) ...
215s dpkg: libgnutls30:s390x: dependency problems, but removing anyway as you requested:
215s  apt depends on libgnutls30 (>= 3.8.1).
215s 
215s (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 ... 52187 files and directories currently installed.)
215s Removing libgnutls30:s390x (3.8.3-1ubuntu1) ...
215s Selecting previously unselected package libgnutls30t64:s390x.
215s (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 ... 52178 files and directories currently installed.)
215s Preparing to unpack .../libgnutls30t64_3.8.3-1.1ubuntu2_s390x.deb ...
215s Unpacking libgnutls30t64:s390x (3.8.3-1.1ubuntu2) ...
215s Setting up libgnutls30t64:s390x (3.8.3-1.1ubuntu2) ...
215s (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 ... 52206 files and directories currently installed.)
215s Preparing to unpack .../archives/apt_2.7.14_s390x.deb ...
215s Unpacking apt (2.7.14) over (2.7.12) ...
215s Setting up apt (2.7.14) ...
216s (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 ... 52206 files and directories currently installed.)
216s Preparing to unpack .../gpgconf_2.4.4-2ubuntu15_s390x.deb ...
216s Unpacking gpgconf (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
216s Preparing to unpack .../gpgsm_2.4.4-2ubuntu15_s390x.deb ...
216s Unpacking gpgsm (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
216s dpkg: libreadline8:s390x: dependency problems, but removing anyway as you requested:
216s  libpython3.12-stdlib:s390x depends on libreadline8 (>= 7.0~beta).
216s  gawk depends on libreadline8 (>= 6.0).
216s  fdisk depends on libreadline8 (>= 6.0).
216s 
216s (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 ... 52206 files and directories currently installed.)
216s Removing libreadline8:s390x (8.2-3) ...
216s Selecting previously unselected package libreadline8t64:s390x.
216s (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 ... 52194 files and directories currently installed.)
216s Preparing to unpack .../libreadline8t64_8.2-4_s390x.deb ...
216s Adding 'diversion of /lib/s390x-linux-gnu/libhistory.so.8 to /lib/s390x-linux-gnu/libhistory.so.8.usr-is-merged by libreadline8t64'
216s Adding 'diversion of /lib/s390x-linux-gnu/libhistory.so.8.2 to /lib/s390x-linux-gnu/libhistory.so.8.2.usr-is-merged by libreadline8t64'
216s Adding 'diversion of /lib/s390x-linux-gnu/libreadline.so.8 to /lib/s390x-linux-gnu/libreadline.so.8.usr-is-merged by libreadline8t64'
216s Adding 'diversion of /lib/s390x-linux-gnu/libreadline.so.8.2 to /lib/s390x-linux-gnu/libreadline.so.8.2.usr-is-merged by libreadline8t64'
216s Unpacking libreadline8t64:s390x (8.2-4) ...
216s Setting up libreadline8t64:s390x (8.2-4) ...
216s (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 ... 52214 files and directories currently installed.)
216s Preparing to unpack .../gawk_1%3a5.2.1-2build2_s390x.deb ...
216s Unpacking gawk (1:5.2.1-2build2) over (1:5.2.1-2) ...
216s Preparing to unpack .../fdisk_2.39.3-9ubuntu2_s390x.deb ...
216s Unpacking fdisk (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
216s Preparing to unpack .../libpython3.12-stdlib_3.12.2-4build3_s390x.deb ...
216s Unpacking libpython3.12-stdlib:s390x (3.12.2-4build3) over (3.12.2-1) ...
216s Preparing to unpack .../perl-base_5.38.2-3.2_s390x.deb ...
216s Unpacking perl-base (5.38.2-3.2) over (5.38.2-3) ...
216s Setting up perl-base (5.38.2-3.2) ...
217s (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 ... 52212 files and directories currently installed.)
217s Preparing to unpack .../perl-modules-5.38_5.38.2-3.2_all.deb ...
217s Unpacking perl-modules-5.38 (5.38.2-3.2) over (5.38.2-3) ...
217s Preparing to unpack .../python3-gdbm_3.12.2-3ubuntu1.1_s390x.deb ...
217s Unpacking python3-gdbm:s390x (3.12.2-3ubuntu1.1) over (3.11.5-1) ...
217s Preparing to unpack .../man-db_2.12.0-3build4_s390x.deb ...
217s Unpacking man-db (2.12.0-3build4) over (2.12.0-3) ...
217s dpkg: libgdbm-compat4:s390x: dependency problems, but removing anyway as you requested:
217s  libperl5.38:s390x depends on libgdbm-compat4 (>= 1.18-3).
217s 
217s (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 ... 52212 files and directories currently installed.)
217s Removing libgdbm-compat4:s390x (1.23-5) ...
217s dpkg: libgdbm6:s390x: dependency problems, but removing anyway as you requested:
217s  libperl5.38:s390x depends on libgdbm6 (>= 1.21).
217s 
217s Removing libgdbm6:s390x (1.23-5) ...
217s Selecting previously unselected package libgdbm6t64:s390x.
217s (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 ... 52202 files and directories currently installed.)
217s Preparing to unpack .../libgdbm6t64_1.23-5.1_s390x.deb ...
217s Unpacking libgdbm6t64:s390x (1.23-5.1) ...
217s Selecting previously unselected package libgdbm-compat4t64:s390x.
217s Preparing to unpack .../libgdbm-compat4t64_1.23-5.1_s390x.deb ...
217s Unpacking libgdbm-compat4t64:s390x (1.23-5.1) ...
217s dpkg: libperl5.38:s390x: dependency problems, but removing anyway as you requested:
217s  perl depends on libperl5.38 (= 5.38.2-3).
217s 
217s (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 ... 52214 files and directories currently installed.)
217s Removing libperl5.38:s390x (5.38.2-3) ...
217s Selecting previously unselected package libperl5.38t64:s390x.
217s (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 ... 51692 files and directories currently installed.)
217s Preparing to unpack .../libperl5.38t64_5.38.2-3.2_s390x.deb ...
217s Unpacking libperl5.38t64:s390x (5.38.2-3.2) ...
217s Preparing to unpack .../perl_5.38.2-3.2_s390x.deb ...
217s Unpacking perl (5.38.2-3.2) over (5.38.2-3) ...
217s dpkg: libdb5.3:s390x: dependency problems, but removing anyway as you requested:
217s  libsasl2-modules-db:s390x depends on libdb5.3.
217s  libpam-modules:s390x depends on libdb5.3.
217s  iproute2 depends on libdb5.3.
217s 
217s (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 ... 52214 files and directories currently installed.)
217s Removing libdb5.3:s390x (5.3.28+dfsg2-4) ...
217s Selecting previously unselected package libdb5.3t64:s390x.
217s (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 ... 52208 files and directories currently installed.)
217s Preparing to unpack .../0-libdb5.3t64_5.3.28+dfsg2-6_s390x.deb ...
217s Unpacking libdb5.3t64:s390x (5.3.28+dfsg2-6) ...
217s Preparing to unpack .../1-libsasl2-modules-db_2.1.28+dfsg1-5ubuntu1_s390x.deb ...
217s Unpacking libsasl2-modules-db:s390x (2.1.28+dfsg1-5ubuntu1) over (2.1.28+dfsg1-4) ...
217s Preparing to unpack .../2-libsasl2-2_2.1.28+dfsg1-5ubuntu1_s390x.deb ...
217s Unpacking libsasl2-2:s390x (2.1.28+dfsg1-5ubuntu1) over (2.1.28+dfsg1-4) ...
217s Preparing to unpack .../3-libfido2-1_1.14.0-1build1_s390x.deb ...
217s Unpacking libfido2-1:s390x (1.14.0-1build1) over (1.14.0-1) ...
218s Preparing to unpack .../4-libcryptsetup12_2%3a2.7.0-1ubuntu2_s390x.deb ...
218s Unpacking libcryptsetup12:s390x (2:2.7.0-1ubuntu2) over (2:2.7.0-1ubuntu1) ...
218s Preparing to unpack .../5-dhcpcd-base_1%3a10.0.6-1ubuntu2_s390x.deb ...
218s Unpacking dhcpcd-base (1:10.0.6-1ubuntu2) over (1:10.0.6-1ubuntu1) ...
218s dpkg: libuv1:s390x: dependency problems, but removing anyway as you requested:
218s  bind9-libs:s390x depends on libuv1 (>= 1.40.0).
218s 
218s (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 ... 52214 files and directories currently installed.)
218s Removing libuv1:s390x (1.48.0-1) ...
218s Selecting previously unselected package libuv1t64:s390x.
218s (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 ... 52209 files and directories currently installed.)
218s Preparing to unpack .../libuv1t64_1.48.0-1.1_s390x.deb ...
218s Unpacking libuv1t64:s390x (1.48.0-1.1) ...
218s Preparing to unpack .../bind9-host_1%3a9.18.24-0ubuntu3_s390x.deb ...
218s Unpacking bind9-host (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ...
218s Preparing to unpack .../bind9-dnsutils_1%3a9.18.24-0ubuntu3_s390x.deb ...
218s Unpacking bind9-dnsutils (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ...
218s Preparing to unpack .../bind9-libs_1%3a9.18.24-0ubuntu3_s390x.deb ...
218s Unpacking bind9-libs:s390x (1:9.18.24-0ubuntu3) over (1:9.18.21-0ubuntu1) ...
218s dpkg: libssl3:s390x: dependency problems, but removing anyway as you requested:
218s  systemd depends on libssl3 (>= 3.0.0).
218s  s390-tools depends on libssl3 (>= 3.0.0).
218s  linux-headers-6.8.0-11-generic depends on libssl3 (>= 3.0.0).
218s 
218s (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 ... 52215 files and directories currently installed.)
218s Removing libssl3:s390x (3.0.10-1ubuntu4) ...
218s Selecting previously unselected package libssl3t64:s390x.
218s (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 ... 52204 files and directories currently installed.)
218s Preparing to unpack .../libssl3t64_3.0.13-0ubuntu2_s390x.deb ...
218s Unpacking libssl3t64:s390x (3.0.13-0ubuntu2) ...
218s Setting up libssl3t64:s390x (3.0.13-0ubuntu2) ...
218s (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 ... 52217 files and directories currently installed.)
218s Preparing to unpack .../libnss-systemd_255.4-1ubuntu5_s390x.deb ...
218s Unpacking libnss-systemd:s390x (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
218s Preparing to unpack .../libudev1_255.4-1ubuntu5_s390x.deb ...
218s Unpacking libudev1:s390x (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
218s Setting up libudev1:s390x (255.4-1ubuntu5) ...
218s (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 ... 52217 files and directories currently installed.)
218s Preparing to unpack .../systemd_255.4-1ubuntu5_s390x.deb ...
218s Unpacking systemd (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
218s Preparing to unpack .../udev_255.4-1ubuntu5_s390x.deb ...
218s Unpacking udev (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
218s Preparing to unpack .../libsystemd0_255.4-1ubuntu5_s390x.deb ...
218s Unpacking libsystemd0:s390x (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
218s Setting up libsystemd0:s390x (255.4-1ubuntu5) ...
218s Setting up libcryptsetup12:s390x (2:2.7.0-1ubuntu2) ...
218s Setting up libkmod2:s390x (31+20240202-2ubuntu4) ...
218s Setting up libsystemd-shared:s390x (255.4-1ubuntu5) ...
218s Setting up systemd-dev (255.4-1ubuntu5) ...
218s Setting up systemd (255.4-1ubuntu5) ...
219s (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 ... 52217 files and directories currently installed.)
219s Preparing to unpack .../systemd-sysv_255.4-1ubuntu5_s390x.deb ...
219s Unpacking systemd-sysv (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
219s Preparing to unpack .../libpam-systemd_255.4-1ubuntu5_s390x.deb ...
219s Unpacking libpam-systemd:s390x (255.4-1ubuntu5) over (255.2-3ubuntu2) ...
219s Preparing to unpack .../libpam-modules-bin_1.5.3-5ubuntu3_s390x.deb ...
219s Unpacking libpam-modules-bin (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ...
219s Setting up libpam-modules-bin (1.5.3-5ubuntu3) ...
219s pam_namespace.service is a disabled or a static unit not running, not starting it.
219s (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 ... 52217 files and directories currently installed.)
219s Preparing to unpack .../libpam-modules_1.5.3-5ubuntu3_s390x.deb ...
219s Unpacking libpam-modules:s390x (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ...
220s Setting up libpam-modules:s390x (1.5.3-5ubuntu3) ...
220s Installing new version of config file /etc/security/namespace.init ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../libpam-runtime_1.5.3-5ubuntu3_all.deb ...
220s Unpacking libpam-runtime (1.5.3-5ubuntu3) over (1.5.2-9.1ubuntu3) ...
220s Setting up libpam-runtime (1.5.3-5ubuntu3) ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../0-dbus-user-session_1.14.10-4ubuntu2_s390x.deb ...
220s Unpacking dbus-user-session (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ...
220s Preparing to unpack .../1-libapparmor1_4.0.0-beta3-0ubuntu2_s390x.deb ...
220s Unpacking libapparmor1:s390x (4.0.0-beta3-0ubuntu2) over (4.0.0~alpha4-0ubuntu1) ...
220s Preparing to unpack .../2-libexpat1_2.6.1-2_s390x.deb ...
220s Unpacking libexpat1:s390x (2.6.1-2) over (2.6.0-1) ...
220s Preparing to unpack .../3-dbus-system-bus-common_1.14.10-4ubuntu2_all.deb ...
220s Unpacking dbus-system-bus-common (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ...
220s Preparing to unpack .../4-dbus-bin_1.14.10-4ubuntu2_s390x.deb ...
220s Unpacking dbus-bin (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ...
220s Preparing to unpack .../5-dbus_1.14.10-4ubuntu2_s390x.deb ...
220s Unpacking dbus (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ...
220s Preparing to unpack .../6-dbus-daemon_1.14.10-4ubuntu2_s390x.deb ...
220s Unpacking dbus-daemon (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ...
220s Preparing to unpack .../7-libdbus-1-3_1.14.10-4ubuntu2_s390x.deb ...
220s Unpacking libdbus-1-3:s390x (1.14.10-4ubuntu2) over (1.14.10-4ubuntu1) ...
220s Preparing to unpack .../8-libmount1_2.39.3-9ubuntu2_s390x.deb ...
220s Unpacking libmount1:s390x (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
220s Setting up libmount1:s390x (2.39.3-9ubuntu2) ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../libseccomp2_2.5.5-1ubuntu2_s390x.deb ...
220s Unpacking libseccomp2:s390x (2.5.5-1ubuntu2) over (2.5.5-1ubuntu1) ...
220s Setting up libseccomp2:s390x (2.5.5-1ubuntu2) ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../libdevmapper1.02.1_2%3a1.02.185-3ubuntu2_s390x.deb ...
220s Unpacking libdevmapper1.02.1:s390x (2:1.02.185-3ubuntu2) over (2:1.02.185-3ubuntu1) ...
220s Preparing to unpack .../libuuid1_2.39.3-9ubuntu2_s390x.deb ...
220s Unpacking libuuid1:s390x (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
220s Setting up libuuid1:s390x (2.39.3-9ubuntu2) ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../libfdisk1_2.39.3-9ubuntu2_s390x.deb ...
220s Unpacking libfdisk1:s390x (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
220s Preparing to unpack .../mount_2.39.3-9ubuntu2_s390x.deb ...
220s Unpacking mount (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
220s Preparing to unpack .../libsqlite3-0_3.45.1-1ubuntu1_s390x.deb ...
220s Unpacking libsqlite3-0:s390x (3.45.1-1ubuntu1) over (3.45.1-1) ...
220s Preparing to unpack .../gcc-14-base_14-20240315-1ubuntu1_s390x.deb ...
220s Unpacking gcc-14-base:s390x (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ...
220s Setting up gcc-14-base:s390x (14-20240315-1ubuntu1) ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../libgcc-s1_14-20240315-1ubuntu1_s390x.deb ...
220s Unpacking libgcc-s1:s390x (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ...
220s Setting up libgcc-s1:s390x (14-20240315-1ubuntu1) ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../libstdc++6_14-20240315-1ubuntu1_s390x.deb ...
220s Unpacking libstdc++6:s390x (14-20240315-1ubuntu1) over (14-20240303-1ubuntu1) ...
220s Setting up libstdc++6:s390x (14-20240315-1ubuntu1) ...
220s (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 ... 52215 files and directories currently installed.)
220s Preparing to unpack .../dpkg_1.22.6ubuntu5_s390x.deb ...
220s Unpacking dpkg (1.22.6ubuntu5) over (1.22.4ubuntu5) ...
221s Setting up dpkg (1.22.6ubuntu5) ...
221s Setting up libpython3.12-minimal:s390x (3.12.2-4build3) ...
221s Setting up libexpat1:s390x (2.6.1-2) ...
221s Setting up python3.12-minimal (3.12.2-4build3) ...
222s (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 ... 52215 files and directories currently installed.)
222s Preparing to unpack .../python3-minimal_3.12.2-0ubuntu1_s390x.deb ...
222s Unpacking python3-minimal (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ...
222s Setting up python3-minimal (3.12.2-0ubuntu1) ...
222s (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 ... 52215 files and directories currently installed.)
222s Preparing to unpack .../python3_3.12.2-0ubuntu1_s390x.deb ...
222s Unpacking python3 (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ...
222s Preparing to unpack .../libpython3-stdlib_3.12.2-0ubuntu1_s390x.deb ...
222s Unpacking libpython3-stdlib:s390x (3.12.2-0ubuntu1) over (3.12.1-0ubuntu2) ...
222s Preparing to unpack .../libsmartcols1_2.39.3-9ubuntu2_s390x.deb ...
222s Unpacking libsmartcols1:s390x (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
222s Setting up libsmartcols1:s390x (2.39.3-9ubuntu2) ...
222s (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 ... 52215 files and directories currently installed.)
222s Preparing to unpack .../0-bsdextrautils_2.39.3-9ubuntu2_s390x.deb ...
222s Unpacking bsdextrautils (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
222s Preparing to unpack .../1-groff-base_1.23.0-3build1_s390x.deb ...
222s Unpacking groff-base (1.23.0-3build1) over (1.23.0-3) ...
222s Preparing to unpack .../2-pinentry-curses_1.2.1-3ubuntu4_s390x.deb ...
222s Unpacking pinentry-curses (1.2.1-3ubuntu4) over (1.2.1-3ubuntu1) ...
222s Preparing to unpack .../3-readline-common_8.2-4_all.deb ...
222s Unpacking readline-common (8.2-4) over (8.2-3) ...
222s Preparing to unpack .../4-libxml2_2.9.14+dfsg-1.3ubuntu2_s390x.deb ...
222s Unpacking libxml2:s390x (2.9.14+dfsg-1.3ubuntu2) over (2.9.14+dfsg-1.3ubuntu1) ...
222s Preparing to unpack .../5-libbpf1_1%3a1.3.0-2build1_s390x.deb ...
222s Unpacking libbpf1:s390x (1:1.3.0-2build1) over (1:1.3.0-2) ...
222s dpkg: libelf1:s390x: dependency problems, but removing anyway as you requested:
222s  linux-headers-6.8.0-11-generic depends on libelf1 (>= 0.144).
222s  iproute2 depends on libelf1 (>= 0.131).
222s 
222s (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 ... 52215 files and directories currently installed.)
222s Removing libelf1:s390x (0.190-1) ...
222s Selecting previously unselected package libelf1t64:s390x.
222s (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 ... 52210 files and directories currently installed.)
222s Preparing to unpack .../libelf1t64_0.190-1.1build2_s390x.deb ...
222s Unpacking libelf1t64:s390x (0.190-1.1build2) ...
222s Preparing to unpack .../libtirpc-common_1.3.4+ds-1.1_all.deb ...
222s Unpacking libtirpc-common (1.3.4+ds-1.1) over (1.3.4+ds-1build1) ...
222s Preparing to unpack .../lsof_4.95.0-1build2_s390x.deb ...
222s Unpacking lsof (4.95.0-1build2) over (4.95.0-1build1) ...
222s Preparing to unpack .../libnsl2_1.3.0-3build2_s390x.deb ...
222s Unpacking libnsl2:s390x (1.3.0-3build2) over (1.3.0-3) ...
223s dpkg: libtirpc3:s390x: dependency problems, but removing anyway as you requested:
223s  iproute2 depends on libtirpc3 (>= 1.0.2).
223s 
223s (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 ... 52215 files and directories currently installed.)
223s Removing libtirpc3:s390x (1.3.4+ds-1build1) ...
223s Selecting previously unselected package libtirpc3t64:s390x.
223s (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 ... 52209 files and directories currently installed.)
223s Preparing to unpack .../0-libtirpc3t64_1.3.4+ds-1.1_s390x.deb ...
223s Adding 'diversion of /lib/s390x-linux-gnu/libtirpc.so.3 to /lib/s390x-linux-gnu/libtirpc.so.3.usr-is-merged by libtirpc3t64'
223s Adding 'diversion of /lib/s390x-linux-gnu/libtirpc.so.3.0.0 to /lib/s390x-linux-gnu/libtirpc.so.3.0.0.usr-is-merged by libtirpc3t64'
223s Unpacking libtirpc3t64:s390x (1.3.4+ds-1.1) ...
223s Preparing to unpack .../1-iproute2_6.1.0-1ubuntu5_s390x.deb ...
223s Unpacking iproute2 (6.1.0-1ubuntu5) over (6.1.0-1ubuntu2) ...
223s Preparing to unpack .../2-python3-yaml_6.0.1-2build1_s390x.deb ...
223s Unpacking python3-yaml (6.0.1-2build1) over (6.0.1-2) ...
223s Preparing to unpack .../3-libusb-1.0-0_2%3a1.0.27-1_s390x.deb ...
223s Unpacking libusb-1.0-0:s390x (2:1.0.27-1) over (2:1.0.26-1) ...
223s Preparing to unpack .../4-libprotobuf-c1_1.4.1-1ubuntu3_s390x.deb ...
223s Unpacking libprotobuf-c1:s390x (1.4.1-1ubuntu3) over (1.4.1-1ubuntu2) ...
223s Preparing to unpack .../5-libnghttp2-14_1.59.0-1build1_s390x.deb ...
223s Unpacking libnghttp2-14:s390x (1.59.0-1build1) over (1.59.0-1) ...
223s Preparing to unpack .../6-libproc2-0_2%3a4.0.4-4ubuntu2_s390x.deb ...
223s Unpacking libproc2-0:s390x (2:4.0.4-4ubuntu2) over (2:4.0.4-4ubuntu1) ...
223s Preparing to unpack .../7-procps_2%3a4.0.4-4ubuntu2_s390x.deb ...
223s Unpacking procps (2:4.0.4-4ubuntu2) over (2:4.0.4-4ubuntu1) ...
223s Preparing to unpack .../8-coreutils_9.4-3ubuntu3_s390x.deb ...
223s Unpacking coreutils (9.4-3ubuntu3) over (9.4-2ubuntu4) ...
223s Setting up coreutils (9.4-3ubuntu3) ...
223s (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 ... 52220 files and directories currently installed.)
223s Preparing to unpack .../util-linux_2.39.3-9ubuntu2_s390x.deb ...
223s Unpacking util-linux (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
223s Setting up util-linux (2.39.3-9ubuntu2) ...
224s fstrim.service is a disabled or a static unit not running, not starting it.
224s (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 ... 52220 files and directories currently installed.)
224s Removing libatm1:s390x (1:2.5.1-5) ...
224s (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 ... 52215 files and directories currently installed.)
224s Preparing to unpack .../file_1%3a5.45-3_s390x.deb ...
224s Unpacking file (1:5.45-3) over (1:5.45-2) ...
224s (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 ... 52215 files and directories currently installed.)
224s Removing libmagic1:s390x (1:5.45-2) ...
224s (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 ... 52205 files and directories currently installed.)
224s Preparing to unpack .../libmagic-mgc_1%3a5.45-3_s390x.deb ...
224s Unpacking libmagic-mgc (1:5.45-3) over (1:5.45-2) ...
224s Selecting previously unselected package libmagic1t64:s390x.
224s Preparing to unpack .../libmagic1t64_1%3a5.45-3_s390x.deb ...
224s Unpacking libmagic1t64:s390x (1:5.45-3) ...
224s Preparing to unpack .../libplymouth5_24.004.60-1ubuntu6_s390x.deb ...
224s Unpacking libplymouth5:s390x (24.004.60-1ubuntu6) over (24.004.60-1ubuntu3) ...
224s (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 ... 52216 files and directories currently installed.)
224s Removing libpng16-16:s390x (1.6.43-1) ...
224s Selecting previously unselected package libpng16-16t64:s390x.
224s (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 ... 52206 files and directories currently installed.)
224s Preparing to unpack .../libpng16-16t64_1.6.43-3_s390x.deb ...
224s Unpacking libpng16-16t64:s390x (1.6.43-3) ...
224s Preparing to unpack .../multipath-tools_0.9.4-5ubuntu6_s390x.deb ...
224s Unpacking multipath-tools (0.9.4-5ubuntu6) over (0.9.4-5ubuntu3) ...
224s dpkg: liburcu8:s390x: dependency problems, but removing anyway as you requested:
224s  xfsprogs depends on liburcu8 (>= 0.13.0).
224s 
224s (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 ... 52216 files and directories currently installed.)
224s Removing liburcu8:s390x (0.14.0-3) ...
224s Selecting previously unselected package liburcu8t64:s390x.
224s (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 ... 52197 files and directories currently installed.)
224s Preparing to unpack .../liburcu8t64_0.14.0-3.1_s390x.deb ...
224s Unpacking liburcu8t64:s390x (0.14.0-3.1) ...
224s Preparing to unpack .../liblocale-gettext-perl_1.07-6ubuntu4_s390x.deb ...
224s Unpacking liblocale-gettext-perl (1.07-6ubuntu4) over (1.07-6build1) ...
224s Preparing to unpack .../uuid-runtime_2.39.3-9ubuntu2_s390x.deb ...
224s Unpacking uuid-runtime (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
224s Preparing to unpack .../libdebconfclient0_0.271ubuntu2_s390x.deb ...
224s Unpacking libdebconfclient0:s390x (0.271ubuntu2) over (0.271ubuntu1) ...
224s Setting up libdebconfclient0:s390x (0.271ubuntu2) ...
224s (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 ... 52217 files and directories currently installed.)
224s Preparing to unpack .../libsemanage-common_3.5-1build4_all.deb ...
224s Unpacking libsemanage-common (3.5-1build4) over (3.5-1build2) ...
224s Setting up libsemanage-common (3.5-1build4) ...
224s (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 ... 52217 files and directories currently installed.)
224s Preparing to unpack .../libsemanage2_3.5-1build4_s390x.deb ...
224s Unpacking libsemanage2:s390x (3.5-1build4) over (3.5-1build2) ...
224s Setting up libsemanage2:s390x (3.5-1build4) ...
224s (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 ... 52217 files and directories currently installed.)
225s Preparing to unpack .../install-info_7.1-3build1_s390x.deb ...
225s Unpacking install-info (7.1-3build1) over (7.1-3) ...
225s Setting up install-info (7.1-3build1) ...
225s (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 ... 52217 files and directories currently installed.)
225s Preparing to unpack .../000-gcc-13-base_13.2.0-21ubuntu1_s390x.deb ...
225s Unpacking gcc-13-base:s390x (13.2.0-21ubuntu1) over (13.2.0-17ubuntu2) ...
225s Preparing to unpack .../001-libss2_1.47.0-2.4~exp1ubuntu2_s390x.deb ...
225s Unpacking libss2:s390x (1.47.0-2.4~exp1ubuntu2) over (1.47.0-2ubuntu1) ...
225s Preparing to unpack .../002-dmsetup_2%3a1.02.185-3ubuntu2_s390x.deb ...
225s Unpacking dmsetup (2:1.02.185-3ubuntu2) over (2:1.02.185-3ubuntu1) ...
225s Preparing to unpack .../003-eject_2.39.3-9ubuntu2_s390x.deb ...
225s Unpacking eject (2.39.3-9ubuntu2) over (2.39.3-6ubuntu2) ...
225s Preparing to unpack .../004-krb5-locales_1.20.1-6ubuntu1_all.deb ...
225s Unpacking krb5-locales (1.20.1-6ubuntu1) over (1.20.1-5build1) ...
225s Preparing to unpack .../005-libglib2.0-data_2.79.3-3ubuntu5_all.deb ...
225s Unpacking libglib2.0-data (2.79.3-3ubuntu5) over (2.79.2-1~ubuntu1) ...
225s Preparing to unpack .../006-libslang2_2.3.3-3build1_s390x.deb ...
225s Unpacking libslang2:s390x (2.3.3-3build1) over (2.3.3-3) ...
225s Preparing to unpack .../007-libtext-charwidth-perl_0.04-11build2_s390x.deb ...
225s Unpacking libtext-charwidth-perl:s390x (0.04-11build2) over (0.04-11build1) ...
225s Preparing to unpack .../008-libtext-iconv-perl_1.7-8build2_s390x.deb ...
225s Unpacking libtext-iconv-perl:s390x (1.7-8build2) over (1.7-8build1) ...
225s Preparing to unpack .../009-python-apt-common_2.7.7_all.deb ...
225s Unpacking python-apt-common (2.7.7) over (2.7.6) ...
225s Preparing to unpack .../010-python3-setuptools_68.1.2-2ubuntu1_all.deb ...
225s Unpacking python3-setuptools (68.1.2-2ubuntu1) over (68.1.2-2) ...
225s Preparing to unpack .../011-python3-pkg-resources_68.1.2-2ubuntu1_all.deb ...
225s Unpacking python3-pkg-resources (68.1.2-2ubuntu1) over (68.1.2-2) ...
225s Preparing to unpack .../012-rsyslog_8.2312.0-3ubuntu7_s390x.deb ...
225s Unpacking rsyslog (8.2312.0-3ubuntu7) over (8.2312.0-3ubuntu3) ...
225s Preparing to unpack .../013-vim-tiny_2%3a9.1.0016-1ubuntu6_s390x.deb ...
225s Unpacking vim-tiny (2:9.1.0016-1ubuntu6) over (2:9.1.0016-1ubuntu2) ...
225s Preparing to unpack .../014-vim-common_2%3a9.1.0016-1ubuntu6_all.deb ...
225s Unpacking vim-common (2:9.1.0016-1ubuntu6) over (2:9.1.0016-1ubuntu2) ...
225s Selecting previously unselected package xdg-user-dirs.
225s Preparing to unpack .../015-xdg-user-dirs_0.18-1_s390x.deb ...
225s Unpacking xdg-user-dirs (0.18-1) ...
225s Preparing to unpack .../016-xxd_2%3a9.1.0016-1ubuntu6_s390x.deb ...
225s Unpacking xxd (2:9.1.0016-1ubuntu6) over (2:9.1.0016-1ubuntu2) ...
225s Preparing to unpack .../017-apparmor_4.0.0-beta3-0ubuntu2_s390x.deb ...
226s Unpacking apparmor (4.0.0-beta3-0ubuntu2) over (4.0.0~alpha4-0ubuntu1) ...
226s Preparing to unpack .../018-ftp_20230507-2build1_all.deb ...
226s Unpacking ftp (20230507-2build1) over (20230507-2) ...
226s Preparing to unpack .../019-inetutils-telnet_2%3a2.5-3ubuntu3_s390x.deb ...
226s Unpacking inetutils-telnet (2:2.5-3ubuntu3) over (2:2.5-3ubuntu1) ...
226s Preparing to unpack .../020-info_7.1-3build1_s390x.deb ...
226s Unpacking info (7.1-3build1) over (7.1-3) ...
226s Preparing to unpack .../021-libxmuu1_2%3a1.1.3-3build1_s390x.deb ...
226s Unpacking libxmuu1:s390x (2:1.1.3-3build1) over (2:1.1.3-3) ...
226s Preparing to unpack .../022-lshw_02.19.git.2021.06.19.996aaad9c7-2build2_s390x.deb ...
226s Unpacking lshw (02.19.git.2021.06.19.996aaad9c7-2build2) over (02.19.git.2021.06.19.996aaad9c7-2build1) ...
226s Selecting previously unselected package manpages.
226s Preparing to unpack .../023-manpages_6.05.01-1_all.deb ...
226s Unpacking manpages (6.05.01-1) ...
226s Preparing to unpack .../024-mtr-tiny_0.95-1.1build1_s390x.deb ...
226s Unpacking mtr-tiny (0.95-1.1build1) over (0.95-1.1) ...
226s Preparing to unpack .../025-plymouth-theme-ubuntu-text_24.004.60-1ubuntu6_s390x.deb ...
226s Unpacking plymouth-theme-ubuntu-text (24.004.60-1ubuntu6) over (24.004.60-1ubuntu3) ...
226s Preparing to unpack .../026-plymouth_24.004.60-1ubuntu6_s390x.deb ...
226s Unpacking plymouth (24.004.60-1ubuntu6) over (24.004.60-1ubuntu3) ...
226s Preparing to unpack .../027-telnet_0.17+2.5-3ubuntu3_all.deb ...
226s Unpacking telnet (0.17+2.5-3ubuntu3) over (0.17+2.5-3ubuntu1) ...
226s Preparing to unpack .../028-usb.ids_2024.03.18-1_all.deb ...
226s Unpacking usb.ids (2024.03.18-1) over (2024.01.30-1) ...
226s Preparing to unpack .../029-xz-utils_5.6.0-0.2_s390x.deb ...
226s Unpacking xz-utils (5.6.0-0.2) over (5.4.5-0.3) ...
226s Preparing to unpack .../030-libctf0_2.42-4ubuntu1_s390x.deb ...
226s Unpacking libctf0:s390x (2.42-4ubuntu1) over (2.42-3ubuntu1) ...
226s Preparing to unpack .../031-libctf-nobfd0_2.42-4ubuntu1_s390x.deb ...
226s Unpacking libctf-nobfd0:s390x (2.42-4ubuntu1) over (2.42-3ubuntu1) ...
226s Preparing to unpack .../032-binutils-s390x-linux-gnu_2.42-4ubuntu1_s390x.deb ...
226s Unpacking binutils-s390x-linux-gnu (2.42-4ubuntu1) over (2.42-3ubuntu1) ...
226s Preparing to unpack .../033-libbinutils_2.42-4ubuntu1_s390x.deb ...
226s Unpacking libbinutils:s390x (2.42-4ubuntu1) over (2.42-3ubuntu1) ...
226s Preparing to unpack .../034-binutils_2.42-4ubuntu1_s390x.deb ...
226s Unpacking binutils (2.42-4ubuntu1) over (2.42-3ubuntu1) ...
226s Preparing to unpack .../035-binutils-common_2.42-4ubuntu1_s390x.deb ...
226s Unpacking binutils-common:s390x (2.42-4ubuntu1) over (2.42-3ubuntu1) ...
226s Preparing to unpack .../036-libsframe1_2.42-4ubuntu1_s390x.deb ...
226s Unpacking libsframe1:s390x (2.42-4ubuntu1) over (2.42-3ubuntu1) ...
226s Selecting previously unselected package libllvm18:s390x.
226s Preparing to unpack .../037-libllvm18_1%3a18.1.2-1ubuntu2_s390x.deb ...
226s Unpacking libllvm18:s390x (1:18.1.2-1ubuntu2) ...
227s Selecting previously unselected package libclang-cpp18.
227s Preparing to unpack .../038-libclang-cpp18_1%3a18.1.2-1ubuntu2_s390x.deb ...
227s Unpacking libclang-cpp18 (1:18.1.2-1ubuntu2) ...
228s Selecting previously unselected package libbpfcc:s390x.
228s Preparing to unpack .../039-libbpfcc_0.29.1+ds-1ubuntu4_s390x.deb ...
228s Unpacking libbpfcc:s390x (0.29.1+ds-1ubuntu4) ...
228s Selecting previously unselected package python3-bpfcc.
228s Preparing to unpack .../040-python3-bpfcc_0.29.1+ds-1ubuntu4_all.deb ...
228s Unpacking python3-bpfcc (0.29.1+ds-1ubuntu4) ...
228s Selecting previously unselected package ieee-data.
228s Preparing to unpack .../041-ieee-data_20220827.1_all.deb ...
228s Unpacking ieee-data (20220827.1) ...
228s Selecting previously unselected package python3-netaddr.
228s Preparing to unpack .../042-python3-netaddr_0.8.0-2ubuntu1_all.deb ...
228s Unpacking python3-netaddr (0.8.0-2ubuntu1) ...
228s Selecting previously unselected package bpfcc-tools.
228s Preparing to unpack .../043-bpfcc-tools_0.29.1+ds-1ubuntu4_all.deb ...
228s Unpacking bpfcc-tools (0.29.1+ds-1ubuntu4) ...
228s Selecting previously unselected package libclang1-18.
228s Preparing to unpack .../044-libclang1-18_1%3a18.1.2-1ubuntu2_s390x.deb ...
228s Unpacking libclang1-18 (1:18.1.2-1ubuntu2) ...
228s Selecting previously unselected package libdw1t64:s390x.
228s Preparing to unpack .../045-libdw1t64_0.190-1.1build2_s390x.deb ...
228s Unpacking libdw1t64:s390x (0.190-1.1build2) ...
229s Selecting previously unselected package bpftrace.
229s Preparing to unpack .../046-bpftrace_0.20.2-1ubuntu1_s390x.deb ...
229s Unpacking bpftrace (0.20.2-1ubuntu1) ...
229s Preparing to unpack .../047-cryptsetup-bin_2%3a2.7.0-1ubuntu2_s390x.deb ...
229s Unpacking cryptsetup-bin (2:2.7.0-1ubuntu2) over (2:2.7.0-1ubuntu1) ...
229s Preparing to unpack .../048-dpkg-dev_1.22.6ubuntu5_all.deb ...
229s Unpacking dpkg-dev (1.22.6ubuntu5) over (1.22.4ubuntu5) ...
229s Preparing to unpack .../049-libdpkg-perl_1.22.6ubuntu5_all.deb ...
229s Unpacking libdpkg-perl (1.22.6ubuntu5) over (1.22.4ubuntu5) ...
229s Selecting previously unselected package fonts-dejavu-mono.
229s Preparing to unpack .../050-fonts-dejavu-mono_2.37-8_all.deb ...
229s Unpacking fonts-dejavu-mono (2.37-8) ...
229s Selecting previously unselected package fonts-dejavu-core.
229s Preparing to unpack .../051-fonts-dejavu-core_2.37-8_all.deb ...
229s Unpacking fonts-dejavu-core (2.37-8) ...
229s Selecting previously unselected package fontconfig-config.
229s Preparing to unpack .../052-fontconfig-config_2.15.0-1.1ubuntu1_s390x.deb ...
229s Unpacking fontconfig-config (2.15.0-1.1ubuntu1) ...
229s Preparing to unpack .../053-gnupg-l10n_2.4.4-2ubuntu15_all.deb ...
229s Unpacking gnupg-l10n (2.4.4-2ubuntu15) over (2.4.4-2ubuntu7) ...
229s Selecting previously unselected package hwdata.
229s Preparing to unpack .../054-hwdata_0.379-1_all.deb ...
229s Unpacking hwdata (0.379-1) ...
229s Preparing to unpack .../055-libibverbs1_50.0-2build1_s390x.deb ...
229s Unpacking libibverbs1:s390x (50.0-2build1) over (50.0-2) ...
229s Preparing to unpack .../056-ibverbs-providers_50.0-2build1_s390x.deb ...
229s Unpacking ibverbs-providers:s390x (50.0-2build1) over (50.0-2) ...
229s Preparing to unpack .../057-jq_1.7.1-3_s390x.deb ...
229s Unpacking jq (1.7.1-3) over (1.7.1-2) ...
229s Preparing to unpack .../058-libjq1_1.7.1-3_s390x.deb ...
229s Unpacking libjq1:s390x (1.7.1-3) over (1.7.1-2) ...
229s Selecting previously unselected package libaio1t64:s390x.
229s Preparing to unpack .../059-libaio1t64_0.3.113-6_s390x.deb ...
229s Unpacking libaio1t64:s390x (0.3.113-6) ...
229s Selecting previously unselected package libatm1t64:s390x.
229s Preparing to unpack .../060-libatm1t64_1%3a2.5.1-5.1_s390x.deb ...
229s Unpacking libatm1t64:s390x (1:2.5.1-5.1) ...
229s Selecting previously unselected package libc-dev-bin.
229s Preparing to unpack .../061-libc-dev-bin_2.39-0ubuntu6_s390x.deb ...
229s Unpacking libc-dev-bin (2.39-0ubuntu6) ...
229s Selecting previously unselected package libfreetype6:s390x.
229s Preparing to unpack .../062-libfreetype6_2.13.2+dfsg-1build2_s390x.deb ...
229s Unpacking libfreetype6:s390x (2.13.2+dfsg-1build2) ...
229s Selecting previously unselected package libfontconfig1:s390x.
229s Preparing to unpack .../063-libfontconfig1_2.15.0-1.1ubuntu1_s390x.deb ...
229s Unpacking libfontconfig1:s390x (2.15.0-1.1ubuntu1) ...
229s Selecting previously unselected package libjpeg-turbo8:s390x.
229s Preparing to unpack .../064-libjpeg-turbo8_2.1.5-2ubuntu1_s390x.deb ...
229s Unpacking libjpeg-turbo8:s390x (2.1.5-2ubuntu1) ...
229s Selecting previously unselected package libjpeg8:s390x.
229s Preparing to unpack .../065-libjpeg8_8c-2ubuntu11_s390x.deb ...
229s Unpacking libjpeg8:s390x (8c-2ubuntu11) ...
229s Selecting previously unselected package libdeflate0:s390x.
229s Preparing to unpack .../066-libdeflate0_1.19-1_s390x.deb ...
229s Unpacking libdeflate0:s390x (1.19-1) ...
229s Selecting previously unselected package libjbig0:s390x.
229s Preparing to unpack .../067-libjbig0_2.1-6.1ubuntu1_s390x.deb ...
229s Unpacking libjbig0:s390x (2.1-6.1ubuntu1) ...
229s Selecting previously unselected package libsharpyuv0:s390x.
229s Preparing to unpack .../068-libsharpyuv0_1.3.2-0.4build2_s390x.deb ...
229s Unpacking libsharpyuv0:s390x (1.3.2-0.4build2) ...
229s Selecting previously unselected package libwebp7:s390x.
229s Preparing to unpack .../069-libwebp7_1.3.2-0.4build2_s390x.deb ...
229s Unpacking libwebp7:s390x (1.3.2-0.4build2) ...
229s Selecting previously unselected package libtiff6:s390x.
229s Preparing to unpack .../070-libtiff6_4.5.1+git230720-4ubuntu1_s390x.deb ...
229s Unpacking libtiff6:s390x (4.5.1+git230720-4ubuntu1) ...
229s Selecting previously unselected package libxpm4:s390x.
229s Preparing to unpack .../071-libxpm4_1%3a3.5.17-1build1_s390x.deb ...
229s Unpacking libxpm4:s390x (1:3.5.17-1build1) ...
229s Selecting previously unselected package libgd3:s390x.
229s Preparing to unpack .../072-libgd3_2.3.3-9ubuntu3_s390x.deb ...
229s Unpacking libgd3:s390x (2.3.3-9ubuntu3) ...
229s Selecting previously unselected package libc-devtools.
229s Preparing to unpack .../073-libc-devtools_2.39-0ubuntu6_s390x.deb ...
229s Unpacking libc-devtools (2.39-0ubuntu6) ...
229s Selecting previously unselected package linux-libc-dev:s390x.
229s Preparing to unpack .../074-linux-libc-dev_6.8.0-20.20_s390x.deb ...
229s Unpacking linux-libc-dev:s390x (6.8.0-20.20) ...
229s Selecting previously unselected package libcrypt-dev:s390x.
229s Preparing to unpack .../075-libcrypt-dev_1%3a4.4.36-4_s390x.deb ...
229s Unpacking libcrypt-dev:s390x (1:4.4.36-4) ...
229s Selecting previously unselected package rpcsvc-proto.
229s Preparing to unpack .../076-rpcsvc-proto_1.4.2-0ubuntu6_s390x.deb ...
229s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ...
229s Selecting previously unselected package libc6-dev:s390x.
229s Preparing to unpack .../077-libc6-dev_2.39-0ubuntu6_s390x.deb ...
229s Unpacking libc6-dev:s390x (2.39-0ubuntu6) ...
230s Preparing to unpack .../078-libevent-core-2.1-7_2.1.12-stable-9build1_s390x.deb ...
230s Unpacking libevent-core-2.1-7:s390x (2.1.12-stable-9build1) over (2.1.12-stable-9) ...
230s Preparing to unpack .../079-libftdi1-2_1.5-6build4_s390x.deb ...
230s Unpacking libftdi1-2:s390x (1.5-6build4) over (1.5-6build3) ...
230s Preparing to unpack .../080-libldap-common_2.6.7+dfsg-1~exp1ubuntu6_all.deb ...
230s Unpacking libldap-common (2.6.7+dfsg-1~exp1ubuntu6) over (2.6.7+dfsg-1~exp1ubuntu1) ...
230s Selecting previously unselected package linux-modules-6.8.0-20-generic.
230s Preparing to unpack .../081-linux-modules-6.8.0-20-generic_6.8.0-20.20_s390x.deb ...
230s Unpacking linux-modules-6.8.0-20-generic (6.8.0-20.20) ...
230s Selecting previously unselected package linux-image-6.8.0-20-generic.
230s Preparing to unpack .../082-linux-image-6.8.0-20-generic_6.8.0-20.20_s390x.deb ...
230s Unpacking linux-image-6.8.0-20-generic (6.8.0-20.20) ...
230s Selecting previously unselected package linux-modules-extra-6.8.0-20-generic.
230s Preparing to unpack .../083-linux-modules-extra-6.8.0-20-generic_6.8.0-20.20_s390x.deb ...
230s Unpacking linux-modules-extra-6.8.0-20-generic (6.8.0-20.20) ...
230s Preparing to unpack .../084-linux-generic_6.8.0-20.20+1_s390x.deb ...
230s Unpacking linux-generic (6.8.0-20.20+1) over (6.8.0-11.11+1) ...
230s Preparing to unpack .../085-linux-image-generic_6.8.0-20.20+1_s390x.deb ...
230s Unpacking linux-image-generic (6.8.0-20.20+1) over (6.8.0-11.11+1) ...
230s Preparing to unpack .../086-linux-virtual_6.8.0-20.20+1_s390x.deb ...
230s Unpacking linux-virtual (6.8.0-20.20+1) over (6.8.0-11.11+1) ...
230s Preparing to unpack .../087-linux-image-virtual_6.8.0-20.20+1_s390x.deb ...
230s Unpacking linux-image-virtual (6.8.0-20.20+1) over (6.8.0-11.11+1) ...
230s Preparing to unpack .../088-linux-headers-virtual_6.8.0-20.20+1_s390x.deb ...
230s Unpacking linux-headers-virtual (6.8.0-20.20+1) over (6.8.0-11.11+1) ...
230s Selecting previously unselected package linux-headers-6.8.0-20.
230s Preparing to unpack .../089-linux-headers-6.8.0-20_6.8.0-20.20_all.deb ...
230s Unpacking linux-headers-6.8.0-20 (6.8.0-20.20) ...
232s Selecting previously unselected package linux-headers-6.8.0-20-generic.
232s Preparing to unpack .../090-linux-headers-6.8.0-20-generic_6.8.0-20.20_s390x.deb ...
232s Unpacking linux-headers-6.8.0-20-generic (6.8.0-20.20) ...
233s Preparing to unpack .../091-linux-headers-generic_6.8.0-20.20+1_s390x.deb ...
233s Unpacking linux-headers-generic (6.8.0-20.20+1) over (6.8.0-11.11+1) ...
233s Selecting previously unselected package linux-tools-common.
233s Preparing to unpack .../092-linux-tools-common_6.8.0-20.20_all.deb ...
233s Unpacking linux-tools-common (6.8.0-20.20) ...
233s Selecting previously unselected package linux-tools-6.8.0-20.
233s Preparing to unpack .../093-linux-tools-6.8.0-20_6.8.0-20.20_s390x.deb ...
233s Unpacking linux-tools-6.8.0-20 (6.8.0-20.20) ...
233s Selecting previously unselected package linux-tools-6.8.0-20-generic.
233s Preparing to unpack .../094-linux-tools-6.8.0-20-generic_6.8.0-20.20_s390x.deb ...
233s Unpacking linux-tools-6.8.0-20-generic (6.8.0-20.20) ...
233s Selecting previously unselected package manpages-dev.
233s Preparing to unpack .../095-manpages-dev_6.05.01-1_all.deb ...
233s Unpacking manpages-dev (6.05.01-1) ...
233s Preparing to unpack .../096-python3-distutils_3.12.2-3ubuntu1.1_all.deb ...
233s Unpacking python3-distutils (3.12.2-3ubuntu1.1) over (3.11.5-1) ...
233s Preparing to unpack .../097-python3-lib2to3_3.12.2-3ubuntu1.1_all.deb ...
233s Unpacking python3-lib2to3 (3.12.2-3ubuntu1.1) over (3.11.5-1) ...
233s Preparing to unpack .../098-python3-pyrsistent_0.20.0-1build1_s390x.deb ...
233s Unpacking python3-pyrsistent:s390x (0.20.0-1build1) over (0.20.0-1) ...
233s Preparing to unpack .../099-python3-typing-extensions_4.10.0-1_all.deb ...
234s Unpacking python3-typing-extensions (4.10.0-1) over (4.9.0-1) ...
234s Preparing to unpack .../100-s390-tools-data_2.31.0-0ubuntu3_all.deb ...
234s Unpacking s390-tools-data (2.31.0-0ubuntu3) over (2.31.0-0ubuntu1) ...
234s Selecting previously unselected package ubuntu-kernel-accessories.
234s Preparing to unpack .../101-ubuntu-kernel-accessories_1.536build1_s390x.deb ...
234s Unpacking ubuntu-kernel-accessories (1.536build1) ...
234s Preparing to unpack .../102-kpartx_0.9.4-5ubuntu6_s390x.deb ...
234s Unpacking kpartx (0.9.4-5ubuntu6) over (0.9.4-5ubuntu3) ...
234s Setting up cryptsetup-bin (2:2.7.0-1ubuntu2) ...
234s Setting up pinentry-curses (1.2.1-3ubuntu4) ...
234s Setting up motd-news-config (13ubuntu8) ...
234s Setting up libtext-iconv-perl:s390x (1.7-8build2) ...
234s Setting up libtext-charwidth-perl:s390x (0.04-11build2) ...
234s Setting up libsharpyuv0:s390x (1.3.2-0.4build2) ...
234s Setting up liburcu8t64:s390x (0.14.0-3.1) ...
234s Setting up tcpdump (4.99.4-3ubuntu2) ...
234s Setting up libibverbs1:s390x (50.0-2build1) ...
234s Setting up systemd-sysv (255.4-1ubuntu5) ...
234s Setting up ubuntu-kernel-accessories (1.536build1) ...
234s Setting up libapparmor1:s390x (4.0.0-beta3-0ubuntu2) ...
234s Setting up libatm1t64:s390x (1:2.5.1-5.1) ...
234s Setting up libgdbm6t64:s390x (1.23-5.1) ...
234s Setting up bsdextrautils (2.39.3-9ubuntu2) ...
234s Setting up libxpm4:s390x (1:3.5.17-1build1) ...
234s Setting up libgdbm-compat4t64:s390x (1.23-5.1) ...
234s Setting up xdg-user-dirs (0.18-1) ...
234s Setting up ibverbs-providers:s390x (50.0-2build1) ...
234s Setting up linux-headers-6.8.0-20 (6.8.0-20.20) ...
234s Setting up libmagic-mgc (1:5.45-3) ...
234s Setting up gawk (1:5.2.1-2build2) ...
234s Setting up libjq1:s390x (1.7.1-3) ...
234s Setting up manpages (6.05.01-1) ...
234s Setting up libtirpc-common (1.3.4+ds-1.1) ...
234s Setting up libbrotli1:s390x (1.1.0-2build1) ...
234s Setting up libsqlite3-0:s390x (3.45.1-1ubuntu1) ...
234s Setting up libsasl2-modules:s390x (2.1.28+dfsg1-5ubuntu1) ...
234s Setting up libuv1t64:s390x (1.48.0-1.1) ...
234s Setting up libmagic1t64:s390x (1:5.45-3) ...
234s Setting up rsyslog (8.2312.0-3ubuntu7) ...
234s info: The user `syslog' is already a member of `adm'.
235s Setting up binutils-common:s390x (2.42-4ubuntu1) ...
235s Setting up libpsl5t64:s390x (0.21.2-1.1) ...
235s Setting up libnghttp2-14:s390x (1.59.0-1build1) ...
235s Setting up libdeflate0:s390x (1.19-1) ...
235s Setting up linux-libc-dev:s390x (6.8.0-20.20) ...
235s Setting up libreiserfscore0t64 (1:3.6.27-7.1) ...
235s Setting up libctf-nobfd0:s390x (2.42-4ubuntu1) ...
235s Setting up libnss-systemd:s390x (255.4-1ubuntu5) ...
235s Setting up krb5-locales (1.20.1-6ubuntu1) ...
235s Setting up file (1:5.45-3) ...
235s Setting up kmod (31+20240202-2ubuntu4) ...
235s Setting up lshw (02.19.git.2021.06.19.996aaad9c7-2build2) ...
235s Setting up libldap-common (2.6.7+dfsg-1~exp1ubuntu6) ...
235s Setting up libprotobuf-c1:s390x (1.4.1-1ubuntu3) ...
235s Setting up libjbig0:s390x (2.1-6.1ubuntu1) ...
235s Setting up xxd (2:9.1.0016-1ubuntu6) ...
235s Setting up libsframe1:s390x (2.42-4ubuntu1) ...
235s Setting up libelf1t64:s390x (0.190-1.1build2) ...
235s Setting up libkrb5support0:s390x (1.20.1-6ubuntu1) ...
235s Setting up libdw1t64:s390x (0.190-1.1build2) ...
235s Setting up linux-headers-6.8.0-20-generic (6.8.0-20.20) ...
235s Setting up eject (2.39.3-9ubuntu2) ...
235s Setting up apparmor (4.0.0-beta3-0ubuntu2) ...
235s Installing new version of config file /etc/apparmor.d/abstractions/authentication ...
235s Installing new version of config file /etc/apparmor.d/abstractions/crypto ...
235s Installing new version of config file /etc/apparmor.d/abstractions/kde-open5 ...
235s Installing new version of config file /etc/apparmor.d/abstractions/openssl ...
235s Installing new version of config file /etc/apparmor.d/code ...
235s Installing new version of config file /etc/apparmor.d/firefox ...
236s Reloading AppArmor profiles 
236s Setting up libglib2.0-0t64:s390x (2.79.3-3ubuntu5) ...
236s No schema files found: doing nothing.
236s Setting up libglib2.0-data (2.79.3-3ubuntu5) ...
236s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ...
236s Setting up vim-common (2:9.1.0016-1ubuntu6) ...
236s Setting up gcc-13-base:s390x (13.2.0-21ubuntu1) ...
236s Setting up libqrtr-glib0:s390x (1.2.2-1ubuntu3) ...
236s Setting up libslang2:s390x (2.3.3-3build1) ...
236s Setting up libnvme1t64 (1.8-3) ...
236s Setting up mtr-tiny (0.95-1.1build1) ...
237s Setting up gnupg-l10n (2.4.4-2ubuntu15) ...
237s Setting up librtmp1:s390x (2.4+20151223.gitfa8646d.1-2build6) ...
237s Setting up libdbus-1-3:s390x (1.14.10-4ubuntu2) ...
237s Setting up xz-utils (5.6.0-0.2) ...
237s Setting up perl-modules-5.38 (5.38.2-3.2) ...
237s Setting up libproc2-0:s390x (2:4.0.4-4ubuntu2) ...
237s Setting up libblockdev-utils3:s390x (3.1.0-1build1) ...
237s Setting up fonts-dejavu-mono (2.37-8) ...
237s Setting up libpng16-16t64:s390x (1.6.43-3) ...
237s Setting up systemd-timesyncd (255.4-1ubuntu5) ...
237s Setting up libevent-core-2.1-7:s390x (2.1.12-stable-9build1) ...
237s Setting up udev (255.4-1ubuntu5) ...
238s Setting up libss2:s390x (1.47.0-2.4~exp1ubuntu2) ...
238s Setting up usb.ids (2024.03.18-1) ...
238s Setting up sudo (1.9.15p5-3ubuntu3) ...
238s Setting up fonts-dejavu-core (2.37-8) ...
238s Setting up dhcpcd-base (1:10.0.6-1ubuntu2) ...
238s Setting up gir1.2-glib-2.0:s390x (2.79.3-3ubuntu5) ...
238s Setting up libk5crypto3:s390x (1.20.1-6ubuntu1) ...
238s Setting up libjpeg-turbo8:s390x (2.1.5-2ubuntu1) ...
238s Setting up logsave (1.47.0-2.4~exp1ubuntu2) ...
238s Setting up libwebp7:s390x (1.3.2-0.4build2) ...
238s Setting up libfdisk1:s390x (2.39.3-9ubuntu2) ...
238s Setting up libdb5.3t64:s390x (5.3.28+dfsg2-6) ...
238s Setting up libblockdev-nvme3:s390x (3.1.0-1build1) ...
238s Setting up libdevmapper1.02.1:s390x (2:1.02.185-3ubuntu2) ...
238s Setting up libblockdev-fs3:s390x (3.1.0-1build1) ...
238s Setting up libaio1t64:s390x (0.3.113-6) ...
238s Setting up python-apt-common (2.7.7) ...
238s Setting up mount (2.39.3-9ubuntu2) ...
238s Setting up dmsetup (2:1.02.185-3ubuntu2) ...
238s Setting up uuid-runtime (2.39.3-9ubuntu2) ...
239s uuidd.service is a disabled or a static unit not running, not starting it.
239s Setting up libmm-glib0:s390x (1.23.4-0ubuntu1) ...
239s Setting up groff-base (1.23.0-3build1) ...
239s Setting up libcrypt-dev:s390x (1:4.4.36-4) ...
239s Setting up libplymouth5:s390x (24.004.60-1ubuntu6) ...
239s Setting up dbus-session-bus-common (1.14.10-4ubuntu2) ...
239s Setting up kpartx (0.9.4-5ubuntu6) ...
239s Setting up jq (1.7.1-3) ...
239s Setting up procps (2:4.0.4-4ubuntu2) ...
239s Setting up gpgconf (2.4.4-2ubuntu15) ...
239s Setting up libgirepository-1.0-1:s390x (1.79.1-1ubuntu6) ...
239s Setting up libjson-glib-1.0-common (1.8.0-2build1) ...
239s Setting up libkrb5-3:s390x (1.20.1-6ubuntu1) ...
239s Setting up libpython3.11-minimal:s390x (3.11.8-1build4) ...
239s Setting up libusb-1.0-0:s390x (2:1.0.27-1) ...
239s Setting up libperl5.38t64:s390x (5.38.2-3.2) ...
239s Setting up tnftp (20230507-2build1) ...
239s Setting up libbinutils:s390x (2.42-4ubuntu1) ...
239s Setting up dbus-system-bus-common (1.14.10-4ubuntu2) ...
239s Setting up libfido2-1:s390x (1.14.0-1build1) ...
239s Setting up libc-dev-bin (2.39-0ubuntu6) ...
239s Setting up openssl (3.0.13-0ubuntu2) ...
239s Setting up linux-modules-6.8.0-20-generic (6.8.0-20.20) ...
239s Setting up readline-common (8.2-4) ...
239s Setting up libxml2:s390x (2.9.14+dfsg-1.3ubuntu2) ...
239s Setting up libxmuu1:s390x (2:1.1.3-3build1) ...
239s Setting up dbus-bin (1.14.10-4ubuntu2) ...
239s Setting up info (7.1-3build1) ...
239s Setting up liblocale-gettext-perl (1.07-6ubuntu4) ...
239s Setting up gpg (2.4.4-2ubuntu15) ...
239s Setting up libgudev-1.0-0:s390x (1:238-3ubuntu2) ...
239s Setting up libpolkit-gobject-1-0:s390x (124-1ubuntu1) ...
239s Setting up libbpf1:s390x (1:1.3.0-2build1) ...
239s Setting up libmbim-glib4:s390x (1.31.2-0ubuntu2) ...
239s Setting up rsync (3.2.7-1build1) ...
240s rsync.service is a disabled or a static unit not running, not starting it.
240s Setting up libudisks2-0:s390x (2.10.1-6) ...
240s Setting up bolt (0.9.6-2build1) ...
240s bolt.service is a disabled or a static unit not running, not starting it.
240s Setting up s390-tools-data (2.31.0-0ubuntu3) ...
240s Setting up libllvm18:s390x (1:18.1.2-1ubuntu2) ...
240s Setting up gnupg-utils (2.4.4-2ubuntu15) ...
240s Setting up initramfs-tools-bin (0.142ubuntu23) ...
240s Setting up libctf0:s390x (2.42-4ubuntu1) ...
240s Setting up libjpeg8:s390x (8c-2ubuntu11) ...
240s Setting up python3.11-minimal (3.11.8-1build4) ...
241s Setting up libclang1-18 (1:18.1.2-1ubuntu2) ...
241s Setting up manpages-dev (6.05.01-1) ...
241s Setting up linux-modules-extra-6.8.0-20-generic (6.8.0-20.20) ...
242s Setting up apt-utils (2.7.14) ...
242s Setting up binutils-s390x-linux-gnu (2.42-4ubuntu1) ...
242s Setting up gpg-agent (2.4.4-2ubuntu15) ...
242s Setting up libpython3.12-stdlib:s390x (3.12.2-4build3) ...
242s Setting up libblockdev-mdraid3:s390x (3.1.0-1build1) ...
242s Setting up wget (1.21.4-1ubuntu2) ...
242s Setting up linux-image-6.8.0-20-generic (6.8.0-20.20) ...
243s I: /boot/vmlinuz is now a symlink to vmlinuz-6.8.0-20-generic
243s I: /boot/initrd.img is now a symlink to initrd.img-6.8.0-20-generic
243s Setting up libblockdev-swap3:s390x (3.1.0-1build1) ...
243s Setting up plymouth (24.004.60-1ubuntu6) ...
243s update-initramfs: Generating /boot/initrd.img-6.8.0-11-generic
243s W: No lz4 in /usr/bin:/sbin:/bin, using gzip
246s Not invoking zipl: initrd doesn't exist yet
246s update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults
247s update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults
247s Setting up fontconfig-config (2.15.0-1.1ubuntu1) ...
247s Setting up libxmlb2:s390x (0.3.15-1build1) ...
247s Setting up btrfs-progs (6.6.3-1.1build1) ...
247s Setting up libpython3.11-stdlib:s390x (3.11.8-1build4) ...
247s Setting up python3.12 (3.12.2-4build3) ...
248s Setting up libblockdev-loop3:s390x (3.1.0-1build1) ...
248s Setting up gpgsm (2.4.4-2ubuntu15) ...
248s Setting up inetutils-telnet (2:2.5-3ubuntu3) ...
248s Setting up e2fsprogs (1.47.0-2.4~exp1ubuntu2) ...
248s update-initramfs: deferring update (trigger activated)
249s e2scrub_all.service is a disabled or a static unit not running, not starting it.
249s Setting up libparted2t64:s390x (3.6-3.1build2) ...
249s Setting up linux-headers-generic (6.8.0-20.20+1) ...
249s Setting up dbus-daemon (1.14.10-4ubuntu2) ...
249s Setting up binutils (2.42-4ubuntu1) ...
249s Setting up libmbim-proxy (1.31.2-0ubuntu2) ...
249s Setting up vim-tiny (2:9.1.0016-1ubuntu6) ...
249s Setting up libnetplan1:s390x (1.0-1) ...
249s Setting up man-db (2.12.0-3build4) ...
249s Updating database of manual pages ...
251s man-db.service is a disabled or a static unit not running, not starting it.
251s Setting up libblockdev3:s390x (3.1.0-1build1) ...
251s Setting up fdisk (2.39.3-9ubuntu2) ...
251s Setting up multipath-tools (0.9.4-5ubuntu6) ...
251s Setting up libjson-glib-1.0-0:s390x (1.8.0-2build1) ...
251s Setting up libblockdev-part3:s390x (3.1.0-1build1) ...
251s Setting up libsasl2-modules-db:s390x (2.1.28+dfsg1-5ubuntu1) ...
251s Setting up hwdata (0.379-1) ...
251s Setting up libftdi1-2:s390x (1.5-6build4) ...
251s Setting up perl (5.38.2-3.2) ...
251s Setting up plymouth-theme-ubuntu-text (24.004.60-1ubuntu6) ...
251s update-initramfs: deferring update (trigger activated)
251s Setting up libfreetype6:s390x (2.13.2+dfsg-1build2) ...
251s Setting up gir1.2-girepository-2.0:s390x (1.79.1-1ubuntu6) ...
251s Setting up dbus (1.14.10-4ubuntu2) ...
251s A reboot is required to replace the running dbus-daemon.
251s Please reboot the system when convenient.
252s Setting up shared-mime-info (2.4-1build1) ...
252s Setting up libgssapi-krb5-2:s390x (1.20.1-6ubuntu1) ...
252s Setting up ftp (20230507-2build1) ...
252s Setting up keyboxd (2.4.4-2ubuntu15) ...
252s Setting up libdpkg-perl (1.22.6ubuntu5) ...
252s Setting up libsasl2-2:s390x (2.1.28+dfsg1-5ubuntu1) ...
252s Setting up libssh-4:s390x (0.10.6-2build1) ...
252s Setting up ieee-data (20220827.1) ...
252s Setting up libtiff6:s390x (4.5.1+git230720-4ubuntu1) ...
252s Setting up libpam-systemd:s390x (255.4-1ubuntu5) ...
252s Setting up libpolkit-agent-1-0:s390x (124-1ubuntu1) ...
252s Setting up libc6-dev:s390x (2.39-0ubuntu6) ...
252s Setting up libgpgme11t64:s390x (1.18.0-4.1ubuntu3) ...
252s Setting up libfontconfig1:s390x (2.15.0-1.1ubuntu1) ...
252s Setting up linux-image-virtual (6.8.0-20.20+1) ...
252s Setting up netplan-generator (1.0-1) ...
252s Removing 'diversion of /lib/systemd/system-generators/netplan to /lib/systemd/system-generators/netplan.usr-is-merged by netplan-generator'
252s Setting up initramfs-tools-core (0.142ubuntu23) ...
252s Setting up libclang-cpp18 (1:18.1.2-1ubuntu2) ...
252s Setting up libbpfcc:s390x (0.29.1+ds-1ubuntu4) ...
252s Setting up linux-tools-common (6.8.0-20.20) ...
252s Setting up libarchive13t64:s390x (3.7.2-1.1ubuntu2) ...
252s Setting up libldap2:s390x (2.6.7+dfsg-1~exp1ubuntu6) ...
252s Setting up libpython3-stdlib:s390x (3.12.2-0ubuntu1) ...
252s Setting up systemd-resolved (255.4-1ubuntu5) ...
253s Setting up python3.11 (3.11.8-1build4) ...
254s Setting up linux-image-generic (6.8.0-20.20+1) ...
254s Setting up telnet (0.17+2.5-3ubuntu3) ...
254s Setting up initramfs-tools (0.142ubuntu23) ...
254s update-initramfs: deferring update (trigger activated)
254s Setting up linux-headers-virtual (6.8.0-20.20+1) ...
254s Setting up linux-generic (6.8.0-20.20+1) ...
254s Setting up libcurl4t64:s390x (8.5.0-2ubuntu8) ...
254s Setting up bpftrace (0.20.2-1ubuntu1) ...
254s Setting up bind9-libs:s390x (1:9.18.24-0ubuntu3) ...
254s Setting up libtirpc3t64:s390x (1.3.4+ds-1.1) ...
254s Setting up e2fsprogs-l10n (1.47.0-2.4~exp1ubuntu2) ...
254s Setting up iproute2 (6.1.0-1ubuntu5) ...
254s Setting up openssh-client (1:9.6p1-3ubuntu11) ...
254s Setting up libgusb2:s390x (0.4.8-1build1) ...
254s Setting up libcurl3t64-gnutls:s390x (8.5.0-2ubuntu8) ...
254s Setting up parted (3.6-3.1build2) ...
254s Setting up libqmi-glib5:s390x (1.35.2-0ubuntu1) ...
254s Setting up linux-tools-6.8.0-20 (6.8.0-20.20) ...
254s Setting up python3 (3.12.2-0ubuntu1) ...
254s Setting up libjcat1:s390x (0.2.0-2build2) ...
254s Setting up dpkg-dev (1.22.6ubuntu5) ...
254s Setting up linux-virtual (6.8.0-20.20+1) ...
254s Setting up dirmngr (2.4.4-2ubuntu15) ...
254s Setting up dbus-user-session (1.14.10-4ubuntu2) ...
254s Setting up linux-tools-6.8.0-20-generic (6.8.0-20.20) ...
254s Setting up python3-cryptography (41.0.7-4build2) ...
255s Setting up python3-gi (3.47.0-3build1) ...
255s Setting up libgd3:s390x (2.3.3-9ubuntu3) ...
255s Setting up python3-typing-extensions (4.10.0-1) ...
255s Setting up lsof (4.95.0-1build2) ...
255s Setting up python3-pyrsistent:s390x (0.20.0-1build1) ...
255s Setting up python3-netaddr (0.8.0-2ubuntu1) ...
255s Setting up libnsl2:s390x (1.3.0-3build2) ...
255s Setting up gnupg (2.4.4-2ubuntu15) ...
255s Setting up python3-netplan (1.0-1) ...
255s Setting up curl (8.5.0-2ubuntu8) ...
255s Setting up libvolume-key1:s390x (0.3.12-7build1) ...
255s Setting up bind9-host (1:9.18.24-0ubuntu3) ...
255s Setting up python3-lib2to3 (3.12.2-3ubuntu1.1) ...
256s Setting up python3-bpfcc (0.29.1+ds-1ubuntu4) ...
256s Setting up libc-devtools (2.39-0ubuntu6) ...
256s Setting up python3-pkg-resources (68.1.2-2ubuntu1) ...
256s Setting up python3-distutils (3.12.2-3ubuntu1.1) ...
256s python3.12: can't get files for byte-compilation
256s Setting up openssh-sftp-server (1:9.6p1-3ubuntu11) ...
256s Setting up python3-dbus (1.3.2-5build2) ...
256s Setting up python3-setuptools (68.1.2-2ubuntu1) ...
257s Setting up gpg-wks-client (2.4.4-2ubuntu15) ...
257s Setting up openssh-server (1:9.6p1-3ubuntu11) ...
257s Replacing config file /etc/ssh/sshd_config with new version
258s Created symlink /etc/systemd/system/ssh.service.requires/ssh.socket → /usr/lib/systemd/system/ssh.socket.

259s Setting up libblockdev-crypto3:s390x (3.1.0-1build1) ...
259s Setting up python3-gdbm:s390x (3.12.2-3ubuntu1.1) ...
259s Setting up python3-apt (2.7.7) ...
260s Setting up libfwupd2:s390x (1.9.15-2) ...
260s Setting up python3-yaml (6.0.1-2build1) ...
260s Setting up libqmi-proxy (1.35.2-0ubuntu1) ...
260s Setting up netplan.io (1.0-1) ...
260s Setting up bpfcc-tools (0.29.1+ds-1ubuntu4) ...
260s Setting up bind9-dnsutils (1:9.18.24-0ubuntu3) ...
260s Setting up ubuntu-pro-client (31.2.2) ...
261s Setting up fwupd (1.9.15-2) ...
261s fwupd-offline-update.service is a disabled or a static unit not running, not starting it.
261s fwupd-refresh.service is a disabled or a static unit not running, not starting it.
261s fwupd.service is a disabled or a static unit not running, not starting it.
262s Setting up ubuntu-pro-client-l10n (31.2.2) ...
262s Setting up udisks2 (2.10.1-6) ...
262s Processing triggers for ufw (0.36.2-5) ...
262s Processing triggers for debianutils (5.17) ...
262s Processing triggers for install-info (7.1-3build1) ...
262s Processing triggers for libc-bin (2.39-0ubuntu6) ...
262s Processing triggers for linux-image-6.8.0-20-generic (6.8.0-20.20) ...
262s /etc/kernel/postinst.d/initramfs-tools:
262s update-initramfs: Generating /boot/initrd.img-6.8.0-20-generic
262s W: No lz4 in /usr/bin:/sbin:/bin, using gzip
266s Using config file '/etc/zipl.conf'
266s Building bootmap in '/boot'
266s Adding IPL section 'ubuntu' (default)
266s Preparing boot device for LD-IPL: vda (0000).
266s Done.
266s /etc/kernel/postinst.d/zz-zipl:
266s Using config file '/etc/zipl.conf'
266s Building bootmap in '/boot'
266s Adding IPL section 'ubuntu' (default)
266s Preparing boot device for LD-IPL: vda (0000).
266s Done.
266s Processing triggers for initramfs-tools (0.142ubuntu23) ...
266s update-initramfs: Generating /boot/initrd.img-6.8.0-20-generic
266s W: No lz4 in /usr/bin:/sbin:/bin, using gzip
269s Using config file '/etc/zipl.conf'
269s Building bootmap in '/boot'
269s Adding IPL section 'ubuntu' (default)
269s Preparing boot device for LD-IPL: vda (0000).
269s Done.
271s Reading package lists...
271s Building dependency tree...
271s Reading state information...
271s The following packages will be REMOVED:
271s   libaio1* libnetplan0* python3-distutils* python3-lib2to3*
271s 0 upgraded, 0 newly installed, 4 to remove and 1 not upgraded.
271s After this operation, 1445 kB disk space will be freed.
271s (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 ... 81786 files and directories currently installed.)
271s Removing libaio1:s390x (0.3.113-5) ...
271s Removing libnetplan0:s390x (0.107.1-3) ...
271s Removing python3-distutils (3.12.2-3ubuntu1.1) ...
271s Removing python3-lib2to3 (3.12.2-3ubuntu1.1) ...
272s Processing triggers for libc-bin (2.39-0ubuntu6) ...
272s autopkgtest [02:54:51]: rebooting testbed after setup commands that affected boot
301s autopkgtest [02:55:20]: testbed running kernel: Linux 6.8.0-20-generic #20-Ubuntu SMP Mon Mar 18 10:49:25 UTC 2024
303s autopkgtest [02:55:22]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge
305s Get:1 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (dsc) [1896 B]
305s Get:2 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (tar) [64.4 kB]
305s Get:3 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (diff) [3144 B]
305s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC
305s gpgv:                using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3
305s gpgv: Can't check signature: No public key
305s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found
305s autopkgtest [02:55:24]: testing package git-imerge version 1.2.0-5
305s autopkgtest [02:55:24]: build not needed
306s autopkgtest [02:55:25]: test pybuild-autopkgtest: preparing testbed
308s Reading package lists...
308s Building dependency tree...
308s Reading state information...
308s Starting pkgProblemResolver with broken count: 0
308s Starting 2 pkgProblemResolver with broken count: 0
308s Done
308s The following additional packages will be installed:
308s   autoconf automake autopoint autotools-dev build-essential cpp cpp-13
308s   cpp-13-s390x-linux-gnu cpp-s390x-linux-gnu debhelper debugedit dh-autoreconf
308s   dh-python dh-strip-nondeterminism dwz g++ g++-13 g++-13-s390x-linux-gnu
308s   g++-s390x-linux-gnu gcc gcc-13 gcc-13-s390x-linux-gnu gcc-s390x-linux-gnu
308s   gettext git git-imerge git-man intltool-debian libarchive-zip-perl libasan8
308s   libatomic1 libcc1-0 libdebhelper-perl liberror-perl
308s   libfile-stripnondeterminism-perl libgcc-13-dev libgomp1 libisl23 libitm1
308s   libjs-jquery libjs-sphinxdoc libjs-underscore libmpc3 libpkgconf3
308s   libstdc++-13-dev libsub-override-perl libtool libubsan1 m4 pkg-config
308s   pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest python3-cachetools
308s   python3-colorama python3-distlib python3-filelock python3-packaging
308s   python3-pip-whl python3-platformdirs python3-pluggy python3-pyproject-api
308s   python3-setuptools-whl python3-virtualenv python3-wheel python3-wheel-whl
308s   tox
308s Suggested packages:
308s   autoconf-archive gnu-standards autoconf-doc cpp-doc gcc-13-locales
308s   cpp-13-doc dh-make flit python3-build python3-installer g++-multilib
308s   g++-13-multilib gcc-13-doc gcc-multilib flex bison gdb gcc-doc
308s   gcc-13-multilib gdb-s390x-linux-gnu gettext-doc libasprintf-dev
308s   libgettextpo-dev git-daemon-run | git-daemon-sysvinit git-doc git-email
308s   git-gui gitk gitweb git-cvs git-mediawiki git-svn git-mergify-rebase mergify
308s   libstdc++-13-doc libtool-doc gfortran | fortran95-compiler gcj-jdk m4-doc
308s   libmail-box-perl
308s Recommended packages:
308s   libarchive-cpio-perl javascript-common libltdl-dev libmail-sendmail-perl
308s   python3-dev python3-distutils
308s The following NEW packages will be installed:
308s   autoconf automake autopkgtest-satdep autopoint autotools-dev build-essential
308s   cpp cpp-13 cpp-13-s390x-linux-gnu cpp-s390x-linux-gnu debhelper debugedit
308s   dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13
308s   g++-13-s390x-linux-gnu g++-s390x-linux-gnu gcc gcc-13 gcc-13-s390x-linux-gnu
308s   gcc-s390x-linux-gnu gettext git git-imerge git-man intltool-debian
308s   libarchive-zip-perl libasan8 libatomic1 libcc1-0 libdebhelper-perl
308s   liberror-perl libfile-stripnondeterminism-perl libgcc-13-dev libgomp1
308s   libisl23 libitm1 libjs-jquery libjs-sphinxdoc libjs-underscore libmpc3
308s   libpkgconf3 libstdc++-13-dev libsub-override-perl libtool libubsan1 m4
308s   pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest
308s   python3-cachetools python3-colorama python3-distlib python3-filelock
308s   python3-packaging python3-pip-whl python3-platformdirs python3-pluggy
308s   python3-pyproject-api python3-setuptools-whl python3-virtualenv
308s   python3-wheel python3-wheel-whl tox
308s 0 upgraded, 69 newly installed, 0 to remove and 1 not upgraded.
308s Need to get 63.0 MB/63.0 MB of archives.
308s After this operation, 209 MB of additional disk space will be used.
308s Get:1 /tmp/autopkgtest.iiYcjY/1-autopkgtest-satdep.deb autopkgtest-satdep s390x 0 [812 B]
308s Get:2 http://ftpmaster.internal/ubuntu noble/main s390x m4 s390x 1.4.19-4 [255 kB]
309s Get:3 http://ftpmaster.internal/ubuntu noble/main s390x autoconf all 2.71-3 [339 kB]
309s Get:4 http://ftpmaster.internal/ubuntu noble/main s390x autotools-dev all 20220109.1 [44.9 kB]
309s Get:5 http://ftpmaster.internal/ubuntu noble/main s390x automake all 1:1.16.5-1.3ubuntu1 [558 kB]
309s Get:6 http://ftpmaster.internal/ubuntu noble/main s390x autopoint all 0.21-14ubuntu1 [422 kB]
309s Get:7 http://ftpmaster.internal/ubuntu noble/main s390x libisl23 s390x 0.26-3 [722 kB]
309s Get:8 http://ftpmaster.internal/ubuntu noble/main s390x libmpc3 s390x 1.3.1-1 [54.9 kB]
309s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/main s390x cpp-13-s390x-linux-gnu s390x 13.2.0-21ubuntu1 [9935 kB]
310s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/main s390x cpp-13 s390x 13.2.0-21ubuntu1 [1026 B]
310s Get:11 http://ftpmaster.internal/ubuntu noble/main s390x cpp-s390x-linux-gnu s390x 4:13.2.0-7ubuntu1 [5308 B]
310s Get:12 http://ftpmaster.internal/ubuntu noble/main s390x cpp s390x 4:13.2.0-7ubuntu1 [22.4 kB]
310s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libcc1-0 s390x 14-20240315-1ubuntu1 [50.0 kB]
310s Get:14 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgomp1 s390x 14-20240315-1ubuntu1 [151 kB]
310s Get:15 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libitm1 s390x 14-20240315-1ubuntu1 [31.1 kB]
310s Get:16 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libatomic1 s390x 14-20240315-1ubuntu1 [9396 B]
310s Get:17 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libasan8 s390x 14-20240315-1ubuntu1 [2997 kB]
310s Get:18 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libubsan1 s390x 14-20240315-1ubuntu1 [1186 kB]
310s Get:19 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libgcc-13-dev s390x 13.2.0-21ubuntu1 [1003 kB]
310s Get:20 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gcc-13-s390x-linux-gnu s390x 13.2.0-21ubuntu1 [19.1 MB]
311s Get:21 http://ftpmaster.internal/ubuntu noble-proposed/main s390x gcc-13 s390x 13.2.0-21ubuntu1 [469 kB]
311s Get:22 http://ftpmaster.internal/ubuntu noble/main s390x gcc-s390x-linux-gnu s390x 4:13.2.0-7ubuntu1 [1208 B]
311s Get:23 http://ftpmaster.internal/ubuntu noble/main s390x gcc s390x 4:13.2.0-7ubuntu1 [5014 B]
311s Get:24 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libstdc++-13-dev s390x 13.2.0-21ubuntu1 [2494 kB]
311s Get:25 http://ftpmaster.internal/ubuntu noble-proposed/main s390x g++-13-s390x-linux-gnu s390x 13.2.0-21ubuntu1 [11.3 MB]
311s Get:26 http://ftpmaster.internal/ubuntu noble-proposed/main s390x g++-13 s390x 13.2.0-21ubuntu1 [14.4 kB]
311s Get:27 http://ftpmaster.internal/ubuntu noble/main s390x g++-s390x-linux-gnu s390x 4:13.2.0-7ubuntu1 [956 B]
311s Get:28 http://ftpmaster.internal/ubuntu noble/main s390x g++ s390x 4:13.2.0-7ubuntu1 [1096 B]
311s Get:29 http://ftpmaster.internal/ubuntu noble/main s390x build-essential s390x 12.10ubuntu1 [4930 B]
311s Get:30 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libdebhelper-perl all 13.14.1ubuntu5 [89.8 kB]
311s Get:31 http://ftpmaster.internal/ubuntu noble/main s390x libtool all 2.4.7-7 [166 kB]
311s Get:32 http://ftpmaster.internal/ubuntu noble/main s390x dh-autoreconf all 20 [16.1 kB]
311s Get:33 http://ftpmaster.internal/ubuntu noble/main s390x libarchive-zip-perl all 1.68-1 [90.2 kB]
311s Get:34 http://ftpmaster.internal/ubuntu noble/main s390x libsub-override-perl all 0.10-1 [10.0 kB]
311s Get:35 http://ftpmaster.internal/ubuntu noble/main s390x libfile-stripnondeterminism-perl all 1.13.1-1 [18.1 kB]
311s Get:36 http://ftpmaster.internal/ubuntu noble/main s390x dh-strip-nondeterminism all 1.13.1-1 [5362 B]
311s Get:37 http://ftpmaster.internal/ubuntu noble-proposed/main s390x debugedit s390x 1:5.0-5build1 [50.5 kB]
311s Get:38 http://ftpmaster.internal/ubuntu noble-proposed/main s390x dwz s390x 0.15-1build5 [122 kB]
311s Get:39 http://ftpmaster.internal/ubuntu noble/main s390x gettext s390x 0.21-14ubuntu1 [917 kB]
311s Get:40 http://ftpmaster.internal/ubuntu noble/main s390x intltool-debian all 0.35.0+20060710.6 [23.2 kB]
311s Get:41 http://ftpmaster.internal/ubuntu noble/main s390x po-debconf all 1.0.21+nmu1 [233 kB]
311s Get:42 http://ftpmaster.internal/ubuntu noble-proposed/main s390x debhelper all 13.14.1ubuntu5 [869 kB]
311s Get:43 http://ftpmaster.internal/ubuntu noble/universe s390x dh-python all 6.20231223ubuntu2 [111 kB]
311s Get:44 http://ftpmaster.internal/ubuntu noble/main s390x liberror-perl all 0.17029-2 [25.6 kB]
311s Get:45 http://ftpmaster.internal/ubuntu noble-proposed/main s390x git-man all 1:2.43.0-1ubuntu5 [1099 kB]
311s Get:46 http://ftpmaster.internal/ubuntu noble-proposed/main s390x git s390x 1:2.43.0-1ubuntu5 [3847 kB]
312s Get:47 http://ftpmaster.internal/ubuntu noble/universe s390x git-imerge all 1.2.0-5 [49.5 kB]
312s Get:48 http://ftpmaster.internal/ubuntu noble/main s390x libjs-jquery all 3.6.1+dfsg+~3.5.14-1 [328 kB]
312s Get:49 http://ftpmaster.internal/ubuntu noble/main s390x libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB]
312s Get:50 http://ftpmaster.internal/ubuntu noble-proposed/main s390x libjs-sphinxdoc all 7.2.6-6 [149 kB]
312s Get:51 http://ftpmaster.internal/ubuntu noble/main s390x libpkgconf3 s390x 1.8.1-2 [30.4 kB]
312s Get:52 http://ftpmaster.internal/ubuntu noble/main s390x pkgconf-bin s390x 1.8.1-2 [20.8 kB]
312s Get:53 http://ftpmaster.internal/ubuntu noble/main s390x pkgconf s390x 1.8.1-2 [16.7 kB]
312s Get:54 http://ftpmaster.internal/ubuntu noble/main s390x pkg-config s390x 1.8.1-2 [7170 B]
312s Get:55 http://ftpmaster.internal/ubuntu noble/universe s390x pybuild-plugin-autopkgtest all 6.20231223ubuntu2 [1760 B]
312s Get:56 http://ftpmaster.internal/ubuntu noble/main s390x python3-cachetools all 5.3.0-2 [10.6 kB]
312s Get:57 http://ftpmaster.internal/ubuntu noble/main s390x python3-colorama all 0.4.6-4 [32.1 kB]
312s Get:58 http://ftpmaster.internal/ubuntu noble/universe s390x python3-distlib all 0.3.8-1 [318 kB]
312s Get:59 http://ftpmaster.internal/ubuntu noble/universe s390x python3-filelock all 3.13.1-1 [10.8 kB]
312s Get:60 http://ftpmaster.internal/ubuntu noble/main s390x python3-packaging all 23.2-1 [40.6 kB]
312s Get:61 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x python3-pip-whl all 24.0+dfsg-1ubuntu1 [1702 kB]
312s Get:62 http://ftpmaster.internal/ubuntu noble/universe s390x python3-platformdirs all 4.2.0-1 [16.1 kB]
312s Get:63 http://ftpmaster.internal/ubuntu noble/universe s390x python3-pluggy all 1.4.0-1 [20.4 kB]
312s Get:64 http://ftpmaster.internal/ubuntu noble/universe s390x python3-pyproject-api all 1.6.1-1 [50.9 kB]
312s Get:65 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x python3-setuptools-whl all 68.1.2-2ubuntu1 [715 kB]
312s Get:66 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x python3-wheel-whl all 0.42.0-2 [67.8 kB]
312s Get:67 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x python3-virtualenv all 20.25.0+ds-2 [70.8 kB]
312s Get:68 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x python3-wheel all 0.42.0-2 [53.1 kB]
312s Get:69 http://ftpmaster.internal/ubuntu noble/universe s390x tox all 4.13.0-1 [302 kB]
312s Fetched 63.0 MB in 4s (17.4 MB/s)
312s Selecting previously unselected package m4.
312s (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 ... 81562 files and directories currently installed.)
312s Preparing to unpack .../00-m4_1.4.19-4_s390x.deb ...
312s Unpacking m4 (1.4.19-4) ...
312s Selecting previously unselected package autoconf.
312s Preparing to unpack .../01-autoconf_2.71-3_all.deb ...
312s Unpacking autoconf (2.71-3) ...
312s Selecting previously unselected package autotools-dev.
312s Preparing to unpack .../02-autotools-dev_20220109.1_all.deb ...
312s Unpacking autotools-dev (20220109.1) ...
312s Selecting previously unselected package automake.
312s Preparing to unpack .../03-automake_1%3a1.16.5-1.3ubuntu1_all.deb ...
312s Unpacking automake (1:1.16.5-1.3ubuntu1) ...
312s Selecting previously unselected package autopoint.
312s Preparing to unpack .../04-autopoint_0.21-14ubuntu1_all.deb ...
312s Unpacking autopoint (0.21-14ubuntu1) ...
312s Selecting previously unselected package libisl23:s390x.
312s Preparing to unpack .../05-libisl23_0.26-3_s390x.deb ...
312s Unpacking libisl23:s390x (0.26-3) ...
313s Selecting previously unselected package libmpc3:s390x.
313s Preparing to unpack .../06-libmpc3_1.3.1-1_s390x.deb ...
313s Unpacking libmpc3:s390x (1.3.1-1) ...
313s Selecting previously unselected package cpp-13-s390x-linux-gnu.
313s Preparing to unpack .../07-cpp-13-s390x-linux-gnu_13.2.0-21ubuntu1_s390x.deb ...
313s Unpacking cpp-13-s390x-linux-gnu (13.2.0-21ubuntu1) ...
313s Selecting previously unselected package cpp-13.
313s Preparing to unpack .../08-cpp-13_13.2.0-21ubuntu1_s390x.deb ...
313s Unpacking cpp-13 (13.2.0-21ubuntu1) ...
313s Selecting previously unselected package cpp-s390x-linux-gnu.
313s Preparing to unpack .../09-cpp-s390x-linux-gnu_4%3a13.2.0-7ubuntu1_s390x.deb ...
313s Unpacking cpp-s390x-linux-gnu (4:13.2.0-7ubuntu1) ...
313s Selecting previously unselected package cpp.
313s Preparing to unpack .../10-cpp_4%3a13.2.0-7ubuntu1_s390x.deb ...
313s Unpacking cpp (4:13.2.0-7ubuntu1) ...
313s Selecting previously unselected package libcc1-0:s390x.
313s Preparing to unpack .../11-libcc1-0_14-20240315-1ubuntu1_s390x.deb ...
313s Unpacking libcc1-0:s390x (14-20240315-1ubuntu1) ...
313s Selecting previously unselected package libgomp1:s390x.
313s Preparing to unpack .../12-libgomp1_14-20240315-1ubuntu1_s390x.deb ...
313s Unpacking libgomp1:s390x (14-20240315-1ubuntu1) ...
313s Selecting previously unselected package libitm1:s390x.
313s Preparing to unpack .../13-libitm1_14-20240315-1ubuntu1_s390x.deb ...
313s Unpacking libitm1:s390x (14-20240315-1ubuntu1) ...
313s Selecting previously unselected package libatomic1:s390x.
313s Preparing to unpack .../14-libatomic1_14-20240315-1ubuntu1_s390x.deb ...
313s Unpacking libatomic1:s390x (14-20240315-1ubuntu1) ...
313s Selecting previously unselected package libasan8:s390x.
313s Preparing to unpack .../15-libasan8_14-20240315-1ubuntu1_s390x.deb ...
313s Unpacking libasan8:s390x (14-20240315-1ubuntu1) ...
313s Selecting previously unselected package libubsan1:s390x.
313s Preparing to unpack .../16-libubsan1_14-20240315-1ubuntu1_s390x.deb ...
313s Unpacking libubsan1:s390x (14-20240315-1ubuntu1) ...
313s Selecting previously unselected package libgcc-13-dev:s390x.
313s Preparing to unpack .../17-libgcc-13-dev_13.2.0-21ubuntu1_s390x.deb ...
313s Unpacking libgcc-13-dev:s390x (13.2.0-21ubuntu1) ...
313s Selecting previously unselected package gcc-13-s390x-linux-gnu.
313s Preparing to unpack .../18-gcc-13-s390x-linux-gnu_13.2.0-21ubuntu1_s390x.deb ...
313s Unpacking gcc-13-s390x-linux-gnu (13.2.0-21ubuntu1) ...
313s Selecting previously unselected package gcc-13.
313s Preparing to unpack .../19-gcc-13_13.2.0-21ubuntu1_s390x.deb ...
313s Unpacking gcc-13 (13.2.0-21ubuntu1) ...
313s Selecting previously unselected package gcc-s390x-linux-gnu.
313s Preparing to unpack .../20-gcc-s390x-linux-gnu_4%3a13.2.0-7ubuntu1_s390x.deb ...
313s Unpacking gcc-s390x-linux-gnu (4:13.2.0-7ubuntu1) ...
314s Selecting previously unselected package gcc.
314s Preparing to unpack .../21-gcc_4%3a13.2.0-7ubuntu1_s390x.deb ...
314s Unpacking gcc (4:13.2.0-7ubuntu1) ...
314s Selecting previously unselected package libstdc++-13-dev:s390x.
314s Preparing to unpack .../22-libstdc++-13-dev_13.2.0-21ubuntu1_s390x.deb ...
314s Unpacking libstdc++-13-dev:s390x (13.2.0-21ubuntu1) ...
314s Selecting previously unselected package g++-13-s390x-linux-gnu.
314s Preparing to unpack .../23-g++-13-s390x-linux-gnu_13.2.0-21ubuntu1_s390x.deb ...
314s Unpacking g++-13-s390x-linux-gnu (13.2.0-21ubuntu1) ...
314s Selecting previously unselected package g++-13.
314s Preparing to unpack .../24-g++-13_13.2.0-21ubuntu1_s390x.deb ...
314s Unpacking g++-13 (13.2.0-21ubuntu1) ...
314s Selecting previously unselected package g++-s390x-linux-gnu.
314s Preparing to unpack .../25-g++-s390x-linux-gnu_4%3a13.2.0-7ubuntu1_s390x.deb ...
314s Unpacking g++-s390x-linux-gnu (4:13.2.0-7ubuntu1) ...
314s Selecting previously unselected package g++.
314s Preparing to unpack .../26-g++_4%3a13.2.0-7ubuntu1_s390x.deb ...
314s Unpacking g++ (4:13.2.0-7ubuntu1) ...
314s Selecting previously unselected package build-essential.
314s Preparing to unpack .../27-build-essential_12.10ubuntu1_s390x.deb ...
314s Unpacking build-essential (12.10ubuntu1) ...
314s Selecting previously unselected package libdebhelper-perl.
314s Preparing to unpack .../28-libdebhelper-perl_13.14.1ubuntu5_all.deb ...
314s Unpacking libdebhelper-perl (13.14.1ubuntu5) ...
314s Selecting previously unselected package libtool.
314s Preparing to unpack .../29-libtool_2.4.7-7_all.deb ...
314s Unpacking libtool (2.4.7-7) ...
314s Selecting previously unselected package dh-autoreconf.
314s Preparing to unpack .../30-dh-autoreconf_20_all.deb ...
314s Unpacking dh-autoreconf (20) ...
314s Selecting previously unselected package libarchive-zip-perl.
314s Preparing to unpack .../31-libarchive-zip-perl_1.68-1_all.deb ...
314s Unpacking libarchive-zip-perl (1.68-1) ...
314s Selecting previously unselected package libsub-override-perl.
314s Preparing to unpack .../32-libsub-override-perl_0.10-1_all.deb ...
314s Unpacking libsub-override-perl (0.10-1) ...
314s Selecting previously unselected package libfile-stripnondeterminism-perl.
314s Preparing to unpack .../33-libfile-stripnondeterminism-perl_1.13.1-1_all.deb ...
314s Unpacking libfile-stripnondeterminism-perl (1.13.1-1) ...
314s Selecting previously unselected package dh-strip-nondeterminism.
314s Preparing to unpack .../34-dh-strip-nondeterminism_1.13.1-1_all.deb ...
314s Unpacking dh-strip-nondeterminism (1.13.1-1) ...
314s Selecting previously unselected package debugedit.
314s Preparing to unpack .../35-debugedit_1%3a5.0-5build1_s390x.deb ...
314s Unpacking debugedit (1:5.0-5build1) ...
314s Selecting previously unselected package dwz.
314s Preparing to unpack .../36-dwz_0.15-1build5_s390x.deb ...
314s Unpacking dwz (0.15-1build5) ...
314s Selecting previously unselected package gettext.
314s Preparing to unpack .../37-gettext_0.21-14ubuntu1_s390x.deb ...
314s Unpacking gettext (0.21-14ubuntu1) ...
314s Selecting previously unselected package intltool-debian.
314s Preparing to unpack .../38-intltool-debian_0.35.0+20060710.6_all.deb ...
314s Unpacking intltool-debian (0.35.0+20060710.6) ...
314s Selecting previously unselected package po-debconf.
314s Preparing to unpack .../39-po-debconf_1.0.21+nmu1_all.deb ...
314s Unpacking po-debconf (1.0.21+nmu1) ...
314s Selecting previously unselected package debhelper.
314s Preparing to unpack .../40-debhelper_13.14.1ubuntu5_all.deb ...
314s Unpacking debhelper (13.14.1ubuntu5) ...
314s Selecting previously unselected package dh-python.
314s Preparing to unpack .../41-dh-python_6.20231223ubuntu2_all.deb ...
314s Unpacking dh-python (6.20231223ubuntu2) ...
314s Selecting previously unselected package liberror-perl.
314s Preparing to unpack .../42-liberror-perl_0.17029-2_all.deb ...
314s Unpacking liberror-perl (0.17029-2) ...
314s Selecting previously unselected package git-man.
314s Preparing to unpack .../43-git-man_1%3a2.43.0-1ubuntu5_all.deb ...
314s Unpacking git-man (1:2.43.0-1ubuntu5) ...
315s Selecting previously unselected package git.
315s Preparing to unpack .../44-git_1%3a2.43.0-1ubuntu5_s390x.deb ...
315s Unpacking git (1:2.43.0-1ubuntu5) ...
315s Selecting previously unselected package git-imerge.
315s Preparing to unpack .../45-git-imerge_1.2.0-5_all.deb ...
315s Unpacking git-imerge (1.2.0-5) ...
315s Selecting previously unselected package libjs-jquery.
315s Preparing to unpack .../46-libjs-jquery_3.6.1+dfsg+~3.5.14-1_all.deb ...
315s Unpacking libjs-jquery (3.6.1+dfsg+~3.5.14-1) ...
315s Selecting previously unselected package libjs-underscore.
315s Preparing to unpack .../47-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ...
315s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ...
315s Selecting previously unselected package libjs-sphinxdoc.
315s Preparing to unpack .../48-libjs-sphinxdoc_7.2.6-6_all.deb ...
315s Unpacking libjs-sphinxdoc (7.2.6-6) ...
315s Selecting previously unselected package libpkgconf3:s390x.
315s Preparing to unpack .../49-libpkgconf3_1.8.1-2_s390x.deb ...
315s Unpacking libpkgconf3:s390x (1.8.1-2) ...
315s Selecting previously unselected package pkgconf-bin.
315s Preparing to unpack .../50-pkgconf-bin_1.8.1-2_s390x.deb ...
315s Unpacking pkgconf-bin (1.8.1-2) ...
315s Selecting previously unselected package pkgconf:s390x.
315s Preparing to unpack .../51-pkgconf_1.8.1-2_s390x.deb ...
315s Unpacking pkgconf:s390x (1.8.1-2) ...
315s Selecting previously unselected package pkg-config:s390x.
315s Preparing to unpack .../52-pkg-config_1.8.1-2_s390x.deb ...
315s Unpacking pkg-config:s390x (1.8.1-2) ...
315s Selecting previously unselected package pybuild-plugin-autopkgtest.
315s Preparing to unpack .../53-pybuild-plugin-autopkgtest_6.20231223ubuntu2_all.deb ...
315s Unpacking pybuild-plugin-autopkgtest (6.20231223ubuntu2) ...
315s Selecting previously unselected package python3-cachetools.
315s Preparing to unpack .../54-python3-cachetools_5.3.0-2_all.deb ...
315s Unpacking python3-cachetools (5.3.0-2) ...
315s Selecting previously unselected package python3-colorama.
315s Preparing to unpack .../55-python3-colorama_0.4.6-4_all.deb ...
315s Unpacking python3-colorama (0.4.6-4) ...
315s Selecting previously unselected package python3-distlib.
315s Preparing to unpack .../56-python3-distlib_0.3.8-1_all.deb ...
315s Unpacking python3-distlib (0.3.8-1) ...
315s Selecting previously unselected package python3-filelock.
315s Preparing to unpack .../57-python3-filelock_3.13.1-1_all.deb ...
315s Unpacking python3-filelock (3.13.1-1) ...
315s Selecting previously unselected package python3-packaging.
315s Preparing to unpack .../58-python3-packaging_23.2-1_all.deb ...
315s Unpacking python3-packaging (23.2-1) ...
315s Selecting previously unselected package python3-pip-whl.
315s Preparing to unpack .../59-python3-pip-whl_24.0+dfsg-1ubuntu1_all.deb ...
315s Unpacking python3-pip-whl (24.0+dfsg-1ubuntu1) ...
315s Selecting previously unselected package python3-platformdirs.
315s Preparing to unpack .../60-python3-platformdirs_4.2.0-1_all.deb ...
315s Unpacking python3-platformdirs (4.2.0-1) ...
315s Selecting previously unselected package python3-pluggy.
315s Preparing to unpack .../61-python3-pluggy_1.4.0-1_all.deb ...
315s Unpacking python3-pluggy (1.4.0-1) ...
315s Selecting previously unselected package python3-pyproject-api.
315s Preparing to unpack .../62-python3-pyproject-api_1.6.1-1_all.deb ...
315s Unpacking python3-pyproject-api (1.6.1-1) ...
315s Selecting previously unselected package python3-setuptools-whl.
315s Preparing to unpack .../63-python3-setuptools-whl_68.1.2-2ubuntu1_all.deb ...
315s Unpacking python3-setuptools-whl (68.1.2-2ubuntu1) ...
315s Selecting previously unselected package python3-wheel-whl.
315s Preparing to unpack .../64-python3-wheel-whl_0.42.0-2_all.deb ...
315s Unpacking python3-wheel-whl (0.42.0-2) ...
315s Selecting previously unselected package python3-virtualenv.
315s Preparing to unpack .../65-python3-virtualenv_20.25.0+ds-2_all.deb ...
315s Unpacking python3-virtualenv (20.25.0+ds-2) ...
315s Selecting previously unselected package python3-wheel.
315s Preparing to unpack .../66-python3-wheel_0.42.0-2_all.deb ...
315s Unpacking python3-wheel (0.42.0-2) ...
315s Selecting previously unselected package tox.
315s Preparing to unpack .../67-tox_4.13.0-1_all.deb ...
315s Unpacking tox (4.13.0-1) ...
315s Selecting previously unselected package autopkgtest-satdep.
315s Preparing to unpack .../68-1-autopkgtest-satdep.deb ...
315s Unpacking autopkgtest-satdep (0) ...
315s Setting up dh-python (6.20231223ubuntu2) ...
315s Setting up python3-setuptools-whl (68.1.2-2ubuntu1) ...
315s Setting up python3-filelock (3.13.1-1) ...
316s Setting up python3-cachetools (5.3.0-2) ...
316s Setting up python3-colorama (0.4.6-4) ...
316s Setting up python3-pip-whl (24.0+dfsg-1ubuntu1) ...
316s Setting up libarchive-zip-perl (1.68-1) ...
316s Setting up libdebhelper-perl (13.14.1ubuntu5) ...
316s Setting up m4 (1.4.19-4) ...
316s Setting up python3-distlib (0.3.8-1) ...
316s Setting up libgomp1:s390x (14-20240315-1ubuntu1) ...
316s Setting up python3-wheel (0.42.0-2) ...
316s Setting up python3-platformdirs (4.2.0-1) ...
316s Setting up liberror-perl (0.17029-2) ...
316s Setting up autotools-dev (20220109.1) ...
316s Setting up python3-packaging (23.2-1) ...
317s Setting up libpkgconf3:s390x (1.8.1-2) ...
317s Setting up libmpc3:s390x (1.3.1-1) ...
317s Setting up libatomic1:s390x (14-20240315-1ubuntu1) ...
317s Setting up autopoint (0.21-14ubuntu1) ...
317s Setting up pkgconf-bin (1.8.1-2) ...
317s Setting up autoconf (2.71-3) ...
317s Setting up python3-pluggy (1.4.0-1) ...
317s Setting up libubsan1:s390x (14-20240315-1ubuntu1) ...
317s Setting up dwz (0.15-1build5) ...
317s Setting up libasan8:s390x (14-20240315-1ubuntu1) ...
317s Setting up debugedit (1:5.0-5build1) ...
317s Setting up libsub-override-perl (0.10-1) ...
317s Setting up git-man (1:2.43.0-1ubuntu5) ...
317s Setting up libjs-jquery (3.6.1+dfsg+~3.5.14-1) ...
317s Setting up libisl23:s390x (0.26-3) ...
317s Setting up python3-wheel-whl (0.42.0-2) ...
317s Setting up libcc1-0:s390x (14-20240315-1ubuntu1) ...
317s Setting up libitm1:s390x (14-20240315-1ubuntu1) ...
317s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ...
317s Setting up automake (1:1.16.5-1.3ubuntu1) ...
317s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode
317s Setting up libfile-stripnondeterminism-perl (1.13.1-1) ...
317s Setting up gettext (0.21-14ubuntu1) ...
317s Setting up python3-virtualenv (20.25.0+ds-2) ...
317s Setting up pkgconf:s390x (1.8.1-2) ...
317s Setting up intltool-debian (0.35.0+20060710.6) ...
317s Setting up cpp-13-s390x-linux-gnu (13.2.0-21ubuntu1) ...
317s Setting up pkg-config:s390x (1.8.1-2) ...
317s Setting up git (1:2.43.0-1ubuntu5) ...
317s Setting up libjs-sphinxdoc (7.2.6-6) ...
317s Setting up dh-strip-nondeterminism (1.13.1-1) ...
317s Setting up libgcc-13-dev:s390x (13.2.0-21ubuntu1) ...
317s Setting up libstdc++-13-dev:s390x (13.2.0-21ubuntu1) ...
317s Setting up cpp-13 (13.2.0-21ubuntu1) ...
317s Setting up cpp-s390x-linux-gnu (4:13.2.0-7ubuntu1) ...
317s Setting up po-debconf (1.0.21+nmu1) ...
317s Setting up python3-pyproject-api (1.6.1-1) ...
317s Setting up git-imerge (1.2.0-5) ...
317s Setting up gcc-13-s390x-linux-gnu (13.2.0-21ubuntu1) ...
317s Setting up gcc-s390x-linux-gnu (4:13.2.0-7ubuntu1) ...
317s Setting up g++-13-s390x-linux-gnu (13.2.0-21ubuntu1) ...
317s Setting up gcc-13 (13.2.0-21ubuntu1) ...
317s Setting up cpp (4:13.2.0-7ubuntu1) ...
317s Setting up g++-13 (13.2.0-21ubuntu1) ...
317s Setting up tox (4.13.0-1) ...
317s Setting up libtool (2.4.7-7) ...
317s Setting up g++-s390x-linux-gnu (4:13.2.0-7ubuntu1) ...
317s Setting up gcc (4:13.2.0-7ubuntu1) ...
317s Setting up dh-autoreconf (20) ...
317s Setting up g++ (4:13.2.0-7ubuntu1) ...
317s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode
317s Setting up build-essential (12.10ubuntu1) ...
317s Setting up debhelper (13.14.1ubuntu5) ...
318s Setting up pybuild-plugin-autopkgtest (6.20231223ubuntu2) ...
318s Setting up autopkgtest-satdep (0) ...
318s Processing triggers for man-db (2.12.0-3build4) ...
319s Processing triggers for install-info (7.1-3build1) ...
319s Processing triggers for libc-bin (2.39-0ubuntu6) ...
321s (Reading database ... 85608 files and directories currently installed.)
321s Removing autopkgtest-satdep (0) ...
322s autopkgtest [02:55:41]: test pybuild-autopkgtest: pybuild-autopkgtest
322s autopkgtest [02:55:41]: test pybuild-autopkgtest: [-----------------------
322s pybuild-autopkgtest
323s I: pybuild base:305: cd /tmp/autopkgtest.iiYcjY/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.iiYcjY/build.2hy/src/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 
323s py312: skip building and installing the package
323s py312: commands[0] /tmp/autopkgtest.iiYcjY/build.2hy/src> /bin/sh t/test-unconflicted
323s + dirname t/test-unconflicted
323s + cd t
323s + pwd
323s + dirname /tmp/autopkgtest.iiYcjY/build.2hy/src/t
323s + BASE=/tmp/autopkgtest.iiYcjY/build.2hy/src
323s + . /tmp/autopkgtest.iiYcjY/build.2hy/src/t/test-lib.sh
323s + GIT_IMERGE=git-imerge
323s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s + DESCRIPTION=git-imerge test repository without conflicts
323s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted git-imerge test repository without conflicts
323s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s + local description=git-imerge test repository without conflicts
323s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted git-imerge test repository without conflicts
323s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s + local description=git-imerge test repository without conflicts
323s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s hint: Using 'master' as the name for the initial branch. This default branch name
323s hint: is subject to change. To configure the initial branch name to use in all
323s hint: of your new repositories, which will suppress this warning, call:
323s hint: 
323s hint: 	git config --global init.defaultBranch <name>
323s hint: 
323s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
323s hint: 'development'. The just-created branch can be renamed via this command:
323s hint: 
323s hint: 	git branch -m <name>
323s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted/.git/
323s + echo git-imerge test repository without conflicts
323s + printf %s\n /*.out /*.css /*.html
323s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted/.git config user.name Loú User
323s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted/.git config user.email luser@example.com
323s + TIME=1112911993
323s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/unconflicted
323s + modify a.txt 0
323s + filename=a.txt
323s + text=0
323s + echo 0
323s + git add a.txt
323s + modify b.txt 0
323s + filename=b.txt
323s + text=0
323s + echo 0
323s + git add b.txt
323s + commit -m m⇒0
323s + TIME=1112911994
323s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
323s + git checkout -b a --
323s Switched to a new branch 'a'
323s + seq 8
323s + modify a.txt 1
323s + filename=a.txt
323s + text=1
323s + echo 1
323s + git add a.txt
323s + commit -m a⇒1
323s + TIME=1112911995
323s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1
323s + modify a.txt 2
323s + filename=a.txt
323s + text=2
323s + echo 2
323s + git add a.txt
323s + commit -m a⇒2
323s + TIME=1112911996
323s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2
323s + modify a.txt 3
323s + filename=a.txt
323s + text=3
323s + echo 3
323s + git add a.txt
323s + commit -m a⇒3
323s + TIME=1112911997
323s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3
323s + modify a.txt 4
323s + filename=a.txt
323s + text=4
323s + echo 4
323s + git add a.txt
323s + commit -m a⇒4
323s [master (root-commit) 780ddf5] m⇒0
323s  2 files changed, 2 insertions(+)
323s  create mode 100644 a.txt
323s  create mode 100644 b.txt
323s [a b862e30] a⇒1
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s [a dcbe282] a⇒2
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s [a ecd8647] a⇒3
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s [a 1634bab] a⇒4
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s + TIME=1112911998
323s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4
323s + modify a.txt 5
323s + filename=a.txt
323s + text=5
323s + echo 5
323s + git add a.txt
323s + commit -m a⇒5
323s + TIME=1112911999
323s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5
323s + modify a.txt 6
323s + filename=a.txt
323s + text=6
323s + echo 6
323s + git add a.txt
323s + commit -m a⇒6
323s [a 909ce12] a⇒5
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s + TIME=1112912000
323s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6
323s [a f6520bf] a⇒6
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s + modify a.txt 7
323s + filename=a.txt
323s + text=7
323s + echo 7
323s + git add a.txt
323s + commit -m a⇒7
323s + TIME=1112912001
323s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7
323s [a 6797186] a⇒7
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s + modify a.txt 8
323s + filename=a.txt
323s + text=8
323s + echo 8
323s + git add a.txt
323s + commit -m a⇒8
323s + TIME=1112912002
323s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8
323s [a 49643dd] a⇒8
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s + git checkout -b b master --
323s [b d43305b] b⇒1
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s [b 853ee68] b⇒2
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s [b 03a2455] b⇒3
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s Switched to a new branch 'b'
323s + seq 5
323s + modify b.txt 1
323s + filename=b.txt
323s + text=1
323s + echo 1
323s + git add b.txt
323s + commit -m b⇒1
323s + TIME=1112912003
323s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1
323s + modify b.txt 2
323s + filename=b.txt
323s + text=2
323s + echo 2
323s + git add b.txt
323s + commit -m b⇒2
323s + TIME=1112912004
323s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2
323s + modify b.txt 3
323s + filename=b.txt
323s + text=3
323s + echo 3
323s + git add b.txt
323s + commit -m b⇒3
323s + TIME=1112912005
323s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3
323s + modify b.txt 4
323s + filename=b.txt
323s + text=4
323s + echo 4
323s + git add b.txt
323s + commit -m b⇒4
323s + TIME=1112912006
323s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4
323s [b 484ea85] b⇒4
323s  1 file changed, 1 insertion(+), 1 deletion(-)
323s + modify b.txt 5
323s + filename=b.txt
323s + text=5
323s + echo 5
323s + git add b.txt
323s + commit -m b⇒5
323s + TIME=1112912007
323s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5
324s [b e22cd97] b⇒5
324s  1 file changed, 1 insertion(+), 1 deletion(-)
324s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + git checkout a
324s Switched to branch 'a'
324s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b
324s Attempting automerge of 8-5...success.
324s Autofilling 1-5...success.
324s Autofilling 2-5...success.
324s Autofilling 3-5...success.
324s Autofilling 4-5...success.
324s Autofilling 5-5...success.
324s Autofilling 6-5...success.
324s Autofilling 7-5...success.
324s Autofilling 8-1...success.
324s Autofilling 8-2...success.
324s Autofilling 8-3...success.
324s Autofilling 8-4...success.
324s Autofilling 8-5 (first way)...success.
324s Autofilling 8-5 (second way)...success.
324s The two ways of autofilling 8-5 agree.
324s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6].
324s Merge is complete!
324s + git-imerge list
324s * a-b
324s + git-imerge diagram --commits --frontier --html=imerge3.html
324s        0    5  8
324s        |    |  |
324s    0 - ********* - a
324s        *???????.
324s        *???????.
324s        *???????.
324s        *???????.
324s    5 - *........
324s        |
324s      b
324s 
324s        0    5  8
324s        |    |  |
324s    0 - ********* - a
324s        *???????|
324s        *???????|
324s        *???????|
324s        *???????|
324s    5 - *-------+
324s        |
324s      b
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 + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge
324s Merge b into a (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:      Wed Mar 27 02:55:42 2024 +0000
324s #
324s # On branch a-b-merge
324s # Changes to be committed:
324s #	modified:   b.txt
324s #
324s [a-b-merge af0b32f] Merge b into a (using imerge)
324s  Date: Wed Mar 27 02:55:42 2024 +0000
324s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + local refname=a-b-merge
324s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + git rev-parse a-b-merge^{tree}
324s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + git-imerge simplify --goal=rebase --branch=a-b-rebase
324s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + local refname=a-b-rebase
324s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + git rev-parse a-b-rebase^{tree}
324s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history
324s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + local refname=a-b-rebase-with-history
324s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + git rev-parse a-b-rebase-with-history^{tree}
324s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
324s + git-imerge simplify --goal=border --branch=a-b-border
325s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + local refname=a-b-border
325s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + git rev-parse a-b-border^{tree}
325s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history
325s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + local refname=a-b-border-with-history
325s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + git rev-parse a-b-border-with-history^{tree}
325s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2
325s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + local refname=a-b-border-with-history2
325s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + git rev-parse a-b-border-with-history2^{tree}
325s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
325s + git-imerge remove
325s + git checkout a
325s Switched to branch 'a'
325s + git-imerge start --goal=full --name=a-b b
325s Attempting to merge 1-1...success.
325s Attempting to merge 1-2...success.
325s Attempting to merge 1-3...success.
325s Attempting to merge 1-4...success.
325s Attempting to merge 1-5...success.
325s Attempting to merge 2-1...success.
325s Attempting to merge 2-2...success.
325s Attempting to merge 2-3...success.
325s Attempting to merge 2-4...success.
325s Attempting to merge 2-5...success.
325s Attempting to merge 3-1...success.
325s Attempting to merge 3-2...success.
325s Attempting to merge 3-3...success.
325s Attempting to merge 3-4...success.
325s Attempting to merge 3-5...success.
325s Attempting to merge 4-1...success.
325s Attempting to merge 4-2...success.
325s Attempting to merge 4-3...success.
325s Attempting to merge 4-4...success.
325s Attempting to merge 4-5...success.
325s Attempting to merge 5-1...success.
325s Attempting to merge 5-2...success.
325s Attempting to merge 5-3...success.
325s Attempting to merge 5-4...success.
325s Attempting to merge 5-5...success.
325s Attempting to merge 6-1...success.
325s Attempting to merge 6-2...success.
325s Attempting to merge 6-3...success.
325s Attempting to merge 6-4...success.
326s Attempting to merge 6-5...success.
326s Attempting to merge 7-1...success.
326s Attempting to merge 7-2...success.
326s Attempting to merge 7-3...success.
326s Attempting to merge 7-4...success.
326s Attempting to merge 7-5...success.
326s Attempting to merge 8-1...success.
326s Attempting to merge 8-2...success.
326s Attempting to merge 8-3...success.
326s Attempting to merge 8-4...success.
326s Attempting to merge 8-5...success.
326s Merge is complete!
326s + git-imerge list
326s * a-b
326s + git-imerge diagram --commits --frontier --html=imerge4.html
326s        0    5  8
326s        |    |  |
326s    0 - ********* - a
326s        *........
326s        *........
326s        *........
326s        *........
326s    5 - *........
326s        |
326s      b
326s 
326s        0    5  8
326s        |    |  |
326s    0 - ********* - a
326s        *.......|
326s        *.......|
326s        *.......|
326s        *.......|
326s    5 - *-------+
326s        |
326s      b
326s 
326s Key:
326s   |,-,+ = rectangles forming current merge frontier
326s   * = merge done manually
326s   . = merge done automatically
326s   # = conflict that is currently blocking progress
326s   @ = merge was blocked but has been resolved
326s   ? = no merge recorded
326s 
326s + git-imerge finish --branch=a-b-full
326s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42
326s + local refname=a-b-full
326s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
326s + git rev-parse a-b-full^{tree}
326s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
326s py312: commands[1] /tmp/autopkgtest.iiYcjY/build.2hy/src> /bin/sh t/test-conflicted
326s + dirname t/test-conflicted
326s + cd t
326s + pwd
326s + dirname /tmp/autopkgtest.iiYcjY/build.2hy/src/t
326s + BASE=/tmp/autopkgtest.iiYcjY/build.2hy/src
326s + . /tmp/autopkgtest.iiYcjY/build.2hy/src/t/test-lib.sh
326s + GIT_IMERGE=git-imerge
326s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5
326s + test_conflict 4-3
326s + local conflict=4-3
326s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
326s + DESCRIPTION=git-imerge test repository with conflict at 4-3
326s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3
326s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
326s + local description=git-imerge test repository with conflict at 4-3
326s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3
326s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
326s + local description=git-imerge test repository with conflict at 4-3
326s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
326s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
326s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
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 <name>
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 <name>
326s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3/.git/
326s + echo git-imerge test repository with conflict at 4-3
326s + printf %s\n /*.out /*.css /*.html
326s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3/.git config user.name Loú User
326s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com
326s + TIME=1112911993
326s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
326s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-4-3
326s + modify c.txt 0
326s + filename=c.txt
326s + text=0
326s + echo 0
326s + git add c.txt
326s + modify d.txt 0
326s + filename=d.txt
326s + text=0
326s + echo 0
326s + git add d.txt
326s + modify conflict.txt original version
326s + filename=conflict.txt
326s + text=original version
326s + echo original version
326s + git add conflict.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 [master (root-commit) d70e04b] m⇒0
326s  3 files changed, 3 insertions(+)
326s  create mode 100644 c.txt
326s  create mode 100644 conflict.txt
326s  create mode 100644 d.txt
326s + git checkout -b c master --
326s Switched to a new branch 'c'
326s + seq 9
326s + modify c.txt 1
326s + filename=c.txt
326s + text=1
326s + echo 1
326s + git add c.txt
326s + commit -m c⇒1
326s + TIME=1112911995
326s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
326s [c 89e2141] c⇒1
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + modify c.txt 2
326s [c 7c431f2] c⇒2
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s [c f02ab24] c⇒3
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s [c 3c091de] c⇒4
326s  2 files changed, 2 insertions(+), 2 deletions(-)
326s [c a0ac37a] c⇒5
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + filename=c.txt
326s + text=2
326s + echo 2
326s + git add c.txt
326s + commit -m c⇒2
326s + TIME=1112911996
326s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
326s + modify c.txt 3
326s + filename=c.txt
326s + text=3
326s + echo 3
326s + git add c.txt
326s + commit -m c⇒3
326s + TIME=1112911997
326s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
326s + modify c.txt 4
326s + filename=c.txt
326s + text=4
326s + echo 4
326s + git add c.txt
326s + modify conflict.txt c version
326s + filename=conflict.txt
326s + text=c version
326s + echo c version
326s + git add conflict.txt
326s + commit -m c⇒4
326s + TIME=1112911998
326s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
326s + modify c.txt 5
326s + filename=c.txt
326s + text=5
326s + echo 5
326s + git add c.txt
326s + commit -m c⇒5
326s + TIME=1112911999
326s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
326s + modify c.txt 6
326s + filename=c.txt
326s + text=6
326s + echo 6
326s + git add c.txt
326s [c ed9fdfa] c⇒6
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + commit -m c⇒6
326s + TIME=1112912000
326s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
326s + modify c.txt 7
326s + filename=c.txt
326s + text=7
326s + echo 7
326s + git add c.txt
326s + commit -m c⇒7
326s + TIME=1112912001
326s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
326s [c 1da7bf5] c⇒7
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + modify c.txt 8
326s + filename=c.txt
326s + text=8
326s + echo 8
326s + git add c.txt
326s + commit -m c⇒8
326s + TIME=1112912002
326s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
326s + modify c.txt 9
326s + filename=c.txt
326s + text=9
326s + echo 9
326s + git add c.txt
326s [c d8de99f] c⇒8
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + commit -m c⇒9
326s + TIME=1112912003
326s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
326s [c 9cde605] c⇒9
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + git checkout -b d master --
326s Switched to a new branch 'd'
326s + seq 6
326s + modify d.txt 1
326s + filename=d.txt
326s + text=1
326s + echo 1
326s + git add d.txt
326s + commit -m d⇒1
326s + TIME=1112912004
326s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
326s [d bd5368a] d⇒1
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + modify d.txt 2
326s + filename=d.txt
326s + text=2
326s + echo 2
326s + git add d.txt
326s + commit -m d⇒2
326s + TIME=1112912005
326s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
326s [d 93e27e6] d⇒2
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + modify d.txt 3
326s + filename=d.txt
326s + text=3
326s + echo 3
326s + git add d.txt
326s + modify conflict.txt d version
326s + filename=conflict.txt
326s + text=d version
326s + echo d version
326s + git add conflict.txt
326s + commit -m d⇒3
326s + TIME=1112912006
326s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
326s [d 2bb1a7e] d⇒3
326s  2 files changed, 2 insertions(+), 2 deletions(-)
326s + modify d.txt 4
326s + filename=d.txt
326s + text=4
326s + echo 4
326s + git add d.txt
326s + commit -m d⇒4
326s [d 81f9c80] d⇒4
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s [d 3690dde] d⇒5
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s + TIME=1112912007
326s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
326s + modify d.txt 5
326s + filename=d.txt
326s + text=5
326s + echo 5
326s + git add d.txt
326s + commit -m d⇒5
326s + TIME=1112912008
326s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
326s + modify d.txt 6
326s + filename=d.txt
326s + text=6
326s + echo 6
326s + git add d.txt
326s + commit -m d⇒6
326s + TIME=1112912009
326s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
326s + git checkout c
326s [d 8085853] d⇒6
326s  1 file changed, 1 insertion(+), 1 deletion(-)
326s Switched to branch 'c'
326s + git-imerge init --name=c-d d
326s + git-imerge list
326s * c-d
326s + git-imerge diagram --commits --frontier --html=imerge0.html
326s        0    5   9
326s        |    |   |
326s    0 - ********** - c
326s        *?????????
326s        *?????????
326s        *?????????
326s        *?????????
326s    5 - *?????????
326s    6 - *?????????
326s        |
326s      d
326s 
326s        0    5   9
326s        |    |   |
326s    0 - ********** - c
326s        *?????????
326s        *?????????
326s        *?????????
326s        *?????????
326s    5 - *?????????
326s    6 - *?????????
326s        |
326s      d
326s 
326s Key:
326s   |,-,+ = rectangles forming current merge frontier
326s   * = merge done manually
326s   . = merge done automatically
326s   # = conflict that is currently blocking progress
326s   @ = merge was blocked but has been resolved
326s   ? = no merge recorded
326s 
326s + git-imerge autofill
326s + tee autofill.out
327s Attempting automerge of 9-6...failure.
327s Attempting automerge of 1-1...success.
327s Attempting automerge of 1-4...success.
327s Attempting automerge of 1-6...success.
327s Attempting automerge of 9-6...failure.
327s Attempting automerge of 5-6...failure.
327s Attempting automerge of 3-6...success.
327s Attempting automerge of 4-6...failure.
327s Attempting automerge of 4-1...success.
327s Attempting automerge of 4-4...failure.
327s Attempting automerge of 4-3...failure.
327s Attempting automerge of 4-2...success.
327s Attempting automerge of 9-2...success.
327s Autofilling 1-6...success.
327s Autofilling 2-6...success.
327s Autofilling 3-1...success.
327s Autofilling 3-2...success.
327s Autofilling 3-3...success.
327s Autofilling 3-4...success.
327s Autofilling 3-5...success.
327s Autofilling 3-6 (first way)...success.
327s Autofilling 3-6 (second way)...success.
327s The two ways of autofilling 3-6 agree.
327s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7].
327s Autofilling 4-2...success.
327s Autofilling 5-2...success.
327s Autofilling 6-2...success.
327s Autofilling 7-2...success.
327s Autofilling 8-2...success.
327s Autofilling 9-1...success.
327s Autofilling 9-2 (first way)...success.
327s Autofilling 9-2 (second way)...success.
327s The two ways of autofilling 9-2 agree.
327s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3].
327s Attempting automerge of 9-6...failure.
327s Attempting automerge of 4-3...failure.
327s HEAD is now at 9cde605 c⇒9
327s Conflict; suggest manual merge of 4-3
327s + grep -q Traceback autofill.out
327s + grep -q suggest manual merge of 4-3 autofill.out
327s + git-imerge diagram --commits --frontier --html=imerge1.html
327s        0    5   9
327s        |    |   |
327s    0 - ********** - c
327s        *??.?????.
327s        *??.......
327s        *??.#?????
327s        *??.??????
327s    5 - *??.??????
327s    6 - *...??????
327s        |
327s      d
327s 
327s        0    5   9
327s        |    |   |
327s    0 - ********** - c
327s        *??.?????|
327s        *??.-----+
327s        *??|#?????
327s        *??|??????
327s    5 - *??|??????
327s    6 - *--+??????
327s        |
327s      d
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-imerge continue --edit
327s Switched to branch 'imerge/c-d'
327s Auto-merging conflict.txt
327s CONFLICT (content): Merge conflict in conflict.txt
327s Automatic merge failed; fix conflicts and then commit the result.
327s 
327s Original first commit:
327s commit 3c091ded129a5edf9061360bab867edade996c93
327s Author: Loú User <luser@example.com>
327s Date:   Thu Apr 7 22:13:18 2005 +0000
327s 
327s     c⇒4
327s 
327s Original second commit:
327s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b
327s Author: Loú User <luser@example.com>
327s Date:   Thu Apr 7 22:13:26 2005 +0000
327s 
327s     d⇒3
327s 
327s There was a conflict merging commit 4-3, shown above.
327s Please resolve the conflict, commit the result, then type
327s 
327s     git-imerge continue
327s + echo merged version
327s + git add conflict.txt
327s + git-imerge continue --no-edit
327s [imerge/c-d 1584dcf] imerge 'c-d': manual merge 4-3
327s Merge has been recorded for merge 4-3.
327s Attempting automerge of 4-6...success.
327s Autofilling 4-4...success.
327s Autofilling 4-5...success.
327s Autofilling 4-6...success.
327s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7].
327s Attempting automerge of 9-6...success.
327s Autofilling 5-6...success.
327s Autofilling 6-6...success.
327s Autofilling 7-6...success.
327s Autofilling 8-6...success.
327s Autofilling 9-3...success.
327s Autofilling 9-4...success.
327s Autofilling 9-5...success.
327s Autofilling 9-6 (first way)...success.
327s Autofilling 9-6 (second way)...success.
327s The two ways of autofilling 9-6 agree.
327s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7].
327s Merge is complete!
327s + git-imerge diagram --commits --frontier --html=imerge2.html
327s        0    5   9
327s        |    |   |
327s    0 - ********** - c
327s        *??.?????.
327s        *??.......
327s        *??.*????.
327s        *??..????.
327s    5 - *??..????.
327s    6 - *.........
327s        |
327s      d
327s 
327s        0    5   9
327s        |    |   |
327s    0 - ********** - c
327s        *??.?????|
327s        *??......|
327s        *??.*????|
327s        *??..????|
327s    5 - *??..????|
327s    6 - *--------+
327s        |
327s      d
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=c-d-merge
328s Merge d into c (using imerge)
328s 
328s # Please enter the commit message for your changes. Lines starting
328s # with '#' will be ignored, and an empty message aborts the commit.
328s #
328s # Date:      Wed Mar 27 02:55:47 2024 +0000
328s #
328s # On branch c-d-merge
328s # Changes to be committed:
328s #	modified:   conflict.txt
328s #	modified:   d.txt
328s #
328s [c-d-merge 9676405] Merge d into c (using imerge)
328s  Date: Wed Mar 27 02:55:47 2024 +0000
328s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + local refname=c-d-merge
328s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git rev-parse c-d-merge^{tree}
328s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git-imerge simplify --goal=rebase --branch=c-d-rebase
328s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + local refname=c-d-rebase
328s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git rev-parse c-d-rebase^{tree}
328s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
328s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + local refname=c-d-rebase-with-history
328s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git rev-parse c-d-rebase-with-history^{tree}
328s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git-imerge simplify --goal=border --branch=c-d-border
328s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + local refname=c-d-border
328s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git rev-parse c-d-border^{tree}
328s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
328s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + local refname=c-d-border-with-history
328s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git rev-parse c-d-border-with-history^{tree}
328s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
328s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + local refname=c-d-border-with-history2
328s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git rev-parse c-d-border-with-history2^{tree}
328s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
328s + git-imerge remove
329s + git checkout c
329s Switched to branch 'c'
329s + + git-imerge start --goal=full --first-parent --name=c-d d
329s tee start.out
329s Attempting to merge 1-1...success.
329s Attempting to merge 1-2...success.
329s Attempting to merge 1-3...success.
329s Attempting to merge 1-4...success.
329s Attempting to merge 1-5...success.
329s Attempting to merge 1-6...success.
329s Attempting to merge 2-1...success.
329s Attempting to merge 2-2...success.
329s Attempting to merge 2-3...success.
329s Attempting to merge 2-4...success.
329s Attempting to merge 2-5...success.
329s Attempting to merge 2-6...success.
329s Attempting to merge 3-1...success.
329s Attempting to merge 3-2...success.
329s Attempting to merge 3-3...success.
329s Attempting to merge 3-4...success.
329s Attempting to merge 3-5...success.
329s Attempting to merge 3-6...success.
329s Attempting to merge 4-1...success.
329s Attempting to merge 4-2...success.
329s Attempting to merge 4-3...conflict.
329s Attempting to merge 5-1...success.
329s Attempting to merge 5-2...success.
329s Attempting to merge 6-1...success.
329s Attempting to merge 6-2...success.
329s Attempting to merge 7-1...success.
329s Attempting to merge 7-2...success.
329s Attempting to merge 8-1...success.
329s Attempting to merge 8-2...success.
329s Attempting to merge 9-1...success.
329s Attempting to merge 9-2...success.
329s Previous HEAD position was 568c38e imerge 'c-d': automatic merge 9-2
329s Switched to branch 'imerge/c-d'
329s Auto-merging conflict.txt
329s CONFLICT (content): Merge conflict in conflict.txt
329s Automatic merge failed; fix conflicts and then commit the result.
329s 
329s Original first commit:
329s commit 3c091ded129a5edf9061360bab867edade996c93
329s Author: Loú User <luser@example.com>
329s Date:   Thu Apr 7 22:13:18 2005 +0000
329s 
329s     c⇒4
329s 
329s Original second commit:
329s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b
329s Author: Loú User <luser@example.com>
329s Date:   Thu Apr 7 22:13:26 2005 +0000
329s 
329s     d⇒3
329s 
329s There was a conflict merging commit 4-3, shown above.
329s Please resolve the conflict, commit the result, then type
329s 
329s     git-imerge continue
329s + grep -q Traceback start.out
329s + grep -q suggest manual merge of 4-3 autofill.out
329s + git-imerge diagram --commits --frontier --html=imerge3.html
329s        0    5   9
329s        |    |   |
329s    0 - ********** - c
329s        *.........
329s        *.........
329s        *...#?????
329s        *...??????
329s    5 - *...??????
329s    6 - *...??????
329s        |
329s      d
329s 
329s        0    5   9
329s        |    |   |
329s    0 - ********** - c
329s        *........|
329s        *...-----+
329s        *..|#?????
329s        *..|??????
329s    5 - *..|??????
329s    6 - *--+??????
329s        |
329s      d
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 + echo merged version
329s + git add conflict.txt
329s + GIT_EDITOR=cat git commit
329s imerge 'c-d': manual merge 4-3
329s 
329s # Conflicts:
329s #	conflict.txt
329s #
329s # It looks like you may be committing a merge.
329s # If this is not correct, please run
329s #	git update-ref -d MERGE_HEAD
329s # and try again.
329s 
329s 
329s # Please enter the commit message for your changes. Lines starting
329s # with '#' will be ignored, and an empty message aborts the commit.
329s #
329s # On branch imerge/c-d
329s # All conflicts fixed but you are still merging.
329s #
329s # Changes to be committed:
329s #	modified:   conflict.txt
329s #	modified:   d.txt
329s #
329s [imerge/c-d b036d1f] imerge 'c-d': manual merge 4-3
329s + git-imerge continue --edit
329s Merge has been recorded for merge 4-3.
329s Attempting to merge 4-4...success.
329s Attempting to merge 4-5...success.
329s Attempting to merge 4-6...success.
329s Attempting to merge 5-3...success.
329s Attempting to merge 5-4...success.
329s Attempting to merge 5-5...success.
329s Attempting to merge 5-6...success.
329s Attempting to merge 6-3...success.
329s Attempting to merge 6-4...success.
329s Attempting to merge 6-5...success.
329s Attempting to merge 6-6...success.
329s Attempting to merge 7-3...success.
329s Attempting to merge 7-4...success.
329s Attempting to merge 7-5...success.
330s Attempting to merge 7-6...success.
330s Attempting to merge 8-3...success.
330s Attempting to merge 8-4...success.
330s Attempting to merge 8-5...success.
330s Attempting to merge 8-6...success.
330s Attempting to merge 9-3...success.
330s Attempting to merge 9-4...success.
330s Attempting to merge 9-5...success.
330s Attempting to merge 9-6...success.
330s Merge is complete!
330s + git-imerge diagram --commits --frontier --html=imerge4.html
330s        0    5   9
330s        |    |   |
330s    0 - ********** - c
330s        *.........
330s        *.........
330s        *...*.....
330s        *.........
330s    5 - *.........
330s    6 - *.........
330s        |
330s      d
330s 
330s        0    5   9
330s        |    |   |
330s    0 - ********** - c
330s        *........|
330s        *........|
330s        *...*....|
330s        *........|
330s    5 - *........|
330s    6 - *--------+
330s        |
330s      d
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-imerge finish --branch=c-d-full
330s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
330s + local refname=c-d-full
330s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
330s + git rev-parse c-d-full^{tree}
330s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
330s + test_conflict 1-1
330s + local conflict=1-1
330s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s + DESCRIPTION=git-imerge test repository with conflict at 1-1
330s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1
330s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s + local description=git-imerge test repository with conflict at 1-1
330s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1
330s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s + local description=git-imerge test repository with conflict at 1-1
330s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s hint: Using 'master' as the name for the initial branch. This default branch name
330s hint: is subject to change. To configure the initial branch name to use in all
330s hint: of your new repositories, which will suppress this warning, call:
330s hint: 
330s hint: 	git config --global init.defaultBranch <name>
330s hint: 
330s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
330s hint: 'development'. The just-created branch can be renamed via this command:
330s hint: 
330s hint: 	git branch -m <name>
330s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1/.git/
330s + echo git-imerge test repository with conflict at 1-1
330s + printf %s\n /*.out /*.css /*.html
330s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1/.git config user.name Loú User
330s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com
330s + TIME=1112911993
330s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-1
330s + modify c.txt 0
330s + filename=c.txt
330s + text=0
330s + echo 0
330s + git add c.txt
330s + modify d.txt 0
330s + filename=d.txt
330s + text=0
330s + echo 0
330s + git add d.txt
330s + modify conflict.txt original version
330s + filename=conflict.txt
330s + text=original version
330s + echo original version
330s + git add conflict.txt
330s + commit -m m⇒0
330s + TIME=1112911994
330s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
330s [master (root-commit) d70e04b] m⇒0
330s  3 files changed, 3 insertions(+)
330s  create mode 100644 c.txt
330s  create mode 100644 conflict.txt
330s  create mode 100644 d.txt
330s + git checkout -b c master --
330s Switched to a new branch 'c'
330s + seq 9
330s + modify c.txt 1
330s + filename=c.txt
330s + text=1
330s + echo 1
330s + git add c.txt
330s + modify conflict.txt c version
330s + filename=conflict.txt
330s + text=c version
330s + echo c version
330s + git add conflict.txt
330s + commit -m c⇒1
330s + TIME=1112911995
330s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
330s [c 2120f40] c⇒1
330s  2 files changed, 2 insertions(+), 2 deletions(-)
330s + modify c.txt 2
330s + filename=c.txt
330s + text=2
330s + echo 2
330s + git add c.txt
330s + commit -m c⇒2
330s + TIME=1112911996
330s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
330s [c 90cc7de] c⇒2
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s + modify c.txt 3
330s + filename=c.txt
330s + text=3
330s + echo 3
330s + git add c.txt
330s [c 2046ed2] c⇒3
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s [c 8a2cee9] c⇒4
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s [c ac16a05] c⇒5
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s [c 30dd2ae] c⇒6
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s [c 0883eb9] c⇒7
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s [c f661c06] c⇒8
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s + commit -m c⇒3
330s + TIME=1112911997
330s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
330s + modify c.txt 4
330s + filename=c.txt
330s + text=4
330s + echo 4
330s + git add c.txt
330s + commit -m c⇒4
330s + TIME=1112911998
330s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
330s + modify c.txt 5
330s + filename=c.txt
330s + text=5
330s + echo 5
330s + git add c.txt
330s + commit -m c⇒5
330s + TIME=1112911999
330s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
330s + modify c.txt 6
330s + filename=c.txt
330s + text=6
330s + echo 6
330s + git add c.txt
330s + commit -m c⇒6
330s + TIME=1112912000
330s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
330s + modify c.txt 7
330s + filename=c.txt
330s + text=7
330s + echo 7
330s + git add c.txt
330s + commit -m c⇒7
330s + TIME=1112912001
330s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
330s + modify c.txt 8
330s + filename=c.txt
330s + text=8
330s + echo 8
330s + git add c.txt
330s + commit -m c⇒8
330s + TIME=1112912002
330s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
330s + modify c.txt 9
330s + filename=c.txt
330s + text=9
330s [c 243e8ed] c⇒9
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s + echo 9
330s + git add c.txt
330s + commit -m c⇒9
330s + TIME=1112912003
330s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
330s + git checkout -b d master --
330s Switched to a new branch 'd'
330s + seq 6
330s + modify d.txt 1
330s + filename=d.txt
330s + text=1
330s + echo 1
330s + git add d.txt
330s + modify conflict.txt d version
330s + filename=conflict.txt
330s + text=d version
330s + echo d version
330s + git add conflict.txt
330s + commit -m d⇒1
330s + TIME=1112912004
330s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
330s [d ac0427a] d⇒1
330s  2 files changed, 2 insertions(+), 2 deletions(-)
330s + modify d.txt 2
330s + filename=d.txt
330s + text=2
330s + echo 2
330s + git add d.txt
330s + commit -m d⇒2
330s + TIME=1112912005
330s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
330s + modify d.txt 3
330s [d 43c38c0] d⇒2
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s + filename=d.txt
330s + text=3
330s + echo 3
330s + git add d.txt
330s + commit -m d⇒3
330s + TIME=1112912006
330s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
330s + modify d.txt 4
330s + filename=d.txt
330s + text=4
330s + echo 4
330s + git add d.txt
330s + commit -m d⇒4
330s + TIME=1112912007
330s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
330s + modify d.txt 5
330s + filename=d.txt
330s + text=5
330s + echo 5
330s + git add d.txt
330s + commit -m d⇒5
330s + TIME=1112912008
330s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
330s [d 0260058] d⇒3
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s [d 40fef44] d⇒4
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s [d b080a65] d⇒5
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s + modify d.txt 6
330s + filename=d.txt
330s + text=6
330s + echo 6
330s + git add d.txt
330s + commit -m d⇒6
330s + TIME=1112912009
330s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
330s + git checkout c
330s Switched to branch 'c'
330s + git-imerge init --name=c-d d
330s [d 200ce5c] d⇒6
330s  1 file changed, 1 insertion(+), 1 deletion(-)
330s + git-imerge list
330s * c-d
330s + git-imerge diagram --commits --frontier --html=imerge0.html
330s        0    5   9
330s        |    |   |
330s    0 - ********** - c
330s        *?????????
330s        *?????????
330s        *?????????
330s        *?????????
330s    5 - *?????????
330s    6 - *?????????
330s        |
330s      d
330s 
330s        0    5   9
330s        |    |   |
330s    0 - ********** - c
330s        *?????????
330s        *?????????
330s        *?????????
330s        *?????????
330s    5 - *?????????
330s    6 - *?????????
330s        |
330s      d
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-imerge autofilltee
330s  autofill.out
330s Attempting automerge of 9-6...failure.
330s Attempting automerge of 1-1...failure.
330s HEAD is now at 243e8ed c⇒9
330s No progress was possible; suggest manual merge of 1-1
330s + grep -q Traceback autofill.out
330s + grep -q suggest manual merge of 1-1 autofill.out
330s + git-imerge diagram --commits --frontier --html=imerge1.html
331s        0    5   9
331s        |    |   |
331s    0 - ********** - c
331s        *#????????
331s        *?????????
331s        *?????????
331s        *?????????
331s    5 - *?????????
331s    6 - *?????????
331s        |
331s      d
331s 
331s        0    5   9
331s        |    |   |
331s    0 - ********** - c
331s        *#????????
331s        *?????????
331s        *?????????
331s        *?????????
331s    5 - *?????????
331s    6 - *?????????
331s        |
331s      d
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 + git-imerge continue --edit
331s Switched to branch 'imerge/c-d'
331s 
331s Original first commit:
331s 
331s Original second commit:
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 Auto-merging conflict.txt
331s CONFLICT (content): Merge conflict in conflict.txt
331s Automatic merge failed; fix conflicts and then commit the result.
331s commit 2120f40dc39d28052a5279b645124e8ed7e5de73
331s Author: Loú User <luser@example.com>
331s Date:   Thu Apr 7 22:13:15 2005 +0000
331s 
331s     c⇒1
331s commit ac0427a285b64f2815ebd6eb83880f309600d0c7
331s Author: Loú User <luser@example.com>
331s Date:   Thu Apr 7 22:13:24 2005 +0000
331s 
331s     d⇒1
331s + echo merged version
331s + git add conflict.txt
331s + git-imerge continue --no-edit
331s [imerge/c-d aabf986] imerge 'c-d': manual merge 1-1
331s Merge has been recorded for merge 1-1.
331s Attempting automerge of 1-6...success.
331s Autofilling 1-2...success.
331s Autofilling 1-3...success.
331s Autofilling 1-4...success.
331s Autofilling 1-5...success.
331s Autofilling 1-6...success.
331s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7].
331s Attempting automerge of 9-6...success.
331s Autofilling 2-6...success.
331s Autofilling 3-6...success.
331s Autofilling 4-6...success.
331s Autofilling 5-6...success.
331s Autofilling 6-6...success.
331s Autofilling 7-6...success.
331s Autofilling 8-6...success.
331s Autofilling 9-1...success.
331s Autofilling 9-2...success.
331s Autofilling 9-3...success.
331s Autofilling 9-4...success.
331s Autofilling 9-5...success.
331s Autofilling 9-6 (first way)...success.
331s Autofilling 9-6 (second way)...success.
331s The two ways of autofilling 9-6 agree.
331s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7].
331s Merge is complete!
331s + git-imerge diagram --commits --frontier --html=imerge2.html
331s        0    5   9
331s        |    |   |
331s    0 - ********** - c
331s        **???????.
331s        *.???????.
331s        *.???????.
331s        *.???????.
331s    5 - *.???????.
331s    6 - *.........
331s        |
331s      d
331s 
331s        0    5   9
331s        |    |   |
331s    0 - ********** - c
331s        **???????|
331s        *.???????|
331s        *.???????|
331s        *.???????|
331s    5 - *.???????|
331s    6 - *--------+
331s        |
331s      d
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 + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
331s Merge d into c (using imerge)
331s 
331s # Please enter the commit message for your changes. Lines starting
331s # with '#' will be ignored, and an empty message aborts the commit.
331s #
331s # Date:      Wed Mar 27 02:55:50 2024 +0000
331s #
331s # On branch c-d-merge
331s # Changes to be committed:
331s #	modified:   conflict.txt
331s #	modified:   d.txt
331s #
331s [c-d-merge 2c39257] Merge d into c (using imerge)
331s  Date: Wed Mar 27 02:55:50 2024 +0000
331s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
331s + local refname=c-d-merge
331s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
331s + git rev-parse c-d-merge^{tree}
331s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
331s + git-imerge simplify --goal=rebase --branch=c-d-rebase
331s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
331s + local refname=c-d-rebase
331s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
331s + git rev-parse c-d-rebase^{tree}
331s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
331s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
332s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + local refname=c-d-rebase-with-history
332s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git rev-parse c-d-rebase-with-history^{tree}
332s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git-imerge simplify --goal=border --branch=c-d-border
332s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + local refname=c-d-border
332s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git rev-parse c-d-border^{tree}
332s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
332s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + local refname=c-d-border-with-history
332s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git rev-parse c-d-border-with-history^{tree}
332s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
332s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + local refname=c-d-border-with-history2
332s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git rev-parse c-d-border-with-history2^{tree}
332s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
332s + git-imerge remove
332s + git checkout c
332s Switched to branch 'c'
332s + + git-imerge start --goal=fulltee --first-parent --name=c-d d
332s  start.out
332s Attempting to merge 1-1...conflict.
332s Switched to branch 'imerge/c-d'
332s Auto-merging conflict.txt
332s CONFLICT (content): Merge conflict in conflict.txt
332s Automatic merge failed; fix conflicts and then commit the result.
332s 
332s Original first commit:
332s commit 2120f40dc39d28052a5279b645124e8ed7e5de73
332s Author: Loú User <luser@example.com>
332s Date:   Thu Apr 7 22:13:15 2005 +0000
332s 
332s     c⇒1
332s 
332s Original second commit:
332s commit ac0427a285b64f2815ebd6eb83880f309600d0c7
332s Author: Loú User <luser@example.com>
332s Date:   Thu Apr 7 22:13:24 2005 +0000
332s 
332s     d⇒1
332s 
332s There was a conflict merging commit 1-1, shown above.
332s Please resolve the conflict, commit the result, then type
332s 
332s     git-imerge continue
332s + grep -q Traceback start.out
332s + grep -q suggest manual merge of 1-1 autofill.out
332s + git-imerge diagram --commits --frontier --html=imerge3.html
332s        0    5   9
332s        |    |   |
332s    0 - ********** - c
332s        *#????????
332s        *?????????
332s        *?????????
332s        *?????????
332s    5 - *?????????
332s    6 - *?????????
332s        |
332s      d
332s 
332s        0    5   9
332s        |    |   |
332s    0 - ********** - c
332s        *#????????
332s        *?????????
332s        *?????????
332s        *?????????
332s    5 - *?????????
332s    6 - *?????????
332s        |
332s      d
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 + echo merged version
332s + git add conflict.txt
332s + GIT_EDITOR=cat git commit
332s + git-imerge continue --edit
332s imerge 'c-d': manual merge 1-1
332s 
332s # Conflicts:
332s #	conflict.txt
332s #
332s # It looks like you may be committing a merge.
332s # If this is not correct, please run
332s #	git update-ref -d MERGE_HEAD
332s # and try again.
332s 
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 # On branch imerge/c-d
332s # All conflicts fixed but you are still merging.
332s #
332s # Changes to be committed:
332s #	modified:   conflict.txt
332s #	modified:   d.txt
332s #
332s [imerge/c-d a7eb105] imerge 'c-d': manual merge 1-1
333s Merge has been recorded for merge 1-1.
333s Attempting to merge 1-2...success.
333s Attempting to merge 1-3...success.
333s Attempting to merge 1-4...success.
333s Attempting to merge 1-5...success.
333s Attempting to merge 1-6...success.
333s Attempting to merge 2-1...success.
333s Attempting to merge 2-2...success.
333s Attempting to merge 2-3...success.
333s Attempting to merge 2-4...success.
333s Attempting to merge 2-5...success.
333s Attempting to merge 2-6...success.
333s Attempting to merge 3-1...success.
333s Attempting to merge 3-2...success.
333s Attempting to merge 3-3...success.
333s Attempting to merge 3-4...success.
333s Attempting to merge 3-5...success.
333s Attempting to merge 3-6...success.
333s Attempting to merge 4-1...success.
333s Attempting to merge 4-2...success.
333s Attempting to merge 4-3...success.
333s Attempting to merge 4-4...success.
333s Attempting to merge 4-5...success.
333s Attempting to merge 4-6...success.
333s Attempting to merge 5-1...success.
333s Attempting to merge 5-2...success.
333s Attempting to merge 5-3...success.
333s Attempting to merge 5-4...success.
333s Attempting to merge 5-5...success.
333s Attempting to merge 5-6...success.
333s Attempting to merge 6-1...success.
333s Attempting to merge 6-2...success.
333s Attempting to merge 6-3...success.
333s Attempting to merge 6-4...success.
333s Attempting to merge 6-5...success.
333s Attempting to merge 6-6...success.
333s Attempting to merge 7-1...success.
333s Attempting to merge 7-2...success.
333s Attempting to merge 7-3...success.
333s Attempting to merge 7-4...success.
333s Attempting to merge 7-5...success.
333s Attempting to merge 7-6...success.
333s Attempting to merge 8-1...success.
333s Attempting to merge 8-2...success.
333s Attempting to merge 8-3...success.
333s Attempting to merge 8-4...success.
333s Attempting to merge 8-5...success.
333s Attempting to merge 8-6...success.
333s Attempting to merge 9-1...success.
333s Attempting to merge 9-2...success.
333s Attempting to merge 9-3...success.
333s Attempting to merge 9-4...success.
333s Attempting to merge 9-5...success.
333s Attempting to merge 9-6...success.
333s Merge is complete!
333s + git-imerge diagram --commits --frontier --html=imerge4.html
333s        0    5   9
333s        |    |   |
333s    0 - ********** - c
333s        **........
333s        *.........
333s        *.........
333s        *.........
333s    5 - *.........
333s    6 - *.........
333s        |
333s      d
333s 
333s        0    5   9
333s        |    |   |
333s    0 - ********** - c
333s        **.......|
333s        *........|
333s        *........|
333s        *........|
333s    5 - *........|
333s    6 - *--------+
333s        |
333s      d
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-imerge finish --branch=c-d-full
333s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
333s + local refname=c-d-full
333s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
333s + git rev-parse c-d-full^{tree}
333s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
333s + test_conflict 9-1
333s + local conflict=9-1
333s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s + DESCRIPTION=git-imerge test repository with conflict at 9-1
333s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1
333s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s + local description=git-imerge test repository with conflict at 9-1
333s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1
333s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s + local description=git-imerge test repository with conflict at 9-1
333s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s hint: Using 'master' as the name for the initial branch. This default branch name
333s hint: is subject to change. To configure the initial branch name to use in all
333s hint: of your new repositories, which will suppress this warning, call:
333s hint: 
333s hint: 	git config --global init.defaultBranch <name>
333s hint: 
333s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
333s hint: 'development'. The just-created branch can be renamed via this command:
333s hint: 
333s hint: 	git branch -m <name>
333s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1/.git/
333s + echo git-imerge test repository with conflict at 9-1
333s + printf %s\n /*.out /*.css /*.html
333s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1/.git config user.name Loú User
333s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com
333s + TIME=1112911993
333s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-1
333s + modify c.txt 0
333s + filename=c.txt
333s + text=0
333s + echo 0
333s + git add c.txt
333s + modify d.txt 0
333s + filename=d.txt
333s + text=0
333s + echo 0
333s + git add d.txt
333s + modify conflict.txt original version
333s + filename=conflict.txt
333s + text=original version
333s + echo original version
333s + git add conflict.txt
333s + commit -m m⇒0
333s + TIME=1112911994
333s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
333s [master (root-commit) d70e04b] m⇒0
333s  3 files changed, 3 insertions(+)
333s  create mode 100644 c.txt
333s  create mode 100644 conflict.txt
333s  create mode 100644 d.txt
333s + git checkout -b c master --
333s Switched to a new branch 'c'
333s + seq 9
333s + modify c.txt 1
333s + filename=c.txt
333s + text=1
333s + echo 1
333s + git add c.txt
333s + commit -m c⇒1
333s + TIME=1112911995
333s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
333s [c 89e2141] c⇒1
333s  1 file changed, 1 insertion(+), 1 deletion(-)
333s + modify c.txt 2
333s + filename=c.txt
333s + text=2
333s + echo 2
333s + git add c.txt
333s + commit -m c⇒2
333s + TIME=1112911996
333s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
333s [c 7c431f2] c⇒2
333s  1 file changed, 1 insertion(+), 1 deletion(-)
333s + modify c.txt 3
333s + filename=c.txt
333s + text=3
333s + echo 3
333s + git add c.txt
333s + commit -m c⇒3
333s + TIME=1112911997
333s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
333s [c f02ab24] c⇒3
333s  1 file changed, 1 insertion(+), 1 deletion(-)
333s + modify c.txt 4
333s + filename=c.txt
333s + text=4
333s + echo 4
333s + git add c.txt
333s + commit -m c⇒4
333s + TIME=1112911998
333s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
333s [c ed9122f] c⇒4
333s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + modify c.txt 5
334s + filename=c.txt
334s + text=5
334s + echo 5
334s + git add c.txt
334s + commit -m c⇒5
334s + TIME=1112911999
334s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
334s [c 1d3bf09] c⇒5
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + modify c.txt 6
334s + filename=c.txt
334s + text=6
334s + echo 6
334s + git add c.txt
334s + commit -m c⇒6
334s + TIME=1112912000
334s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
334s + modify c.txt 7
334s + filename=c.txt
334s + text=7
334s + echo 7
334s + git add c.txt
334s [c f999ecd] c⇒6
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + commit -m c⇒7
334s + TIME=1112912001
334s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
334s [c 7050a8a] c⇒7
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + modify c.txt 8
334s + filename=c.txt
334s + text=8
334s + echo 8
334s + git add c.txt
334s + commit -m c⇒8
334s + TIME=1112912002
334s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
334s [c 9732e77] c⇒8
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + modify c.txt 9
334s + filename=c.txt
334s + text=9
334s + echo 9
334s + git add c.txt
334s + modify conflict.txt c version
334s + filename=conflict.txt
334s + text=c version
334s + echo c version
334s + git add conflict.txt
334s + commit -m c⇒9
334s + TIME=1112912003
334s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
334s [c 73a5eed] c⇒9
334s  2 files changed, 2 insertions(+), 2 deletions(-)
334s + git checkout -b d master --
334s Switched to a new branch 'd'
334s + seq 6
334s + modify d.txt 1
334s + filename=d.txt
334s + text=1
334s + echo 1
334s + git add d.txt
334s + modify conflict.txt d version
334s + filename=conflict.txt
334s + text=d version
334s + echo d version
334s + git add conflict.txt
334s + commit -m d⇒1
334s + TIME=1112912004
334s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
334s [d ac0427a] d⇒1
334s  2 files changed, 2 insertions(+), 2 deletions(-)
334s + modify d.txt 2
334s + filename=d.txt
334s + text=2
334s + echo 2
334s + git add d.txt
334s + commit -m d⇒2
334s + TIME=1112912005
334s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
334s + modify d.txt 3
334s + filename=d.txt
334s [d 43c38c0] d⇒2
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + text=3
334s + echo 3
334s + git add d.txt
334s + commit -m d⇒3
334s + TIME=1112912006
334s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
334s [d 0260058] d⇒3
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + modify d.txt 4
334s + filename=d.txt
334s + text=4
334s + echo 4
334s + git add d.txt
334s + commit -m d⇒4
334s + TIME=1112912007
334s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
334s [d 40fef44] d⇒4
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + modify d.txt 5
334s + filename=d.txt
334s + text=5
334s + echo 5
334s + git add d.txt
334s + commit -m d⇒5
334s + TIME=1112912008
334s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
334s [d b080a65] d⇒5
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + modify d.txt 6
334s + filename=d.txt
334s + text=6
334s + echo 6
334s + git add d.txt
334s + commit -m d⇒6
334s + TIME=1112912009
334s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
334s [d 200ce5c] d⇒6
334s  1 file changed, 1 insertion(+), 1 deletion(-)
334s + git checkout c
334s Switched to branch 'c'
334s + git-imerge init --name=c-d d
334s + git-imerge list
334s * c-d
334s + git-imerge diagram --commits --frontier --html=imerge0.html
334s        0    5   9
334s        |    |   |
334s    0 - ********** - c
334s        *?????????
334s        *?????????
334s        *?????????
334s        *?????????
334s    5 - *?????????
334s    6 - *?????????
334s        |
334s      d
334s 
334s        0    5   9
334s        |    |   |
334s    0 - ********** - c
334s        *?????????
334s        *?????????
334s        *?????????
334s        *?????????
334s    5 - *?????????
334s    6 - *?????????
334s        |
334s      d
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 + + git-imerge autofill
334s tee autofill.out
334s Attempting automerge of 9-6...failure.
334s Attempting automerge of 1-1...success.
334s Attempting automerge of 1-4...success.
334s Attempting automerge of 1-6...success.
334s Attempting automerge of 9-6...failure.
334s Attempting automerge of 5-6...success.
334s Attempting automerge of 7-6...success.
334s Attempting automerge of 8-6...success.
334s Attempting automerge of 9-1...failure.
334s Autofilling 1-6...success.
334s Autofilling 2-6...success.
334s Autofilling 3-6...success.
334s Autofilling 4-6...success.
334s Autofilling 5-6...success.
334s Autofilling 6-6...success.
334s Autofilling 7-6...success.
334s Autofilling 8-1...success.
334s Autofilling 8-2...success.
334s Autofilling 8-3...success.
334s Autofilling 8-4...success.
334s Autofilling 8-5...success.
334s Autofilling 8-6 (first way)...success.
334s Autofilling 8-6 (second way)...success.
334s The two ways of autofilling 8-6 agree.
334s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7].
334s Attempting automerge of 9-6...failure.
334s Attempting automerge of 9-1...failure.
334s HEAD is now at 73a5eed c⇒9
334s Conflict; suggest manual merge of 9-1
334s + grep -q Traceback autofill.out
334s + grep -q suggest manual merge of 9-1 autofill.out
334s + git-imerge diagram --commits --frontier --html=imerge1.html
334s        0    5   9
334s        |    |   |
334s    0 - ********** - c
334s        *???????.#
334s        *???????.?
334s        *???????.?
334s        *???????.?
334s    5 - *???????.?
334s    6 - *........?
334s        |
334s      d
334s 
334s        0    5   9
334s        |    |   |
334s    0 - ********** - c
334s        *???????|#
334s        *???????|?
334s        *???????|?
334s        *???????|?
334s    5 - *???????|?
334s    6 - *-------+?
334s        |
334s      d
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 + git-imerge continue --edit
334s Switched to branch 'imerge/c-d'
334s Auto-merging conflict.txt
334s CONFLICT (content): Merge conflict in conflict.txt
334s Automatic merge failed; fix conflicts and then commit the result.
334s 
334s Original first commit:
334s commit 73a5eedb087a0f656d730831b8def7943b40f3cf
334s Author: Loú User <luser@example.com>
334s Date:   Thu Apr 7 22:13:23 2005 +0000
334s 
334s     c⇒9
334s 
334s Original second commit:
334s commit ac0427a285b64f2815ebd6eb83880f309600d0c7
334s Author: Loú User <luser@example.com>
334s Date:   Thu Apr 7 22:13:24 2005 +0000
334s 
334s     d⇒1
334s 
334s There was a conflict merging commit 9-1, shown above.
334s Please resolve the conflict, commit the result, then type
334s 
334s     git-imerge continue
334s + echo merged version
334s + git add conflict.txt
334s + git-imerge continue --no-edit
335s [imerge/c-d eaae856] imerge 'c-d': manual merge 9-1
335s Merge has been recorded for merge 9-1.
335s Attempting automerge of 9-6...success.
335s Autofilling 9-2...success.
335s Autofilling 9-3...success.
335s Autofilling 9-4...success.
335s Autofilling 9-5...success.
335s Autofilling 9-6...success.
335s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7].
335s Merge is complete!
335s + git-imerge diagram --commits --frontier --html=imerge2.html
335s        0    5   9
335s        |    |   |
335s    0 - ********** - c
335s        *???????.*
335s        *???????..
335s        *???????..
335s        *???????..
335s    5 - *???????..
335s    6 - *.........
335s        |
335s      d
335s 
335s        0    5   9
335s        |    |   |
335s    0 - ********** - c
335s        *???????.*
335s        *???????.|
335s        *???????.|
335s        *???????.|
335s    5 - *???????.|
335s    6 - *--------+
335s        |
335s      d
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 simplify --goal=merge --branch=c-d-merge
335s Merge d into c (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:      Wed Mar 27 02:55:54 2024 +0000
335s #
335s # On branch c-d-merge
335s # Changes to be committed:
335s #	modified:   conflict.txt
335s #	modified:   d.txt
335s #
335s [c-d-merge 9d847a7] Merge d into c (using imerge)
335s  Date: Wed Mar 27 02:55:54 2024 +0000
335s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + local refname=c-d-merge
335s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git rev-parse c-d-merge^{tree}
335s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git-imerge simplify --goal=rebase --branch=c-d-rebase
335s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + local refname=c-d-rebase
335s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git rev-parse c-d-rebase^{tree}
335s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
335s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + local refname=c-d-rebase-with-history
335s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git rev-parse c-d-rebase-with-history^{tree}
335s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git-imerge simplify --goal=border --branch=c-d-border
335s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + local refname=c-d-border
335s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git rev-parse c-d-border^{tree}
335s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
335s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
336s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
336s + local refname=c-d-border-with-history
336s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
336s + git rev-parse c-d-border-with-history^{tree}
336s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
336s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
336s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
336s + local refname=c-d-border-with-history2
336s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
336s + git rev-parse c-d-border-with-history2^{tree}
336s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
336s + git-imerge remove
336s + git checkout c
336s Switched to branch 'c'
336s + + git-imerge start --goal=full --first-parent --name=c-dtee d
336s  start.out
336s Attempting to merge 1-1...success.
336s Attempting to merge 1-2...success.
336s Attempting to merge 1-3...success.
336s Attempting to merge 1-4...success.
336s Attempting to merge 1-5...success.
336s Attempting to merge 1-6...success.
336s Attempting to merge 2-1...success.
336s Attempting to merge 2-2...success.
336s Attempting to merge 2-3...success.
336s Attempting to merge 2-4...success.
336s Attempting to merge 2-5...success.
336s Attempting to merge 2-6...success.
336s Attempting to merge 3-1...success.
336s Attempting to merge 3-2...success.
336s Attempting to merge 3-3...success.
336s Attempting to merge 3-4...success.
336s Attempting to merge 3-5...success.
336s Attempting to merge 3-6...success.
336s Attempting to merge 4-1...success.
336s Attempting to merge 4-2...success.
336s Attempting to merge 4-3...success.
336s Attempting to merge 4-4...success.
336s Attempting to merge 4-5...success.
336s Attempting to merge 4-6...success.
336s Attempting to merge 5-1...success.
336s Attempting to merge 5-2...success.
336s Attempting to merge 5-3...success.
336s Attempting to merge 5-4...success.
336s Attempting to merge 5-5...success.
336s Attempting to merge 5-6...success.
336s Attempting to merge 6-1...success.
336s Attempting to merge 6-2...success.
336s Attempting to merge 6-3...success.
336s Attempting to merge 6-4...success.
336s Attempting to merge 6-5...success.
336s Attempting to merge 6-6...success.
336s Attempting to merge 7-1...success.
336s Attempting to merge 7-2...success.
336s Attempting to merge 7-3...success.
336s Attempting to merge 7-4...success.
336s Attempting to merge 7-5...success.
336s Attempting to merge 7-6...success.
336s Attempting to merge 8-1...success.
336s Attempting to merge 8-2...success.
336s Attempting to merge 8-3...success.
337s Attempting to merge 8-4...success.
337s Attempting to merge 8-5...success.
337s Attempting to merge 8-6...success.
337s Attempting to merge 9-1...conflict.
337s Switched to branch 'imerge/c-d'
337s Auto-merging conflict.txt
337s CONFLICT (content): Merge conflict in conflict.txt
337s Automatic merge failed; fix conflicts and then commit the result.
337s 
337s Original first commit:
337s commit 73a5eedb087a0f656d730831b8def7943b40f3cf
337s Author: Loú User <luser@example.com>
337s Date:   Thu Apr 7 22:13:23 2005 +0000
337s 
337s     c⇒9
337s 
337s Original second commit:
337s commit ac0427a285b64f2815ebd6eb83880f309600d0c7
337s Author: Loú User <luser@example.com>
337s Date:   Thu Apr 7 22:13:24 2005 +0000
337s 
337s     d⇒1
337s 
337s There was a conflict merging commit 9-1, shown above.
337s Please resolve the conflict, commit the result, then type
337s 
337s     git-imerge continue
337s + grep -q Traceback start.out
337s + grep -q suggest manual merge of 9-1 autofill.out
337s + git-imerge diagram --commits --frontier --html=imerge3.html
337s        0    5   9
337s        |    |   |
337s    0 - ********** - c
337s        *........#
337s        *........?
337s        *........?
337s        *........?
337s    5 - *........?
337s    6 - *........?
337s        |
337s      d
337s 
337s        0    5   9
337s        |    |   |
337s    0 - ********** - c
337s        *.......|#
337s        *.......|?
337s        *.......|?
337s        *.......|?
337s    5 - *.......|?
337s    6 - *-------+?
337s        |
337s      d
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 + echo merged version
337s + git add conflict.txt
337s + GIT_EDITOR=cat git commit
337s imerge 'c-d': manual merge 9-1
337s 
337s # Conflicts:
337s #	conflict.txt
337s #
337s # It looks like you may be committing a merge.
337s # If this is not correct, please run
337s #	git update-ref -d MERGE_HEAD
337s # and try again.
337s 
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 # On branch imerge/c-d
337s # All conflicts fixed but you are still merging.
337s #
337s # Changes to be committed:
337s #	modified:   conflict.txt
337s #	modified:   d.txt
337s #
337s [imerge/c-d 42716c2] imerge 'c-d': manual merge 9-1
337s + git-imerge continue --edit
337s Merge has been recorded for merge 9-1.
337s Attempting to merge 9-2...success.
337s Attempting to merge 9-3...success.
337s Attempting to merge 9-4...success.
337s Attempting to merge 9-5...success.
337s Attempting to merge 9-6...success.
337s Merge is complete!
337s + git-imerge diagram --commits --frontier --html=imerge4.html
337s        0    5   9
337s        |    |   |
337s    0 - ********** - c
337s        *........*
337s        *.........
337s        *.........
337s        *.........
337s    5 - *.........
337s    6 - *.........
337s        |
337s      d
337s 
337s        0    5   9
337s        |    |   |
337s    0 - ********** - c
337s        *........*
337s        *........|
337s        *........|
337s        *........|
337s    5 - *........|
337s    6 - *--------+
337s        |
337s      d
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-imerge finish --branch=c-d-full
337s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
337s + local refname=c-d-full
337s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
337s + git rev-parse c-d-full^{tree}
337s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
337s + test_conflict 1-6
337s + local conflict=1-6
337s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s + DESCRIPTION=git-imerge test repository with conflict at 1-6
337s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6
337s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s + local description=git-imerge test repository with conflict at 1-6
337s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6
337s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s + local description=git-imerge test repository with conflict at 1-6
337s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s hint: Using 'master' as the name for the initial branch. This default branch name
337s hint: is subject to change. To configure the initial branch name to use in all
337s hint: of your new repositories, which will suppress this warning, call:
337s hint: 
337s hint: 	git config --global init.defaultBranch <name>
337s hint: 
337s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
337s hint: 'development'. The just-created branch can be renamed via this command:
337s hint: 
337s hint: 	git branch -m <name>
337s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6/.git/
337s + echo git-imerge test repository with conflict at 1-6
337s + printf %s\n /*.out /*.css /*.html
337s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6/.git config user.name Loú User
337s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com
337s + TIME=1112911993
337s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-6
337s + modify c.txt 0
337s + filename=c.txt
337s + text=0
337s + echo 0
337s + git add c.txt
337s + modify d.txt 0
337s + filename=d.txt
337s + text=0
337s + echo 0
337s + git add d.txt
337s + modify conflict.txt original version
337s + filename=conflict.txt
337s + text=original version
337s + echo original version
337s + git add conflict.txt
337s + commit -m m⇒0
337s + TIME=1112911994
337s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
337s [master (root-commit) d70e04b] m⇒0
337s  3 files changed, 3 insertions(+)
337s  create mode 100644 c.txt
337s  create mode 100644 conflict.txt
337s  create mode 100644 d.txt
337s + git checkout -b c master --
337s Switched to a new branch 'c'
337s + seq 9
337s + modify c.txt 1
337s + filename=c.txt
337s + text=1
337s + echo 1
337s + git add c.txt
337s + modify conflict.txt c version
337s + filename=conflict.txt
337s + text=c version
337s + echo c version
337s + git add conflict.txt
337s + commit -m c⇒1
337s + TIME=1112911995
337s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
337s [c 2120f40] c⇒1
337s  2 files changed, 2 insertions(+), 2 deletions(-)
337s + modify c.txt 2
337s + filename=c.txt
337s + text=2
337s + echo 2
337s + git add c.txt
337s + commit -m c⇒2
337s + TIME=1112911996
337s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
337s [c 90cc7de] c⇒2
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify c.txt 3
337s + filename=c.txt
337s + text=3
337s + echo 3
337s + git add c.txt
337s + commit -m c⇒3
337s + TIME=1112911997
337s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
337s [c 2046ed2] c⇒3
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify c.txt 4
337s + filename=c.txt
337s + text=4
337s + echo 4
337s + git add c.txt
337s + commit -m c⇒4
337s + TIME=1112911998
337s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
337s [c 8a2cee9] c⇒4
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify c.txt 5
337s + filename=c.txt
337s + text=5
337s + echo 5
337s + git add c.txt
337s + commit -m c⇒5
337s + TIME=1112911999
337s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
337s + modify c.txt 6
337s + filename=c.txt
337s [c ac16a05] c⇒5
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + text=6
337s + echo 6
337s + git add c.txt
337s + commit -m c⇒6
337s + TIME=1112912000
337s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
337s [c 30dd2ae] c⇒6
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify c.txt 7
337s + filename=c.txt
337s + text=7
337s + echo 7
337s + git add c.txt
337s + commit -m c⇒7
337s + TIME=1112912001
337s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
337s [c 0883eb9] c⇒7
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify c.txt 8
337s + filename=c.txt
337s + text=8
337s + echo 8
337s + git add c.txt
337s + commit -m c⇒8
337s + TIME=1112912002
337s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
337s [c f661c06] c⇒8
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify c.txt 9
337s + filename=c.txt
337s + text=9
337s + echo 9
337s + git add c.txt
337s + commit -m c⇒9
337s + TIME=1112912003
337s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
337s [c 243e8ed] c⇒9
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + git checkout -b d master --
337s Switched to a new branch 'd'
337s + seq 6
337s + modify d.txt 1
337s + filename=d.txt
337s + text=1
337s + echo 1
337s + git add d.txt
337s + commit -m d⇒1
337s + TIME=1112912004
337s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
337s [d bd5368a] d⇒1
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify d.txt 2
337s + filename=d.txt
337s + text=2
337s + echo 2
337s + git add d.txt
337s + commit -m d⇒2
337s + TIME=1112912005
337s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
337s + modify d.txt 3
337s + filename=d.txt
337s + text=3
337s + echo 3
337s + git add d.txt
337s [d 93e27e6] d⇒2
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + commit -m d⇒3
337s + TIME=1112912006
337s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
337s [d 133f385] d⇒3
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify d.txt 4
337s + filename=d.txt
337s + text=4
337s + echo 4
337s + git add d.txt
337s + commit -m d⇒4
337s + TIME=1112912007
337s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
337s [d 586472a] d⇒4
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify d.txt 5
337s + filename=d.txt
337s + text=5
337s + echo 5
337s + git add d.txt
337s + commit -m d⇒5
337s + TIME=1112912008
337s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
337s [d 9522207] d⇒5
337s  1 file changed, 1 insertion(+), 1 deletion(-)
337s + modify d.txt 6
337s + filename=d.txt
337s + text=6
337s + echo 6
337s + git add d.txt
337s + modify conflict.txt d version
337s + filename=conflict.txt
337s + text=d version
337s + echo d version
337s + git add conflict.txt
337s + commit -m d⇒6
337s + TIME=1112912009
337s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
337s [d f7e451a] d⇒6
337s  2 files changed, 2 insertions(+), 2 deletions(-)
337s + git checkout c
337s Switched to branch 'c'
337s + git-imerge init --name=c-d d
337s + git-imerge list
337s * c-d
337s + git-imerge diagram --commits --frontier --html=imerge0.html
338s        0    5   9
338s        |    |   |
338s    0 - ********** - c
338s        *?????????
338s        *?????????
338s        *?????????
338s        *?????????
338s    5 - *?????????
338s    6 - *?????????
338s        |
338s      d
338s 
338s        0    5   9
338s        |    |   |
338s    0 - ********** - c
338s        *?????????
338s        *?????????
338s        *?????????
338s        *?????????
338s    5 - *?????????
338s    6 - *?????????
338s        |
338s      d
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-imergetee autofill
338s  autofill.out
338s Attempting automerge of 9-6...failure.
338s Attempting automerge of 1-1...success.
338s Attempting automerge of 1-4...success.
338s Attempting automerge of 1-6...failure.
338s Attempting automerge of 1-5...success.
338s Attempting automerge of 9-5...success.
338s Autofilling 1-5...success.
338s Autofilling 2-5...success.
338s Autofilling 3-5...success.
338s Autofilling 4-5...success.
338s Autofilling 5-5...success.
338s Autofilling 6-5...success.
338s Autofilling 7-5...success.
338s Autofilling 8-5...success.
338s Autofilling 9-1...success.
338s Autofilling 9-2...success.
338s Autofilling 9-3...success.
338s Autofilling 9-4...success.
338s Autofilling 9-5 (first way)...success.
338s Autofilling 9-5 (second way)...success.
338s The two ways of autofilling 9-5 agree.
338s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6].
338s Attempting automerge of 9-6...failure.
338s Attempting automerge of 1-6...failure.
338s HEAD is now at 243e8ed c⇒9
338s Conflict; suggest manual merge of 1-6
338s + grep -q Traceback autofill.out
338s + grep -q suggest manual merge of 1-6 autofill.out
338s + git-imerge diagram --commits --frontier --html=imerge1.html
338s        0    5   9
338s        |    |   |
338s    0 - ********** - c
338s        *????????.
338s        *????????.
338s        *????????.
338s        *????????.
338s    5 - *.........
338s    6 - *#????????
338s        |
338s      d
338s 
338s        0    5   9
338s        |    |   |
338s    0 - ********** - c
338s        *????????|
338s        *????????|
338s        *????????|
338s        *????????|
338s    5 - *--------+
338s    6 - *#????????
338s        |
338s      d
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-imerge continue --edit
338s Switched to branch 'imerge/c-d'
338s Auto-merging conflict.txt
338s CONFLICT (content): Merge conflict in conflict.txt
338s Automatic merge failed; fix conflicts and then commit the result.
338s 
338s Original first commit:
338s 
338s Original second commit:
338s 
338s There was a conflict merging commit 1-6, shown above.
338s Please resolve the conflict, commit the result, then type
338s 
338s     git-imerge continue
338s commit 2120f40dc39d28052a5279b645124e8ed7e5de73
338s Author: Loú User <luser@example.com>
338s Date:   Thu Apr 7 22:13:15 2005 +0000
338s 
338s     c⇒1
338s commit f7e451a6c9656dda15641a9fbc591a602f158692
338s Author: Loú User <luser@example.com>
338s Date:   Thu Apr 7 22:13:29 2005 +0000
338s 
338s     d⇒6
338s + echo merged version
338s + git add conflict.txt
338s + git-imerge continue --no-edit
338s [imerge/c-d e7edd69] imerge 'c-d': manual merge 1-6
338s Merge has been recorded for merge 1-6.
338s Attempting automerge of 9-6...success.
338s Autofilling 2-6...success.
338s Autofilling 3-6...success.
338s Autofilling 4-6...success.
338s Autofilling 5-6...success.
338s Autofilling 6-6...success.
338s Autofilling 7-6...success.
338s Autofilling 8-6...success.
338s Autofilling 9-6...success.
338s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7].
338s Merge is complete!
338s + git-imerge diagram --commits --frontier --html=imerge2.html
338s        0    5   9
338s        |    |   |
338s    0 - ********** - c
338s        *????????.
338s        *????????.
338s        *????????.
338s        *????????.
338s    5 - *.........
338s    6 - **........
338s        |
338s      d
338s 
338s        0    5   9
338s        |    |   |
338s    0 - ********** - c
338s        *????????|
338s        *????????|
338s        *????????|
338s        *????????|
338s    5 - *........|
338s    6 - **-------+
338s        |
338s      d
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 simplify --goal=merge --branch=c-d-merge
338s Merge d into c (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:      Wed Mar 27 02:55:57 2024 +0000
338s #
338s # On branch c-d-merge
338s # Changes to be committed:
338s #	modified:   conflict.txt
338s #	modified:   d.txt
338s #
339s [c-d-merge 6a506be] Merge d into c (using imerge)
339s  Date: Wed Mar 27 02:55:57 2024 +0000
339s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + local refname=c-d-merge
339s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git rev-parse c-d-merge^{tree}
339s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git-imerge simplify --goal=rebase --branch=c-d-rebase
339s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + local refname=c-d-rebase
339s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git rev-parse c-d-rebase^{tree}
339s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
339s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + local refname=c-d-rebase-with-history
339s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git rev-parse c-d-rebase-with-history^{tree}
339s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git-imerge simplify --goal=border --branch=c-d-border
339s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + local refname=c-d-border
339s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git rev-parse c-d-border^{tree}
339s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
339s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + local refname=c-d-border-with-history
339s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git rev-parse c-d-border-with-history^{tree}
339s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
339s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + local refname=c-d-border-with-history2
339s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git rev-parse c-d-border-with-history2^{tree}
339s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
339s + git-imerge remove
339s + git checkout c
339s Switched to branch 'c'
339s + git-imerge start --goal=full --first-parent --name=c-d d
339s + tee start.out
340s Attempting to merge 1-1...success.
340s Attempting to merge 1-2...success.
340s Attempting to merge 1-3...success.
340s Attempting to merge 1-4...success.
340s Attempting to merge 1-5...success.
340s Attempting to merge 1-6...conflict.
340s Attempting to merge 2-1...success.
340s Attempting to merge 2-2...success.
340s Attempting to merge 2-3...success.
340s Attempting to merge 2-4...success.
340s Attempting to merge 2-5...success.
340s Attempting to merge 3-1...success.
340s Attempting to merge 3-2...success.
340s Attempting to merge 3-3...success.
340s Attempting to merge 3-4...success.
340s Attempting to merge 3-5...success.
340s Attempting to merge 4-1...success.
340s Attempting to merge 4-2...success.
340s Attempting to merge 4-3...success.
340s Attempting to merge 4-4...success.
340s Attempting to merge 4-5...success.
340s Attempting to merge 5-1...success.
340s Attempting to merge 5-2...success.
340s Attempting to merge 5-3...success.
340s Attempting to merge 5-4...success.
340s Attempting to merge 5-5...success.
340s Attempting to merge 6-1...success.
340s Attempting to merge 6-2...success.
340s Attempting to merge 6-3...success.
340s Attempting to merge 6-4...success.
340s Attempting to merge 6-5...success.
340s Attempting to merge 7-1...success.
340s Attempting to merge 7-2...success.
340s Attempting to merge 7-3...success.
340s Attempting to merge 7-4...success.
340s Attempting to merge 7-5...success.
340s Attempting to merge 8-1...success.
340s Attempting to merge 8-2...success.
340s Attempting to merge 8-3...success.
340s Attempting to merge 8-4...success.
340s Attempting to merge 8-5...success.
340s Attempting to merge 9-1...success.
340s Attempting to merge 9-2...success.
340s Attempting to merge 9-3...success.
340s Attempting to merge 9-4...success.
340s Attempting to merge 9-5...success.
340s Previous HEAD position was c16fca2 imerge 'c-d': automatic merge 9-5
340s Switched to branch 'imerge/c-d'
340s Auto-merging conflict.txt
340s CONFLICT (content): Merge conflict in conflict.txt
340s Automatic merge failed; fix conflicts and then commit the result.
340s 
340s Original first commit:
340s commit 2120f40dc39d28052a5279b645124e8ed7e5de73
340s Author: Loú User <luser@example.com>
340s Date:   Thu Apr 7 22:13:15 2005 +0000
340s 
340s     c⇒1
340s 
340s Original second commit:
340s commit f7e451a6c9656dda15641a9fbc591a602f158692
340s Author: Loú User <luser@example.com>
340s Date:   Thu Apr 7 22:13:29 2005 +0000
340s 
340s     d⇒6
340s 
340s There was a conflict merging commit 1-6, shown above.
340s Please resolve the conflict, commit the result, then type
340s 
340s     git-imerge continue
340s + grep -q Traceback start.out
340s + grep -q suggest manual merge of 1-6 autofill.out
340s + git-imerge diagram --commits --frontier --html=imerge3.html
340s        0    5   9
340s        |    |   |
340s    0 - ********** - c
340s        *.........
340s        *.........
340s        *.........
340s        *.........
340s    5 - *.........
340s    6 - *#????????
340s        |
340s      d
340s 
340s        0    5   9
340s        |    |   |
340s    0 - ********** - c
340s        *........|
340s        *........|
340s        *........|
340s        *........|
340s    5 - *--------+
340s    6 - *#????????
340s        |
340s      d
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 + echo merged version
340s + git add conflict.txt
340s + GIT_EDITOR=cat git commit
340s imerge 'c-d': manual merge 1-6
340s 
340s # Conflicts:
340s #	conflict.txt
340s #
340s # It looks like you may be committing a merge.
340s # If this is not correct, please run
340s #	git update-ref -d MERGE_HEAD
340s # and try again.
340s 
340s 
340s # Please enter the commit message for your changes. Lines starting
340s # with '#' will be ignored, and an empty message aborts the commit.
340s #
340s # On branch imerge/c-d
340s # All conflicts fixed but you are still merging.
340s #
340s # Changes to be committed:
340s #	modified:   conflict.txt
340s #	modified:   d.txt
340s #
340s [imerge/c-d 3bf0ca1] imerge 'c-d': manual merge 1-6
340s + git-imerge continue --edit
340s Merge has been recorded for merge 1-6.
340s Attempting to merge 2-6...success.
340s Attempting to merge 3-6...success.
340s Attempting to merge 4-6...success.
340s Attempting to merge 5-6...success.
340s Attempting to merge 6-6...success.
340s Attempting to merge 7-6...success.
340s Attempting to merge 8-6...success.
340s Attempting to merge 9-6...success.
340s Merge is complete!
341s + git-imerge diagram --commits --frontier --html=imerge4.html
341s        0    5   9
341s        |    |   |
341s    0 - ********** - c
341s        *.........
341s        *.........
341s        *.........
341s        *.........
341s    5 - *.........
341s    6 - **........
341s        |
341s      d
341s 
341s        0    5   9
341s        |    |   |
341s    0 - ********** - c
341s        *........|
341s        *........|
341s        *........|
341s        *........|
341s    5 - *........|
341s    6 - **-------+
341s        |
341s      d
341s 
341s Key:
341s   |,-,+ = rectangles forming current merge frontier
341s   * = merge done manually
341s   . = merge done automatically
341s   # = conflict that is currently blocking progress
341s   @ = merge was blocked but has been resolved
341s   ? = no merge recorded
341s 
341s + git-imerge finish --branch=c-d-full
341s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
341s + local refname=c-d-full
341s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
341s + git rev-parse c-d-full^{tree}
341s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
341s + test_conflict 9-6
341s + local conflict=9-6
341s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s + DESCRIPTION=git-imerge test repository with conflict at 9-6
341s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6
341s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s + local description=git-imerge test repository with conflict at 9-6
341s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6
341s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s + local description=git-imerge test repository with conflict at 9-6
341s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s hint: Using 'master' as the name for the initial branch. This default branch name
341s hint: is subject to change. To configure the initial branch name to use in all
341s hint: of your new repositories, which will suppress this warning, call:
341s hint: 
341s hint: 	git config --global init.defaultBranch <name>
341s hint: 
341s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
341s hint: 'development'. The just-created branch can be renamed via this command:
341s hint: 
341s hint: 	git branch -m <name>
341s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6/.git/
341s + echo git-imerge test repository with conflict at 9-6
341s + printf %s\n /*.out /*.css /*.html
341s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6/.git config user.name Loú User
341s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com
341s + TIME=1112911993
341s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-6
341s + modify c.txt 0
341s + filename=c.txt
341s + text=0
341s + echo 0
341s + git add c.txt
341s + modify d.txt 0
341s + filename=d.txt
341s + text=0
341s + echo 0
341s + git add d.txt
341s + modify conflict.txt original version
341s + filename=conflict.txt
341s + text=original version
341s + echo original version
341s + git add conflict.txt
341s + commit -m m⇒0
341s + TIME=1112911994
341s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
341s [master (root-commit) d70e04b] m⇒0
341s  3 files changed, 3 insertions(+)
341s  create mode 100644 c.txt
341s  create mode 100644 conflict.txt
341s  create mode 100644 d.txt
341s + git checkout -b c master --
341s Switched to a new branch 'c'
341s + seq 9
341s + modify c.txt 1
341s + filename=c.txt
341s + text=1
341s + echo 1
341s + git add c.txt
341s + commit -m c⇒1
341s + TIME=1112911995
341s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
341s [c 89e2141] c⇒1
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s + modify c.txt 2
341s + filename=c.txt
341s + text=2
341s + echo 2
341s + git add c.txt
341s + commit -m c⇒2
341s + TIME=1112911996
341s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
341s [c 7c431f2] c⇒2
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s + modify c.txt 3
341s + filename=c.txt
341s + text=3
341s + echo 3
341s + git add c.txt
341s + commit -m c⇒3
341s + TIME=1112911997
341s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
341s [c f02ab24] c⇒3
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s + modify c.txt 4
341s + filename=c.txt
341s + text=4
341s + echo 4
341s + git add c.txt
341s + commit -m c⇒4
341s + TIME=1112911998
341s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
341s + modify c.txt 5
341s + filename=c.txt
341s + text=5
341s + echo 5
341s + git add c.txt
341s + commit -m c⇒5
341s + TIME=1112911999
341s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
341s + modify c.txt 6
341s + filename=c.txt
341s + text=6
341s + echo 6
341s + git add c.txt
341s + commit -m c⇒6
341s + TIME=1112912000
341s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
341s + modify c.txt 7
341s + filename=c.txt
341s + text=7
341s + echo 7
341s + git add c.txt
341s + commit -m c⇒7
341s + TIME=1112912001
341s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
341s + modify c.txt 8
341s + filename=c.txt
341s + text=8
341s + echo 8
341s + git add c.txt
341s + commit -m c⇒8
341s + TIME=1112912002
341s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
341s + modify c.txt 9
341s + filename=c.txt
341s + text=9
341s + echo 9
341s + git add c.txt
341s + modify conflict.txt c version
341s + filename=conflict.txt
341s + text=c version
341s + echo c version
341s + git add conflict.txt
341s + commit -m c⇒9
341s + TIME=1112912003
341s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
341s + git checkout -b d master --
341s Switched to a new branch 'd'
341s + seq 6
341s + modify d.txt 1
341s + filename=d.txt
341s + text=1
341s + echo 1
341s + git add d.txt
341s + commit -m d⇒1
341s + TIME=1112912004
341s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
341s + modify d.txt 2
341s + filename=d.txt
341s + text=2
341s + echo 2
341s + git add d.txt
341s + commit -m d⇒2
341s + TIME=1112912005
341s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
341s + modify d.txt 3
341s + filename=d.txt
341s + text=3
341s + echo 3
341s + git add d.txt
341s + commit -m d⇒3
341s + TIME=1112912006
341s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
341s + modify d.txt 4
341s + filename=d.txt
341s + text=4
341s + echo 4
341s + git add d.txt
341s + commit -m d⇒4
341s + TIME=1112912007
341s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
341s + modify d.txt 5
341s + filename=d.txt
341s + text=5
341s + echo 5
341s + git add d.txt
341s + commit -m d⇒5
341s + TIME=1112912008
341s [c ed9122f] c⇒4
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [c 1d3bf09] c⇒5
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [c f999ecd] c⇒6
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [c 7050a8a] c⇒7
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [c 9732e77] c⇒8
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [c 73a5eed] c⇒9
341s  2 files changed, 2 insertions(+), 2 deletions(-)
341s [d bd5368a] d⇒1
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [d 93e27e6] d⇒2
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [d 133f385] d⇒3
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s [d 586472a] d⇒4
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
341s + modify d.txt 6
341s + filename=d.txt
341s + text=6
341s [d 9522207] d⇒5
341s  1 file changed, 1 insertion(+), 1 deletion(-)
341s + echo 6
341s + git add d.txt
341s + modify conflict.txt d version
341s + filename=conflict.txt
341s + text=d version
341s + echo d version
341s + git add conflict.txt
341s + commit -m d⇒6
341s + TIME=1112912009
341s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
341s [d f7e451a] d⇒6
341s  2 files changed, 2 insertions(+), 2 deletions(-)
341s + git checkout c
341s Switched to branch 'c'
341s + git-imerge init --name=c-d d
341s + git-imerge list
341s * c-d
341s + git-imerge diagram --commits --frontier --html=imerge0.html
341s        0    5   9
341s        |    |   |
341s    0 - ********** - c
341s        *?????????
341s        *?????????
341s        *?????????
341s        *?????????
341s    5 - *?????????
341s    6 - *?????????
341s        |
341s      d
341s 
341s        0    5   9
341s        |    |   |
341s    0 - ********** - c
341s        *?????????
341s        *?????????
341s        *?????????
341s        *?????????
341s    5 - *?????????
341s    6 - *?????????
341s        |
341s      d
341s 
341s Key:
341s   |,-,+ = rectangles forming current merge frontier
341s   * = merge done manually
341s   . = merge done automatically
341s   # = conflict that is currently blocking progress
341s   @ = merge was blocked but has been resolved
341s   ? = no merge recorded
341s 
341s + + git-imerge autofill
341s tee autofill.out
341s Attempting automerge of 9-6...failure.
341s Attempting automerge of 1-1...success.
341s Attempting automerge of 1-4...success.
341s Attempting automerge of 1-6...success.
341s Attempting automerge of 9-6...failure.
341s Attempting automerge of 5-6...success.
341s Attempting automerge of 7-6...success.
341s Attempting automerge of 8-6...success.
341s Attempting automerge of 9-1...success.
341s Attempting automerge of 9-4...success.
341s Attempting automerge of 9-5...success.
341s Autofilling 1-6...success.
341s Autofilling 2-6...success.
341s Autofilling 3-6...success.
341s Autofilling 4-6...success.
341s Autofilling 5-6...success.
341s Autofilling 6-6...success.
341s Autofilling 7-6...success.
341s Autofilling 8-1...success.
341s Autofilling 8-2...success.
341s Autofilling 8-3...success.
341s Autofilling 8-4...success.
341s Autofilling 8-5...success.
341s Autofilling 8-6 (first way)...success.
341s Autofilling 8-6 (second way)...success.
341s The two ways of autofilling 8-6 agree.
341s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7].
341s Autofilling 9-1...success.
341s Autofilling 9-2...success.
341s Autofilling 9-3...success.
342s Autofilling 9-4...success.
342s Autofilling 9-5...success.
342s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6].
342s Attempting automerge of 9-6...failure.
342s Attempting automerge of 9-6...failure.
342s HEAD is now at 73a5eed c⇒9
342s Conflict; suggest manual merge of 9-6
342s + grep -q Traceback autofill.out
342s + grep -q suggest manual merge of 9-6 autofill.out
342s + git-imerge diagram --commits --frontier --html=imerge1.html
342s        0    5   9
342s        |    |   |
342s    0 - ********** - c
342s        *???????..
342s        *???????..
342s        *???????..
342s        *???????..
342s    5 - *???????..
342s    6 - *........#
342s        |
342s      d
342s 
342s        0    5   9
342s        |    |   |
342s    0 - ********** - c
342s        *???????.|
342s        *???????.|
342s        *???????.|
342s        *???????.|
342s    5 - *???????.+
342s    6 - *-------+#
342s        |
342s      d
342s 
342s Key:
342s   |,-,+ = rectangles forming current merge frontier
342s   * = merge done manually
342s   . = merge done automatically
342s   # = conflict that is currently blocking progress
342s   @ = merge was blocked but has been resolved
342s   ? = no merge recorded
342s 
342s + git-imerge continue --edit
342s Switched to branch 'imerge/c-d'
342s Auto-merging conflict.txt
342s CONFLICT (content): Merge conflict in conflict.txt
342s Automatic merge failed; fix conflicts and then commit the result.
342s 
342s Original first commit:
342s commit 73a5eedb087a0f656d730831b8def7943b40f3cf
342s Author: Loú User <luser@example.com>
342s Date:   Thu Apr 7 22:13:23 2005 +0000
342s 
342s     c⇒9
342s 
342s Original second commit:
342s commit f7e451a6c9656dda15641a9fbc591a602f158692
342s Author: Loú User <luser@example.com>
342s Date:   Thu Apr 7 22:13:29 2005 +0000
342s 
342s     d⇒6
342s 
342s There was a conflict merging commit 9-6, shown above.
342s Please resolve the conflict, commit the result, then type
342s 
342s     git-imerge continue
342s + echo merged version
342s + git add conflict.txt
342s + git-imerge continue --no-edit
342s [imerge/c-d dd8ee8a] imerge 'c-d': manual merge 9-6
342s Merge has been recorded for merge 9-6.
342s Merge is complete!
342s + git-imerge diagram --commits --frontier --html=imerge2.html
342s        0    5   9
342s        |    |   |
342s    0 - ********** - c
342s        *???????..
342s        *???????..
342s        *???????..
342s        *???????..
342s    5 - *???????..
342s    6 - *........*
342s        |
342s      d
342s 
342s        0    5   9
342s        |    |   |
342s    0 - ********** - c
342s        *???????.|
342s        *???????.|
342s        *???????.|
342s        *???????.|
342s    5 - *???????.|
342s    6 - *--------*
342s        |
342s      d
342s 
342s Key:
342s   |,-,+ = rectangles forming current merge frontier
342s   * = merge done manually
342s   . = merge done automatically
342s   # = conflict that is currently blocking progress
342s   @ = merge was blocked but has been resolved
342s   ? = no merge recorded
342s 
342s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
342s Merge d into c (using imerge)
342s 
342s # Please enter the commit message for your changes. Lines starting
342s # with '#' will be ignored, and an empty message aborts the commit.
342s #
342s # Date:      Wed Mar 27 02:56:01 2024 +0000
342s #
342s # On branch c-d-merge
342s # Changes to be committed:
342s #	modified:   conflict.txt
342s #	modified:   d.txt
342s #
342s [c-d-merge 002f3b1] Merge d into c (using imerge)
342s  Date: Wed Mar 27 02:56:01 2024 +0000
342s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + local refname=c-d-merge
342s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + git rev-parse c-d-merge^{tree}
342s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + git-imerge simplify --goal=rebase --branch=c-d-rebase
342s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + local refname=c-d-rebase
342s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + git rev-parse c-d-rebase^{tree}
342s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
342s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + local refname=c-d-rebase-with-history
342s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + git rev-parse c-d-rebase-with-history^{tree}
342s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
342s + git-imerge simplify --goal=border --branch=c-d-border
343s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + local refname=c-d-border
343s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + git rev-parse c-d-border^{tree}
343s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
343s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + local refname=c-d-border-with-history
343s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + git rev-parse c-d-border-with-history^{tree}
343s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
343s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + local refname=c-d-border-with-history2
343s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + git rev-parse c-d-border-with-history2^{tree}
343s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
343s + git-imerge remove
343s + git checkout c
343s Switched to branch 'c'
343s + + git-imerge start --goal=full --first-parent --name=c-d d
343s tee start.out
343s Attempting to merge 1-1...success.
343s Attempting to merge 1-2...success.
343s Attempting to merge 1-3...success.
343s Attempting to merge 1-4...success.
343s Attempting to merge 1-5...success.
343s Attempting to merge 1-6...success.
343s Attempting to merge 2-1...success.
343s Attempting to merge 2-2...success.
343s Attempting to merge 2-3...success.
343s Attempting to merge 2-4...success.
343s Attempting to merge 2-5...success.
343s Attempting to merge 2-6...success.
343s Attempting to merge 3-1...success.
343s Attempting to merge 3-2...success.
343s Attempting to merge 3-3...success.
343s Attempting to merge 3-4...success.
343s Attempting to merge 3-5...success.
343s Attempting to merge 3-6...success.
343s Attempting to merge 4-1...success.
343s Attempting to merge 4-2...success.
343s Attempting to merge 4-3...success.
343s Attempting to merge 4-4...success.
343s Attempting to merge 4-5...success.
343s Attempting to merge 4-6...success.
343s Attempting to merge 5-1...success.
343s Attempting to merge 5-2...success.
343s Attempting to merge 5-3...success.
344s Attempting to merge 5-4...success.
344s Attempting to merge 5-5...success.
344s Attempting to merge 5-6...success.
344s Attempting to merge 6-1...success.
344s Attempting to merge 6-2...success.
344s Attempting to merge 6-3...success.
344s Attempting to merge 6-4...success.
344s Attempting to merge 6-5...success.
344s Attempting to merge 6-6...success.
344s Attempting to merge 7-1...success.
344s Attempting to merge 7-2...success.
344s Attempting to merge 7-3...success.
344s Attempting to merge 7-4...success.
344s Attempting to merge 7-5...success.
344s Attempting to merge 7-6...success.
344s Attempting to merge 8-1...success.
344s Attempting to merge 8-2...success.
344s Attempting to merge 8-3...success.
344s Attempting to merge 8-4...success.
344s Attempting to merge 8-5...success.
344s Attempting to merge 8-6...success.
344s Attempting to merge 9-1...success.
344s Attempting to merge 9-2...success.
344s Attempting to merge 9-3...success.
344s Attempting to merge 9-4...success.
344s Attempting to merge 9-5...success.
344s Attempting to merge 9-6...conflict.
344s Switched to branch 'imerge/c-d'
344s Auto-merging conflict.txt
344s CONFLICT (content): Merge conflict in conflict.txt
344s Automatic merge failed; fix conflicts and then commit the result.
344s 
344s Original first commit:
344s commit 73a5eedb087a0f656d730831b8def7943b40f3cf
344s Author: Loú User <luser@example.com>
344s Date:   Thu Apr 7 22:13:23 2005 +0000
344s 
344s     c⇒9
344s 
344s Original second commit:
344s commit f7e451a6c9656dda15641a9fbc591a602f158692
344s Author: Loú User <luser@example.com>
344s Date:   Thu Apr 7 22:13:29 2005 +0000
344s 
344s     d⇒6
344s 
344s There was a conflict merging commit 9-6, shown above.
344s Please resolve the conflict, commit the result, then type
344s 
344s     git-imerge continue
344s + grep -q Traceback start.out
344s + grep -q suggest manual merge of 9-6 autofill.out
344s + git-imerge diagram --commits --frontier --html=imerge3.html
344s        0    5   9
344s        |    |   |
344s    0 - ********** - c
344s        *.........
344s        *.........
344s        *.........
344s        *.........
344s    5 - *.........
344s    6 - *........#
344s        |
344s      d
344s 
344s        0    5   9
344s        |    |   |
344s    0 - ********** - c
344s        *........|
344s        *........|
344s        *........|
344s        *........|
344s    5 - *........+
344s    6 - *-------+#
344s        |
344s      d
344s 
344s Key:
344s   |,-,+ = rectangles forming current merge frontier
344s   * = merge done manually
344s   . = merge done automatically
344s   # = conflict that is currently blocking progress
344s   @ = merge was blocked but has been resolved
344s   ? = no merge recorded
344s 
344s + echo merged version
344s + git add conflict.txt
344s + GIT_EDITOR=cat git commit
344s imerge 'c-d': manual merge 9-6
344s 
344s # Conflicts:
344s #	conflict.txt
344s #
344s # It looks like you may be committing a merge.
344s # If this is not correct, please run
344s #	git update-ref -d MERGE_HEAD
344s # and try again.
344s 
344s 
344s # Please enter the commit message for your changes. Lines starting
344s # with '#' will be ignored, and an empty message aborts the commit.
344s #
344s # On branch imerge/c-d
344s # All conflicts fixed but you are still merging.
344s #
344s # Changes to be committed:
344s #	modified:   conflict.txt
344s #	modified:   d.txt
344s #
344s + git-imerge continue --edit
344s [imerge/c-d df249f2] imerge 'c-d': manual merge 9-6
344s Merge has been recorded for merge 9-6.
344s Merge is complete!
344s + git-imerge diagram --commits --frontier --html=imerge4.html
344s        0    5   9
344s        |    |   |
344s    0 - ********** - c
344s        *.........
344s        *.........
344s        *.........
344s        *.........
344s    5 - *.........
344s    6 - *........*
344s        |
344s      d
344s 
344s        0    5   9
344s        |    |   |
344s    0 - ********** - c
344s        *........|
344s        *........|
344s        *........|
344s        *........|
344s    5 - *........|
344s    6 - *--------*
344s        |
344s      d
344s 
344s Key:
344s   |,-,+ = rectangles forming current merge frontier
344s   * = merge done manually
344s   . = merge done automatically
344s   # = conflict that is currently blocking progress
344s   @ = merge was blocked but has been resolved
344s   ? = no merge recorded
344s 
344s + git-imerge finish --branch=c-d-full
344s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
344s + local refname=c-d-full
344s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
344s + git rev-parse c-d-full^{tree}
344s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
344s + test_conflict 1-2
344s + local conflict=1-2
344s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s + DESCRIPTION=git-imerge test repository with conflict at 1-2
344s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2
344s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s + local description=git-imerge test repository with conflict at 1-2
344s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2
344s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s + local description=git-imerge test repository with conflict at 1-2
344s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s hint: Using 'master' as the name for the initial branch. This default branch name
344s hint: is subject to change. To configure the initial branch name to use in all
344s hint: of your new repositories, which will suppress this warning, call:
344s hint: 
344s hint: 	git config --global init.defaultBranch <name>
344s hint: 
344s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
344s hint: 'development'. The just-created branch can be renamed via this command:
344s hint: 
344s hint: 	git branch -m <name>
344s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2/.git/
344s + echo git-imerge test repository with conflict at 1-2
344s + printf %s\n /*.out /*.css /*.html
344s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2/.git config user.name Loú User
344s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com
344s + TIME=1112911993
344s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-1-2
344s + modify c.txt 0
344s + filename=c.txt
344s + text=0
344s + echo 0
344s + git add c.txt
344s + modify d.txt 0
344s + filename=d.txt
344s + text=0
344s + echo 0
344s + git add d.txt
344s + modify conflict.txt original version
344s + filename=conflict.txt
344s + text=original version
344s + echo original version
344s + git add conflict.txt
344s + commit -m m⇒0
344s + TIME=1112911994
344s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
344s [master (root-commit) d70e04b] m⇒0
344s  3 files changed, 3 insertions(+)
344s  create mode 100644 c.txt
344s  create mode 100644 conflict.txt
344s  create mode 100644 d.txt
344s + git checkout -b c master --
344s Switched to a new branch 'c'
344s + seq 9
344s + modify c.txt 1
344s + filename=c.txt
344s + text=1
344s + echo 1
344s + git add c.txt
344s + modify conflict.txt c version
344s + filename=conflict.txt
344s + text=c version
344s + echo c version
344s + git add conflict.txt
344s + commit -m c⇒1
344s + TIME=1112911995
344s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
344s [c 2120f40] c⇒1
344s  2 files changed, 2 insertions(+), 2 deletions(-)
344s + modify c.txt 2
344s + filename=c.txt
344s + text=2
344s + echo 2
344s + git add c.txt
344s + commit -m c⇒2
344s + TIME=1112911996
344s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
344s + modify c.txt 3
344s + filename=c.txt
344s + text=3
344s + echo 3
344s + git add c.txt
344s + commit -m c⇒3
344s + TIME=1112911997
344s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
344s + modify c.txt 4
344s + filename=c.txt
344s + text=4
344s + echo 4
344s + git add c.txt
344s + commit -m c⇒4
344s + TIME=1112911998
344s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
344s + modify c.txt 5
344s + filename=c.txt
344s + text=5
344s + echo 5
344s + git add c.txt
344s + commit -m c⇒5
344s + TIME=1112911999
344s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
344s + modify c.txt 6
344s + filename=c.txt
344s + text=6
344s + echo 6
344s + git add c.txt
344s + commit -m c⇒6
344s + TIME=1112912000
344s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
344s + modify c.txt 7
344s [c 90cc7de] c⇒2
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s [c 2046ed2] c⇒3
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s [c 8a2cee9] c⇒4
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s [c ac16a05] c⇒5
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s [c 30dd2ae] c⇒6
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s + filename=c.txt
344s + text=7
344s + echo 7
344s + git add c.txt
344s + commit -m c⇒7
344s + TIME=1112912001
344s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
344s [c 0883eb9] c⇒7
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s + modify c.txt 8
344s + filename=c.txt
344s + text=8
344s + echo 8
344s + git add c.txt
344s + commit -m c⇒8
344s + TIME=1112912002
344s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
344s [c f661c06] c⇒8
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s + modify c.txt 9
344s + filename=c.txt
344s + text=9
344s + echo 9
344s + git add c.txt
344s + commit -m c⇒9
344s + TIME=1112912003
344s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
344s [c 243e8ed] c⇒9
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s + git checkout -b d master --
344s Switched to a new branch 'd'
344s + seq 6
344s + modify d.txt 1
344s + filename=d.txt
344s + text=1
344s + echo 1
344s + git add d.txt
344s + commit -m d⇒1
344s + TIME=1112912004
344s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
344s [d bd5368a] d⇒1
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s + modify d.txt 2
344s + filename=d.txt
344s + text=2
344s + echo 2
344s + git add d.txt
344s + modify conflict.txt d version
344s + filename=conflict.txt
344s + text=d version
344s + echo d version
344s + git add conflict.txt
344s + commit -m d⇒2
344s + TIME=1112912005
344s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
344s [d 69efde8] d⇒2
344s  2 files changed, 2 insertions(+), 2 deletions(-)
344s + modify d.txt 3
344s + filename=d.txt
344s + text=3
344s + echo 3
344s + git add d.txt
344s + commit -m d⇒3
344s + TIME=1112912006
344s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
344s + modify d.txt 4
344s + filename=d.txt
344s + text=4
344s + echo 4
344s + git add d.txt
344s + commit -m d⇒4
344s + TIME=1112912007
344s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
344s + modify d.txt 5
344s + filename=d.txt
344s + text=5
344s + echo 5
344s + git add d.txt
344s + commit -m d⇒5
344s + TIME=1112912008
344s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
344s + modify d.txt 6
344s + filename=d.txt
344s + text=6
344s + echo 6
344s + git add d.txt
344s + commit -m d⇒6
344s + TIME=1112912009
344s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
344s + git checkout c
344s Switched to branch 'c'
344s + git-imerge init --name=c-d d
344s [d 3169557] d⇒3
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s [d 86c8052] d⇒4
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s [d 1700773] d⇒5
344s  1 file changed, 1 insertion(+), 1 deletion(-)
344s [d df2e493] d⇒6
344s  1 file changed, 1 insertion(+), 1 deletion(-)
345s + git-imerge list
345s * c-d
345s + git-imerge diagram --commits --frontier --html=imerge0.html
345s        0    5   9
345s        |    |   |
345s    0 - ********** - c
345s        *?????????
345s        *?????????
345s        *?????????
345s        *?????????
345s    5 - *?????????
345s    6 - *?????????
345s        |
345s      d
345s 
345s        0    5   9
345s        |    |   |
345s    0 - ********** - c
345s        *?????????
345s        *?????????
345s        *?????????
345s        *?????????
345s    5 - *?????????
345s    6 - *?????????
345s        |
345s      d
345s 
345s Key:
345s   |,-,+ = rectangles forming current merge frontier
345s   * = merge done manually
345s   . = merge done automatically
345s   # = conflict that is currently blocking progress
345s   @ = merge was blocked but has been resolved
345s   ? = no merge recorded
345s 
345s + + git-imerge autofill
345s tee autofill.out
345s Attempting automerge of 9-6...failure.
345s Attempting automerge of 1-1...success.
345s Attempting automerge of 1-4...failure.
345s Attempting automerge of 1-3...failure.
345s Attempting automerge of 1-2...failure.
345s Attempting automerge of 9-1...success.
345s Autofilling 1-1...success.
345s Autofilling 2-1...success.
345s Autofilling 3-1...success.
345s Autofilling 4-1...success.
345s Autofilling 5-1...success.
345s Autofilling 6-1...success.
345s Autofilling 7-1...success.
345s Autofilling 8-1...success.
345s Autofilling 9-1...success.
345s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2].
345s Attempting automerge of 9-6...failure.
345s Attempting automerge of 1-2...failure.
345s HEAD is now at 243e8ed c⇒9
345s Conflict; suggest manual merge of 1-2
345s + grep -q Traceback autofill.out
345s + grep -q suggest manual merge of 1-2 autofill.out
345s + git-imerge diagram --commits --frontier --html=imerge1.html
345s        0    5   9
345s        |    |   |
345s    0 - ********** - c
345s        *.........
345s        *#????????
345s        *?????????
345s        *?????????
345s    5 - *?????????
345s    6 - *?????????
345s        |
345s      d
345s 
345s        0    5   9
345s        |    |   |
345s    0 - ********** - c
345s        *--------+
345s        *#????????
345s        *?????????
345s        *?????????
345s    5 - *?????????
345s    6 - *?????????
345s        |
345s      d
345s 
345s Key:
345s   |,-,+ = rectangles forming current merge frontier
345s   * = merge done manually
345s   . = merge done automatically
345s   # = conflict that is currently blocking progress
345s   @ = merge was blocked but has been resolved
345s   ? = no merge recorded
345s 
345s + git-imerge continue --edit
345s Switched to branch 'imerge/c-d'
345s Auto-merging conflict.txt
345s CONFLICT (content): Merge conflict in conflict.txt
345s Automatic merge failed; fix conflicts and then commit the result.
345s 
345s Original first commit:
345s commit 2120f40dc39d28052a5279b645124e8ed7e5de73
345s Author: Loú User <luser@example.com>
345s Date:   Thu Apr 7 22:13:15 2005 +0000
345s 
345s     c⇒1
345s 
345s Original second commit:
345s commit 69efde8f66d581a765a3909ffacb9f895f95c345
345s Author: Loú User <luser@example.com>
345s Date:   Thu Apr 7 22:13:25 2005 +0000
345s 
345s     d⇒2
345s 
345s There was a conflict merging commit 1-2, shown above.
345s Please resolve the conflict, commit the result, then type
345s 
345s     git-imerge continue
345s + echo merged version
345s + git add conflict.txt
345s + git-imerge continue --no-edit
345s [imerge/c-d e215e26] imerge 'c-d': manual merge 1-2
345s Merge has been recorded for merge 1-2.
345s Attempting automerge of 1-6...success.
345s Autofilling 1-3...success.
345s Autofilling 1-4...success.
345s Autofilling 1-5...success.
345s Autofilling 1-6...success.
345s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7].
345s Attempting automerge of 9-6...success.
345s Autofilling 2-6...success.
345s Autofilling 3-6...success.
345s Autofilling 4-6...success.
345s Autofilling 5-6...success.
345s Autofilling 6-6...success.
345s Autofilling 7-6...success.
345s Autofilling 8-6...success.
345s Autofilling 9-2...success.
345s Autofilling 9-3...success.
345s Autofilling 9-4...success.
345s Autofilling 9-5...success.
345s Autofilling 9-6 (first way)...success.
345s Autofilling 9-6 (second way)...success.
345s The two ways of autofilling 9-6 agree.
345s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7].
346s Merge is complete!
346s + git-imerge diagram --commits --frontier --html=imerge2.html
346s        0    5   9
346s        |    |   |
346s    0 - ********** - c
346s        *.........
346s        **???????.
346s        *.???????.
346s        *.???????.
346s    5 - *.???????.
346s    6 - *.........
346s        |
346s      d
346s 
346s        0    5   9
346s        |    |   |
346s    0 - ********** - c
346s        *........|
346s        **???????|
346s        *.???????|
346s        *.???????|
346s    5 - *.???????|
346s    6 - *--------+
346s        |
346s      d
346s 
346s Key:
346s   |,-,+ = rectangles forming current merge frontier
346s   * = merge done manually
346s   . = merge done automatically
346s   # = conflict that is currently blocking progress
346s   @ = merge was blocked but has been resolved
346s   ? = no merge recorded
346s 
346s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
346s Merge d into c (using imerge)
346s 
346s # Please enter the commit message for your changes. Lines starting
346s # with '#' will be ignored, and an empty message aborts the commit.
346s #
346s # Date:      Wed Mar 27 02:56:05 2024 +0000
346s #
346s # On branch c-d-merge
346s # Changes to be committed:
346s #	modified:   conflict.txt
346s #	modified:   d.txt
346s #
346s [c-d-merge 2b1af8a] Merge d into c (using imerge)
346s  Date: Wed Mar 27 02:56:05 2024 +0000
346s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + local refname=c-d-merge
346s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git rev-parse c-d-merge^{tree}
346s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git-imerge simplify --goal=rebase --branch=c-d-rebase
346s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + local refname=c-d-rebase
346s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git rev-parse c-d-rebase^{tree}
346s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
346s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + local refname=c-d-rebase-with-history
346s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git rev-parse c-d-rebase-with-history^{tree}
346s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git-imerge simplify --goal=border --branch=c-d-border
346s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + local refname=c-d-border
346s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git rev-parse c-d-border^{tree}
346s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
346s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + local refname=c-d-border-with-history
346s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git rev-parse c-d-border-with-history^{tree}
346s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
346s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
347s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
347s + local refname=c-d-border-with-history2
347s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
347s + git rev-parse c-d-border-with-history2^{tree}
347s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
347s + git-imerge remove
347s + git checkout c
347s Switched to branch 'c'
347s + + git-imerge start --goal=full --first-parent --name=c-d d
347s tee start.out
347s Attempting to merge 1-1...success.
347s Attempting to merge 1-2...conflict.
347s Attempting to merge 2-1...success.
347s Attempting to merge 3-1...success.
347s Attempting to merge 4-1...success.
347s Attempting to merge 5-1...success.
347s Attempting to merge 6-1...success.
347s Attempting to merge 7-1...success.
347s Attempting to merge 8-1...success.
347s Attempting to merge 9-1...success.
347s Previous HEAD position was 757c688 imerge 'c-d': automatic merge 9-1
347s Switched to branch 'imerge/c-d'
347s Auto-merging conflict.txt
347s CONFLICT (content): Merge conflict in conflict.txt
347s Automatic merge failed; fix conflicts and then commit the result.
347s 
347s Original first commit:
347s commit 2120f40dc39d28052a5279b645124e8ed7e5de73
347s Author: Loú User <luser@example.com>
347s Date:   Thu Apr 7 22:13:15 2005 +0000
347s 
347s     c⇒1
347s 
347s Original second commit:
347s commit 69efde8f66d581a765a3909ffacb9f895f95c345
347s Author: Loú User <luser@example.com>
347s Date:   Thu Apr 7 22:13:25 2005 +0000
347s 
347s     d⇒2
347s 
347s There was a conflict merging commit 1-2, shown above.
347s Please resolve the conflict, commit the result, then type
347s 
347s     git-imerge continue
347s + grep -q Traceback start.out
347s + grep -q suggest manual merge of 1-2 autofill.out
347s + git-imerge diagram --commits --frontier --html=imerge3.html
347s        0    5   9
347s        |    |   |
347s    0 - ********** - c
347s        *.........
347s        *#????????
347s        *?????????
347s        *?????????
347s    5 - *?????????
347s    6 - *?????????
347s        |
347s      d
347s 
347s        0    5   9
347s        |    |   |
347s    0 - ********** - c
347s        *--------+
347s        *#????????
347s        *?????????
347s        *?????????
347s    5 - *?????????
347s    6 - *?????????
347s        |
347s      d
347s 
347s Key:
347s   |,-,+ = rectangles forming current merge frontier
347s   * = merge done manually
347s   . = merge done automatically
347s   # = conflict that is currently blocking progress
347s   @ = merge was blocked but has been resolved
347s   ? = no merge recorded
347s 
347s + echo merged version
347s + git add conflict.txt
347s + GIT_EDITOR=cat git commit
347s imerge 'c-d': manual merge 1-2
347s 
347s # Conflicts:
347s #	conflict.txt
347s #
347s # It looks like you may be committing a merge.
347s # If this is not correct, please run
347s #	git update-ref -d MERGE_HEAD
347s # and try again.
347s 
347s 
347s # Please enter the commit message for your changes. Lines starting
347s # with '#' will be ignored, and an empty message aborts the commit.
347s #
347s # On branch imerge/c-d
347s # All conflicts fixed but you are still merging.
347s #
347s # Changes to be committed:
347s #	modified:   conflict.txt
347s #	modified:   d.txt
347s #
347s [imerge/c-d f1088ab] imerge 'c-d': manual merge 1-2
347s + git-imerge continue --edit
347s Merge has been recorded for merge 1-2.
347s Attempting to merge 1-3...success.
347s Attempting to merge 1-4...success.
347s Attempting to merge 1-5...success.
347s Attempting to merge 1-6...success.
347s Attempting to merge 2-2...success.
347s Attempting to merge 2-3...success.
347s Attempting to merge 2-4...success.
347s Attempting to merge 2-5...success.
347s Attempting to merge 2-6...success.
347s Attempting to merge 3-2...success.
347s Attempting to merge 3-3...success.
347s Attempting to merge 3-4...success.
347s Attempting to merge 3-5...success.
347s Attempting to merge 3-6...success.
347s Attempting to merge 4-2...success.
347s Attempting to merge 4-3...success.
347s Attempting to merge 4-4...success.
347s Attempting to merge 4-5...success.
347s Attempting to merge 4-6...success.
347s Attempting to merge 5-2...success.
347s Attempting to merge 5-3...success.
347s Attempting to merge 5-4...success.
347s Attempting to merge 5-5...success.
347s Attempting to merge 5-6...success.
347s Attempting to merge 6-2...success.
347s Attempting to merge 6-3...success.
347s Attempting to merge 6-4...success.
347s Attempting to merge 6-5...success.
347s Attempting to merge 6-6...success.
347s Attempting to merge 7-2...success.
347s Attempting to merge 7-3...success.
347s Attempting to merge 7-4...success.
347s Attempting to merge 7-5...success.
347s Attempting to merge 7-6...success.
347s Attempting to merge 8-2...success.
347s Attempting to merge 8-3...success.
348s Attempting to merge 8-4...success.
348s Attempting to merge 8-5...success.
348s Attempting to merge 8-6...success.
348s Attempting to merge 9-2...success.
348s Attempting to merge 9-3...success.
348s Attempting to merge 9-4...success.
348s Attempting to merge 9-5...success.
348s Attempting to merge 9-6...success.
348s Merge is complete!
348s + git-imerge diagram --commits --frontier --html=imerge4.html
348s        0    5   9
348s        |    |   |
348s    0 - ********** - c
348s        *.........
348s        **........
348s        *.........
348s        *.........
348s    5 - *.........
348s    6 - *.........
348s        |
348s      d
348s 
348s        0    5   9
348s        |    |   |
348s    0 - ********** - c
348s        *........|
348s        **.......|
348s        *........|
348s        *........|
348s    5 - *........|
348s    6 - *--------+
348s        |
348s      d
348s 
348s Key:
348s   |,-,+ = rectangles forming current merge frontier
348s   * = merge done manually
348s   . = merge done automatically
348s   # = conflict that is currently blocking progress
348s   @ = merge was blocked but has been resolved
348s   ? = no merge recorded
348s 
348s + git-imerge finish --branch=c-d-full
348s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
348s + local refname=c-d-full
348s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
348s + git rev-parse c-d-full^{tree}
348s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
348s + test_conflict 9-5
348s + local conflict=9-5
348s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s + DESCRIPTION=git-imerge test repository with conflict at 9-5
348s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5
348s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s + local description=git-imerge test repository with conflict at 9-5
348s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5
348s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s + local description=git-imerge test repository with conflict at 9-5
348s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5/.git/
348s hint: Using 'master' as the name for the initial branch. This default branch name
348s hint: is subject to change. To configure the initial branch name to use in all
348s hint: of your new repositories, which will suppress this warning, call:
348s hint: 
348s hint: 	git config --global init.defaultBranch <name>
348s hint: 
348s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
348s hint: 'development'. The just-created branch can be renamed via this command:
348s hint: 
348s hint: 	git branch -m <name>
348s + echo git-imerge test repository with conflict at 9-5
348s + printf %s\n /*.out /*.css /*.html
348s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5/.git config user.name Loú User
348s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com
348s + TIME=1112911993
348s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-9-5
348s + modify c.txt 0
348s + filename=c.txt
348s + text=0
348s + echo 0
348s + git add c.txt
348s + modify d.txt 0
348s + filename=d.txt
348s + text=0
348s + echo 0
348s + git add d.txt
348s + modify conflict.txt original version
348s + filename=conflict.txt
348s + text=original version
348s + echo original version
348s + git add conflict.txt
348s + commit -m m⇒0
348s + TIME=1112911994
348s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
348s [master (root-commit) d70e04b] m⇒0
348s  3 files changed, 3 insertions(+)
348s  create mode 100644 c.txt
348s  create mode 100644 conflict.txt
348s  create mode 100644 d.txt
348s + git checkout -b c master --
348s Switched to a new branch 'c'
348s + seq 9
348s + modify c.txt 1
348s + filename=c.txt
348s + text=1
348s + echo 1
348s + git add c.txt
348s + commit -m c⇒1
348s + TIME=1112911995
348s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
348s [c 89e2141] c⇒1
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + modify c.txt 2
348s + filename=c.txt
348s + text=2
348s + echo 2
348s + git add c.txt
348s + commit -m c⇒2
348s + TIME=1112911996
348s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
348s [c 7c431f2] c⇒2
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + modify c.txt 3
348s + filename=c.txt
348s + text=3
348s + echo 3
348s + git add c.txt
348s + commit -m c⇒3
348s + TIME=1112911997
348s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
348s + modify c.txt 4
348s + filename=c.txt
348s + text=4
348s + echo 4
348s + git add c.txt
348s + commit -m c⇒4
348s + TIME=1112911998
348s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
348s + modify c.txt 5
348s + filename=c.txt
348s + text=5
348s + echo 5
348s + git add c.txt
348s + commit -m c⇒5
348s + TIME=1112911999
348s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
348s [c f02ab24] c⇒3
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s [c ed9122f] c⇒4
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s [c 1d3bf09] c⇒5
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s [c f999ecd] c⇒6
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s [c 7050a8a] c⇒7
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + modify c.txt 6
348s + filename=c.txt
348s + text=6
348s + echo 6
348s + git add c.txt
348s + commit -m c⇒6
348s + TIME=1112912000
348s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
348s + modify c.txt 7
348s + filename=c.txt
348s + text=7
348s + echo 7
348s + git add c.txt
348s + commit -m c⇒7
348s + TIME=1112912001
348s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
348s + modify c.txt 8
348s + filename=c.txt
348s + text=8
348s + echo 8
348s + git add c.txt
348s + commit -m c⇒8
348s + TIME=1112912002
348s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
348s + modify c.txt 9
348s + filename=c.txt
348s + text=9
348s + echo 9
348s + git add c.txt
348s + modify conflict.txt c version
348s + filename=conflict.txt
348s [c 9732e77] c⇒8
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + text=c version
348s + echo c version
348s + git add conflict.txt
348s + commit -m c⇒9
348s + TIME=1112912003
348s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
348s [c 73a5eed] c⇒9
348s  2 files changed, 2 insertions(+), 2 deletions(-)
348s + git checkout -b d master --
348s Switched to a new branch 'd'
348s + seq 6
348s + modify d.txt 1
348s + filename=d.txt
348s + text=1
348s + echo 1
348s + git add d.txt
348s + commit -m d⇒1
348s + TIME=1112912004
348s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
348s [d bd5368a] d⇒1
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + modify d.txt 2
348s + filename=d.txt
348s + text=2
348s + echo 2
348s + git add d.txt
348s + commit -m d⇒2
348s + TIME=1112912005
348s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
348s [d 93e27e6] d⇒2
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + modify d.txt 3
348s + filename=d.txt
348s + text=3
348s + echo 3
348s + git add d.txt
348s + commit -m d⇒3
348s + TIME=1112912006
348s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
348s [d 133f385] d⇒3
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + modify d.txt 4
348s + filename=d.txt
348s + text=4
348s + echo 4
348s + git add d.txt
348s + commit -m d⇒4
348s + TIME=1112912007
348s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
348s [d 586472a] d⇒4
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + modify d.txt 5
348s [d 0a6f956] d⇒5
348s  2 files changed, 2 insertions(+), 2 deletions(-)
348s [d bfb30f0] d⇒6
348s  1 file changed, 1 insertion(+), 1 deletion(-)
348s + filename=d.txt
348s + text=5
348s + echo 5
348s + git add d.txt
348s + modify conflict.txt d version
348s + filename=conflict.txt
348s + text=d version
348s + echo d version
348s + git add conflict.txt
348s + commit -m d⇒5
348s + TIME=1112912008
348s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
348s + modify d.txt 6
348s + filename=d.txt
348s + text=6
348s + echo 6
348s + git add d.txt
348s + commit -m d⇒6
348s + TIME=1112912009
348s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
348s + git checkout c
348s Switched to branch 'c'
348s + git-imerge init --name=c-d d
348s + git-imerge list
348s * c-d
348s + git-imerge diagram --commits --frontier --html=imerge0.html
348s        0    5   9
348s        |    |   |
348s    0 - ********** - c
348s        *?????????
348s        *?????????
348s        *?????????
348s        *?????????
348s    5 - *?????????
348s    6 - *?????????
348s        |
348s      d
348s 
348s        0    5   9
348s        |    |   |
348s    0 - ********** - c
348s        *?????????
348s        *?????????
348s        *?????????
348s        *?????????
348s    5 - *?????????
348s    6 - *?????????
348s        |
348s      d
348s 
348s Key:
348s   |,-,+ = rectangles forming current merge frontier
348s   * = merge done manually
348s   . = merge done automatically
348s   # = conflict that is currently blocking progress
348s   @ = merge was blocked but has been resolved
348s   ? = no merge recorded
348s 
348s + + git-imerge autofill
348s tee autofill.out
348s Attempting automerge of 9-6...failure.
348s Attempting automerge of 1-1...success.
348s Attempting automerge of 1-4...success.
348s Attempting automerge of 1-6...success.
348s Attempting automerge of 9-6...failure.
348s Attempting automerge of 5-6...success.
348s Attempting automerge of 7-6...success.
348s Attempting automerge of 8-6...success.
348s Attempting automerge of 9-1...success.
348s Attempting automerge of 9-4...success.
348s Attempting automerge of 9-5...failure.
348s Autofilling 1-6...success.
348s Autofilling 2-6...success.
348s Autofilling 3-6...success.
348s Autofilling 4-6...success.
349s Autofilling 5-6...success.
349s Autofilling 6-6...success.
349s Autofilling 7-6...success.
349s Autofilling 8-1...success.
349s Autofilling 8-2...success.
349s Autofilling 8-3...success.
349s Autofilling 8-4...success.
349s Autofilling 8-5...success.
349s Autofilling 8-6 (first way)...success.
349s Autofilling 8-6 (second way)...success.
349s The two ways of autofilling 8-6 agree.
349s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7].
349s Autofilling 9-1...success.
349s Autofilling 9-2...success.
349s Autofilling 9-3...success.
349s Autofilling 9-4...success.
349s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5].
349s Attempting automerge of 9-6...failure.
349s Attempting automerge of 9-5...failure.
349s HEAD is now at 73a5eed c⇒9
349s Conflict; suggest manual merge of 9-5
349s + grep -q Traceback autofill.out
349s + grep -q suggest manual merge of 9-5 autofill.out
349s + git-imerge diagram --commits --frontier --html=imerge1.html
349s        0    5   9
349s        |    |   |
349s    0 - ********** - c
349s        *???????..
349s        *???????..
349s        *???????..
349s        *???????..
349s    5 - *???????.#
349s    6 - *........?
349s        |
349s      d
349s 
349s        0    5   9
349s        |    |   |
349s    0 - ********** - c
349s        *???????.|
349s        *???????.|
349s        *???????.|
349s        *???????.+
349s    5 - *???????|#
349s    6 - *-------+?
349s        |
349s      d
349s 
349s Key:
349s   |,-,+ = rectangles forming current merge frontier
349s   * = merge done manually
349s   . = merge done automatically
349s   # = conflict that is currently blocking progress
349s   @ = merge was blocked but has been resolved
349s   ? = no merge recorded
349s 
349s + git-imerge continue --edit
349s Switched to branch 'imerge/c-d'
349s Auto-merging conflict.txt
349s CONFLICT (content): Merge conflict in conflict.txt
349s Automatic merge failed; fix conflicts and then commit the result.
349s 
349s Original first commit:
349s commit 73a5eedb087a0f656d730831b8def7943b40f3cf
349s Author: Loú User <luser@example.com>
349s Date:   Thu Apr 7 22:13:23 2005 +0000
349s 
349s     c⇒9
349s 
349s Original second commit:
349s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f
349s Author: Loú User <luser@example.com>
349s Date:   Thu Apr 7 22:13:28 2005 +0000
349s 
349s     d⇒5
349s 
349s There was a conflict merging commit 9-5, shown above.
349s Please resolve the conflict, commit the result, then type
349s 
349s     git-imerge continue
349s + echo merged version
349s + git add conflict.txt
349s + git-imerge continue --no-edit
349s [imerge/c-d 720bbf9] imerge 'c-d': manual merge 9-5
349s Merge has been recorded for merge 9-5.
349s Attempting automerge of 9-6...success.
349s Autofilling 9-6...success.
349s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7].
349s Merge is complete!
349s + git-imerge diagram --commits --frontier --html=imerge2.html
349s        0    5   9
349s        |    |   |
349s    0 - ********** - c
349s        *???????..
349s        *???????..
349s        *???????..
349s        *???????..
349s    5 - *???????.*
349s    6 - *.........
349s        |
349s      d
349s 
349s        0    5   9
349s        |    |   |
349s    0 - ********** - c
349s        *???????.|
349s        *???????.|
349s        *???????.|
349s        *???????.|
349s    5 - *???????.*
349s    6 - *--------+
349s        |
349s      d
349s 
349s Key:
349s   |,-,+ = rectangles forming current merge frontier
349s   * = merge done manually
349s   . = merge done automatically
349s   # = conflict that is currently blocking progress
349s   @ = merge was blocked but has been resolved
349s   ? = no merge recorded
349s 
349s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
349s Merge d into c (using imerge)
349s 
349s # Please enter the commit message for your changes. Lines starting
349s # with '#' will be ignored, and an empty message aborts the commit.
349s #
349s # Date:      Wed Mar 27 02:56:08 2024 +0000
349s #
349s # On branch c-d-merge
349s # Changes to be committed:
349s #	modified:   conflict.txt
349s #	modified:   d.txt
349s #
349s [c-d-merge 33afea1] Merge d into c (using imerge)
349s  Date: Wed Mar 27 02:56:08 2024 +0000
349s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
349s + local refname=c-d-merge
349s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
349s + git rev-parse c-d-merge^{tree}
349s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
349s + git-imerge simplify --goal=rebase --branch=c-d-rebase
349s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
349s + local refname=c-d-rebase
349s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
349s + git rev-parse c-d-rebase^{tree}
349s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
349s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
350s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + local refname=c-d-rebase-with-history
350s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git rev-parse c-d-rebase-with-history^{tree}
350s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git-imerge simplify --goal=border --branch=c-d-border
350s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + local refname=c-d-border
350s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git rev-parse c-d-border^{tree}
350s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
350s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + local refname=c-d-border-with-history
350s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git rev-parse c-d-border-with-history^{tree}
350s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
350s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + local refname=c-d-border-with-history2
350s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git rev-parse c-d-border-with-history2^{tree}
350s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
350s + git-imerge remove
350s + git checkout c
350s Switched to branch 'c'
350s + + git-imerge start --goal=full --first-parent --name=c-dtee d
350s  start.out
350s Attempting to merge 1-1...success.
350s Attempting to merge 1-2...success.
350s Attempting to merge 1-3...success.
350s Attempting to merge 1-4...success.
350s Attempting to merge 1-5...success.
350s Attempting to merge 1-6...success.
350s Attempting to merge 2-1...success.
350s Attempting to merge 2-2...success.
350s Attempting to merge 2-3...success.
350s Attempting to merge 2-4...success.
350s Attempting to merge 2-5...success.
350s Attempting to merge 2-6...success.
350s Attempting to merge 3-1...success.
350s Attempting to merge 3-2...success.
351s Attempting to merge 3-3...success.
351s Attempting to merge 3-4...success.
351s Attempting to merge 3-5...success.
351s Attempting to merge 3-6...success.
351s Attempting to merge 4-1...success.
351s Attempting to merge 4-2...success.
351s Attempting to merge 4-3...success.
351s Attempting to merge 4-4...success.
351s Attempting to merge 4-5...success.
351s Attempting to merge 4-6...success.
351s Attempting to merge 5-1...success.
351s Attempting to merge 5-2...success.
351s Attempting to merge 5-3...success.
351s Attempting to merge 5-4...success.
351s Attempting to merge 5-5...success.
351s Attempting to merge 5-6...success.
351s Attempting to merge 6-1...success.
351s Attempting to merge 6-2...success.
351s Attempting to merge 6-3...success.
351s Attempting to merge 6-4...success.
351s Attempting to merge 6-5...success.
351s Attempting to merge 6-6...success.
351s Attempting to merge 7-1...success.
351s Attempting to merge 7-2...success.
351s Attempting to merge 7-3...success.
351s Attempting to merge 7-4...success.
351s Attempting to merge 7-5...success.
351s Attempting to merge 7-6...success.
351s Attempting to merge 8-1...success.
351s Attempting to merge 8-2...success.
351s Attempting to merge 8-3...success.
351s Attempting to merge 8-4...success.
351s Attempting to merge 8-5...success.
351s Attempting to merge 8-6...success.
351s Attempting to merge 9-1...success.
351s Attempting to merge 9-2...success.
351s Attempting to merge 9-3...success.
351s Attempting to merge 9-4...success.
351s Attempting to merge 9-5...conflict.
351s Switched to branch 'imerge/c-d'
351s Auto-merging conflict.txt
351s CONFLICT (content): Merge conflict in conflict.txt
351s Automatic merge failed; fix conflicts and then commit the result.
351s 
351s Original first commit:
351s commit 73a5eedb087a0f656d730831b8def7943b40f3cf
351s Author: Loú User <luser@example.com>
351s Date:   Thu Apr 7 22:13:23 2005 +0000
351s 
351s     c⇒9
351s 
351s Original second commit:
351s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f
351s Author: Loú User <luser@example.com>
351s Date:   Thu Apr 7 22:13:28 2005 +0000
351s 
351s     d⇒5
351s 
351s There was a conflict merging commit 9-5, shown above.
351s Please resolve the conflict, commit the result, then type
351s 
351s     git-imerge continue
351s + grep -q Traceback start.out
351s + grep -q suggest manual merge of 9-5 autofill.out
351s + git-imerge diagram --commits --frontier --html=imerge3.html
351s        0    5   9
351s        |    |   |
351s    0 - ********** - c
351s        *.........
351s        *.........
351s        *.........
351s        *.........
351s    5 - *........#
351s    6 - *........?
351s        |
351s      d
351s 
351s        0    5   9
351s        |    |   |
351s    0 - ********** - c
351s        *........|
351s        *........|
351s        *........|
351s        *........+
351s    5 - *.......|#
351s    6 - *-------+?
351s        |
351s      d
351s 
351s Key:
351s   |,-,+ = rectangles forming current merge frontier
351s   * = merge done manually
351s   . = merge done automatically
351s   # = conflict that is currently blocking progress
351s   @ = merge was blocked but has been resolved
351s   ? = no merge recorded
351s 
351s + echo merged version
351s + git add conflict.txt
351s + GIT_EDITOR=cat git commit
351s imerge 'c-d': manual merge 9-5
351s 
351s # Conflicts:
351s #	conflict.txt
351s #
351s # It looks like you may be committing a merge.
351s # If this is not correct, please run
351s #	git update-ref -d MERGE_HEAD
351s # and try again.
351s 
351s 
351s # Please enter the commit message for your changes. Lines starting
351s # with '#' will be ignored, and an empty message aborts the commit.
351s #
351s # On branch imerge/c-d
351s # All conflicts fixed but you are still merging.
351s #
351s # Changes to be committed:
351s #	modified:   conflict.txt
351s #	modified:   d.txt
351s #
351s [imerge/c-d f840f3e] imerge 'c-d': manual merge 9-5
351s + git-imerge continue --edit
351s Merge has been recorded for merge 9-5.
351s Attempting to merge 9-6...success.
351s Merge is complete!
351s + git-imerge diagram --commits --frontier --html=imerge4.html
351s        0    5   9
351s        |    |   |
351s    0 - ********** - c
351s        *.........
351s        *.........
351s        *.........
351s        *.........
351s    5 - *........*
351s    6 - *.........
351s        |
351s      d
351s 
351s        0    5   9
351s        |    |   |
351s    0 - ********** - c
351s        *........|
351s        *........|
351s        *........|
351s        *........|
351s    5 - *........*
351s    6 - *--------+
351s        |
351s      d
351s 
351s Key:
351s   |,-,+ = rectangles forming current merge frontier
351s   * = merge done manually
351s   . = merge done automatically
351s   # = conflict that is currently blocking progress
351s   @ = merge was blocked but has been resolved
351s   ? = no merge recorded
351s 
351s + git-imerge finish --branch=c-d-full
352s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
352s + local refname=c-d-full
352s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
352s + git rev-parse c-d-full^{tree}
352s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
352s + test_conflict 5-1
352s + local conflict=5-1
352s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s + DESCRIPTION=git-imerge test repository with conflict at 5-1
352s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1
352s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s + local description=git-imerge test repository with conflict at 5-1
352s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1
352s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s + local description=git-imerge test repository with conflict at 5-1
352s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1/.git/
352s [master (root-commit) d70e04b] m⇒0
352s  3 files changed, 3 insertions(+)
352s  create mode 100644 c.txt
352s  create mode 100644 conflict.txt
352s  create mode 100644 d.txt
352s hint: Using 'master' as the name for the initial branch. This default branch name
352s hint: is subject to change. To configure the initial branch name to use in all
352s hint: of your new repositories, which will suppress this warning, call:
352s hint: 
352s hint: 	git config --global init.defaultBranch <name>
352s hint: 
352s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
352s hint: 'development'. The just-created branch can be renamed via this command:
352s hint: 
352s hint: 	git branch -m <name>
352s + echo git-imerge test repository with conflict at 5-1
352s + printf %s\n /*.out /*.css /*.html
352s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1/.git config user.name Loú User
352s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com
352s + TIME=1112911993
352s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-5-1
352s + modify c.txt 0
352s + filename=c.txt
352s + text=0
352s + echo 0
352s + git add c.txt
352s + modify d.txt 0
352s + filename=d.txt
352s + text=0
352s + echo 0
352s + git add d.txt
352s + modify conflict.txt original version
352s + filename=conflict.txt
352s + text=original version
352s + echo original version
352s + git add conflict.txt
352s + commit -m m⇒0
352s + TIME=1112911994
352s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
352s + git checkout -b c master --
352s Switched to a new branch 'c'
352s + seq 9
352s + modify c.txt 1
352s + filename=c.txt
352s + text=1
352s + echo 1
352s + git add c.txt
352s + commit -m c⇒1
352s + TIME=1112911995
352s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
352s [c 89e2141] c⇒1
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify c.txt 2
352s + filename=c.txt
352s + text=2
352s + echo 2
352s + git add c.txt
352s + commit -m c⇒2
352s + TIME=1112911996
352s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
352s [c 7c431f2] c⇒2
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify c.txt 3
352s + filename=c.txt
352s + text=3
352s + echo 3
352s + git add c.txt
352s + commit -m c⇒3
352s + TIME=1112911997
352s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
352s [c f02ab24] c⇒3
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify c.txt 4
352s [c ed9122f] c⇒4
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + filename=c.txt
352s + text=4
352s + echo 4
352s + git add c.txt
352s + commit -m c⇒4
352s + TIME=1112911998
352s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
352s + modify c.txt 5
352s + filename=c.txt
352s + text=5
352s + echo 5
352s + git add c.txt
352s + modify conflict.txt c version
352s + filename=conflict.txt
352s + text=c version
352s + echo c version
352s + git add conflict.txt
352s + commit -m c⇒5
352s + TIME=1112911999
352s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
352s [c 7e31f25] c⇒5
352s  2 files changed, 2 insertions(+), 2 deletions(-)
352s + modify c.txt 6
352s + filename=c.txt
352s + text=6
352s + echo 6
352s + git add c.txt
352s + commit -m c⇒6
352s + TIME=1112912000
352s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
352s [c df3c57a] c⇒6
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify c.txt 7
352s + filename=c.txt
352s + text=7
352s + echo 7
352s + git add c.txt
352s + commit -m c⇒7
352s + TIME=1112912001
352s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
352s [c ea32d81] c⇒7
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify c.txt 8
352s + filename=c.txt
352s + text=8
352s + echo 8
352s + git add c.txt
352s + commit -m c⇒8
352s + TIME=1112912002
352s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
352s [c 44473d6] c⇒8
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify c.txt 9
352s + filename=c.txt
352s + text=9
352s + echo 9
352s + git add c.txt
352s + commit -m c⇒9
352s + TIME=1112912003
352s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
352s [c d8d80cf] c⇒9
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + git checkout -b d master --
352s Switched to a new branch 'd'
352s + seq 6
352s + modify d.txt 1
352s + filename=d.txt
352s + text=1
352s + echo 1
352s + git add d.txt
352s + modify conflict.txt d version
352s + filename=conflict.txt
352s + text=d version
352s + echo d version
352s + git add conflict.txt
352s + commit -m d⇒1
352s + TIME=1112912004
352s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
352s [d ac0427a] d⇒1
352s  2 files changed, 2 insertions(+), 2 deletions(-)
352s + modify d.txt 2
352s + filename=d.txt
352s + text=2
352s + echo 2
352s + git add d.txt
352s + commit -m d⇒2
352s + TIME=1112912005
352s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
352s [d 43c38c0] d⇒2
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify d.txt 3
352s + filename=d.txt
352s + text=3
352s + echo 3
352s + git add d.txt
352s [d 0260058] d⇒3
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s [d 40fef44] d⇒4
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + commit -m d⇒3
352s + TIME=1112912006
352s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
352s + modify d.txt 4
352s + filename=d.txt
352s + text=4
352s + echo 4
352s + git add d.txt
352s + commit -m d⇒4
352s + TIME=1112912007
352s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
352s + modify d.txt 5
352s + filename=d.txt
352s + text=5
352s + echo 5
352s + git add d.txt
352s + commit -m d⇒5
352s + TIME=1112912008
352s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
352s [d b080a65] d⇒5
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + modify d.txt 6
352s + filename=d.txt
352s + text=6
352s + echo 6
352s + git add d.txt
352s + commit -m d⇒6
352s + TIME=1112912009
352s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
352s [d 200ce5c] d⇒6
352s  1 file changed, 1 insertion(+), 1 deletion(-)
352s + git checkout c
352s Switched to branch 'c'
352s + git-imerge init --name=c-d d
352s + git-imerge list
352s * c-d
352s + git-imerge diagram --commits --frontier --html=imerge0.html
352s        0    5   9
352s        |    |   |
352s    0 - ********** - c
352s        *?????????
352s        *?????????
352s        *?????????
352s        *?????????
352s    5 - *?????????
352s    6 - *?????????
352s        |
352s      d
352s 
352s        0    5   9
352s        |    |   |
352s    0 - ********** - c
352s        *?????????
352s        *?????????
352s        *?????????
352s        *?????????
352s    5 - *?????????
352s    6 - *?????????
352s        |
352s      d
352s 
352s Key:
352s   |,-,+ = rectangles forming current merge frontier
352s   * = merge done manually
352s   . = merge done automatically
352s   # = conflict that is currently blocking progress
352s   @ = merge was blocked but has been resolved
352s   ? = no merge recorded
352s 
352s + + git-imerge autofilltee
352s  autofill.out
352s Attempting automerge of 9-6...failure.
352s Attempting automerge of 1-1...success.
352s Attempting automerge of 1-4...success.
352s Attempting automerge of 1-6...success.
352s Attempting automerge of 9-6...failure.
352s Attempting automerge of 5-6...failure.
352s Attempting automerge of 3-6...success.
352s Attempting automerge of 4-6...success.
352s Attempting automerge of 5-1...failure.
352s Autofilling 1-6...success.
352s Autofilling 2-6...success.
352s Autofilling 3-6...success.
352s Autofilling 4-1...success.
352s Autofilling 4-2...success.
352s Autofilling 4-3...success.
352s Autofilling 4-4...success.
352s Autofilling 4-5...success.
352s Autofilling 4-6 (first way)...success.
352s Autofilling 4-6 (second way)...success.
352s The two ways of autofilling 4-6 agree.
352s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7].
352s Attempting automerge of 9-6...failure.
352s Attempting automerge of 5-1...failure.
352s HEAD is now at d8d80cf c⇒9
352s Conflict; suggest manual merge of 5-1
352s + grep -q Traceback autofill.out
352s + grep -q suggest manual merge of 5-1 autofill.out
352s + git-imerge diagram --commits --frontier --html=imerge1.html
352s        0    5   9
352s        |    |   |
352s    0 - ********** - c
352s        *???.#????
352s        *???.?????
352s        *???.?????
352s        *???.?????
352s    5 - *???.?????
352s    6 - *....?????
352s        |
352s      d
352s 
352s        0    5   9
352s        |    |   |
352s    0 - ********** - c
352s        *???|#????
352s        *???|?????
352s        *???|?????
352s        *???|?????
352s    5 - *???|?????
352s    6 - *---+?????
352s        |
352s      d
352s 
352s Key:
352s   |,-,+ = rectangles forming current merge frontier
352s   * = merge done manually
352s   . = merge done automatically
352s   # = conflict that is currently blocking progress
352s   @ = merge was blocked but has been resolved
352s   ? = no merge recorded
352s 
352s + git-imerge continue --edit
353s Switched to branch 'imerge/c-d'
353s Auto-merging conflict.txt
353s CONFLICT (content): Merge conflict in conflict.txt
353s Automatic merge failed; fix conflicts and then commit the result.
353s 
353s Original first commit:
353s commit 7e31f254c318decc434628f023dac0703f3d2b9e
353s Author: Loú User <luser@example.com>
353s Date:   Thu Apr 7 22:13:19 2005 +0000
353s 
353s     c⇒5
353s 
353s Original second commit:
353s commit ac0427a285b64f2815ebd6eb83880f309600d0c7
353s Author: Loú User <luser@example.com>
353s Date:   Thu Apr 7 22:13:24 2005 +0000
353s 
353s     d⇒1
353s 
353s There was a conflict merging commit 5-1, shown above.
353s Please resolve the conflict, commit the result, then type
353s 
353s     git-imerge continue
353s + echo merged version
353s + git add conflict.txt
353s + git-imerge continue --no-edit
353s [imerge/c-d 2897c06] imerge 'c-d': manual merge 5-1
353s Merge has been recorded for merge 5-1.
353s Attempting automerge of 5-6...success.
353s Autofilling 5-2...success.
353s Autofilling 5-3...success.
353s Autofilling 5-4...success.
353s Autofilling 5-5...success.
353s Autofilling 5-6...success.
353s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7].
353s Attempting automerge of 9-6...success.
353s Autofilling 6-6...success.
353s Autofilling 7-6...success.
353s Autofilling 8-6...success.
353s Autofilling 9-1...success.
353s Autofilling 9-2...success.
353s Autofilling 9-3...success.
353s Autofilling 9-4...success.
353s Autofilling 9-5...success.
353s Autofilling 9-6 (first way)...success.
353s Autofilling 9-6 (second way)...success.
353s The two ways of autofilling 9-6 agree.
353s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7].
353s Merge is complete!
353s + git-imerge diagram --commits --frontier --html=imerge2.html
353s        0    5   9
353s        |    |   |
353s    0 - ********** - c
353s        *???.*???.
353s        *???..???.
353s        *???..???.
353s        *???..???.
353s    5 - *???..???.
353s    6 - *.........
353s        |
353s      d
353s 
353s        0    5   9
353s        |    |   |
353s    0 - ********** - c
353s        *???.*???|
353s        *???..???|
353s        *???..???|
353s        *???..???|
353s    5 - *???..???|
353s    6 - *--------+
353s        |
353s      d
353s 
353s Key:
353s   |,-,+ = rectangles forming current merge frontier
353s   * = merge done manually
353s   . = merge done automatically
353s   # = conflict that is currently blocking progress
353s   @ = merge was blocked but has been resolved
353s   ? = no merge recorded
353s 
353s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
353s Merge d into c (using imerge)
353s 
353s # Please enter the commit message for your changes. Lines starting
353s # with '#' will be ignored, and an empty message aborts the commit.
353s #
353s # Date:      Wed Mar 27 02:56:12 2024 +0000
353s #
353s # On branch c-d-merge
353s # Changes to be committed:
353s #	modified:   conflict.txt
353s #	modified:   d.txt
353s #
353s [c-d-merge 7d05d42] Merge d into c (using imerge)
353s  Date: Wed Mar 27 02:56:12 2024 +0000
353s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + local refname=c-d-merge
353s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + git rev-parse c-d-merge^{tree}
353s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + git-imerge simplify --goal=rebase --branch=c-d-rebase
353s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + local refname=c-d-rebase
353s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + git rev-parse c-d-rebase^{tree}
353s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
353s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + local refname=c-d-rebase-with-history
353s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + git rev-parse c-d-rebase-with-history^{tree}
353s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
353s + git-imerge simplify --goal=border --branch=c-d-border
354s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + local refname=c-d-border
354s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + git rev-parse c-d-border^{tree}
354s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
354s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + local refname=c-d-border-with-history
354s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + git rev-parse c-d-border-with-history^{tree}
354s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
354s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + local refname=c-d-border-with-history2
354s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + git rev-parse c-d-border-with-history2^{tree}
354s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
354s + git-imerge remove
354s + git checkout c
354s Switched to branch 'c'
354s + + git-imerge start --goal=fulltee --first-parent --name=c-d d
354s  start.out
354s Attempting to merge 1-1...success.
354s Attempting to merge 1-2...success.
354s Attempting to merge 1-3...success.
354s Attempting to merge 1-4...success.
354s Attempting to merge 1-5...success.
354s Attempting to merge 1-6...success.
354s Attempting to merge 2-1...success.
354s Attempting to merge 2-2...success.
354s Attempting to merge 2-3...success.
354s Attempting to merge 2-4...success.
354s Attempting to merge 2-5...success.
354s Attempting to merge 2-6...success.
354s Attempting to merge 3-1...success.
354s Attempting to merge 3-2...success.
354s Attempting to merge 3-3...success.
354s Attempting to merge 3-4...success.
354s Attempting to merge 3-5...success.
354s Attempting to merge 3-6...success.
354s Attempting to merge 4-1...success.
354s Attempting to merge 4-2...success.
354s Attempting to merge 4-3...success.
354s Attempting to merge 4-4...success.
354s Attempting to merge 4-5...success.
354s Attempting to merge 4-6...success.
354s Attempting to merge 5-1...conflict.
354s Switched to branch 'imerge/c-d'
354s Auto-merging conflict.txt
354s CONFLICT (content): Merge conflict in conflict.txt
354s Automatic merge failed; fix conflicts and then commit the result.
354s 
354s Original first commit:
354s commit 7e31f254c318decc434628f023dac0703f3d2b9e
354s Author: Loú User <luser@example.com>
354s Date:   Thu Apr 7 22:13:19 2005 +0000
354s 
354s     c⇒5
354s 
354s Original second commit:
354s commit ac0427a285b64f2815ebd6eb83880f309600d0c7
354s Author: Loú User <luser@example.com>
354s Date:   Thu Apr 7 22:13:24 2005 +0000
354s 
354s     d⇒1
354s 
354s There was a conflict merging commit 5-1, shown above.
354s Please resolve the conflict, commit the result, then type
354s 
354s     git-imerge continue
354s + grep -q Traceback start.out
354s + grep -q suggest manual merge of 5-1 autofill.out
354s + git-imerge diagram --commits --frontier --html=imerge3.html
355s        0    5   9
355s        |    |   |
355s    0 - ********** - c
355s        *....#????
355s        *....?????
355s        *....?????
355s        *....?????
355s    5 - *....?????
355s    6 - *....?????
355s        |
355s      d
355s 
355s        0    5   9
355s        |    |   |
355s    0 - ********** - c
355s        *...|#????
355s        *...|?????
355s        *...|?????
355s        *...|?????
355s    5 - *...|?????
355s    6 - *---+?????
355s        |
355s      d
355s 
355s Key:
355s   |,-,+ = rectangles forming current merge frontier
355s   * = merge done manually
355s   . = merge done automatically
355s   # = conflict that is currently blocking progress
355s   @ = merge was blocked but has been resolved
355s   ? = no merge recorded
355s 
355s imerge 'c-d': manual merge 5-1
355s 
355s # Conflicts:
355s #	conflict.txt
355s #
355s # It looks like you may be committing a merge.
355s # If this is not correct, please run
355s #	git update-ref -d MERGE_HEAD
355s # and try again.
355s 
355s 
355s # Please enter the commit message for your changes. Lines starting
355s # with '#' will be ignored, and an empty message aborts the commit.
355s #
355s # On branch imerge/c-d
355s # All conflicts fixed but you are still merging.
355s #
355s # Changes to be committed:
355s #	modified:   conflict.txt
355s #	modified:   d.txt
355s #
355s + echo merged version
355s + git add conflict.txt
355s + GIT_EDITOR=cat git commit
355s [imerge/c-d b7dc748] imerge 'c-d': manual merge 5-1
355s + git-imerge continue --edit
355s Merge has been recorded for merge 5-1.
355s Attempting to merge 5-2...success.
355s Attempting to merge 5-3...success.
355s Attempting to merge 5-4...success.
355s Attempting to merge 5-5...success.
355s Attempting to merge 5-6...success.
355s Attempting to merge 6-1...success.
355s Attempting to merge 6-2...success.
355s Attempting to merge 6-3...success.
355s Attempting to merge 6-4...success.
355s Attempting to merge 6-5...success.
355s Attempting to merge 6-6...success.
355s Attempting to merge 7-1...success.
355s Attempting to merge 7-2...success.
355s Attempting to merge 7-3...success.
355s Attempting to merge 7-4...success.
355s Attempting to merge 7-5...success.
355s Attempting to merge 7-6...success.
355s Attempting to merge 8-1...success.
355s Attempting to merge 8-2...success.
355s Attempting to merge 8-3...success.
355s Attempting to merge 8-4...success.
355s Attempting to merge 8-5...success.
355s Attempting to merge 8-6...success.
355s Attempting to merge 9-1...success.
355s Attempting to merge 9-2...success.
355s Attempting to merge 9-3...success.
355s Attempting to merge 9-4...success.
355s Attempting to merge 9-5...success.
355s Attempting to merge 9-6...success.
355s Merge is complete!
355s + git-imerge diagram --commits --frontier --html=imerge4.html
355s        0    5   9
355s        |    |   |
355s    0 - ********** - c
355s        *....*....
355s        *.........
355s        *.........
355s        *.........
355s    5 - *.........
355s    6 - *.........
355s        |
355s      d
355s 
355s        0    5   9
355s        |    |   |
355s    0 - ********** - c
355s        *....*...|
355s        *........|
355s        *........|
355s        *........|
355s    5 - *........|
355s    6 - *--------+
355s        |
355s      d
355s 
355s Key:
355s   |,-,+ = rectangles forming current merge frontier
355s   * = merge done manually
355s   . = merge done automatically
355s   # = conflict that is currently blocking progress
355s   @ = merge was blocked but has been resolved
355s   ? = no merge recorded
355s 
355s + git-imerge finish --branch=c-d-full
355s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
355s + local refname=c-d-full
355s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
355s + git rev-parse c-d-full^{tree}
355s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
355s + test_conflict 6-6
355s + local conflict=6-6
355s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s + DESCRIPTION=git-imerge test repository with conflict at 6-6
355s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6
355s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s + local description=git-imerge test repository with conflict at 6-6
355s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6
355s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s + local description=git-imerge test repository with conflict at 6-6
355s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s hint: Using 'master' as the name for the initial branch. This default branch name
355s hint: is subject to change. To configure the initial branch name to use in all
355s hint: of your new repositories, which will suppress this warning, call:
355s hint: 
355s hint: 	git config --global init.defaultBranch <name>
355s hint: 
355s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
355s hint: 'development'. The just-created branch can be renamed via this command:
355s hint: 
355s hint: 	git branch -m <name>
355s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6/.git/
355s + echo git-imerge test repository with conflict at 6-6
355s + printf %s\n /*.out /*.css /*.html
355s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6/.git config user.name Loú User
355s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com
355s + TIME=1112911993
355s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/conflicted-6-6
355s + modify c.txt 0
355s + filename=c.txt
355s + text=0
355s + echo 0
355s + git add c.txt
355s + modify d.txt 0
355s + filename=d.txt
355s + text=0
355s + echo 0
355s + git add d.txt
355s + modify conflict.txt original version
355s + filename=conflict.txt
355s + text=original version
355s + echo original version
355s + git add conflict.txt
355s + commit -m m⇒0
355s + TIME=1112911994
355s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
355s [master (root-commit) d70e04b] m⇒0
355s  3 files changed, 3 insertions(+)
355s  create mode 100644 c.txt
355s  create mode 100644 conflict.txt
355s  create mode 100644 d.txt
355s + git checkout -b c master --
355s Switched to a new branch 'c'
355s + seq 9
355s + modify c.txt 1
355s + filename=c.txt
355s + text=1
355s + echo 1
355s + git add c.txt
355s + commit -m c⇒1
355s + TIME=1112911995
355s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
355s [c 89e2141] c⇒1
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify c.txt 2
355s + filename=c.txt
355s + text=2
355s + echo 2
355s + git add c.txt
355s + commit -m c⇒2
355s + TIME=1112911996
355s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
355s [c 7c431f2] c⇒2
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify c.txt 3
355s + filename=c.txt
355s + text=3
355s + echo 3
355s + git add c.txt
355s + commit -m c⇒3
355s + TIME=1112911997
355s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
355s [c f02ab24] c⇒3
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify c.txt 4
355s + filename=c.txt
355s [c ed9122f] c⇒4
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s [c 1d3bf09] c⇒5
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s [c fe4fed8] c⇒6
355s  2 files changed, 2 insertions(+), 2 deletions(-)
355s + text=4
355s + echo 4
355s + git add c.txt
355s + commit -m c⇒4
355s + TIME=1112911998
355s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
355s + modify c.txt 5
355s + filename=c.txt
355s + text=5
355s + echo 5
355s + git add c.txt
355s + commit -m c⇒5
355s + TIME=1112911999
355s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
355s + modify c.txt 6
355s + filename=c.txt
355s + text=6
355s + echo 6
355s + git add c.txt
355s + modify conflict.txt c version
355s + filename=conflict.txt
355s + text=c version
355s + echo c version
355s + git add conflict.txt
355s + commit -m c⇒6
355s + TIME=1112912000
355s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
355s + modify c.txt 7
355s + filename=c.txt
355s + text=7
355s + echo 7
355s + git add c.txt
355s + commit -m c⇒7
355s + TIME=1112912001
355s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
355s [c ec255ea] c⇒7
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify c.txt 8
355s + filename=c.txt
355s + text=8
355s + echo 8
355s + git add c.txt
355s + commit -m c⇒8
355s + TIME=1112912002
355s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
355s [c 7459ac3] c⇒8
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify c.txt 9
355s + filename=c.txt
355s + text=9
355s + echo 9
355s + git add c.txt
355s + commit -m c⇒9
355s + TIME=1112912003
355s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
355s [c 70408c8] c⇒9
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + git checkout -b d master --
355s Switched to a new branch 'd'
355s + seq 6
355s + modify d.txt 1
355s + filename=d.txt
355s + text=1
355s + echo 1
355s + git add d.txt
355s + commit -m d⇒1
355s + TIME=1112912004
355s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
355s [d bd5368a] d⇒1
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify d.txt 2
355s + filename=d.txt
355s + text=2
355s + echo 2
355s + git add d.txt
355s + commit -m d⇒2
355s + TIME=1112912005
355s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
355s + modify d.txt 3
355s + filename=d.txt
355s + text=3
355s + echo 3
355s + git add d.txt
355s [d 93e27e6] d⇒2
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + commit -m d⇒3
355s + TIME=1112912006
355s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
355s + modify d.txt 4
355s + filename=d.txt
355s + text=4
355s + echo 4
355s + git add d.txt
355s [d 133f385] d⇒3
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + commit -m d⇒4
355s + TIME=1112912007
355s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
355s [d 586472a] d⇒4
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify d.txt 5
355s + filename=d.txt
355s + text=5
355s + echo 5
355s + git add d.txt
355s + commit -m d⇒5
355s + TIME=1112912008
355s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
355s [d 9522207] d⇒5
355s  1 file changed, 1 insertion(+), 1 deletion(-)
355s + modify d.txt 6
355s + filename=d.txt
355s + text=6
355s + echo 6
355s + git add d.txt
355s + modify conflict.txt d version
355s + filename=conflict.txt
355s + text=d version
355s + echo d version
355s + git add conflict.txt
355s + commit -m d⇒6
355s + TIME=1112912009
355s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
355s + git checkout c
355s Switched to branch 'c'
355s + git-imerge init --name=c-d d
355s [d f7e451a] d⇒6
355s  2 files changed, 2 insertions(+), 2 deletions(-)
356s + git-imerge list
356s * c-d
356s + git-imerge diagram --commits --frontier --html=imerge0.html
356s        0    5   9
356s        |    |   |
356s    0 - ********** - c
356s        *?????????
356s        *?????????
356s        *?????????
356s        *?????????
356s    5 - *?????????
356s    6 - *?????????
356s        |
356s      d
356s 
356s        0    5   9
356s        |    |   |
356s    0 - ********** - c
356s        *?????????
356s        *?????????
356s        *?????????
356s        *?????????
356s    5 - *?????????
356s    6 - *?????????
356s        |
356s      d
356s 
356s Key:
356s   |,-,+ = rectangles forming current merge frontier
356s   * = merge done manually
356s   . = merge done automatically
356s   # = conflict that is currently blocking progress
356s   @ = merge was blocked but has been resolved
356s   ? = no merge recorded
356s 
356s + + git-imerge autofill
356s tee autofill.out
356s Attempting automerge of 9-6...failure.
356s Attempting automerge of 1-1...success.
356s Attempting automerge of 1-4...success.
356s Attempting automerge of 1-6...success.
356s Attempting automerge of 9-6...failure.
356s Attempting automerge of 5-6...success.
356s Attempting automerge of 7-6...failure.
356s Attempting automerge of 6-6...failure.
356s Attempting automerge of 6-1...success.
356s Attempting automerge of 6-4...success.
356s Attempting automerge of 6-5...success.
356s Attempting automerge of 9-5...success.
356s Autofilling 1-6...success.
356s Autofilling 2-6...success.
356s Autofilling 3-6...success.
356s Autofilling 4-6...success.
356s Autofilling 5-1...success.
356s Autofilling 5-2...success.
356s Autofilling 5-3...success.
356s Autofilling 5-4...success.
356s Autofilling 5-5...success.
356s Autofilling 5-6 (first way)...success.
356s Autofilling 5-6 (second way)...success.
356s The two ways of autofilling 5-6 agree.
356s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7].
356s Autofilling 6-5...success.
356s Autofilling 7-5...success.
356s Autofilling 8-5...success.
356s Autofilling 9-1...success.
356s Autofilling 9-2...success.
356s Autofilling 9-3...success.
356s Autofilling 9-4...success.
356s Autofilling 9-5 (first way)...success.
356s Autofilling 9-5 (second way)...success.
356s The two ways of autofilling 9-5 agree.
356s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6].
356s Attempting automerge of 9-6...failure.
356s Attempting automerge of 6-6...failure.
356s HEAD is now at 70408c8 c⇒9
356s Conflict; suggest manual merge of 6-6
356s + grep -q Traceback autofill.out
356s + grep -q suggest manual merge of 6-6 autofill.out
356s + git-imerge diagram --commits --frontier --html=imerge1.html
356s        0    5   9
356s        |    |   |
356s    0 - ********** - c
356s        *????.???.
356s        *????.???.
356s        *????.???.
356s        *????.???.
356s    5 - *????.....
356s    6 - *.....#???
356s        |
356s      d
356s 
356s        0    5   9
356s        |    |   |
356s    0 - ********** - c
356s        *????.???|
356s        *????.???|
356s        *????.???|
356s        *????.???|
356s    5 - *????.---+
356s    6 - *----+#???
356s        |
356s      d
356s 
356s Key:
356s   |,-,+ = rectangles forming current merge frontier
356s   * = merge done manually
356s   . = merge done automatically
356s   # = conflict that is currently blocking progress
356s   @ = merge was blocked but has been resolved
356s   ? = no merge recorded
356s 
356s + git-imerge continue --edit
356s Switched to branch 'imerge/c-d'
356s Auto-merging conflict.txt
356s CONFLICT (content): Merge conflict in conflict.txt
356s Automatic merge failed; fix conflicts and then commit the result.
356s 
356s Original first commit:
356s 
356s Original second commit:
356s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854
356s Author: Loú User <luser@example.com>
356s Date:   Thu Apr 7 22:13:20 2005 +0000
356s 
356s     c⇒6
356s commit f7e451a6c9656dda15641a9fbc591a602f158692
356s Author: Loú User <luser@example.com>
356s Date:   Thu Apr 7 22:13:29 2005 +0000
356s 
356s     d⇒6
356s 
356s There was a conflict merging commit 6-6, shown above.
356s Please resolve the conflict, commit the result, then type
356s 
356s     git-imerge continue
356s + echo merged version
356s + git add conflict.txt
356s + git-imerge continue --no-edit
356s [imerge/c-d ad3712e] imerge 'c-d': manual merge 6-6
356s Merge has been recorded for merge 6-6.
356s Attempting automerge of 9-6...success.
356s Autofilling 7-6...success.
356s Autofilling 8-6...success.
356s Autofilling 9-6...success.
356s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7].
356s Merge is complete!
356s + git-imerge diagram --commits --frontier --html=imerge2.html
357s        0    5   9
357s        |    |   |
357s    0 - ********** - c
357s        *????.???.
357s        *????.???.
357s        *????.???.
357s        *????.???.
357s    5 - *????.....
357s    6 - *.....*...
357s        |
357s      d
357s 
357s        0    5   9
357s        |    |   |
357s    0 - ********** - c
357s        *????.???|
357s        *????.???|
357s        *????.???|
357s        *????.???|
357s    5 - *????....|
357s    6 - *-----*--+
357s        |
357s      d
357s 
357s Key:
357s   |,-,+ = rectangles forming current merge frontier
357s   * = merge done manually
357s   . = merge done automatically
357s   # = conflict that is currently blocking progress
357s   @ = merge was blocked but has been resolved
357s   ? = no merge recorded
357s 
357s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
357s Merge d into c (using imerge)
357s 
357s # Please enter the commit message for your changes. Lines starting
357s # with '#' will be ignored, and an empty message aborts the commit.
357s #
357s # Date:      Wed Mar 27 02:56:16 2024 +0000
357s #
357s # On branch c-d-merge
357s # Changes to be committed:
357s #	modified:   conflict.txt
357s #	modified:   d.txt
357s #
357s [c-d-merge 4d08e44] Merge d into c (using imerge)
357s  Date: Wed Mar 27 02:56:16 2024 +0000
357s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + local refname=c-d-merge
357s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git rev-parse c-d-merge^{tree}
357s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git-imerge simplify --goal=rebase --branch=c-d-rebase
357s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + local refname=c-d-rebase
357s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git rev-parse c-d-rebase^{tree}
357s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
357s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + local refname=c-d-rebase-with-history
357s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git rev-parse c-d-rebase-with-history^{tree}
357s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git-imerge simplify --goal=border --branch=c-d-border
357s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + local refname=c-d-border
357s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git rev-parse c-d-border^{tree}
357s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
357s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + local refname=c-d-border-with-history
357s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git rev-parse c-d-border-with-history^{tree}
357s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
357s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
358s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
358s + local refname=c-d-border-with-history2
358s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
358s + git rev-parse c-d-border-with-history2^{tree}
358s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
358s + git-imerge remove
358s + git checkout c
358s Switched to branch 'c'
358s + + git-imerge start --goal=full --first-parent --name=c-d d
358s tee start.out
358s Attempting to merge 1-1...success.
358s Attempting to merge 1-2...success.
358s Attempting to merge 1-3...success.
358s Attempting to merge 1-4...success.
358s Attempting to merge 1-5...success.
358s Attempting to merge 1-6...success.
358s Attempting to merge 2-1...success.
358s Attempting to merge 2-2...success.
358s Attempting to merge 2-3...success.
358s Attempting to merge 2-4...success.
358s Attempting to merge 2-5...success.
358s Attempting to merge 2-6...success.
358s Attempting to merge 3-1...success.
358s Attempting to merge 3-2...success.
358s Attempting to merge 3-3...success.
358s Attempting to merge 3-4...success.
358s Attempting to merge 3-5...success.
358s Attempting to merge 3-6...success.
358s Attempting to merge 4-1...success.
358s Attempting to merge 4-2...success.
358s Attempting to merge 4-3...success.
358s Attempting to merge 4-4...success.
358s Attempting to merge 4-5...success.
358s Attempting to merge 4-6...success.
358s Attempting to merge 5-1...success.
358s Attempting to merge 5-2...success.
358s Attempting to merge 5-3...success.
358s Attempting to merge 5-4...success.
358s Attempting to merge 5-5...success.
358s Attempting to merge 5-6...success.
358s Attempting to merge 6-1...success.
358s Attempting to merge 6-2...success.
358s Attempting to merge 6-3...success.
358s Attempting to merge 6-4...success.
358s Attempting to merge 6-5...success.
358s Attempting to merge 6-6...conflict.
358s Attempting to merge 7-1...success.
358s Attempting to merge 7-2...success.
358s Attempting to merge 7-3...success.
358s Attempting to merge 7-4...success.
358s Attempting to merge 7-5...success.
358s Attempting to merge 8-1...success.
358s Attempting to merge 8-2...success.
358s Attempting to merge 8-3...success.
358s Attempting to merge 8-4...success.
358s Attempting to merge 8-5...success.
358s Attempting to merge 9-1...success.
358s Attempting to merge 9-2...success.
358s Attempting to merge 9-3...success.
358s Attempting to merge 9-4...success.
358s Attempting to merge 9-5...success.
358s Previous HEAD position was 4221801 imerge 'c-d': automatic merge 9-5
358s Switched to branch 'imerge/c-d'
358s Auto-merging conflict.txt
358s CONFLICT (content): Merge conflict in conflict.txt
358s Automatic merge failed; fix conflicts and then commit the result.
358s 
358s Original first commit:
358s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854
358s Author: Loú User <luser@example.com>
358s Date:   Thu Apr 7 22:13:20 2005 +0000
358s 
358s     c⇒6
358s 
358s Original second commit:
358s commit f7e451a6c9656dda15641a9fbc591a602f158692
358s Author: Loú User <luser@example.com>
358s Date:   Thu Apr 7 22:13:29 2005 +0000
358s 
358s     d⇒6
358s 
358s There was a conflict merging commit 6-6, shown above.
358s Please resolve the conflict, commit the result, then type
358s 
358s     git-imerge continue
358s + grep -q Traceback start.out
358s + grep -q suggest manual merge of 6-6 autofill.out
358s + git-imerge diagram --commits --frontier --html=imerge3.html
358s        0    5   9
358s        |    |   |
358s    0 - ********** - c
358s        *.........
358s        *.........
358s        *.........
358s        *.........
358s    5 - *.........
358s    6 - *.....#???
358s        |
358s      d
358s 
358s        0    5   9
358s        |    |   |
358s    0 - ********** - c
358s        *........|
358s        *........|
358s        *........|
358s        *........|
358s    5 - *.....---+
358s    6 - *----+#???
358s        |
358s      d
358s 
358s Key:
358s   |,-,+ = rectangles forming current merge frontier
358s   * = merge done manually
358s   . = merge done automatically
358s   # = conflict that is currently blocking progress
358s   @ = merge was blocked but has been resolved
358s   ? = no merge recorded
358s 
359s + echo merged version
359s + git add conflict.txt
359s + GIT_EDITOR=cat git commit
359s imerge 'c-d': manual merge 6-6
359s 
359s # Conflicts:
359s #	conflict.txt
359s #
359s # It looks like you may be committing a merge.
359s # If this is not correct, please run
359s #	git update-ref -d MERGE_HEAD
359s # and try again.
359s 
359s 
359s # Please enter the commit message for your changes. Lines starting
359s # with '#' will be ignored, and an empty message aborts the commit.
359s #
359s # On branch imerge/c-d
359s # All conflicts fixed but you are still merging.
359s #
359s # Changes to be committed:
359s #	modified:   conflict.txt
359s #	modified:   d.txt
359s #
359s [imerge/c-d 617c699] imerge 'c-d': manual merge 6-6
359s + git-imerge continue --edit
359s Merge has been recorded for merge 6-6.
359s Attempting to merge 7-6...success.
359s Attempting to merge 8-6...success.
359s Attempting to merge 9-6...success.
359s Merge is complete!
359s + git-imerge diagram --commits --frontier --html=imerge4.html
359s        0    5   9
359s        |    |   |
359s    0 - ********** - c
359s        *.........
359s        *.........
359s        *.........
359s        *.........
359s    5 - *.........
359s    6 - *.....*...
359s        |
359s      d
359s 
359s        0    5   9
359s        |    |   |
359s    0 - ********** - c
359s        *........|
359s        *........|
359s        *........|
359s        *........|
359s    5 - *........|
359s    6 - *-----*--+
359s        |
359s      d
359s 
359s Key:
359s   |,-,+ = rectangles forming current merge frontier
359s   * = merge done manually
359s   . = merge done automatically
359s   # = conflict that is currently blocking progress
359s   @ = merge was blocked but has been resolved
359s   ? = no merge recorded
359s 
359s + git-imerge finish --branch=c-d-full
359s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
359s + local refname=c-d-full
359s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
359s + git rev-parse c-d-full^{tree}
359s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
359s py312: commands[2] /tmp/autopkgtest.iiYcjY/build.2hy/src> /bin/sh t/test-really-conflicted
359s + dirname t/test-really-conflicted
359s + cd t
359s + pwd
359s + dirname /tmp/autopkgtest.iiYcjY/build.2hy/src/t
359s + BASE=/tmp/autopkgtest.iiYcjY/build.2hy/src
359s + . /tmp/autopkgtest.iiYcjY/build.2hy/src/t/test-lib.sh
359s + GIT_IMERGE=git-imerge
359s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s + DESCRIPTION=git-imerge test repository with multiple conflicts
359s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts
359s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s + local description=git-imerge test repository with multiple conflicts
359s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts
359s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s + local description=git-imerge test repository with multiple conflicts
359s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s hint: Using 'master' as the name for the initial branch. This default branch name
359s hint: is subject to change. To configure the initial branch name to use in all
359s hint: of your new repositories, which will suppress this warning, call:
359s hint: 
359s hint: 	git config --global init.defaultBranch <name>
359s hint: 
359s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
359s hint: 'development'. The just-created branch can be renamed via this command:
359s hint: 
359s hint: 	git branch -m <name>
359s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted/.git/
359s + echo git-imerge test repository with multiple conflicts
359s + printf %s\n /*.out /*.css /*.html
359s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted/.git config user.name Loú User
359s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted/.git config user.email luser@example.com
359s + TIME=1112911993
359s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/really-conflicted
359s + modify c.txt 0
359s + filename=c.txt
359s + text=0
359s + echo 0
359s + git add c.txt
359s + modify d.txt 0
359s + filename=d.txt
359s + text=0
359s + echo 0
359s + git add d.txt
359s + seq 0 7
359s + modify conflict0.txt original version
359s + filename=conflict0.txt
359s + text=original version
359s + echo original version
359s + git add conflict0.txt
359s + modify conflict1.txt original version
359s + filename=conflict1.txt
359s + text=original version
359s + echo original version
359s + git add conflict1.txt
359s + modify conflict2.txt original version
359s + filename=conflict2.txt
359s + text=original version
359s + echo original version
359s + git add conflict2.txt
359s + modify conflict3.txt original version
359s + filename=conflict3.txt
359s + text=original version
359s + echo original version
359s + git add conflict3.txt
359s + modify conflict4.txt original version
359s + filename=conflict4.txt
359s + text=original version
359s + echo original version
359s + git add conflict4.txt
359s + modify conflict5.txt original version
359s + filename=conflict5.txt
359s + text=original version
359s + echo original version
359s + git add conflict5.txt
359s + modify conflict6.txt original version
359s + filename=conflict6.txt
359s + text=original version
359s + echo original version
359s + git add conflict6.txt
359s + modify conflict7.txt original version
359s + filename=conflict7.txt
359s + text=original version
359s + echo original version
359s + git add conflict7.txt
359s + commit -m m⇒0
359s + TIME=1112911994
359s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
359s [master (root-commit) 8e21fbd] m⇒0
359s  10 files changed, 10 insertions(+)
359s  create mode 100644 c.txt
359s  create mode 100644 conflict0.txt
359s  create mode 100644 conflict1.txt
359s  create mode 100644 conflict2.txt
359s  create mode 100644 conflict3.txt
359s  create mode 100644 conflict4.txt
359s  create mode 100644 conflict5.txt
359s  create mode 100644 conflict6.txt
359s  create mode 100644 conflict7.txt
359s  create mode 100644 d.txt
359s + git checkout -b c master --
359s Switched to a new branch 'c'
359s + modify c.txt 1
359s + filename=c.txt
359s + text=1
359s + echo 1
359s + git add c.txt
359s + modify conflict0.txt c version
359s + filename=conflict0.txt
359s + text=c version
359s + echo c version
359s + git add conflict0.txt
359s + modify conflict4.txt c version
359s + filename=conflict4.txt
359s + text=c version
359s + echo c version
359s + git add conflict4.txt
359s + commit -m c⇒1
359s + TIME=1112911995
359s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
359s [c 4e6007a] c⇒1
359s  3 files changed, 3 insertions(+), 3 deletions(-)
359s + modify c.txt 2
359s [c c2b7c49] c⇒2
359s  1 file changed, 1 insertion(+), 1 deletion(-)
359s + filename=c.txt
359s + text=2
359s + echo 2
359s + git add c.txt
359s + commit -m c⇒2
359s + TIME=1112911996
359s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
359s + modify c.txt 3
359s + filename=c.txt
359s + text=3
359s + echo 3
359s + git add c.txt
359s + commit -m c⇒3
359s + TIME=1112911997
359s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
359s [c 42ad55a] c⇒3
359s  1 file changed, 1 insertion(+), 1 deletion(-)
359s + modify c.txt 4
359s + filename=c.txt
359s + text=4
359s + echo 4
359s + git add c.txt
359s + modify conflict1.txt c version
359s + filename=conflict1.txt
359s + text=c version
359s + echo c version
359s + git add conflict1.txt
359s + commit -m c⇒4
359s + TIME=1112911998
359s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
359s [c a891793] c⇒4
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + modify c.txt 5
359s + filename=c.txt
359s + text=5
359s + echo 5
359s + git add c.txt
359s + modify conflict3.txt c version
359s + filename=conflict3.txt
359s + text=c version
359s + echo c version
359s + git add conflict3.txt
359s + modify conflict6.txt c version
359s + filename=conflict6.txt
359s + text=c version
359s + echo c version
359s + git add conflict6.txt
359s + commit -m c⇒5
359s + TIME=1112911999
359s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
359s [c c21441d] c⇒5
359s  3 files changed, 3 insertions(+), 3 deletions(-)
359s + modify c.txt 6
359s + filename=c.txt
359s + text=6
359s + echo 6
359s + git add c.txt
359s + modify conflict5.txt c version
359s + filename=conflict5.txt
359s + text=c version
359s + echo c version
359s + git add conflict5.txt
359s + commit -m c⇒6
359s + TIME=1112912000
359s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
359s [c a797a66] c⇒6
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + modify c.txt 7
359s + filename=c.txt
359s + text=7
359s + echo 7
359s + git add c.txt
359s + modify conflict2.txt c version
359s + filename=conflict2.txt
359s + text=c version
359s + echo c version
359s + git add conflict2.txt
359s + commit -m c⇒7
359s + TIME=1112912001
359s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
359s [c c0e1537] c⇒7
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + modify c.txt 8
359s + filename=c.txt
359s + text=8
359s + echo 8
359s + git add c.txt
359s + commit -m c⇒8
359s + TIME=1112912002
359s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
359s [c 9f3e7c8] c⇒8
359s  1 file changed, 1 insertion(+), 1 deletion(-)
359s + modify c.txt 9
359s + filename=c.txt
359s + text=9
359s + echo 9
359s + git add c.txt
359s + modify conflict7.txt c version
359s + filename=conflict7.txt
359s + text=c version
359s + echo c version
359s + git add conflict7.txt
359s + commit -m c⇒9
359s + TIME=1112912003
359s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
359s [c ccbfccb] c⇒9
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + git checkout -b d master --
359s Switched to a new branch 'd'
359s + modify d.txt 1
359s + filename=d.txt
359s + text=1
359s + echo 1
359s + git add d.txt
359s + modify conflict0.txt d version
359s + filename=conflict0.txt
359s + text=d version
359s + echo d version
359s + git add conflict0.txt
359s + modify conflict6.txt d version
359s + filename=conflict6.txt
359s + text=d version
359s + echo d version
359s + git add conflict6.txt
359s + commit -m d⇒1
359s + TIME=1112912004
359s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
359s [d 8c3c065] d⇒1
359s  3 files changed, 3 insertions(+), 3 deletions(-)
359s + modify d.txt 2
359s + filename=d.txt
359s + text=2
359s + echo 2
359s + git add d.txt
359s + modify conflict1.txt d version
359s + filename=conflict1.txt
359s + text=d version
359s + echo d version
359s + git add conflict1.txt
359s + modify conflict2.txt d version
359s + filename=conflict2.txt
359s + text=d version
359s + echo d version
359s + git add conflict2.txt
359s + commit -m d⇒2
359s + TIME=1112912005
359s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
359s [d 820b787] d⇒2
359s  3 files changed, 3 insertions(+), 3 deletions(-)
359s + modify d.txt 3
359s + filename=d.txt
359s + text=3
359s + echo 3
359s + git add d.txt
359s + commit -m d⇒3
359s + TIME=1112912006
359s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
359s [d 821c792] d⇒3
359s  1 file changed, 1 insertion(+), 1 deletion(-)
359s + modify d.txt 4
359s + filename=d.txt
359s + text=4
359s + echo 4
359s + git add d.txt
359s + commit -m d⇒4
359s + TIME=1112912007
359s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
359s [d c2a1456] d⇒4
359s  1 file changed, 1 insertion(+), 1 deletion(-)
359s + modify d.txt 5
359s + filename=d.txt
359s + text=5
359s + echo 5
359s + git add d.txt
359s + modify conflict3.txt d version
359s + filename=conflict3.txt
359s + text=d version
359s + echo d version
359s + git add conflict3.txt
359s + commit -m d⇒5
359s + TIME=1112912008
359s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
359s [d c3e3890] d⇒5
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + modify d.txt 6
359s + filename=d.txt
359s + text=6
359s + echo 6
359s + git add d.txt
359s + modify conflict4.txt d version
359s + filename=conflict4.txt
359s + text=d version
359s + echo d version
359s + git add conflict4.txt
359s + commit -m d⇒6
359s + TIME=1112912009
359s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
359s [d b2f5c5e] d⇒6
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + modify d.txt 7
359s + filename=d.txt
359s + text=7
359s + echo 7
359s + git add d.txt
359s + modify conflict5.txt d version
359s + filename=conflict5.txt
359s + text=d version
359s + echo d version
359s + git add conflict5.txt
359s + commit -m d⇒7
359s + TIME=1112912010
359s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7
359s [d 892af56] d⇒7
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + modify d.txt 8
359s + filename=d.txt
359s + text=8
359s + echo 8
359s + git add d.txt
359s + modify conflict7.txt d version
359s + filename=conflict7.txt
359s + text=d version
359s + echo d version
359s + git add conflict7.txt
359s + commit -m d⇒8
359s + TIME=1112912011
359s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8
359s [d 67099d0] d⇒8
359s  2 files changed, 2 insertions(+), 2 deletions(-)
359s + git checkout c
359s Switched to branch 'c'
359s + git-imerge init --name=c-d d
359s + git-imerge diagram --commits --frontier
359s        0    5   9
359s        |    |   |
359s    0 - ********** - c
359s        *?????????
359s        *?????????
359s        *?????????
359s        *?????????
359s    5 - *?????????
359s        *?????????
359s        *?????????
359s    8 - *?????????
359s        |
359s      d
359s 
359s        0    5   9
359s        |    |   |
359s    0 - ********** - c
359s        *?????????
359s        *?????????
359s        *?????????
359s        *?????????
359s    5 - *?????????
359s        *?????????
359s        *?????????
359s    8 - *?????????
359s        |
359s      d
359s 
359s Key:
359s   |,-,+ = rectangles forming current merge frontier
359s   * = merge done manually
359s   . = merge done automatically
359s   # = conflict that is currently blocking progress
359s   @ = merge was blocked but has been resolved
359s   ? = no merge recorded
359s 
359s + conflict_count=0
359s + true
359s + git-imerge continue --no-edit
359s + tee autofill.out
359s Attempting automerge of 9-8...failure.
359s Attempting automerge of 1-1...failure.
359s Switched to branch 'imerge/c-d'
359s Auto-merging conflict0.txt
359s CONFLICT (content): Merge conflict in conflict0.txt
359s Automatic merge failed; fix conflicts and then commit the result.
359s 
359s Original first commit:
359s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79
359s Author: Loú User <luser@example.com>
359s Date:   Thu Apr 7 22:13:15 2005 +0000
359s 
359s     c⇒1
359s 
359s Original second commit:
359s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc
359s Author: Loú User <luser@example.com>
359s Date:   Thu Apr 7 22:13:24 2005 +0000
359s 
359s     d⇒1
359s 
359s There was a conflict merging commit 1-1, shown above.
359s Please resolve the conflict, commit the result, then type
359s 
359s     git-imerge continue
359s + grep -q Traceback autofill.out
359s + git-imerge diagram --frontier
360s        0    5   9
360s        |    |   |
360s    0 - ********** - c
360s        *#????????
360s        *?????????
360s        *?????????
360s        *?????????
360s    5 - *?????????
360s        *?????????
360s        *?????????
360s    8 - *?????????
360s        |
360s      d
360s 
360s Key:
360s   |,-,+ = rectangles forming current merge frontier
360s   * = merge done manually
360s   . = merge done automatically
360s   # = conflict that is currently blocking progress
360s   @ = merge was blocked but has been resolved
360s   ? = no merge recorded
360s 
360s + grep -q There was a conflict merging autofill.out
360s + seq 0 7
360s + grep -q ==== conflict0.txt
360s + modify conflict0.txt merged version
360s + filename=conflict0.txt
360s + text=merged version
360s + echo merged version
360s + git add conflict0.txt
360s + conflict_count=1
360s + grep -q ==== conflict1.txt
360s + grep -q ==== conflict2.txt
360s + grep -q ==== conflict3.txt
360s + grep -q ==== conflict4.txt
360s + grep -q ==== conflict5.txt
360s + grep -q ==== conflict6.txt
360s + grep -q ==== conflict7.txt
360s + true
360s + + tee autofill.out
360s git-imerge continue --no-edit
360s [imerge/c-d f9ab25b] imerge 'c-d': manual merge 1-1
360s Merge has been recorded for merge 1-1.
360s Attempting automerge of 1-8...failure.
360s Attempting automerge of 1-2...success.
360s Attempting automerge of 1-6...failure.
360s Attempting automerge of 1-4...success.
360s Attempting automerge of 1-5...success.
360s Autofilling 1-2...success.
360s Autofilling 1-3...success.
360s Autofilling 1-4...success.
360s Autofilling 1-5...success.
360s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6].
360s Attempting automerge of 1-8...failure.
360s Attempting automerge of 1-6...failure.
360s Attempting automerge of 9-5...failure.
360s Attempting automerge of 2-1...success.
360s Attempting automerge of 2-4...success.
360s Attempting automerge of 2-5...success.
360s Attempting automerge of 9-5...failure.
360s Attempting automerge of 6-5...failure.
360s Attempting automerge of 4-5...failure.
360s Attempting automerge of 3-5...success.
360s Attempting automerge of 4-1...success.
360s Attempting automerge of 4-3...failure.
360s Attempting automerge of 4-2...failure.
360s Attempting automerge of 9-1...failure.
360s Attempting automerge of 7-1...failure.
360s Attempting automerge of 6-1...failure.
360s Attempting automerge of 5-1...failure.
360s Autofilling 2-5...success.
360s Autofilling 3-1...success.
360s Autofilling 3-2...success.
360s Autofilling 3-3...success.
360s Autofilling 3-4...success.
360s Autofilling 3-5 (first way)...success.
360s Autofilling 3-5 (second way)...success.
360s The two ways of autofilling 3-5 agree.
360s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6].
360s Autofilling 4-1...success.
360s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2].
360s Attempting automerge of 4-5...failure.
360s Attempting automerge of 4-2...failure.
360s Attempting automerge of 9-1...failure.
360s Attempting automerge of 5-1...failure.
360s Previous HEAD position was c21441d c⇒5
360s Switched to branch 'imerge/c-d'
360s Auto-merging conflict4.txt
360s CONFLICT (content): Merge conflict in conflict4.txt
360s Automatic merge failed; fix conflicts and then commit the result.
360s 
360s Original first commit:
360s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79
360s Author: Loú User <luser@example.com>
360s Date:   Thu Apr 7 22:13:15 2005 +0000
360s 
360s     c⇒1
360s 
360s Original second commit:
360s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff
360s Author: Loú User <luser@example.com>
360s Date:   Thu Apr 7 22:13:29 2005 +0000
360s 
360s     d⇒6
360s 
360s There was a conflict merging commit 1-6, shown above.
360s Please resolve the conflict, commit the result, then type
360s 
360s     git-imerge continue
360s + grep -q Traceback autofill.out
360s + git-imerge diagram --frontier
360s        0    5   9
360s        |    |   |
360s    0 - ********** - c
360s        **?.+#????
360s        *.?|#?????
360s        *.?|??????
360s        *.?|??????
360s    5 - *--+??????
360s        *#????????
360s        *?????????
360s    8 - *?????????
360s        |
360s      d
360s 
360s Key:
360s   |,-,+ = rectangles forming current merge frontier
360s   * = merge done manually
360s   . = merge done automatically
360s   # = conflict that is currently blocking progress
360s   @ = merge was blocked but has been resolved
360s   ? = no merge recorded
360s 
360s + grep -q There was a conflict merging autofill.out
360s + seq 0 7
360s + grep -q ==== conflict0.txt
360s + grep -q ==== conflict1.txt
360s + grep -q ==== conflict2.txt
360s + grep -q ==== conflict3.txt
360s + grep -q ==== conflict4.txt
360s + modify conflict4.txt merged version
360s + filename=conflict4.txt
360s + text=merged version
360s + echo merged version
360s + git add conflict4.txt
360s + conflict_count=2
360s + grep -q ==== conflict5.txt
360s + grep -q ==== conflict6.txt
360s + grep -q ==== conflict7.txt
360s + true
360s + git-imerge continue --no-edit
360s + tee autofill.out
360s [imerge/c-d 3dc96b3] imerge 'c-d': manual merge 1-6
360s Merge has been recorded for merge 1-6.
360s Attempting automerge of 1-8...success.
360s Autofilling 1-7...success.
360s Autofilling 1-8...success.
360s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9].
360s Attempting automerge of 3-8...success.
360s Autofilling 2-8...success.
360s Autofilling 3-6...success.
360s Autofilling 3-7...success.
360s Autofilling 3-8 (first way)...success.
360s Autofilling 3-8 (second way)...success.
360s The two ways of autofilling 3-8 agree.
360s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9].
360s Warning: you are leaving 1 commit behind, not connected to
360s any of your branches:
360s 
360s   e46d3fd imerge 'c-d': automatic merge 3-8
360s 
360s If you want to keep it by creating a new branch, this may be a good time
360s to do so with:
360s 
360s  git branch <new-branch-name> e46d3fd
360s 
360s Switched to branch 'imerge/c-d'
360s Auto-merging conflict1.txt
360s CONFLICT (content): Merge conflict in conflict1.txt
360s Automatic merge failed; fix conflicts and then commit the result.
360s 
360s Original first commit:
360s commit a89179336bb40a4ca90903425239a9ef3ce659bd
360s Author: Loú User <luser@example.com>
360s Date:   Thu Apr 7 22:13:18 2005 +0000
360s 
360s     c⇒4
360s 
360s Original second commit:
360s commit 820b787e86e22612af7a061db842dc95e9f1d49f
360s Author: Loú User <luser@example.com>
360s Date:   Thu Apr 7 22:13:25 2005 +0000
360s 
360s     d⇒2
360s 
360s There was a conflict merging commit 4-2, shown above.
360s Please resolve the conflict, commit the result, then type
360s 
360s     git-imerge continue
360s + grep -q Traceback autofill.out
360s + git-imerge diagram --frontier
361s        0    5   9
361s        |    |   |
361s    0 - ********** - c
361s        **?.+#????
361s        *.?|#?????
361s        *.?|??????
361s        *.?|??????
361s    5 - *..|??????
361s        **?|??????
361s        *.?|??????
361s    8 - *--+??????
361s        |
361s      d
361s 
361s Key:
361s   |,-,+ = rectangles forming current merge frontier
361s   * = merge done manually
361s   . = merge done automatically
361s   # = conflict that is currently blocking progress
361s   @ = merge was blocked but has been resolved
361s   ? = no merge recorded
361s 
361s + grep -q There was a conflict merging autofill.out
361s + seq 0 7
361s + grep -q ==== conflict0.txt
361s + grep -q ==== conflict1.txt
361s + modify conflict1.txt merged version
361s + filename=conflict1.txt
361s + text=merged version
361s + echo merged version
361s + git add conflict1.txt
361s + conflict_count=3
361s + grep -q ==== conflict2.txt
361s + grep -q ==== conflict3.txt
361s + grep -q ==== conflict4.txt
361s + grep -q ==== conflict5.txt
361s + grep -q ==== conflict6.txt
361s + grep -q ==== conflict7.txt
361s + true
361s + git-imerge continue --no-edit
361s + tee autofill.out
361s [imerge/c-d ab18346] imerge 'c-d': manual merge 4-2
361s Merge has been recorded for merge 4-2.
361s Attempting automerge of 4-8...success.
361s Autofilling 4-3...success.
361s Autofilling 4-4...success.
361s Autofilling 4-5...success.
361s Autofilling 4-6...success.
361s Autofilling 4-7...success.
361s Autofilling 4-8...success.
361s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9].
361s Previous HEAD position was 24e5d20 imerge 'c-d': automatic merge 4-8
361s Switched to branch 'imerge/c-d'
361s Auto-merging conflict6.txt
361s CONFLICT (content): Merge conflict in conflict6.txt
361s Automatic merge failed; fix conflicts and then commit the result.
361s 
361s Original first commit:
361s commit c21441db0b1abc10e3caf5024d19976bd7f9b469
361s Author: Loú User <luser@example.com>
361s Date:   Thu Apr 7 22:13:19 2005 +0000
361s 
361s     c⇒5
361s 
361s Original second commit:
361s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc
361s Author: Loú User <luser@example.com>
361s Date:   Thu Apr 7 22:13:24 2005 +0000
361s 
361s     d⇒1
361s 
361s There was a conflict merging commit 5-1, shown above.
361s Please resolve the conflict, commit the result, then type
361s 
361s     git-imerge continue
361s + grep -q Traceback autofill.out
361s + git-imerge diagram --frontier
361s        0    5   9
361s        |    |   |
361s    0 - ********** - c
361s        **?.|#????
361s        *.?.*?????
361s        *.?.|?????
361s        *.?.|?????
361s    5 - *...|?????
361s        **?.|?????
361s        *.?.|?????
361s    8 - *---+?????
361s        |
361s      d
361s 
361s Key:
361s   |,-,+ = rectangles forming current merge frontier
361s   * = merge done manually
361s   . = merge done automatically
361s   # = conflict that is currently blocking progress
361s   @ = merge was blocked but has been resolved
361s   ? = no merge recorded
361s 
361s + grep -q There was a conflict merging autofill.out
361s + seq 0 7
361s + grep -q ==== conflict0.txt
361s + grep -q ==== conflict1.txt
361s + grep -q ==== conflict2.txt
361s + grep -q ==== conflict3.txt
361s + grep -q ==== conflict4.txt
361s + grep -q ==== conflict5.txt
361s + grep -q ==== conflict6.txt
361s + modify conflict6.txt merged version
361s + filename=conflict6.txt
361s + text=merged version
361s + echo merged version
361s + git add conflict6.txt
361s + conflict_count=4
361s + grep -q ==== conflict7.txt
361s + true
361s + git-imerge continue --no-edit
361s + tee autofill.out
361s [imerge/c-d 6447408] imerge 'c-d': manual merge 5-1
361s Merge has been recorded for merge 5-1.
361s Attempting automerge of 5-8...failure.
361s Attempting automerge of 5-2...success.
361s Attempting automerge of 5-6...failure.
361s Attempting automerge of 5-4...success.
361s Attempting automerge of 5-5...failure.
361s Autofilling 5-2...success.
361s Autofilling 5-3...success.
361s Autofilling 5-4...success.
361s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5].
361s Attempting automerge of 5-8...failure.
361s Attempting automerge of 5-5...failure.
361s Attempting automerge of 9-4...failure.
361s Attempting automerge of 6-1...success.
361s Attempting automerge of 6-3...success.
361s Attempting automerge of 6-4...success.
361s Attempting automerge of 9-4...failure.
361s Attempting automerge of 8-4...failure.
361s Attempting automerge of 7-4...failure.
361s Attempting automerge of 7-1...success.
361s Attempting automerge of 7-3...failure.
361s Attempting automerge of 7-2...failure.
361s Attempting automerge of 9-1...success.
361s Autofilling 6-1...success.
361s Autofilling 6-2...success.
361s Autofilling 6-3...success.
361s Autofilling 6-4...success.
361s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5].
361s Autofilling 7-1...success.
361s Autofilling 8-1...success.
361s Autofilling 9-1...success.
361s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2].
361s Attempting automerge of 9-4...failure.
361s Attempting automerge of 7-2...failure.
361s Previous HEAD position was bbae458 imerge 'c-d': automatic merge 7-1
361s Switched to branch 'imerge/c-d'
361s Auto-merging conflict3.txt
361s CONFLICT (content): Merge conflict in conflict3.txt
361s Automatic merge failed; fix conflicts and then commit the result.
361s 
361s Original first commit:
361s commit c21441db0b1abc10e3caf5024d19976bd7f9b469
361s Author: Loú User <luser@example.com>
361s Date:   Thu Apr 7 22:13:19 2005 +0000
361s 
361s     c⇒5
361s 
361s Original second commit:
361s commit c3e3890b9e3c756c1d8f7e345184d576739be079
361s Author: Loú User <luser@example.com>
361s Date:   Thu Apr 7 22:13:28 2005 +0000
361s 
361s     d⇒5
361s 
361s There was a conflict merging commit 5-5, shown above.
361s Please resolve the conflict, commit the result, then type
361s 
361s     git-imerge continue
361s + grep -q Traceback autofill.out
361s + git-imerge diagram --frontier
361s        0    5   9
361s        |    |   |
361s    0 - ********** - c
361s        **?..*.--+
361s        *.?.*.|#??
361s        *.?...|???
361s        *.?..-+???
361s    5 - *...|#????
361s        **?.|?????
361s        *.?.|?????
361s    8 - *---+?????
361s        |
361s      d
361s 
361s Key:
361s   |,-,+ = rectangles forming current merge frontier
361s   * = merge done manually
361s   . = merge done automatically
361s   # = conflict that is currently blocking progress
361s   @ = merge was blocked but has been resolved
361s   ? = no merge recorded
361s 
361s + grep -q There was a conflict merging autofill.out
361s + seq 0 7
361s + grep -q ==== conflict0.txt
361s + grep -q ==== conflict1.txt
361s + grep -q ==== conflict2.txt
361s + grep -q ==== conflict3.txt
361s + modify conflict3.txt merged version
361s + filename=conflict3.txt
361s + text=merged version
361s + echo merged version
361s + git add conflict3.txt
361s + conflict_count=5
361s + grep -q ==== conflict4.txt
361s + grep -q ==== conflict5.txt
361s + grep -q ==== conflict6.txt
361s + grep -q ==== conflict7.txt
361s + true
361s + git-imerge continue --no-edit
361s + tee autofill.out
362s [imerge/c-d 65ef49c] imerge 'c-d': manual merge 5-5
362s Merge has been recorded for merge 5-5.
362s Attempting automerge of 5-8...success.
362s Autofilling 5-6...success.
362s Autofilling 5-7...success.
362s Autofilling 5-8...success.
362s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9].
362s Attempting automerge of 6-8...failure.
362s Attempting automerge of 6-5...success.
362s Attempting automerge of 6-7...failure.
362s Attempting automerge of 6-6...success.
362s Autofilling 6-5...success.
362s Autofilling 6-6...success.
362s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7].
362s Attempting automerge of 6-8...failure.
362s Attempting automerge of 6-7...failure.
362s Switched to branch 'imerge/c-d'
362s Auto-merging conflict5.txt
362s CONFLICT (content): Merge conflict in conflict5.txt
362s Automatic merge failed; fix conflicts and then commit the result.
362s 
362s Original first commit:
362s commit a797a66a0e4b89690099557280641efeac302bcf
362s Author: Loú User <luser@example.com>
362s Date:   Thu Apr 7 22:13:20 2005 +0000
362s 
362s     c⇒6
362s 
362s Original second commit:
362s commit 892af56ace54c97776e84dff9e6fba7312efe5d0
362s Author: Loú User <luser@example.com>
362s Date:   Thu Apr 7 22:13:30 2005 +0000
362s 
362s     d⇒7
362s 
362s There was a conflict merging commit 6-7, shown above.
362s Please resolve the conflict, commit the result, then type
362s 
362s     git-imerge continue
362s + grep -q Traceback autofill.out
362s + git-imerge diagram --frontier
362s        0    5   9
362s        |    |   |
362s    0 - ********** - c
362s        **?..*.--+
362s        *.?.*.|#??
362s        *.?...|???
362s        *.?...|???
362s    5 - *....*|???
362s        **?...+???
362s        *.?..|#???
362s    8 - *----+????
362s        |
362s      d
362s 
362s Key:
362s   |,-,+ = rectangles forming current merge frontier
362s   * = merge done manually
362s   . = merge done automatically
362s   # = conflict that is currently blocking progress
362s   @ = merge was blocked but has been resolved
362s   ? = no merge recorded
362s 
362s + grep -q There was a conflict merging autofill.out
362s + seq 0 7
362s + grep -q ==== conflict0.txt
362s + grep -q ==== conflict1.txt
362s + grep -q ==== conflict2.txt
362s + grep -q ==== conflict3.txt
362s + grep -q ==== conflict4.txt
362s + grep -q ==== conflict5.txt
362s + modify conflict5.txt merged version
362s + filename=conflict5.txt
362s + text=merged version
362s + echo merged version
362s + git add conflict5.txt
362s + conflict_count=6
362s + grep -q ==== conflict6.txt
362s + grep -q ==== conflict7.txt
362s + true
362s + git-imerge continue --no-edit
362s + tee autofill.out
362s [imerge/c-d e16a4d1] imerge 'c-d': manual merge 6-7
362s Merge has been recorded for merge 6-7.
362s Attempting automerge of 6-8...success.
362s Autofilling 6-8...success.
362s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9].
362s Previous HEAD position was c7da436 imerge 'c-d': automatic merge 6-8
362s Switched to branch 'imerge/c-d'
362s Auto-merging conflict2.txt
362s CONFLICT (content): Merge conflict in conflict2.txt
362s Automatic merge failed; fix conflicts and then commit the result.
362s 
362s Original first commit:
362s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315
362s Author: Loú User <luser@example.com>
362s Date:   Thu Apr 7 22:13:21 2005 +0000
362s 
362s     c⇒7
362s 
362s Original second commit:
362s commit 820b787e86e22612af7a061db842dc95e9f1d49f
362s Author: Loú User <luser@example.com>
362s Date:   Thu Apr 7 22:13:25 2005 +0000
362s 
362s     d⇒2
362s 
362s There was a conflict merging commit 7-2, shown above.
362s Please resolve the conflict, commit the result, then type
362s 
362s     git-imerge continue
362s + grep -q Traceback autofill.out
362s + git-imerge diagram --frontier
362s        0    5   9
362s        |    |   |
362s    0 - ********** - c
362s        **?..*.--+
362s        *.?.*.|#??
362s        *.?...|???
362s        *.?...|???
362s    5 - *....*|???
362s        **?...|???
362s        *.?...*???
362s    8 - *-----+???
362s        |
362s      d
362s 
362s Key:
362s   |,-,+ = rectangles forming current merge frontier
362s   * = merge done manually
362s   . = merge done automatically
362s   # = conflict that is currently blocking progress
362s   @ = merge was blocked but has been resolved
362s   ? = no merge recorded
362s 
362s + grep -q There was a conflict merging autofill.out
362s + seq 0 7
362s + grep -q ==== conflict0.txt
362s + grep -q ==== conflict1.txt
362s + grep -q ==== conflict2.txt
362s + modify conflict2.txt merged version
362s + filename=conflict2.txt
362s + text=merged version
362s + echo merged version
362s + git add conflict2.txt
362s + conflict_count=7
362s + grep -q ==== conflict3.txt
362s + grep -q ==== conflict4.txt
362s + grep -q ==== conflict5.txt
362s + grep -q ==== conflict6.txt
362s + grep -q ==== conflict7.txt
362s + true
362s + git-imerge continue --no-edit
362s + tee autofill.out
362s [imerge/c-d 0287b9d] imerge 'c-d': manual merge 7-2
362s Merge has been recorded for merge 7-2.
362s Attempting automerge of 7-8...success.
362s Autofilling 7-3...success.
362s Autofilling 7-4...success.
362s Autofilling 7-5...success.
362s Autofilling 7-6...success.
362s Autofilling 7-7...success.
362s Autofilling 7-8...success.
362s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9].
362s Attempting automerge of 9-8...failure.
362s Attempting automerge of 8-2...success.
362s Attempting automerge of 8-6...success.
362s Attempting automerge of 8-8...success.
362s Attempting automerge of 9-8...failure.
362s Attempting automerge of 9-2...success.
362s Attempting automerge of 9-5...success.
362s Attempting automerge of 9-7...success.
362s Autofilling 8-2...success.
362s Autofilling 8-3...success.
362s Autofilling 8-4...success.
362s Autofilling 8-5...success.
363s Autofilling 8-6...success.
363s Autofilling 8-7...success.
363s Autofilling 8-8...success.
363s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9].
363s Autofilling 9-2...success.
363s Autofilling 9-3...success.
363s Autofilling 9-4...success.
363s Autofilling 9-5...success.
363s Autofilling 9-6...success.
363s Autofilling 9-7...success.
363s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8].
363s Attempting automerge of 9-8...failure.
363s Attempting automerge of 9-8...failure.
363s Switched to branch 'imerge/c-d'
363s Auto-merging conflict7.txt
363s CONFLICT (content): Merge conflict in conflict7.txt
363s Automatic merge failed; fix conflicts and then commit the result.
363s 
363s Original first commit:
363s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87
363s Author: Loú User <luser@example.com>
363s Date:   Thu Apr 7 22:13:23 2005 +0000
363s 
363s     c⇒9
363s 
363s Original second commit:
363s commit 67099d078100141fbe4063d46a6408200f4ff311
363s Author: Loú User <luser@example.com>
363s Date:   Thu Apr 7 22:13:31 2005 +0000
363s 
363s     d⇒8
363s 
363s There was a conflict merging commit 9-8, shown above.
363s Please resolve the conflict, commit the result, then type
363s 
363s     git-imerge continue
363s + grep -q Traceback autofill.out
363s + git-imerge diagram --frontier
363s        0    5   9
363s        |    |   |
363s    0 - ********** - c
363s        **?..*...|
363s        *.?.*..*.|
363s        *.?......|
363s        *.?......|
363s    5 - *....*...|
363s        **?......|
363s        *.?...*..+
363s    8 - *-------+#
363s        |
363s      d
363s 
363s Key:
363s   |,-,+ = rectangles forming current merge frontier
363s   * = merge done manually
363s   . = merge done automatically
363s   # = conflict that is currently blocking progress
363s   @ = merge was blocked but has been resolved
363s   ? = no merge recorded
363s 
363s + grep -q There was a conflict merging autofill.out
363s + seq 0 7
363s + grep -q ==== conflict0.txt
363s + grep -q ==== conflict1.txt
363s + grep -q ==== conflict2.txt
363s + grep -q ==== conflict3.txt
363s + grep -q ==== conflict4.txt
363s + grep -q ==== conflict5.txt
363s + grep -q ==== conflict6.txt
363s + grep -q ==== conflict7.txt
363s + modify conflict7.txt merged version
363s + filename=conflict7.txt
363s + text=merged version
363s + echo merged version
363s + git add conflict7.txt
363s + conflict_count=8
363s + true
363s + + git-imerge continue --no-edit
363s tee autofill.out
363s [imerge/c-d d80ec30] imerge 'c-d': manual merge 9-8
363s Merge has been recorded for merge 9-8.
363s Merge is complete!
363s + grep -q Traceback autofill.out
363s + git-imerge diagram --frontier
363s        0    5   9
363s        |    |   |
363s    0 - ********** - c
363s        **?..*...|
363s        *.?.*..*.|
363s        *.?......|
363s        *.?......|
363s    5 - *....*...|
363s        **?......|
363s        *.?...*..|
363s    8 - *--------*
363s        |
363s      d
363s 
363s Key:
363s   |,-,+ = rectangles forming current merge frontier
363s   * = merge done manually
363s   . = merge done automatically
363s   # = conflict that is currently blocking progress
363s   @ = merge was blocked but has been resolved
363s   ? = no merge recorded
363s 
363s + grep -q There was a conflict merging autofill.out
363s + break
363s + test 8 -ne 8
363s + git-imerge diagram --commits
363s + + diff -ucat - diagram.out
363s 
363s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
363s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
363s Merge d into c (using imerge)
363s 
363s # Please enter the commit message for your changes. Lines starting
363s # with '#' will be ignored, and an empty message aborts the commit.
363s #
363s # Date:      Wed Mar 27 02:56:22 2024 +0000
363s #
363s # On branch c-d-merge
363s # Changes to be committed:
363s #	modified:   conflict0.txt
363s #	modified:   conflict1.txt
363s #	modified:   conflict2.txt
363s #	modified:   conflict3.txt
363s #	modified:   conflict4.txt
363s #	modified:   conflict5.txt
363s #	modified:   conflict6.txt
363s #	modified:   conflict7.txt
363s #	modified:   d.txt
363s #
363s [c-d-merge 37f0c71] Merge d into c (using imerge)
363s  Date: Wed Mar 27 02:56:22 2024 +0000
363s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
363s + local refname=c-d-merge
363s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
363s + git rev-parse c-d-merge^{tree}
363s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
363s + git-imerge simplify --goal=rebase --branch=c-d-rebase
363s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
363s + local refname=c-d-rebase
363s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
363s + git rev-parse c-d-rebase^{tree}
363s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
363s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
364s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + local refname=c-d-rebase-with-history
364s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git rev-parse c-d-rebase-with-history^{tree}
364s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git-imerge simplify --goal=border --branch=c-d-border
364s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + local refname=c-d-border
364s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git rev-parse c-d-border^{tree}
364s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
364s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + local refname=c-d-border-with-history
364s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git rev-parse c-d-border-with-history^{tree}
364s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
364s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + local refname=c-d-border-with-history2
364s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git rev-parse c-d-border-with-history2^{tree}
364s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
364s + git-imerge remove
364s py312: commands[3] /tmp/autopkgtest.iiYcjY/build.2hy/src> /bin/sh t/test-duplicated
364s + dirname t/test-duplicated
364s + cd t
364s + pwd
364s + dirname /tmp/autopkgtest.iiYcjY/build.2hy/src/t
364s + BASE=/tmp/autopkgtest.iiYcjY/build.2hy/src
364s + . /tmp/autopkgtest.iiYcjY/build.2hy/src/t/test-lib.sh
364s + GIT_IMERGE=git-imerge
364s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s + DESCRIPTION=git-imerge test repository with duplicate commits
364s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated git-imerge test repository with duplicate commits
364s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s + local description=git-imerge test repository with duplicate commits
364s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated git-imerge test repository with duplicate commits
364s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s + local description=git-imerge test repository with duplicate commits
364s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s hint: Using 'master' as the name for the initial branch. This default branch name
364s hint: is subject to change. To configure the initial branch name to use in all
364s hint: of your new repositories, which will suppress this warning, call:
364s hint: 
364s hint: 	git config --global init.defaultBranch <name>
364s hint: 
364s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
364s hint: 'development'. The just-created branch can be renamed via this command:
364s hint: 
364s hint: 	git branch -m <name>
364s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated/.git/
364s + echo git-imerge test repository with duplicate commits
364s + printf %s\n /*.out /*.css /*.html
364s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated/.git config user.name Loú User
364s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated/.git config user.email luser@example.com
364s + TIME=1112911993
364s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/duplicated
364s + modify a.txt 0
364s + filename=a.txt
364s + text=0
364s + echo 0
364s + git add a.txt
364s + commit -m m⇒0
364s + TIME=1112911994
364s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
364s [master (root-commit) a733afa] m⇒0
364s  1 file changed, 1 insertion(+)
364s  create mode 100644 a.txt
364s + git checkout -b a --
364s Switched to a new branch 'a'
364s + seq 3
364s + modify a.txt 1
364s + filename=a.txt
364s + text=1
364s + echo 1
364s + git add a.txt
364s + commit -m a⇒1 on branch a
364s + TIME=1112911995
364s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
364s [a 2f1f75a] a⇒1 on branch a
364s  1 file changed, 1 insertion(+), 1 deletion(-)
364s + modify a.txt 2
364s + filename=a.txt
364s + text=2
364s + echo 2
364s + git add a.txt
364s + commit -m a⇒2 on branch a
364s + TIME=1112911996
364s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
364s [a 4700669] a⇒2 on branch a
364s  1 file changed, 1 insertion(+), 1 deletion(-)
364s + modify a.txt 3
364s + filename=a.txt
364s + text=3
364s + echo 3
364s + git add a.txt
364s + commit -m a⇒3 on branch a
364s + TIME=1112911997
364s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
364s + git checkout -b b master --
364s [a 621c381] a⇒3 on branch a
364s  1 file changed, 1 insertion(+), 1 deletion(-)
364s Switched to a new branch 'b'
364s + seq 4
364s + modify a.txt 1
364s + filename=a.txt
364s + text=1
364s + echo 1
364s + git add a.txt
364s + commit -m a⇒1 on branch b
364s + TIME=1112911998
364s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b
364s [b 62a5c56] a⇒1 on branch b
364s  1 file changed, 1 insertion(+), 1 deletion(-)
364s + modify a.txt 2
364s + filename=a.txt
364s + text=2
364s + echo 2
364s + git add a.txt
364s + commit -m a⇒2 on branch b
364s + TIME=1112911999
364s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b
364s [b f846281] a⇒2 on branch b
364s  1 file changed, 1 insertion(+), 1 deletion(-)
364s + modify a.txt 3
364s + filename=a.txt
364s + text=3
364s + echo 3
364s + git add a.txt
364s + commit -m a⇒3 on branch b
364s + TIME=1112912000
364s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b
364s + modify a.txt 4
364s + filename=a.txt
364s + text=4
364s + echo 4
364s + git add a.txt
364s + commit -m a⇒4 on branch b
364s [b a4b2c2b] a⇒3 on branch b
364s  1 file changed, 1 insertion(+), 1 deletion(-)
364s + TIME=1112912001
364s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b
364s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2
364s + git checkout a
364s [b 5b24553] a⇒4 on branch b
364s  1 file changed, 1 insertion(+), 1 deletion(-)
364s Switched to branch 'a'
364s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b
364s Attempting automerge of 3-4...failure.
364s Attempting automerge of 1-1...success.
364s Attempting automerge of 1-3...failure.
364s Attempting automerge of 1-2...failure.
364s Attempting automerge of 3-1...failure.
364s Attempting automerge of 2-1...failure.
364s Autofilling 1-1...success.
364s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2].
364s Attempting automerge of 1-4...success.
364s Autofilling 1-2...success.
364s Autofilling 1-3...success.
364s Autofilling 1-4...success.
364s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5].
364s Attempting automerge of 3-4...failure.
364s Attempting automerge of 2-1...success.
364s Attempting automerge of 2-3...failure.
364s Attempting automerge of 2-2...success.
364s Attempting automerge of 3-2...failure.
365s Attempting automerge of 3-1...success.
365s Autofilling 2-1...success.
365s Autofilling 2-2...success.
365s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3].
365s Autofilling 3-1...success.
365s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2].
365s Attempting automerge of 2-4...success.
365s Autofilling 2-3...success.
365s Autofilling 2-4...success.
365s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5].
365s Attempting automerge of 3-4...failure.
365s Attempting automerge of 3-2...success.
365s Attempting automerge of 3-4...failure.
365s Attempting automerge of 3-3...success.
365s Autofilling 3-2...success.
365s Autofilling 3-3...success.
365s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4].
365s Attempting automerge of 3-4...success.
365s Autofilling 3-4...success.
365s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5].
365s Merge is complete!
365s + git-imerge diagram --commits --frontier --html=imerge5.html
365s        0  3
365s        |  |
365s    0 - **** - a
365s        *...
365s        *...
365s        *...
365s    4 - *...
365s        |
365s      b
365s 
365s        0  3
365s        |  |
365s    0 - **** - a
365s        *..|
365s        *..|
365s        *..|
365s    4 - *--+
365s        |
365s      b
365s 
365s Key:
365s   |,-,+ = rectangles forming current merge frontier
365s   * = merge done manually
365s   . = merge done automatically
365s   # = conflict that is currently blocking progress
365s   @ = merge was blocked but has been resolved
365s   ? = no merge recorded
365s 
365s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge
365s Merge b into a (using imerge)
365s 
365s # Please enter the commit message for your changes. Lines starting
365s # with '#' will be ignored, and an empty message aborts the commit.
365s #
365s # Date:      Wed Mar 27 02:56:24 2024 +0000
365s #
365s # On branch a-b-merge
365s # Changes to be committed:
365s #	modified:   a.txt
365s #
365s [a-b-merge 5fb10f1] Merge b into a (using imerge)
365s  Date: Wed Mar 27 02:56:24 2024 +0000
365s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + local refname=a-b-merge
365s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git rev-parse a-b-merge^{tree}
365s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git-imerge simplify --goal=rebase --branch=a-b-rebase
365s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + local refname=a-b-rebase
365s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git rev-parse a-b-rebase^{tree}
365s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history
365s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + local refname=a-b-rebase-with-history
365s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git rev-parse a-b-rebase-with-history^{tree}
365s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git-imerge simplify --goal=border --branch=a-b-border
365s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + local refname=a-b-border
365s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git rev-parse a-b-border^{tree}
365s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history
365s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + local refname=a-b-border-with-history
365s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git rev-parse a-b-border-with-history^{tree}
365s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
365s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2
366s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2
366s + local refname=a-b-border-with-history2
366s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
366s + git rev-parse a-b-border-with-history2^{tree}
366s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
366s + git checkout a
366s Switched to branch 'a'
366s + git-imerge start --goal=full --name=a-b b
366s Attempting to merge 1-1...success.
366s Attempting to merge 1-2...success.
366s Attempting to merge 1-3...success.
366s Attempting to merge 1-4...success.
366s Attempting to merge 2-1...success.
366s Attempting to merge 2-2...success.
366s Attempting to merge 2-3...success.
366s Attempting to merge 2-4...success.
366s Attempting to merge 3-1...success.
366s Attempting to merge 3-2...success.
366s Attempting to merge 3-3...success.
366s Attempting to merge 3-4...success.
366s Merge is complete!
366s + git-imerge list
366s * a-b
366s + git-imerge diagram --commits --frontier --html=imerge6.html
366s        0  3
366s        |  |
366s    0 - **** - a
366s        *...
366s        *...
366s        *...
366s    4 - *...
366s        |
366s      b
366s 
366s        0  3
366s        |  |
366s    0 - **** - a
366s        *..|
366s        *..|
366s        *..|
366s    4 - *--+
366s        |
366s      b
366s 
366s Key:
366s   |,-,+ = rectangles forming current merge frontier
366s   * = merge done manually
366s   . = merge done automatically
366s   # = conflict that is currently blocking progress
366s   @ = merge was blocked but has been resolved
366s   ? = no merge recorded
366s 
366s + git-imerge finish --branch=a-b-full
366s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2
366s + local refname=a-b-full
366s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
366s + git rev-parse a-b-full^{tree}
366s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
366s py312: commands[4] /tmp/autopkgtest.iiYcjY/build.2hy/src> /bin/sh t/test-flip-flop
366s + dirname t/test-flip-flop
366s + cd t
366s + pwd
366s + dirname /tmp/autopkgtest.iiYcjY/build.2hy/src/t
366s + BASE=/tmp/autopkgtest.iiYcjY/build.2hy/src
366s + . /tmp/autopkgtest.iiYcjY/build.2hy/src/t/test-lib.sh
366s + GIT_IMERGE=git-imerge
366s + flip_flop_test 1
366s + local n=1
366s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1
366s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1
366s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s + local description=git-imerge test repository with a commit and its revert at n=1
366s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1
366s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s + local description=git-imerge test repository with a commit and its revert at n=1
366s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s hint: Using 'master' as the name for the initial branch. This default branch name
366s hint: is subject to change. To configure the initial branch name to use in all
366s hint: of your new repositories, which will suppress this warning, call:
366s hint: 
366s hint: 	git config --global init.defaultBranch <name>
366s hint: 
366s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
366s hint: 'development'. The just-created branch can be renamed via this command:
366s hint: 
366s hint: 	git branch -m <name>
366s + echo git-imerge test repository with a commit and its revert at n=1
366s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1/.git/
366s + printf %s\n /*.out /*.css /*.html
366s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1/.git config user.name Loú User
366s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1/.git config user.email luser@example.com
366s + TIME=1112911993
366s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-1
366s + modify a.txt 0
366s + filename=a.txt
366s + text=0
366s + echo 0
366s + git add a.txt
366s + commit -m m⇒0
366s + TIME=1112911994
366s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
366s [master (root-commit) a733afa] m⇒0
366s  1 file changed, 1 insertion(+)
366s  create mode 100644 a.txt
366s + git checkout -b a --
366s Switched to a new branch 'a'
366s + modify a.txt 1
366s + filename=a.txt
366s + text=1
366s + echo 1
366s + git add a.txt
366s + commit -m a⇒1 on branch a
366s + TIME=1112911995
366s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
366s [a 2f1f75a] a⇒1 on branch a
366s  1 file changed, 1 insertion(+), 1 deletion(-)
366s + modify a.txt 2
366s + filename=a.txt
366s + text=2
366s + echo 2
366s + git add a.txt
366s + commit -m a⇒2 on branch a
366s + TIME=1112911996
366s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
366s [a 4700669] a⇒2 on branch a
366s  1 file changed, 1 insertion(+), 1 deletion(-)
366s + modify a.txt 3
366s + filename=a.txt
366s + text=3
366s + echo 3
366s + git add a.txt
366s + commit -m a⇒3 on branch a
366s + TIME=1112911997
366s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
366s [a 621c381] a⇒3 on branch a
366s  1 file changed, 1 insertion(+), 1 deletion(-)
366s + git checkout -b b master --
366s Switched to a new branch 'b'
366s + modify b.txt 1
366s + filename=b.txt
366s + text=1
366s + echo 1
366s + git add b.txt
366s + msg=b⇒1
366s + test 1 = 1
366s + modify a.txt X
366s + filename=a.txt
366s + text=X
366s + echo X
366s + git add a.txt
366s + msg=b⇒1 and a⇒X
366s + test 1 = 2
366s + commit -m b⇒1 and a⇒X on branch b
366s + TIME=1112911998
366s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b
366s [b 044a3fa] b⇒1 and a⇒X on branch b
366s  2 files changed, 2 insertions(+), 1 deletion(-)
366s  create mode 100644 b.txt
366s + modify b.txt 2
366s + filename=b.txt
366s + text=2
366s + echo 2
366s + git add b.txt
366s + msg=b⇒2
366s + test 2 = 1
366s + test 2 = 2
366s + modify a.txt 0
366s + filename=a.txt
366s + text=0
366s + echo 0
366s + git add a.txt
366s + msg=b⇒2 and a⇒0
366s + commit -m b⇒2 and a⇒0 on branch b
366s + TIME=1112911999
366s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b
366s [b 7851975] b⇒2 and a⇒0 on branch b
366s  2 files changed, 2 insertions(+), 2 deletions(-)
366s + modify b.txt 3
366s + filename=b.txt
366s + text=3
366s + echo 3
366s + git add b.txt
366s + msg=b⇒3
366s + test 3 = 1
366s + test 3 = 2
366s + commit -m b⇒3 on branch b
366s + TIME=1112912000
366s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b
366s + modify b.txt 4
366s + filename=b.txt
366s + text=4
366s + echo 4
366s + git add b.txt
366s + msg=b⇒4
366s + test 4 = 1
366s + test 4 = 2
366s + commit -m b⇒4 on branch b
366s + TIME=1112912001
366s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b
366s + test_merge b-into-a-1 a b 1-1 1-2
366s + local name=b-into-a-1
366s + local dst=a
366s + local src=b
366s + local conflict1=1-1
366s + local conflict2=1-2
366s + git checkout a
366s Switched to branch 'a'
366s + + git-imerge merge --branch=b-into-a-1 b
366s [b 6fe24f0] b⇒3 on branch b
366s  1 file changed, 1 insertion(+), 1 deletion(-)
366s [b 2dc5eb7] b⇒4 on branch b
366s  1 file changed, 1 insertion(+), 1 deletion(-)
366s tee imerge-b-into-a-1-1.out
366s Attempting automerge of 3-4...success.
366s Autofilling 1-4...success.
366s Autofilling 2-4...success.
366s Autofilling 3-1...unexpected conflict.  Backtracking...
366s Autofilling 1-4...success.
366s Autofilling 2-1...unexpected conflict.  Backtracking...
366s Autofilling 1-1...unexpected conflict.  Backtracking...
366s Switched to branch 'imerge/b'
366s Auto-merging a.txt
366s CONFLICT (content): Merge conflict in a.txt
366s Automatic merge failed; fix conflicts and then commit the result.
366s 
366s Original first commit:
366s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
366s Author: Loú User <luser@example.com>
366s Date:   Thu Apr 7 22:13:15 2005 +0000
366s 
366s     a⇒1 on branch a
366s 
366s Original second commit:
366s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2
366s Author: Loú User <luser@example.com>
366s Date:   Thu Apr 7 22:13:18 2005 +0000
366s 
366s     b⇒1 and a⇒X on branch b
366s 
366s There was a conflict merging commit 1-1, shown above.
366s Please resolve the conflict, commit the result, then type
366s 
366s     git-imerge continue
366s + git-imerge diagram --commits --frontier
367s        0  3
367s        |  |
367s    0 - **** - a
367s        *#??
367s        *???
367s        *???
367s    4 - *???
367s        |
367s      b
367s 
367s        0  3
367s        |  |
367s    0 - **** - a
367s        *#??
367s        *???
367s        *???
367s    4 - *???
367s        |
367s      b
367s 
367s Key:
367s   |,-,+ = rectangles forming current merge frontier
367s   * = merge done manually
367s   . = merge done automatically
367s   # = conflict that is currently blocking progress
367s   @ = merge was blocked but has been resolved
367s   ? = no merge recorded
367s 
367s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out
367s + echo 1
367s + git add a.txt
367s + + git-imerge continue --no-edit
367s tee imerge-b-into-a-1-2.out
367s [imerge/b 1c58ae2] imerge 'b': manual merge 1-1
367s Merge has been recorded for merge 1-1.
367s Attempting automerge of 1-4...failure.
367s Attempting automerge of 1-2...failure.
367s Attempting automerge of 3-1...success.
367s Autofilling 2-1...success.
367s Autofilling 3-1...success.
367s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2].
367s Previous HEAD position was 91792b9 imerge 'b': automatic merge 3-1
367s Switched to branch 'imerge/b'
367s Auto-merging a.txt
367s CONFLICT (content): Merge conflict in a.txt
367s Automatic merge failed; fix conflicts and then commit the result.
367s 
367s Original first commit:
367s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
367s Author: Loú User <luser@example.com>
367s Date:   Thu Apr 7 22:13:15 2005 +0000
367s 
367s     a⇒1 on branch a
367s 
367s Original second commit:
367s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab
367s Author: Loú User <luser@example.com>
367s Date:   Thu Apr 7 22:13:19 2005 +0000
367s 
367s     b⇒2 and a⇒0 on branch b
367s 
367s There was a conflict merging commit 1-2, shown above.
367s Please resolve the conflict, commit the result, then type
367s 
367s     git-imerge continue
367s + git-imerge diagram --commits --frontier
367s        0  3
367s        |  |
367s    0 - **** - a
367s        **..
367s        *#??
367s        *???
367s    4 - *???
367s        |
367s      b
367s 
367s        0  3
367s        |  |
367s    0 - **** - a
367s        **-+
367s        *#??
367s        *???
367s    4 - *???
367s        |
367s      b
367s 
367s Key:
367s   |,-,+ = rectangles forming current merge frontier
367s   * = merge done manually
367s   . = merge done automatically
367s   # = conflict that is currently blocking progress
367s   @ = merge was blocked but has been resolved
367s   ? = no merge recorded
367s 
367s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out
367s + echo 1
367s + git add a.txt
367s + + git-imerge continue --no-edit
367s tee imerge-b-into-a-1-3.out
367s [imerge/b b55c978] imerge 'b': manual merge 1-2
367s Merge has been recorded for merge 1-2.
367s Attempting automerge of 1-4...success.
367s Autofilling 1-3...success.
367s Autofilling 1-4...success.
367s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5].
367s Attempting automerge of 3-4...success.
367s Autofilling 2-4...success.
367s Autofilling 3-2...success.
367s Autofilling 3-3...success.
367s Autofilling 3-4 (first way)...success.
367s Autofilling 3-4 (second way)...success.
367s The two ways of autofilling 3-4 agree.
367s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5].
367s Merge is complete!
367s + grep -q Merge is complete imerge-b-into-a-1-3.out
367s + git-imerge diagram --commits --frontier
367s        0  3
367s        |  |
367s    0 - **** - a
367s        **..
367s        **?.
367s        *.?.
367s    4 - *...
367s        |
367s      b
367s 
367s        0  3
367s        |  |
367s    0 - **** - a
367s        **.|
367s        **?|
367s        *.?|
367s    4 - *--+
367s        |
367s      b
367s 
367s Key:
367s   |,-,+ = rectangles forming current merge frontier
367s   * = merge done manually
367s   . = merge done automatically
367s   # = conflict that is currently blocking progress
367s   @ = merge was blocked but has been resolved
367s   ? = no merge recorded
367s 
367s + GIT_EDITOR=cat git-imerge finish
367s Merge b into a (using imerge)
367s 
367s # Please enter the commit message for your changes. Lines starting
367s # with '#' will be ignored, and an empty message aborts the commit.
367s #
367s # Date:      Wed Mar 27 02:56:26 2024 +0000
367s #
367s # On branch b-into-a-1
367s # Changes to be committed:
367s #	new file:   b.txt
367s #
367s [b-into-a-1 e12467d] Merge b into a (using imerge)
367s  Date: Wed Mar 27 02:56:26 2024 +0000
367s + test_merge a-into-b-1 b a 1-1 2-1
367s + local name=a-into-b-1
367s + local dst=b
367s + local src=a
367s + local conflict1=1-1
367s + local conflict2=2-1
367s + git checkout b
367s Switched to branch 'b'
367s + + git-imerge merge --branch=a-into-b-1 a
367s tee imerge-a-into-b-1-1.out
367s Attempting automerge of 4-3...success.
367s Autofilling 1-3...unexpected conflict.  Backtracking...
367s Autofilling 1-2...unexpected conflict.  Backtracking...
367s Autofilling 1-1...unexpected conflict.  Backtracking...
367s Switched to branch 'imerge/a'
367s Auto-merging a.txt
367s CONFLICT (content): Merge conflict in a.txt
367s Automatic merge failed; fix conflicts and then commit the result.
367s 
367s Original first commit:
367s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2
367s Author: Loú User <luser@example.com>
367s Date:   Thu Apr 7 22:13:18 2005 +0000
367s 
367s     b⇒1 and a⇒X on branch b
367s 
367s Original second commit:
367s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
367s Author: Loú User <luser@example.com>
367s Date:   Thu Apr 7 22:13:15 2005 +0000
367s 
367s     a⇒1 on branch a
367s 
367s There was a conflict merging commit 1-1, shown above.
367s Please resolve the conflict, commit the result, then type
367s 
367s     git-imerge continue
367s + git-imerge diagram --commits --frontier
367s        0   4
367s        |   |
367s    0 - ***** - b
367s        *#???
367s        *????
367s    3 - *????
367s        |
367s      a
367s 
367s        0   4
367s        |   |
367s    0 - ***** - b
367s        *#???
367s        *????
367s    3 - *????
367s        |
367s      a
367s 
367s Key:
367s   |,-,+ = rectangles forming current merge frontier
367s   * = merge done manually
367s   . = merge done automatically
367s   # = conflict that is currently blocking progress
367s   @ = merge was blocked but has been resolved
367s   ? = no merge recorded
367s 
367s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out
367s + echo 1
367s + git add a.txt
367s + + git-imerge continuetee --no-edit
367s  imerge-a-into-b-1-2.out
368s [imerge/a 4524cb5] imerge 'a': manual merge 1-1
368s Merge has been recorded for merge 1-1.
368s Attempting automerge of 1-3...success.
368s Autofilling 1-2...success.
368s Autofilling 1-3...success.
368s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4].
368s Attempting automerge of 4-3...failure.
368s Attempting automerge of 2-1...failure.
368s Switched to branch 'imerge/a'
368s Auto-merging a.txt
368s CONFLICT (content): Merge conflict in a.txt
368s Automatic merge failed; fix conflicts and then commit the result.
368s 
368s Original first commit:
368s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab
368s Author: Loú User <luser@example.com>
368s Date:   Thu Apr 7 22:13:19 2005 +0000
368s 
368s     b⇒2 and a⇒0 on branch b
368s 
368s Original second commit:
368s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
368s Author: Loú User <luser@example.com>
368s Date:   Thu Apr 7 22:13:15 2005 +0000
368s 
368s     a⇒1 on branch a
368s 
368s There was a conflict merging commit 2-1, shown above.
368s Please resolve the conflict, commit the result, then type
368s 
368s     git-imerge continue
368s + git-imerge diagram --commits --frontier
368s        0   4
368s        |   |
368s    0 - ***** - b
368s        **#??
368s        *.???
368s    3 - *.???
368s        |
368s      a
368s 
368s        0   4
368s        |   |
368s    0 - ***** - b
368s        **#??
368s        *|???
368s    3 - *+???
368s        |
368s      a
368s 
368s Key:
368s   |,-,+ = rectangles forming current merge frontier
368s   * = merge done manually
368s   . = merge done automatically
368s   # = conflict that is currently blocking progress
368s   @ = merge was blocked but has been resolved
368s   ? = no merge recorded
368s 
368s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out
368s + echo 1
368s + git add a.txt
368s + git-imerge continue --no-edit
368s + tee imerge-a-into-b-1-3.out
368s [imerge/a 78791f0] imerge 'a': manual merge 2-1
368s Merge has been recorded for merge 2-1.
368s Attempting automerge of 2-3...success.
368s Autofilling 2-2...success.
368s Autofilling 2-3...success.
368s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4].
368s Attempting automerge of 4-3...success.
368s Autofilling 3-3...success.
368s Autofilling 4-1...success.
368s Autofilling 4-2...success.
368s Autofilling 4-3 (first way)...success.
368s Autofilling 4-3 (second way)...success.
368s The two ways of autofilling 4-3 agree.
368s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4].
368s Merge is complete!
368s + grep -q Merge is complete imerge-a-into-b-1-3.out
368s + git-imerge diagram --commits --frontier
368s        0   4
368s        |   |
368s    0 - ***** - b
368s        ***?.
368s        *..?.
368s    3 - *....
368s        |
368s      a
368s 
368s        0   4
368s        |   |
368s    0 - ***** - b
368s        ***?|
368s        *..?|
368s    3 - *---+
368s        |
368s      a
368s 
368s Key:
368s   |,-,+ = rectangles forming current merge frontier
368s   * = merge done manually
368s   . = merge done automatically
368s   # = conflict that is currently blocking progress
368s   @ = merge was blocked but has been resolved
368s   ? = no merge recorded
368s 
368s + GIT_EDITOR=cat git-imerge finish
368s Merge a into b (using imerge)
368s 
368s # Please enter the commit message for your changes. Lines starting
368s # with '#' will be ignored, and an empty message aborts the commit.
368s #
368s # Date:      Wed Mar 27 02:56:27 2024 +0000
368s #
368s # On branch a-into-b-1
368s # Changes to be committed:
368s #	modified:   a.txt
368s #
368s [a-into-b-1 0de27f9] Merge a into b (using imerge)
368s  Date: Wed Mar 27 02:56:27 2024 +0000
368s + flip_flop_test 2
368s + local n=2
368s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2
368s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2
368s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s + local description=git-imerge test repository with a commit and its revert at n=2
368s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2
368s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s + local description=git-imerge test repository with a commit and its revert at n=2
368s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s hint: Using 'master' as the name for the initial branch. This default branch name
368s hint: is subject to change. To configure the initial branch name to use in all
368s hint: of your new repositories, which will suppress this warning, call:
368s hint: 
368s hint: 	git config --global init.defaultBranch <name>
368s hint: 
368s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
368s hint: 'development'. The just-created branch can be renamed via this command:
368s hint: 
368s hint: 	git branch -m <name>
368s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2/.git/
368s + echo git-imerge test repository with a commit and its revert at n=2
368s + printf %s\n /*.out /*.css /*.html
368s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2/.git config user.name Loú User
368s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2/.git config user.email luser@example.com
368s + TIME=1112911993
368s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-2
368s + modify a.txt 0
368s + filename=a.txt
368s + text=0
368s + echo 0
368s + git add a.txt
368s + commit -m m⇒0
368s + TIME=1112911994
368s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
368s [master (root-commit) a733afa] m⇒0
368s  1 file changed, 1 insertion(+)
368s  create mode 100644 a.txt
368s + git checkout -b a --
368s Switched to a new branch 'a'
368s + modify a.txt 1
368s + filename=a.txt
368s + text=1
368s + echo 1
368s + git add a.txt
368s + commit -m a⇒1 on branch a
368s + TIME=1112911995
368s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
368s [a 2f1f75a] a⇒1 on branch a
368s  1 file changed, 1 insertion(+), 1 deletion(-)
368s + modify a.txt 2
368s + filename=a.txt
368s + text=2
368s + echo 2
368s + git add a.txt
368s + commit -m a⇒2 on branch a
368s + TIME=1112911996
368s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
368s [a 4700669] a⇒2 on branch a
368s  1 file changed, 1 insertion(+), 1 deletion(-)
368s + modify a.txt 3
368s + filename=a.txt
368s + text=3
368s + echo 3
368s + git add a.txt
368s + commit -m a⇒3 on branch a
368s + TIME=1112911997
368s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
368s [a 621c381] a⇒3 on branch a
368s  1 file changed, 1 insertion(+), 1 deletion(-)
368s + git checkout -b b master --
368s Switched to a new branch 'b'
368s + modify b.txt 1
368s + filename=b.txt
368s + text=1
368s + echo 1
368s + git add b.txt
368s + msg=b⇒1
368s + test 1 = 2
368s + test 1 = 3
368s + commit -m b⇒1 on branch b
368s + TIME=1112911998
368s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b
368s [b 1f7d097] b⇒1 on branch b
368s  1 file changed, 1 insertion(+)
368s  create mode 100644 b.txt
368s + modify b.txt 2
368s + filename=b.txt
368s + text=2
368s + echo 2
368s + git add b.txt
368s + msg=b⇒2
368s + test 2 = 2
368s + modify a.txt X
368s + filename=a.txt
368s + text=X
368s + echo X
368s + git add a.txt
368s + msg=b⇒2 and a⇒X
368s + test 2 = 3
368s + commit -m b⇒2 and a⇒X on branch b
368s + TIME=1112911999
368s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b
368s [b 48df77d] b⇒2 and a⇒X on branch b
368s  2 files changed, 2 insertions(+), 2 deletions(-)
368s + modify b.txt 3
368s + filename=b.txt
368s + text=3
368s + echo 3
368s + git add b.txt
368s + msg=b⇒3
368s + test 3 = 2
368s + test 3 = 3
368s + modify a.txt 0
368s + filename=a.txt
368s + text=0
368s + echo 0
368s + git add a.txt
368s + msg=b⇒3 and a⇒0
368s + commit -m b⇒3 and a⇒0 on branch b
368s + TIME=1112912000
368s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b
368s [b f3ef019] b⇒3 and a⇒0 on branch b
368s  2 files changed, 2 insertions(+), 2 deletions(-)
368s + modify b.txt 4
368s + filename=b.txt
368s + text=4
368s + echo 4
368s + git add b.txt
368s + msg=b⇒4
368s + test 4 = 2
368s + test 4 = 3
368s + commit -m b⇒4 on branch b
368s + TIME=1112912001
368s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b
368s [b 69d0c21] b⇒4 on branch b
368s  1 file changed, 1 insertion(+), 1 deletion(-)
368s + test_merge b-into-a-2 a b 1-2 1-3
368s + local name=b-into-a-2
368s + local dst=a
368s + local src=b
368s + local conflict1=1-2
368s + local conflict2=1-3
368s + git checkout a
368s Switched to branch 'a'
368s + + git-imerge merge --branch=b-into-a-2tee b
368s  imerge-b-into-a-2-1.out
368s Attempting automerge of 3-4...success.
368s Autofilling 1-4...success.
368s Autofilling 2-4...success.
368s Autofilling 3-1...success.
368s Autofilling 3-2...unexpected conflict.  Backtracking...
368s Autofilling 1-4...success.
368s Autofilling 2-1...success.
368s Autofilling 2-2...unexpected conflict.  Backtracking...
368s Autofilling 1-1...success.
368s Autofilling 1-2...unexpected conflict.  Backtracking...
368s Autofilling 1-1...success.
368s Autofilling 2-1...success.
368s Autofilling 3-1...success.
368s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2].
368s Attempting automerge of 3-4...success.
369s Autofilling 1-4...success.
369s Autofilling 2-4...success.
369s Autofilling 3-2...unexpected conflict.  Backtracking...
369s Autofilling 1-4...success.
369s Autofilling 2-2...unexpected conflict.  Backtracking...
369s Autofilling 1-2...unexpected conflict.  Backtracking...
369s Switched to branch 'imerge/b'
369s Auto-merging a.txt
369s CONFLICT (content): Merge conflict in a.txt
369s Automatic merge failed; fix conflicts and then commit the result.
369s 
369s Original first commit:
369s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
369s Author: Loú User <luser@example.com>
369s Date:   Thu Apr 7 22:13:15 2005 +0000
369s 
369s     a⇒1 on branch a
369s 
369s Original second commit:
369s commit 48df77d20a6d16fe330e32ba17d5472d3868a622
369s Author: Loú User <luser@example.com>
369s Date:   Thu Apr 7 22:13:19 2005 +0000
369s 
369s     b⇒2 and a⇒X on branch b
369s 
369s There was a conflict merging commit 1-2, shown above.
369s Please resolve the conflict, commit the result, then type
369s 
369s     git-imerge continue
369s + git-imerge diagram --commits --frontier
369s        0  3
369s        |  |
369s    0 - **** - a
369s        *...
369s        *#??
369s        *???
369s    4 - *???
369s        |
369s      b
369s 
369s        0  3
369s        |  |
369s    0 - **** - a
369s        *--+
369s        *#??
369s        *???
369s    4 - *???
369s        |
369s      b
369s 
369s Key:
369s   |,-,+ = rectangles forming current merge frontier
369s   * = merge done manually
369s   . = merge done automatically
369s   # = conflict that is currently blocking progress
369s   @ = merge was blocked but has been resolved
369s   ? = no merge recorded
369s 
369s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out
369s + echo 1
369s + git add a.txt
369s + + tee imerge-b-into-a-2-2.out
369s git-imerge continue --no-edit
369s [imerge/b cdaa1df] imerge 'b': manual merge 1-2
369s Merge has been recorded for merge 1-2.
369s Attempting automerge of 1-4...failure.
369s Attempting automerge of 1-3...failure.
369s Attempting automerge of 3-2...success.
369s Autofilling 2-2...success.
369s Autofilling 3-2...success.
369s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3].
369s Previous HEAD position was 34def42 imerge 'b': automatic merge 3-2
369s Switched to branch 'imerge/b'
369s Auto-merging a.txt
369s CONFLICT (content): Merge conflict in a.txt
369s Automatic merge failed; fix conflicts and then commit the result.
369s 
369s Original first commit:
369s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
369s Author: Loú User <luser@example.com>
369s Date:   Thu Apr 7 22:13:15 2005 +0000
369s 
369s     a⇒1 on branch a
369s 
369s Original second commit:
369s commit f3ef01986be02ef5e40589b283c0385471ecca7d
369s Author: Loú User <luser@example.com>
369s Date:   Thu Apr 7 22:13:20 2005 +0000
369s 
369s     b⇒3 and a⇒0 on branch b
369s 
369s There was a conflict merging commit 1-3, shown above.
369s Please resolve the conflict, commit the result, then type
369s 
369s     git-imerge continue
369s + git-imerge diagram --commits --frontier
369s        0  3
369s        |  |
369s    0 - **** - a
369s        *...
369s        **..
369s        *#??
369s    4 - *???
369s        |
369s      b
369s 
369s        0  3
369s        |  |
369s    0 - **** - a
369s        *..|
369s        **-+
369s        *#??
369s    4 - *???
369s        |
369s      b
369s 
369s Key:
369s   |,-,+ = rectangles forming current merge frontier
369s   * = merge done manually
369s   . = merge done automatically
369s   # = conflict that is currently blocking progress
369s   @ = merge was blocked but has been resolved
369s   ? = no merge recorded
369s 
369s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out
369s + echo 1
369s + git add a.txt
369s + + git-imerge continue --no-edit
369s tee imerge-b-into-a-2-3.out
369s [imerge/b f25be47] imerge 'b': manual merge 1-3
369s Merge has been recorded for merge 1-3.
369s Attempting automerge of 1-4...success.
369s Autofilling 1-4...success.
369s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5].
369s Attempting automerge of 3-4...success.
369s Autofilling 2-4...success.
369s Autofilling 3-3...success.
369s Autofilling 3-4 (first way)...success.
369s Autofilling 3-4 (second way)...success.
369s The two ways of autofilling 3-4 agree.
369s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5].
369s Merge is complete!
369s + grep -q Merge is complete imerge-b-into-a-2-3.out
369s + git-imerge diagram --commits --frontier
369s        0  3
369s        |  |
369s    0 - **** - a
369s        *...
369s        **..
369s        **?.
369s    4 - *...
369s        |
369s      b
369s 
369s        0  3
369s        |  |
369s    0 - **** - a
369s        *..|
369s        **.|
369s        **?|
369s    4 - *--+
369s        |
369s      b
369s 
369s Key:
369s   |,-,+ = rectangles forming current merge frontier
369s   * = merge done manually
369s   . = merge done automatically
369s   # = conflict that is currently blocking progress
369s   @ = merge was blocked but has been resolved
369s   ? = no merge recorded
369s 
369s + GIT_EDITOR=cat git-imerge finish
369s Merge b into a (using imerge)
369s 
369s # Please enter the commit message for your changes. Lines starting
369s # with '#' will be ignored, and an empty message aborts the commit.
369s #
369s # Date:      Wed Mar 27 02:56:28 2024 +0000
369s #
369s # On branch b-into-a-2
369s # Changes to be committed:
369s #	new file:   b.txt
369s #
369s [b-into-a-2 e17fc34] Merge b into a (using imerge)
369s  Date: Wed Mar 27 02:56:28 2024 +0000
369s + test_merge a-into-b-2 b a 2-1 3-1
369s + local name=a-into-b-2
369s + local dst=b
369s + local src=a
369s + local conflict1=2-1
369s + local conflict2=3-1
369s + git checkout b
369s Switched to branch 'b'
369s + + git-imerge merge --branch=a-into-b-2 a
369s tee imerge-a-into-b-2-1.out
369s Attempting automerge of 4-3...success.
370s Autofilling 1-3...success.
370s Autofilling 2-3...unexpected conflict.  Backtracking...
370s Autofilling 1-1...success.
370s Autofilling 1-2...success.
370s Autofilling 1-3...success.
370s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4].
370s Autofilling 2-2...unexpected conflict.  Backtracking...
370s Autofilling 2-1...unexpected conflict.  Backtracking...
370s Switched to branch 'imerge/a'
370s Auto-merging a.txt
370s CONFLICT (content): Merge conflict in a.txt
370s Automatic merge failed; fix conflicts and then commit the result.
370s 
370s Original first commit:
370s commit 48df77d20a6d16fe330e32ba17d5472d3868a622
370s Author: Loú User <luser@example.com>
370s Date:   Thu Apr 7 22:13:19 2005 +0000
370s 
370s     b⇒2 and a⇒X on branch b
370s 
370s Original second commit:
370s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
370s Author: Loú User <luser@example.com>
370s Date:   Thu Apr 7 22:13:15 2005 +0000
370s 
370s     a⇒1 on branch a
370s 
370s There was a conflict merging commit 2-1, shown above.
370s Please resolve the conflict, commit the result, then type
370s 
370s     git-imerge continue
370s + git-imerge diagram --commits --frontier
370s        0   4
370s        |   |
370s    0 - ***** - b
370s        *.#??
370s        *.???
370s    3 - *.???
370s        |
370s      a
370s 
370s        0   4
370s        |   |
370s    0 - ***** - b
370s        *|#??
370s        *|???
370s    3 - *+???
370s        |
370s      a
370s 
370s Key:
370s   |,-,+ = rectangles forming current merge frontier
370s   * = merge done manually
370s   . = merge done automatically
370s   # = conflict that is currently blocking progress
370s   @ = merge was blocked but has been resolved
370s   ? = no merge recorded
370s 
370s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out
370s + echo 1
370s + git add a.txt
370s + + git-imerge continue --no-edittee
370s  imerge-a-into-b-2-2.out
370s [imerge/a 2b4aa31] imerge 'a': manual merge 2-1
370s Merge has been recorded for merge 2-1.
370s Attempting automerge of 2-3...success.
370s Autofilling 2-2...success.
370s Autofilling 2-3...success.
370s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4].
370s Attempting automerge of 4-3...failure.
370s Attempting automerge of 3-1...failure.
370s Switched to branch 'imerge/a'
370s Auto-merging a.txt
370s CONFLICT (content): Merge conflict in a.txt
370s Automatic merge failed; fix conflicts and then commit the result.
370s 
370s Original first commit:
370s commit f3ef01986be02ef5e40589b283c0385471ecca7d
370s Author: Loú User <luser@example.com>
370s Date:   Thu Apr 7 22:13:20 2005 +0000
370s 
370s     b⇒3 and a⇒0 on branch b
370s 
370s Original second commit:
370s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
370s Author: Loú User <luser@example.com>
370s Date:   Thu Apr 7 22:13:15 2005 +0000
370s 
370s     a⇒1 on branch a
370s 
370s There was a conflict merging commit 3-1, shown above.
370s Please resolve the conflict, commit the result, then type
370s 
370s     git-imerge continue
370s + git-imerge diagram --commits --frontier
370s        0   4
370s        |   |
370s    0 - ***** - b
370s        *.*#?
370s        *..??
370s    3 - *..??
370s        |
370s      a
370s 
370s        0   4
370s        |   |
370s    0 - ***** - b
370s        *.*#?
370s        *.|??
370s    3 - *-+??
370s        |
370s      a
370s 
370s Key:
370s   |,-,+ = rectangles forming current merge frontier
370s   * = merge done manually
370s   . = merge done automatically
370s   # = conflict that is currently blocking progress
370s   @ = merge was blocked but has been resolved
370s   ? = no merge recorded
370s 
370s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out
370s + echo 1
370s + git add a.txt
370s + + git-imerge continue --no-edit
370s tee imerge-a-into-b-2-3.out
370s [imerge/a 1b8cb33] imerge 'a': manual merge 3-1
370s Merge has been recorded for merge 3-1.
370s Attempting automerge of 3-3...success.
370s Autofilling 3-2...success.
370s Autofilling 3-3...success.
370s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4].
370s Attempting automerge of 4-3...success.
370s Autofilling 4-1...success.
370s Autofilling 4-2...success.
370s Autofilling 4-3...success.
370s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4].
370s Merge is complete!
370s + grep -q Merge is complete imerge-a-into-b-2-3.out
370s + git-imerge diagram --commits --frontier
370s        0   4
370s        |   |
370s    0 - ***** - b
370s        *.**.
370s        *....
370s    3 - *....
370s        |
370s      a
370s 
370s        0   4
370s        |   |
370s    0 - ***** - b
370s        *.**|
370s        *...|
370s    3 - *---+
370s        |
370s      a
370s 
370s Key:
370s   |,-,+ = rectangles forming current merge frontier
370s   * = merge done manually
370s   . = merge done automatically
370s   # = conflict that is currently blocking progress
370s   @ = merge was blocked but has been resolved
370s   ? = no merge recorded
370s 
370s + GIT_EDITOR=cat git-imerge finish
370s Merge a into b (using imerge)
370s 
370s # Please enter the commit message for your changes. Lines starting
370s # with '#' will be ignored, and an empty message aborts the commit.
370s #
370s # Date:      Wed Mar 27 02:56:29 2024 +0000
370s #
370s # On branch a-into-b-2
370s # Changes to be committed:
370s #	modified:   a.txt
370s #
370s [a-into-b-2 9d6c4e7] Merge a into b (using imerge)
370s  Date: Wed Mar 27 02:56:29 2024 +0000
370s + flip_flop_test 3
370s + local n=3
370s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3
370s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3
370s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s + local description=git-imerge test repository with a commit and its revert at n=3
370s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3
370s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s + local description=git-imerge test repository with a commit and its revert at n=3
370s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s hint: Using 'master' as the name for the initial branch. This default branch name
370s hint: is subject to change. To configure the initial branch name to use in all
370s hint: of your new repositories, which will suppress this warning, call:
370s hint: 
370s hint: 	git config --global init.defaultBranch <name>
370s hint: 
370s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
370s hint: 'development'. The just-created branch can be renamed via this command:
370s hint: 
370s hint: 	git branch -m <name>
370s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3/.git/
370s + echo git-imerge test repository with a commit and its revert at n=3
370s + printf %s\n /*.out /*.css /*.html
370s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3/.git config user.name Loú User
370s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3/.git config user.email luser@example.com
370s + TIME=1112911993
370s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/flip-flop-3
370s + modify a.txt 0
370s + filename=a.txt
370s + text=0
370s + echo 0
370s + git add a.txt
370s + commit -m m⇒0
370s + TIME=1112911994
370s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
370s [master (root-commit) a733afa] m⇒0
370s  1 file changed, 1 insertion(+)
370s  create mode 100644 a.txt
370s + git checkout -b a --
370s Switched to a new branch 'a'
370s + modify a.txt 1
370s + filename=a.txt
370s + text=1
370s + echo 1
370s + git add a.txt
370s + commit -m a⇒1 on branch a
370s + TIME=1112911995
370s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
370s [a 2f1f75a] a⇒1 on branch a
370s  1 file changed, 1 insertion(+), 1 deletion(-)
370s + modify a.txt 2
370s + filename=a.txt
370s + text=2
370s + echo 2
370s + git add a.txt
370s + commit -m a⇒2 on branch a
370s + TIME=1112911996
370s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
370s [a 4700669] a⇒2 on branch a
370s  1 file changed, 1 insertion(+), 1 deletion(-)
370s + modify a.txt 3
370s + filename=a.txt
370s + text=3
370s + echo 3
370s + git add a.txt
370s + commit -m a⇒3 on branch a
370s + TIME=1112911997
370s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
370s [a 621c381] a⇒3 on branch a
370s  1 file changed, 1 insertion(+), 1 deletion(-)
370s + git checkout -b b master --
370s Switched to a new branch 'b'
370s + modify b.txt 1
370s + filename=b.txt
370s + text=1
370s + echo 1
370s + git add b.txt
370s + msg=b⇒1
370s + test 1 = 3
370s + test 1 = 4
370s + commit -m b⇒1 on branch b
370s + TIME=1112911998
370s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b
370s [b 1f7d097] b⇒1 on branch b
370s  1 file changed, 1 insertion(+)
370s  create mode 100644 b.txt
370s + modify b.txt 2
370s + filename=b.txt
370s + text=2
370s + echo 2
370s + git add b.txt
370s + msg=b⇒2
370s + test 2 = 3
370s + test 2 = 4
370s + commit -m b⇒2 on branch b
370s + TIME=1112911999
370s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b
370s [b ce671e9] b⇒2 on branch b
370s  1 file changed, 1 insertion(+), 1 deletion(-)
370s + modify b.txt 3
370s + filename=b.txt
370s + text=3
370s + echo 3
370s + git add b.txt
370s + msg=b⇒3
370s + test 3 = 3
370s + modify a.txt X
370s + filename=a.txt
370s + text=X
370s + echo X
370s + git add a.txt
370s + msg=b⇒3 and a⇒X
370s + test 3 = 4
370s + commit -m b⇒3 and a⇒X on branch b
370s + TIME=1112912000
370s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b
370s [b d40495e] b⇒3 and a⇒X on branch b
370s  2 files changed, 2 insertions(+), 2 deletions(-)
370s + modify b.txt 4
370s + filename=b.txt
370s + text=4
370s + echo 4
370s + git add b.txt
370s + msg=b⇒4
370s + test 4 = 3
370s + test 4 = 4
370s + modify a.txt 0
370s + filename=a.txt
370s + text=0
370s + echo 0
370s + git add a.txt
370s + msg=b⇒4 and a⇒0
370s + commit -m b⇒4 and a⇒0 on branch b
370s + TIME=1112912001
370s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b
370s [b eb736f2] b⇒4 and a⇒0 on branch b
370s  2 files changed, 2 insertions(+), 2 deletions(-)
370s + test_merge b-into-a-3 a b 1-3 1-4
370s + local name=b-into-a-3
370s + local dst=a
370s + local src=b
370s + local conflict1=1-3
370s + local conflict2=1-4
370s + git checkout a
370s Switched to branch 'a'
370s + + git-imerge mergetee --branch=b-into-a-3 b
370s  imerge-b-into-a-3-1.out
371s Attempting automerge of 3-4...success.
371s Autofilling 1-4...success.
371s Autofilling 2-4...success.
371s Autofilling 3-1...success.
371s Autofilling 3-2...success.
371s Autofilling 3-3...unexpected conflict.  Backtracking...
371s Autofilling 1-4...success.
371s Autofilling 2-1...success.
371s Autofilling 2-2...success.
371s Autofilling 2-3...unexpected conflict.  Backtracking...
371s Autofilling 1-1...success.
371s Autofilling 1-2...success.
371s Autofilling 1-3...unexpected conflict.  Backtracking...
371s Autofilling 1-2...success.
371s Autofilling 2-2...success.
371s Autofilling 3-1...success.
371s Autofilling 3-2 (first way)...success.
371s Autofilling 3-2 (second way)...success.
371s The two ways of autofilling 3-2 agree.
371s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3].
371s Attempting automerge of 3-4...success.
371s Autofilling 1-4...success.
371s Autofilling 2-4...success.
371s Autofilling 3-3...unexpected conflict.  Backtracking...
371s Autofilling 1-4...success.
371s Autofilling 2-3...unexpected conflict.  Backtracking...
371s Autofilling 1-3...unexpected conflict.  Backtracking...
371s Switched to branch 'imerge/b'
371s Auto-merging a.txt
371s CONFLICT (content): Merge conflict in a.txt
371s Automatic merge failed; fix conflicts and then commit the result.
371s 
371s Original first commit:
371s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
371s Author: Loú User <luser@example.com>
371s Date:   Thu Apr 7 22:13:15 2005 +0000
371s 
371s     a⇒1 on branch a
371s 
371s Original second commit:
371s commit d40495ed379f376841e517047f90b663e8c7c7e1
371s Author: Loú User <luser@example.com>
371s Date:   Thu Apr 7 22:13:20 2005 +0000
371s 
371s     b⇒3 and a⇒X on branch b
371s 
371s There was a conflict merging commit 1-3, shown above.
371s Please resolve the conflict, commit the result, then type
371s 
371s     git-imerge continue
371s + git-imerge diagram --commits --frontier
371s        0  3
371s        |  |
371s    0 - **** - a
371s        *??.
371s        *...
371s        *#??
371s    4 - *???
371s        |
371s      b
371s 
371s        0  3
371s        |  |
371s    0 - **** - a
371s        *??|
371s        *--+
371s        *#??
371s    4 - *???
371s        |
371s      b
371s 
371s Key:
371s   |,-,+ = rectangles forming current merge frontier
371s   * = merge done manually
371s   . = merge done automatically
371s   # = conflict that is currently blocking progress
371s   @ = merge was blocked but has been resolved
371s   ? = no merge recorded
371s 
371s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out
371s + echo 1
371s + git add a.txt
371s + + git-imerge continuetee --no-edit
371s  imerge-b-into-a-3-2.out
371s [imerge/b b24b40e] imerge 'b': manual merge 1-3
371s Merge has been recorded for merge 1-3.
371s Attempting automerge of 1-4...failure.
371s Attempting automerge of 1-4...failure.
371s Attempting automerge of 3-3...success.
371s Autofilling 2-3...success.
371s Autofilling 3-3...success.
371s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4].
371s Previous HEAD position was e101484 imerge 'b': automatic merge 3-3
371s Switched to branch 'imerge/b'
371s Auto-merging a.txt
371s CONFLICT (content): Merge conflict in a.txt
371s Automatic merge failed; fix conflicts and then commit the result.
371s 
371s Original first commit:
371s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
371s Author: Loú User <luser@example.com>
371s Date:   Thu Apr 7 22:13:15 2005 +0000
371s 
371s     a⇒1 on branch a
371s 
371s Original second commit:
371s commit eb736f2ae81944f79f443fd39a89adf74dbc907a
371s Author: Loú User <luser@example.com>
371s Date:   Thu Apr 7 22:13:21 2005 +0000
371s 
371s     b⇒4 and a⇒0 on branch b
371s 
371s There was a conflict merging commit 1-4, shown above.
371s Please resolve the conflict, commit the result, then type
371s 
371s     git-imerge continue
371s + git-imerge diagram --commits --frontier
371s        0  3
371s        |  |
371s    0 - **** - a
371s        *??.
371s        *...
371s        **..
371s    4 - *#??
371s        |
371s      b
371s 
371s        0  3
371s        |  |
371s    0 - **** - a
371s        *??|
371s        *..|
371s        **-+
371s    4 - *#??
371s        |
371s      b
371s 
371s Key:
371s   |,-,+ = rectangles forming current merge frontier
371s   * = merge done manually
371s   . = merge done automatically
371s   # = conflict that is currently blocking progress
371s   @ = merge was blocked but has been resolved
371s   ? = no merge recorded
371s 
371s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out
371s + echo 1
371s + git add a.txt
371s + + git-imerge continue --no-edit
371s tee imerge-b-into-a-3-3.out
371s [imerge/b 25fb382] imerge 'b': manual merge 1-4
371s Merge has been recorded for merge 1-4.
371s Attempting automerge of 3-4...success.
371s Autofilling 2-4...success.
371s Autofilling 3-4...success.
371s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5].
371s Merge is complete!
371s + grep -q Merge is complete imerge-b-into-a-3-3.out
371s + git-imerge diagram --commits --frontier
371s        0  3
371s        |  |
371s    0 - **** - a
371s        *??.
371s        *...
371s        **..
371s    4 - **..
371s        |
371s      b
371s 
371s        0  3
371s        |  |
371s    0 - **** - a
371s        *??|
371s        *..|
371s        **.|
371s    4 - **-+
371s        |
371s      b
371s 
371s Key:
371s   |,-,+ = rectangles forming current merge frontier
371s   * = merge done manually
371s   . = merge done automatically
371s   # = conflict that is currently blocking progress
371s   @ = merge was blocked but has been resolved
371s   ? = no merge recorded
371s 
371s + GIT_EDITOR=cat git-imerge finish
371s Merge b into a (using imerge)
371s 
371s # Please enter the commit message for your changes. Lines starting
371s # with '#' will be ignored, and an empty message aborts the commit.
371s #
371s # Date:      Wed Mar 27 02:56:30 2024 +0000
371s #
371s # On branch b-into-a-3
371s # Changes to be committed:
371s #	new file:   b.txt
371s #
371s [b-into-a-3 a3159f9] Merge b into a (using imerge)
371s  Date: Wed Mar 27 02:56:30 2024 +0000
371s + test_merge a-into-b-3 b a 3-1 4-1
371s + local name=a-into-b-3
371s + local dst=b
371s + local src=a
371s + local conflict1=3-1
371s + local conflict2=4-1
371s + git checkout b
371s Switched to branch 'b'
371s + + git-imerge merge --branch=a-into-b-3 a
371s tee imerge-a-into-b-3-1.out
372s Attempting automerge of 4-3...success.
372s Autofilling 1-3...success.
372s Autofilling 2-3...success.
372s Autofilling 3-3...unexpected conflict.  Backtracking...
372s Autofilling 1-3...success.
372s Autofilling 2-1...success.
372s Autofilling 2-2...success.
372s Autofilling 2-3 (first way)...success.
372s Autofilling 2-3 (second way)...success.
372s The two ways of autofilling 2-3 agree.
372s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4].
372s Autofilling 3-2...unexpected conflict.  Backtracking...
372s Autofilling 3-1...unexpected conflict.  Backtracking...
372s Switched to branch 'imerge/a'
372s Auto-merging a.txt
372s CONFLICT (content): Merge conflict in a.txt
372s Automatic merge failed; fix conflicts and then commit the result.
372s 
372s Original first commit:
372s commit d40495ed379f376841e517047f90b663e8c7c7e1
372s Author: Loú User <luser@example.com>
372s Date:   Thu Apr 7 22:13:20 2005 +0000
372s 
372s     b⇒3 and a⇒X on branch b
372s 
372s Original second commit:
372s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
372s Author: Loú User <luser@example.com>
372s Date:   Thu Apr 7 22:13:15 2005 +0000
372s 
372s     a⇒1 on branch a
372s 
372s There was a conflict merging commit 3-1, shown above.
372s Please resolve the conflict, commit the result, then type
372s 
372s     git-imerge continue
372s + git-imerge diagram --commits --frontier
372s        0   4
372s        |   |
372s    0 - ***** - b
372s        *?.#?
372s        *?.??
372s    3 - *..??
372s        |
372s      a
372s 
372s        0   4
372s        |   |
372s    0 - ***** - b
372s        *?|#?
372s        *?|??
372s    3 - *-+??
372s        |
372s      a
372s 
372s Key:
372s   |,-,+ = rectangles forming current merge frontier
372s   * = merge done manually
372s   . = merge done automatically
372s   # = conflict that is currently blocking progress
372s   @ = merge was blocked but has been resolved
372s   ? = no merge recorded
372s 
372s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out
372s + echo 1
372s + git add a.txt
372s + + git-imerge continue --no-edit
372s tee imerge-a-into-b-3-2.out
372s [imerge/a 90b2e75] imerge 'a': manual merge 3-1
372s Merge has been recorded for merge 3-1.
372s Attempting automerge of 3-3...success.
372s Autofilling 3-2...success.
372s Autofilling 3-3...success.
372s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4].
372s Attempting automerge of 4-3...failure.
372s Attempting automerge of 4-1...failure.
372s Switched to branch 'imerge/a'
372s Auto-merging a.txt
372s CONFLICT (content): Merge conflict in a.txt
372s Automatic merge failed; fix conflicts and then commit the result.
372s 
372s Original first commit:
372s commit eb736f2ae81944f79f443fd39a89adf74dbc907a
372s Author: Loú User <luser@example.com>
372s Date:   Thu Apr 7 22:13:21 2005 +0000
372s 
372s     b⇒4 and a⇒0 on branch b
372s 
372s Original second commit:
372s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
372s Author: Loú User <luser@example.com>
372s Date:   Thu Apr 7 22:13:15 2005 +0000
372s 
372s     a⇒1 on branch a
372s 
372s There was a conflict merging commit 4-1, shown above.
372s Please resolve the conflict, commit the result, then type
372s 
372s     git-imerge continue
372s + git-imerge diagram --commits --frontier
372s        0   4
372s        |   |
372s    0 - ***** - b
372s        *?.*#
372s        *?..?
372s    3 - *...?
372s        |
372s      a
372s 
372s        0   4
372s        |   |
372s    0 - ***** - b
372s        *?.*#
372s        *?.|?
372s    3 - *--+?
372s        |
372s      a
372s 
372s Key:
372s   |,-,+ = rectangles forming current merge frontier
372s   * = merge done manually
372s   . = merge done automatically
372s   # = conflict that is currently blocking progress
372s   @ = merge was blocked but has been resolved
372s   ? = no merge recorded
372s 
372s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out
372s + echo 1
372s + git add a.txt
372s + + git-imerge continue --no-edit
372s tee imerge-a-into-b-3-3.out
372s [imerge/a d21378a] imerge 'a': manual merge 4-1
372s Merge has been recorded for merge 4-1.
372s Attempting automerge of 4-3...success.
372s Autofilling 4-2...success.
372s Autofilling 4-3...success.
372s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4].
372s Merge is complete!
372s + grep -q Merge is complete imerge-a-into-b-3-3.out
372s + git-imerge diagram --commits --frontier
372s        0   4
372s        |   |
372s    0 - ***** - b
372s        *?.**
372s        *?...
372s    3 - *....
372s        |
372s      a
372s 
372s        0   4
372s        |   |
372s    0 - ***** - b
372s        *?.**
372s        *?..|
372s    3 - *---+
372s        |
372s      a
372s 
372s Key:
372s   |,-,+ = rectangles forming current merge frontier
372s   * = merge done manually
372s   . = merge done automatically
372s   # = conflict that is currently blocking progress
372s   @ = merge was blocked but has been resolved
372s   ? = no merge recorded
372s 
372s + GIT_EDITOR=cat git-imerge finish
372s Merge a into b (using imerge)
372s 
372s # Please enter the commit message for your changes. Lines starting
372s # with '#' will be ignored, and an empty message aborts the commit.
372s #
372s # Date:      Wed Mar 27 02:56:31 2024 +0000
372s #
372s # On branch a-into-b-3
372s # Changes to be committed:
372s #	modified:   a.txt
372s #
372s [a-into-b-3 95390d7] Merge a into b (using imerge)
372s  Date: Wed Mar 27 02:56:31 2024 +0000
372s py312: commands[5] /tmp/autopkgtest.iiYcjY/build.2hy/src> /bin/sh t/test-drop
372s + dirname t/test-drop
372s + cd t
372s + pwd
372s + dirname /tmp/autopkgtest.iiYcjY/build.2hy/src/t
372s + BASE=/tmp/autopkgtest.iiYcjY/build.2hy/src
372s + . /tmp/autopkgtest.iiYcjY/build.2hy/src/t/test-lib.sh
372s + GIT_IMERGE=git-imerge
372s + TMP=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
372s + DESCRIPTION=git-imerge drop test repository
372s + init_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop git-imerge drop test repository
372s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
372s + local description=git-imerge drop test repository
372s + delete_test_repo /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop git-imerge drop test repository
372s + local path=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
372s + local description=git-imerge drop test repository
372s + test -d /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
372s + mkdir -p /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
373s Initialized empty Git repository in /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop/.git/
373s + git init /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
373s hint: Using 'master' as the name for the initial branch. This default branch name
373s hint: is subject to change. To configure the initial branch name to use in all
373s hint: of your new repositories, which will suppress this warning, call:
373s hint: 
373s hint: 	git config --global init.defaultBranch <name>
373s hint: 
373s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
373s hint: 'development'. The just-created branch can be renamed via this command:
373s hint: 
373s hint: 	git branch -m <name>
373s + echo git-imerge drop test repository
373s + printf %s\n /*.out /*.css /*.html
373s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop/.git config user.name Loú User
373s + git --git-dir=/tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop/.git config user.email luser@example.com
373s + TIME=1112911993
373s + ln -s /tmp/autopkgtest.iiYcjY/build.2hy/src/imerge.css /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
373s + cd /tmp/autopkgtest.iiYcjY/build.2hy/src/t/tmp/drop
373s + modify a.txt 0
373s + filename=a.txt
373s + text=0
373s + echo 0
373s + git add a.txt
373s + commit -m m⇒0
373s + TIME=1112911994
373s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
373s [master (root-commit) a733afa] m⇒0
373s  1 file changed, 1 insertion(+)
373s  create mode 100644 a.txt
373s + seq 6
373s + modify a1.txt 1
373s + filename=a1.txt
373s + text=1
373s + echo 1
373s + git add a1.txt
373s + commit -m a1⇒1
373s + TIME=1112911995
373s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1
373s [master 389a4ba] a1⇒1
373s  1 file changed, 1 insertion(+)
373s  create mode 100644 a1.txt
373s + modify a2.txt 2
373s + filename=a2.txt
373s + text=2
373s + echo 2
373s + git add a2.txt
373s + commit -m a2⇒2
373s + TIME=1112911996
373s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2
373s [master 4785218] a2⇒2
373s  1 file changed, 1 insertion(+)
373s  create mode 100644 a2.txt
373s + modify a3.txt 3
373s + filename=a3.txt
373s + text=3
373s + echo 3
373s + git add a3.txt
373s + commit -m a3⇒3
373s + TIME=1112911997
373s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3
373s [master 34bdde3] a3⇒3
373s  1 file changed, 1 insertion(+)
373s  create mode 100644 a3.txt
373s + modify a4.txt 4
373s + filename=a4.txt
373s + text=4
373s + echo 4
373s + git add a4.txt
373s + commit -m a4⇒4
373s + TIME=1112911998
373s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4
373s [master c793a5a] a4⇒4
373s  1 file changed, 1 insertion(+)
373s  create mode 100644 a4.txt
373s + modify a5.txt 5
373s + filename=a5.txt
373s + text=5
373s + echo 5
373s + git add a5.txt
373s + commit -m a5⇒5
373s [master b42f60c] a5⇒5
373s  1 file changed, 1 insertion(+)
373s  create mode 100644 a5.txt
373s + TIME=1112911999
373s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5
373s + modify a6.txt 6
373s + filename=a6.txt
373s + text=6
373s + echo 6
373s + git add a6.txt
373s + commit -m a6⇒6
373s + TIME=1112912000
373s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6
373s [master 9d6aec5] a6⇒6
373s  1 file changed, 1 insertion(+)
373s  create mode 100644 a6.txt
373s + git checkout -b dropped master
373s Switched to a new branch 'dropped'
373s + git-imerge drop HEAD~5..HEAD~3
373s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'.
373s 
373s You are in 'detached HEAD' state. You can look around, make experimental
373s changes and commit them, and you can discard any commits you make in this
373s state without impacting any branches by switching back to a branch.
373s 
373s If you want to create a new branch to retain commits you create, you may
373s do so (now or later) by using -c with the switch command. Example:
373s 
373s   git switch -c <new-branch-name>
373s 
373s Or undo this operation with:
373s 
373s   git switch -
373s 
373s Turn off this advice by setting config variable advice.detachedHead to false
373s 
373s HEAD is now at 34bdde3 a3⇒3
373s [detached HEAD 8411639] Revert "a3⇒3"
373s  Date: Wed Mar 27 02:56:32 2024 +0000
373s  1 file changed, 1 deletion(-)
373s  delete mode 100644 a3.txt
373s [detached HEAD 0eb6fe2] Revert "a2⇒2"
373s  Date: Wed Mar 27 02:56:32 2024 +0000
373s  1 file changed, 1 deletion(-)
373s  delete mode 100644 a2.txt
373s Attempting automerge of 3-2...success.
373s Autofilling 1-2...success.
373s Autofilling 2-2...success.
373s Autofilling 3-1...success.
373s Autofilling 3-2 (first way)...success.
373s Autofilling 3-2 (second way)...success.
373s The two ways of autofilling 3-2 agree.
373s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='0eb6fe2b5b102f8334ecb370d1cada070061ba2b', goal='drop')[0:4,0:3].
373s Merge is complete!
373s + git-imerge diagram --commits --frontier --html=imerge-drop.html
373s        0  3
373s        |  |
373s    0 - **** - dropped
373s        *??.
373s    2 - *...
373s        |
373s      0eb6fe2b5b102f8334ecb370d1cada070061ba2b
373s 
373s        0  3
373s        |  |
373s    0 - **** - dropped
373s        *??|
373s    2 - *--+
373s        |
373s      0eb6fe2b5b102f8334ecb370d1cada070061ba2b
373s 
373s Key:
373s   |,-,+ = rectangles forming current merge frontier
373s   * = merge done manually
373s   . = merge done automatically
373s   # = conflict that is currently blocking progress
373s   @ = merge was blocked but has been resolved
373s   ? = no merge recorded
373s 
373s + git-imerge finish
373s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b
373s + local refname=dropped
373s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b
373s + git rev-parse dropped^{tree}
373s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b
373s + git checkout -b reverted master
373s Switched to a new branch 'reverted'
373s + git-imerge revert HEAD~5..HEAD~3
373s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'.
373s 
373s You are in 'detached HEAD' state. You can look around, make experimental
373s changes and commit them, and you can discard any commits you make in this
373s state without impacting any branches by switching back to a branch.
373s 
373s If you want to create a new branch to retain commits you create, you may
373s do so (now or later) by using -c with the switch command. Example:
373s 
373s   git switch -c <new-branch-name>
373s 
373s Or undo this operation with:
373s 
373s   git switch -
373s 
373s Turn off this advice by setting config variable advice.detachedHead to false
373s 
373s HEAD is now at 34bdde3 a3⇒3
373s [detached HEAD 8411639] Revert "a3⇒3"
373s  Date: Wed Mar 27 02:56:32 2024 +0000
373s  1 file changed, 1 deletion(-)
373s  delete mode 100644 a3.txt
373s [detached HEAD 0eb6fe2] Revert "a2⇒2"
373s  Date: Wed Mar 27 02:56:32 2024 +0000
373s  1 file changed, 1 deletion(-)
373s  delete mode 100644 a2.txt
373s Attempting automerge of 3-2...success.
373s Autofilling 1-2...success.
373s Autofilling 2-2...success.
373s Autofilling 3-1...success.
373s Autofilling 3-2 (first way)...success.
373s Autofilling 3-2 (second way)...success.
373s The two ways of autofilling 3-2 agree.
373s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='0eb6fe2b5b102f8334ecb370d1cada070061ba2b', goal='revert')[0:4,0:3].
373s Merge is complete!
373s + git-imerge diagram --commits --frontier --html=imerge-revert.html
373s        0  3
373s        |  |
373s    0 - **** - reverted
373s        *??.
373s    2 - *...
373s        |
373s      0eb6fe2b5b102f8334ecb370d1cada070061ba2b
373s 
373s        0  3
373s        |  |
373s    0 - **** - reverted
373s        *??|
373s    2 - *--+
373s        |
373s      0eb6fe2b5b102f8334ecb370d1cada070061ba2b
373s 
373s Key:
373s   |,-,+ = rectangles forming current merge frontier
373s   * = merge done manually
373s   . = merge done automatically
373s   # = conflict that is currently blocking progress
373s   @ = merge was blocked but has been resolved
373s   ? = no merge recorded
373s 
373s + git-imerge finish
373s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b
373s + local refname=reverted
373s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b
373s + git rev-parse reverted^{tree}
373s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b
373s   py312: OK (50.25=setup[0.23]+cmd[2.65,32.89,5.27,1.98,6.34,0.90] seconds)
373s   congratulations :) (50.37 seconds)
374s autopkgtest [02:56:33]: test pybuild-autopkgtest: -----------------------]
374s autopkgtest [02:56:33]: test pybuild-autopkgtest:  - - - - - - - - - - results - - - - - - - - - -
374s pybuild-autopkgtest  PASS
375s autopkgtest [02:56:34]: @@@@@@@@@@@@@@@@@@@@ summary
375s pybuild-autopkgtest  PASS
389s Creating nova instance adt-noble-s390x-git-imerge-20240327-025019-juju-7f2275-prod-proposed-migration-environment-3-93b96a9a-3ac1-4c77-9d55-4d571a06cf6d from image adt/ubuntu-noble-s390x-server-20240326.img (UUID c527e0e4-2e65-4e86-ad63-05d7f665f2fb)...