0s autopkgtest [10:11:02]: starting date and time: 2024-03-20 10:11:02+0000 0s autopkgtest [10:11:02]: git checkout: 4a1cd702 l/adt_testbed: don't blame the testbed for unsolvable build deps 0s autopkgtest [10:11:02]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.o7e4_l0v/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed=src:git,src:curl,src:gnutls28,src:libpsl,src:nettle --apt-upgrade git-imerge --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 '--env=ADT_TEST_TRIGGERS=git/1:2.43.0-1ubuntu5 curl/8.5.0-2ubuntu7 gnutls28/3.8.3-1.1ubuntu2 libpsl/0.21.2-1.1 nettle/3.9.1-2.2' -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@bos01-arm64-45.secgroup --name adt-noble-arm64-git-imerge-20240320-101101-juju-7f2275-prod-proposed-migration-environment-2 --image adt/ubuntu-noble-arm64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-proposed-migration -e TERM=linux -e ''"'"'http_proxy=http://squid.internal:3128'"'"'' -e ''"'"'https_proxy=http://squid.internal:3128'"'"'' -e ''"'"'no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com'"'"'' --mirror=http://us.ports.ubuntu.com/ubuntu-ports/ 96s autopkgtest [10:12:38]: testbed dpkg architecture: arm64 96s autopkgtest [10:12:38]: testbed apt version: 2.7.12 96s autopkgtest [10:12:38]: @@@@@@@@@@@@@@@@@@@@ test bed setup 98s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB] 98s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/restricted Sources [6540 B] 98s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/multiverse Sources [52.7 kB] 98s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/main Sources [497 kB] 98s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/universe Sources [3813 kB] 99s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 Packages [670 kB] 99s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 c-n-f Metadata [3144 B] 99s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/restricted arm64 Packages [41.7 kB] 99s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/restricted arm64 c-n-f Metadata [116 B] 99s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/universe arm64 Packages [4235 kB] 99s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/universe arm64 c-n-f Metadata [8528 B] 99s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/multiverse arm64 Packages [56.7 kB] 99s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/multiverse arm64 c-n-f Metadata [116 B] 104s Fetched 9501 kB in 3s (3514 kB/s) 105s Reading package lists... 108s Reading package lists... 109s Building dependency tree... 109s Reading state information... 110s Calculating upgrade... 110s The following packages have been kept back: 110s curl 110s The following packages will be upgraded: 110s ubuntu-minimal ubuntu-standard 111s 2 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 111s Need to get 21.5 kB of archives. 111s After this operation, 0 B of additional disk space will be used. 111s Get:1 http://ftpmaster.internal/ubuntu noble/main arm64 ubuntu-minimal arm64 1.536build1 [10.7 kB] 111s Get:2 http://ftpmaster.internal/ubuntu noble/main arm64 ubuntu-standard arm64 1.536build1 [10.7 kB] 112s Fetched 21.5 kB in 0s (92.8 kB/s) 112s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75850 files and directories currently installed.) 112s Preparing to unpack .../ubuntu-minimal_1.536build1_arm64.deb ... 112s Unpacking ubuntu-minimal (1.536build1) over (1.536) ... 112s Preparing to unpack .../ubuntu-standard_1.536build1_arm64.deb ... 112s Unpacking ubuntu-standard (1.536build1) over (1.536) ... 112s Setting up ubuntu-minimal (1.536build1) ... 112s Setting up ubuntu-standard (1.536build1) ... 112s Reading package lists... 113s Building dependency tree... 113s Reading state information... 113s 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 114s Hit:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease 114s Hit:2 http://ftpmaster.internal/ubuntu noble InRelease 114s Hit:3 http://ftpmaster.internal/ubuntu noble-updates InRelease 114s Hit:4 http://ftpmaster.internal/ubuntu noble-security InRelease 117s Reading package lists... 117s Reading package lists... 118s Building dependency tree... 118s Reading state information... 119s Calculating upgrade... 119s The following packages have been kept back: 119s curl 119s 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 119s Reading package lists... 120s Building dependency tree... 120s Reading state information... 121s 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 124s autopkgtest [10:13:06]: testbed running kernel: Linux 6.8.0-11-generic #11-Ubuntu SMP PREEMPT_DYNAMIC Wed Feb 14 02:53:31 UTC 2024 125s autopkgtest [10:13:07]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 127s Get:1 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (dsc) [1896 B] 127s Get:2 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 127s Get:3 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (diff) [3144 B] 127s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 127s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 127s gpgv: Can't check signature: No public key 127s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 127s autopkgtest [10:13:09]: testing package git-imerge version 1.2.0-5 129s autopkgtest [10:13:11]: build not needed 131s autopkgtest [10:13:13]: test pybuild-autopkgtest: preparing testbed 133s Reading package lists... 133s Building dependency tree... 133s Reading state information... 134s Starting pkgProblemResolver with broken count: 0 134s Starting 2 pkgProblemResolver with broken count: 0 134s Done 135s The following additional packages will be installed: 135s autoconf automake autopoint autotools-dev build-essential cpp cpp-13 135s cpp-13-aarch64-linux-gnu cpp-aarch64-linux-gnu curl debhelper debugedit 135s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 135s g++-13-aarch64-linux-gnu g++-aarch64-linux-gnu gcc gcc-13 135s gcc-13-aarch64-linux-gnu gcc-aarch64-linux-gnu gettext git git-imerge 135s git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 libc-dev-bin 135s libc6-dev libcc1-0 libcrypt-dev libcurl3t64-gnutls libcurl4t64 135s libdebhelper-perl libdw1 liberror-perl libfile-stripnondeterminism-perl 135s libgcc-13-dev libgnutls30t64 libgomp1 libhogweed6t64 libhwasan0 libisl23 135s libitm1 libjs-jquery libjs-sphinxdoc libjs-underscore liblsan0 libmpc3 135s libnettle8t64 libnsl-dev libpkgconf3 libpsl5t64 libssl3t64 libstdc++-13-dev 135s libsub-override-perl libtirpc-dev libtool libtsan2 libubsan1 linux-libc-dev 135s m4 pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest 135s python3-cachetools python3-colorama python3-distlib python3-filelock 135s python3-packaging python3-pip-whl python3-platformdirs python3-pluggy 135s python3-pyproject-api python3-setuptools-whl python3-virtualenv 135s python3-wheel python3-wheel-whl rpcsvc-proto tox 135s Suggested packages: 135s autoconf-archive gnu-standards autoconf-doc cpp-doc gcc-13-locales 135s cpp-13-doc dh-make flit python3-build python3-installer gcc-13-doc 135s gcc-multilib manpages-dev flex bison gdb gcc-doc gdb-aarch64-linux-gnu 135s gettext-doc libasprintf-dev libgettextpo-dev git-daemon-run 135s | git-daemon-sysvinit git-doc git-email git-gui gitk gitweb git-cvs 135s git-mediawiki git-svn git-mergify-rebase mergify glibc-doc gnutls-bin 135s libstdc++-13-doc libtool-doc gfortran | fortran95-compiler gcj-jdk m4-doc 135s libmail-box-perl 135s Recommended packages: 135s manpages manpages-dev libc-devtools libarchive-cpio-perl javascript-common 135s libltdl-dev libmail-sendmail-perl python3-dev 135s The following packages will be REMOVED: 135s libcurl3-gnutls libcurl4 libgnutls30 libhogweed6 libnettle8 libpsl5 libssl3 135s The following NEW packages will be installed: 135s autoconf automake autopkgtest-satdep autopoint autotools-dev build-essential 135s cpp cpp-13 cpp-13-aarch64-linux-gnu cpp-aarch64-linux-gnu debhelper 135s debugedit dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 135s g++-13-aarch64-linux-gnu g++-aarch64-linux-gnu gcc gcc-13 135s gcc-13-aarch64-linux-gnu gcc-aarch64-linux-gnu gettext git git-imerge 135s git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 libc-dev-bin 135s libc6-dev libcc1-0 libcrypt-dev libcurl3t64-gnutls libcurl4t64 135s libdebhelper-perl libdw1 liberror-perl libfile-stripnondeterminism-perl 135s libgcc-13-dev libgnutls30t64 libgomp1 libhogweed6t64 libhwasan0 libisl23 135s libitm1 libjs-jquery libjs-sphinxdoc libjs-underscore liblsan0 libmpc3 135s libnettle8t64 libnsl-dev libpkgconf3 libpsl5t64 libssl3t64 libstdc++-13-dev 135s libsub-override-perl libtirpc-dev libtool libtsan2 libubsan1 linux-libc-dev 135s m4 pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest 135s python3-cachetools python3-colorama python3-distlib python3-filelock 135s python3-packaging python3-pip-whl python3-platformdirs python3-pluggy 135s python3-pyproject-api python3-setuptools-whl python3-virtualenv 135s python3-wheel python3-wheel-whl rpcsvc-proto tox 135s The following packages will be upgraded: 135s curl 135s 1 upgraded, 87 newly installed, 7 to remove and 0 not upgraded. 135s Need to get 79.4 MB/79.4 MB of archives. 135s After this operation, 270 MB of additional disk space will be used. 135s Get:1 /tmp/autopkgtest.Vac0jX/1-autopkgtest-satdep.deb autopkgtest-satdep arm64 0 [816 B] 135s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 libnettle8t64 arm64 3.9.1-2.2 [192 kB] 136s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 libhogweed6t64 arm64 3.9.1-2.2 [199 kB] 136s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 libgnutls30t64 arm64 3.8.3-1.1ubuntu2 [1042 kB] 136s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 libssl3t64 arm64 3.0.13-0ubuntu2 [1793 kB] 136s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 libcurl4t64 arm64 8.5.0-2ubuntu7 [332 kB] 136s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 curl arm64 8.5.0-2ubuntu7 [222 kB] 136s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 libpsl5t64 arm64 0.21.2-1.1 [57.4 kB] 136s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 libcurl3t64-gnutls arm64 8.5.0-2ubuntu7 [327 kB] 136s Get:10 http://ftpmaster.internal/ubuntu noble/main arm64 m4 arm64 1.4.19-4 [240 kB] 136s Get:11 http://ftpmaster.internal/ubuntu noble/main arm64 autoconf all 2.71-3 [339 kB] 136s Get:12 http://ftpmaster.internal/ubuntu noble/main arm64 autotools-dev all 20220109.1 [44.9 kB] 136s Get:13 http://ftpmaster.internal/ubuntu noble/main arm64 automake all 1:1.16.5-1.3ubuntu1 [558 kB] 137s Get:14 http://ftpmaster.internal/ubuntu noble/main arm64 autopoint all 0.21-14ubuntu1 [422 kB] 137s Get:15 http://ftpmaster.internal/ubuntu noble/main arm64 libc-dev-bin arm64 2.39-0ubuntu2 [19.7 kB] 137s Get:16 http://ftpmaster.internal/ubuntu noble/main arm64 linux-libc-dev arm64 6.8.0-11.11 [1569 kB] 137s Get:17 http://ftpmaster.internal/ubuntu noble/main arm64 libcrypt-dev arm64 1:4.4.36-4 [136 kB] 137s Get:18 http://ftpmaster.internal/ubuntu noble/main arm64 libtirpc-dev arm64 1.3.4+ds-1build1 [232 kB] 137s Get:19 http://ftpmaster.internal/ubuntu noble/main arm64 libnsl-dev arm64 1.3.0-3 [71.9 kB] 137s Get:20 http://ftpmaster.internal/ubuntu noble/main arm64 rpcsvc-proto arm64 1.4.2-0ubuntu6 [65.4 kB] 137s Get:21 http://ftpmaster.internal/ubuntu noble/main arm64 libc6-dev arm64 2.39-0ubuntu2 [1596 kB] 137s Get:22 http://ftpmaster.internal/ubuntu noble/main arm64 libisl23 arm64 0.26-3 [713 kB] 137s Get:23 http://ftpmaster.internal/ubuntu noble/main arm64 libmpc3 arm64 1.3.1-1 [55.3 kB] 137s Get:24 http://ftpmaster.internal/ubuntu noble/main arm64 cpp-13-aarch64-linux-gnu arm64 13.2.0-17ubuntu2 [10.3 MB] 137s Get:25 http://ftpmaster.internal/ubuntu noble/main arm64 cpp-13 arm64 13.2.0-17ubuntu2 [1028 B] 137s Get:26 http://ftpmaster.internal/ubuntu noble/main arm64 cpp-aarch64-linux-gnu arm64 4:13.2.0-7ubuntu1 [5316 B] 137s Get:27 http://ftpmaster.internal/ubuntu noble/main arm64 cpp arm64 4:13.2.0-7ubuntu1 [22.4 kB] 137s Get:28 http://ftpmaster.internal/ubuntu noble/main arm64 libcc1-0 arm64 14-20240303-1ubuntu1 [44.7 kB] 137s Get:29 http://ftpmaster.internal/ubuntu noble/main arm64 libgomp1 arm64 14-20240303-1ubuntu1 [144 kB] 137s Get:30 http://ftpmaster.internal/ubuntu noble/main arm64 libitm1 arm64 14-20240303-1ubuntu1 [27.7 kB] 137s Get:31 http://ftpmaster.internal/ubuntu noble/main arm64 libatomic1 arm64 14-20240303-1ubuntu1 [11.4 kB] 137s Get:32 http://ftpmaster.internal/ubuntu noble/main arm64 libasan8 arm64 14-20240303-1ubuntu1 [2919 kB] 137s Get:33 http://ftpmaster.internal/ubuntu noble/main arm64 liblsan0 arm64 14-20240303-1ubuntu1 [1282 kB] 137s Get:34 http://ftpmaster.internal/ubuntu noble/main arm64 libtsan2 arm64 14-20240303-1ubuntu1 [2687 kB] 137s Get:35 http://ftpmaster.internal/ubuntu noble/main arm64 libubsan1 arm64 14-20240303-1ubuntu1 [1151 kB] 137s Get:36 http://ftpmaster.internal/ubuntu noble/main arm64 libhwasan0 arm64 14-20240303-1ubuntu1 [1597 kB] 137s Get:37 http://ftpmaster.internal/ubuntu noble/main arm64 libgcc-13-dev arm64 13.2.0-17ubuntu2 [2464 kB] 137s Get:38 http://ftpmaster.internal/ubuntu noble/main arm64 gcc-13-aarch64-linux-gnu arm64 13.2.0-17ubuntu2 [20.1 MB] 137s Get:39 http://ftpmaster.internal/ubuntu noble/main arm64 gcc-13 arm64 13.2.0-17ubuntu2 [467 kB] 137s Get:40 http://ftpmaster.internal/ubuntu noble/main arm64 gcc-aarch64-linux-gnu arm64 4:13.2.0-7ubuntu1 [1198 B] 137s Get:41 http://ftpmaster.internal/ubuntu noble/main arm64 gcc arm64 4:13.2.0-7ubuntu1 [5018 B] 137s Get:42 http://ftpmaster.internal/ubuntu noble/main arm64 libstdc++-13-dev arm64 13.2.0-17ubuntu2 [2322 kB] 138s Get:43 http://ftpmaster.internal/ubuntu noble/main arm64 g++-13-aarch64-linux-gnu arm64 13.2.0-17ubuntu2 [11.7 MB] 138s Get:44 http://ftpmaster.internal/ubuntu noble/main arm64 g++-13 arm64 13.2.0-17ubuntu2 [14.4 kB] 138s Get:45 http://ftpmaster.internal/ubuntu noble/main arm64 g++-aarch64-linux-gnu arm64 4:13.2.0-7ubuntu1 [962 B] 138s Get:46 http://ftpmaster.internal/ubuntu noble/main arm64 g++ arm64 4:13.2.0-7ubuntu1 [1082 B] 138s Get:47 http://ftpmaster.internal/ubuntu noble/main arm64 build-essential arm64 12.10ubuntu1 [4932 B] 138s Get:48 http://ftpmaster.internal/ubuntu noble/main arm64 libdebhelper-perl all 13.14.1ubuntu1 [89.5 kB] 138s Get:49 http://ftpmaster.internal/ubuntu noble/main arm64 libtool all 2.4.7-7 [166 kB] 138s Get:50 http://ftpmaster.internal/ubuntu noble/main arm64 dh-autoreconf all 20 [16.1 kB] 138s Get:51 http://ftpmaster.internal/ubuntu noble/main arm64 libarchive-zip-perl all 1.68-1 [90.2 kB] 138s Get:52 http://ftpmaster.internal/ubuntu noble/main arm64 libsub-override-perl all 0.10-1 [10.0 kB] 138s Get:53 http://ftpmaster.internal/ubuntu noble/main arm64 libfile-stripnondeterminism-perl all 1.13.1-1 [18.1 kB] 138s Get:54 http://ftpmaster.internal/ubuntu noble/main arm64 dh-strip-nondeterminism all 1.13.1-1 [5362 B] 138s Get:55 http://ftpmaster.internal/ubuntu noble/main arm64 libdw1 arm64 0.190-1 [254 kB] 138s Get:56 http://ftpmaster.internal/ubuntu noble/main arm64 debugedit arm64 1:5.0-5 [45.9 kB] 138s Get:57 http://ftpmaster.internal/ubuntu noble/main arm64 dwz arm64 0.15-1 [110 kB] 138s Get:58 http://ftpmaster.internal/ubuntu noble/main arm64 gettext arm64 0.21-14ubuntu1 [846 kB] 138s Get:59 http://ftpmaster.internal/ubuntu noble/main arm64 intltool-debian all 0.35.0+20060710.6 [23.2 kB] 138s Get:60 http://ftpmaster.internal/ubuntu noble/main arm64 po-debconf all 1.0.21+nmu1 [233 kB] 138s Get:61 http://ftpmaster.internal/ubuntu noble/main arm64 debhelper all 13.14.1ubuntu1 [869 kB] 138s Get:62 http://ftpmaster.internal/ubuntu noble/universe arm64 dh-python all 6.20231223ubuntu2 [111 kB] 138s Get:63 http://ftpmaster.internal/ubuntu noble/main arm64 liberror-perl all 0.17029-2 [25.6 kB] 138s Get:64 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 git-man all 1:2.43.0-1ubuntu5 [1099 kB] 138s Get:65 http://ftpmaster.internal/ubuntu noble-proposed/main arm64 git arm64 1:2.43.0-1ubuntu5 [3765 kB] 138s Get:66 http://ftpmaster.internal/ubuntu noble/universe arm64 git-imerge all 1.2.0-5 [49.5 kB] 138s Get:67 http://ftpmaster.internal/ubuntu noble/main arm64 libjs-jquery all 3.6.1+dfsg+~3.5.14-1 [328 kB] 138s Get:68 http://ftpmaster.internal/ubuntu noble/main arm64 libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 138s Get:69 http://ftpmaster.internal/ubuntu noble/main arm64 libjs-sphinxdoc all 7.2.6-4 [149 kB] 138s Get:70 http://ftpmaster.internal/ubuntu noble/main arm64 libpkgconf3 arm64 1.8.1-2 [31.2 kB] 138s Get:71 http://ftpmaster.internal/ubuntu noble/main arm64 pkgconf-bin arm64 1.8.1-2 [20.4 kB] 138s Get:72 http://ftpmaster.internal/ubuntu noble/main arm64 pkgconf arm64 1.8.1-2 [16.7 kB] 138s Get:73 http://ftpmaster.internal/ubuntu noble/main arm64 pkg-config arm64 1.8.1-2 [7170 B] 138s Get:74 http://ftpmaster.internal/ubuntu noble/universe arm64 pybuild-plugin-autopkgtest all 6.20231223ubuntu2 [1760 B] 138s Get:75 http://ftpmaster.internal/ubuntu noble/main arm64 python3-cachetools all 5.3.0-2 [10.6 kB] 138s Get:76 http://ftpmaster.internal/ubuntu noble/main arm64 python3-colorama all 0.4.6-4 [32.1 kB] 138s Get:77 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-distlib all 0.3.8-1 [318 kB] 138s Get:78 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-filelock all 3.13.1-1 [10.8 kB] 138s Get:79 http://ftpmaster.internal/ubuntu noble/main arm64 python3-packaging all 23.2-1 [40.6 kB] 138s Get:80 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-pip-whl all 24.0+dfsg-1 [1702 kB] 138s Get:81 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-platformdirs all 4.2.0-1 [16.1 kB] 138s Get:82 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-pluggy all 1.4.0-1 [20.4 kB] 138s Get:83 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-pyproject-api all 1.6.1-1 [50.9 kB] 138s Get:84 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-setuptools-whl all 68.1.2-2 [715 kB] 138s Get:85 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-wheel-whl all 0.42.0-1 [67.8 kB] 138s Get:86 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-virtualenv all 20.25.0+ds-1 [70.7 kB] 138s Get:87 http://ftpmaster.internal/ubuntu noble/universe arm64 python3-wheel all 0.42.0-1 [53.1 kB] 138s Get:88 http://ftpmaster.internal/ubuntu noble/universe arm64 tox all 4.13.0-1 [302 kB] 139s Fetched 79.4 MB in 3s (25.1 MB/s) 139s dpkg: libhogweed6:arm64: dependency problems, but removing anyway as you requested: 139s librtmp1:arm64 depends on libhogweed6. 139s libjcat1:arm64 depends on libhogweed6. 139s libgnutls30:arm64 depends on libhogweed6 (>= 3.6). 139s 139s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75850 files and directories currently installed.) 139s Removing libhogweed6:arm64 (3.9.1-2) ... 139s dpkg: libnettle8:arm64: dependency problems, but removing anyway as you requested: 139s librtmp1:arm64 depends on libnettle8. 139s libgnutls30:arm64 depends on libnettle8 (>= 3.9~). 139s libcurl3-gnutls:arm64 depends on libnettle8. 139s libarchive13:arm64 depends on libnettle8. 139s 139s Removing libnettle8:arm64 (3.9.1-2) ... 140s Selecting previously unselected package libnettle8t64:arm64. 140s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75838 files and directories currently installed.) 140s Preparing to unpack .../libnettle8t64_3.9.1-2.2_arm64.deb ... 140s Unpacking libnettle8t64:arm64 (3.9.1-2.2) ... 140s Selecting previously unselected package libhogweed6t64:arm64. 140s Preparing to unpack .../libhogweed6t64_3.9.1-2.2_arm64.deb ... 140s Unpacking libhogweed6t64:arm64 (3.9.1-2.2) ... 140s dpkg: libgnutls30:arm64: dependency problems, but removing anyway as you requested: 140s u-boot-tools depends on libgnutls30 (>= 3.7.3). 140s librtmp1:arm64 depends on libgnutls30 (>= 3.7.2). 140s libldap2:arm64 depends on libgnutls30 (>= 3.8.2). 140s libjcat1:arm64 depends on libgnutls30 (>= 3.7.3). 140s libcurl3-gnutls:arm64 depends on libgnutls30 (>= 3.8.2). 140s fwupd depends on libgnutls30 (>= 3.7.3). 140s dirmngr depends on libgnutls30 (>= 3.8.1). 140s apt depends on libgnutls30 (>= 3.8.1). 140s 140s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75852 files and directories currently installed.) 140s Removing libgnutls30:arm64 (3.8.3-1ubuntu1) ... 140s Selecting previously unselected package libgnutls30t64:arm64. 140s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75843 files and directories currently installed.) 140s Preparing to unpack .../libgnutls30t64_3.8.3-1.1ubuntu2_arm64.deb ... 140s Unpacking libgnutls30t64:arm64 (3.8.3-1.1ubuntu2) ... 140s dpkg: libssl3:arm64: dependency problems, but removing anyway as you requested: 140s wget depends on libssl3 (>= 3.0.0). 140s u-boot-tools depends on libssl3 (>= 3.0.0). 140s tnftp depends on libssl3 (>= 3.0.0). 140s tcpdump depends on libssl3 (>= 3.0.0). 140s systemd-resolved depends on libssl3 (>= 3.0.0). 140s systemd depends on libssl3 (>= 3.0.0). 140s sudo depends on libssl3 (>= 3.0.0). 140s sbsigntool depends on libssl3 (>= 3.0.0). 140s rsync depends on libssl3 (>= 3.0.0). 140s python3-cryptography depends on libssl3 (>= 3.0.0). 140s openssl depends on libssl3 (>= 3.0.9). 140s openssh-server depends on libssl3 (>= 3.0.10). 140s openssh-client depends on libssl3 (>= 3.0.10). 140s mtd-utils depends on libssl3 (>= 3.0.0). 140s mokutil depends on libssl3 (>= 3.0.0). 140s linux-headers-6.8.0-11-generic depends on libssl3 (>= 3.0.0). 140s libsystemd-shared:arm64 depends on libssl3 (>= 3.0.0). 140s libssh-4:arm64 depends on libssl3 (>= 3.0.0). 140s libsasl2-modules:arm64 depends on libssl3 (>= 3.0.0). 140s libsasl2-2:arm64 depends on libssl3 (>= 3.0.0). 140s libpython3.12-minimal:arm64 depends on libssl3 (>= 3.0.0). 140s libpython3.11-minimal:arm64 depends on libssl3 (>= 3.0.0). 140s libnvme1 depends on libssl3 (>= 3.0.0). 140s libkrb5-3:arm64 depends on libssl3 (>= 3.0.0). 140s libkmod2:arm64 depends on libssl3 (>= 3.0.0). 140s libfido2-1:arm64 depends on libssl3 (>= 3.0.0). 140s libcurl4:arm64 depends on libssl3 (>= 3.0.0). 140s libcryptsetup12:arm64 depends on libssl3 (>= 3.0.0). 140s kmod depends on libssl3 (>= 3.0.0). 140s dhcpcd-base depends on libssl3 (>= 3.0.0). 140s bind9-libs:arm64 depends on libssl3 (>= 3.0.0). 140s 140s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75871 files and directories currently installed.) 140s Removing libssl3:arm64 (3.0.10-1ubuntu4) ... 140s Selecting previously unselected package libssl3t64:arm64. 140s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75860 files and directories currently installed.) 140s Preparing to unpack .../libssl3t64_3.0.13-0ubuntu2_arm64.deb ... 140s Unpacking libssl3t64:arm64 (3.0.13-0ubuntu2) ... 141s dpkg: libcurl4:arm64: dependency problems, but removing anyway as you requested: 141s curl depends on libcurl4 (= 8.5.0-2ubuntu2). 141s 141s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75873 files and directories currently installed.) 141s Removing libcurl4:arm64 (8.5.0-2ubuntu2) ... 141s Selecting previously unselected package libcurl4t64:arm64. 141s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75868 files and directories currently installed.) 141s Preparing to unpack .../libcurl4t64_8.5.0-2ubuntu7_arm64.deb ... 141s Unpacking libcurl4t64:arm64 (8.5.0-2ubuntu7) ... 141s Preparing to unpack .../curl_8.5.0-2ubuntu7_arm64.deb ... 141s Unpacking curl (8.5.0-2ubuntu7) over (8.5.0-2ubuntu2) ... 141s dpkg: libpsl5:arm64: dependency problems, but removing anyway as you requested: 141s wget depends on libpsl5 (>= 0.16.0). 141s libcurl3-gnutls:arm64 depends on libpsl5 (>= 0.16.0). 141s 141s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75874 files and directories currently installed.) 141s Removing libpsl5:arm64 (0.21.2-1build1) ... 141s Selecting previously unselected package libpsl5t64:arm64. 141s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75869 files and directories currently installed.) 141s Preparing to unpack .../libpsl5t64_0.21.2-1.1_arm64.deb ... 141s Unpacking libpsl5t64:arm64 (0.21.2-1.1) ... 141s dpkg: libcurl3-gnutls:arm64: dependency problems, but removing anyway as you requested: 141s libfwupd2:arm64 depends on libcurl3-gnutls (>= 7.63.0). 141s fwupd depends on libcurl3-gnutls (>= 7.63.0). 141s 141s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75875 files and directories currently installed.) 141s Removing libcurl3-gnutls:arm64 (8.5.0-2ubuntu2) ... 141s Selecting previously unselected package libcurl3t64-gnutls:arm64. 141s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75868 files and directories currently installed.) 141s Preparing to unpack .../00-libcurl3t64-gnutls_8.5.0-2ubuntu7_arm64.deb ... 141s Unpacking libcurl3t64-gnutls:arm64 (8.5.0-2ubuntu7) ... 141s Selecting previously unselected package m4. 141s Preparing to unpack .../01-m4_1.4.19-4_arm64.deb ... 141s Unpacking m4 (1.4.19-4) ... 141s Selecting previously unselected package autoconf. 141s Preparing to unpack .../02-autoconf_2.71-3_all.deb ... 141s Unpacking autoconf (2.71-3) ... 142s Selecting previously unselected package autotools-dev. 142s Preparing to unpack .../03-autotools-dev_20220109.1_all.deb ... 142s Unpacking autotools-dev (20220109.1) ... 142s Selecting previously unselected package automake. 142s Preparing to unpack .../04-automake_1%3a1.16.5-1.3ubuntu1_all.deb ... 142s Unpacking automake (1:1.16.5-1.3ubuntu1) ... 142s Selecting previously unselected package autopoint. 142s Preparing to unpack .../05-autopoint_0.21-14ubuntu1_all.deb ... 142s Unpacking autopoint (0.21-14ubuntu1) ... 142s Selecting previously unselected package libc-dev-bin. 142s Preparing to unpack .../06-libc-dev-bin_2.39-0ubuntu2_arm64.deb ... 142s Unpacking libc-dev-bin (2.39-0ubuntu2) ... 142s Selecting previously unselected package linux-libc-dev:arm64. 142s Preparing to unpack .../07-linux-libc-dev_6.8.0-11.11_arm64.deb ... 142s Unpacking linux-libc-dev:arm64 (6.8.0-11.11) ... 143s Selecting previously unselected package libcrypt-dev:arm64. 143s Preparing to unpack .../08-libcrypt-dev_1%3a4.4.36-4_arm64.deb ... 143s Unpacking libcrypt-dev:arm64 (1:4.4.36-4) ... 143s Selecting previously unselected package libtirpc-dev:arm64. 143s Preparing to unpack .../09-libtirpc-dev_1.3.4+ds-1build1_arm64.deb ... 143s Unpacking libtirpc-dev:arm64 (1.3.4+ds-1build1) ... 143s Selecting previously unselected package libnsl-dev:arm64. 143s Preparing to unpack .../10-libnsl-dev_1.3.0-3_arm64.deb ... 143s Unpacking libnsl-dev:arm64 (1.3.0-3) ... 143s Selecting previously unselected package rpcsvc-proto. 143s Preparing to unpack .../11-rpcsvc-proto_1.4.2-0ubuntu6_arm64.deb ... 143s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 143s Selecting previously unselected package libc6-dev:arm64. 143s Preparing to unpack .../12-libc6-dev_2.39-0ubuntu2_arm64.deb ... 143s Unpacking libc6-dev:arm64 (2.39-0ubuntu2) ... 143s Selecting previously unselected package libisl23:arm64. 143s Preparing to unpack .../13-libisl23_0.26-3_arm64.deb ... 143s Unpacking libisl23:arm64 (0.26-3) ... 143s Selecting previously unselected package libmpc3:arm64. 143s Preparing to unpack .../14-libmpc3_1.3.1-1_arm64.deb ... 143s Unpacking libmpc3:arm64 (1.3.1-1) ... 143s Selecting previously unselected package cpp-13-aarch64-linux-gnu. 143s Preparing to unpack .../15-cpp-13-aarch64-linux-gnu_13.2.0-17ubuntu2_arm64.deb ... 143s Unpacking cpp-13-aarch64-linux-gnu (13.2.0-17ubuntu2) ... 143s Selecting previously unselected package cpp-13. 143s Preparing to unpack .../16-cpp-13_13.2.0-17ubuntu2_arm64.deb ... 143s Unpacking cpp-13 (13.2.0-17ubuntu2) ... 143s Selecting previously unselected package cpp-aarch64-linux-gnu. 143s Preparing to unpack .../17-cpp-aarch64-linux-gnu_4%3a13.2.0-7ubuntu1_arm64.deb ... 143s Unpacking cpp-aarch64-linux-gnu (4:13.2.0-7ubuntu1) ... 143s Selecting previously unselected package cpp. 143s Preparing to unpack .../18-cpp_4%3a13.2.0-7ubuntu1_arm64.deb ... 143s Unpacking cpp (4:13.2.0-7ubuntu1) ... 143s Selecting previously unselected package libcc1-0:arm64. 143s Preparing to unpack .../19-libcc1-0_14-20240303-1ubuntu1_arm64.deb ... 143s Unpacking libcc1-0:arm64 (14-20240303-1ubuntu1) ... 143s Selecting previously unselected package libgomp1:arm64. 143s Preparing to unpack .../20-libgomp1_14-20240303-1ubuntu1_arm64.deb ... 143s Unpacking libgomp1:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package libitm1:arm64. 144s Preparing to unpack .../21-libitm1_14-20240303-1ubuntu1_arm64.deb ... 144s Unpacking libitm1:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package libatomic1:arm64. 144s Preparing to unpack .../22-libatomic1_14-20240303-1ubuntu1_arm64.deb ... 144s Unpacking libatomic1:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package libasan8:arm64. 144s Preparing to unpack .../23-libasan8_14-20240303-1ubuntu1_arm64.deb ... 144s Unpacking libasan8:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package liblsan0:arm64. 144s Preparing to unpack .../24-liblsan0_14-20240303-1ubuntu1_arm64.deb ... 144s Unpacking liblsan0:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package libtsan2:arm64. 144s Preparing to unpack .../25-libtsan2_14-20240303-1ubuntu1_arm64.deb ... 144s Unpacking libtsan2:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package libubsan1:arm64. 144s Preparing to unpack .../26-libubsan1_14-20240303-1ubuntu1_arm64.deb ... 144s Unpacking libubsan1:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package libhwasan0:arm64. 144s Preparing to unpack .../27-libhwasan0_14-20240303-1ubuntu1_arm64.deb ... 144s Unpacking libhwasan0:arm64 (14-20240303-1ubuntu1) ... 144s Selecting previously unselected package libgcc-13-dev:arm64. 144s Preparing to unpack .../28-libgcc-13-dev_13.2.0-17ubuntu2_arm64.deb ... 144s Unpacking libgcc-13-dev:arm64 (13.2.0-17ubuntu2) ... 144s Selecting previously unselected package gcc-13-aarch64-linux-gnu. 144s Preparing to unpack .../29-gcc-13-aarch64-linux-gnu_13.2.0-17ubuntu2_arm64.deb ... 144s Unpacking gcc-13-aarch64-linux-gnu (13.2.0-17ubuntu2) ... 145s Selecting previously unselected package gcc-13. 145s Preparing to unpack .../30-gcc-13_13.2.0-17ubuntu2_arm64.deb ... 145s Unpacking gcc-13 (13.2.0-17ubuntu2) ... 145s Selecting previously unselected package gcc-aarch64-linux-gnu. 145s Preparing to unpack .../31-gcc-aarch64-linux-gnu_4%3a13.2.0-7ubuntu1_arm64.deb ... 145s Unpacking gcc-aarch64-linux-gnu (4:13.2.0-7ubuntu1) ... 145s Selecting previously unselected package gcc. 145s Preparing to unpack .../32-gcc_4%3a13.2.0-7ubuntu1_arm64.deb ... 145s Unpacking gcc (4:13.2.0-7ubuntu1) ... 145s Selecting previously unselected package libstdc++-13-dev:arm64. 145s Preparing to unpack .../33-libstdc++-13-dev_13.2.0-17ubuntu2_arm64.deb ... 145s Unpacking libstdc++-13-dev:arm64 (13.2.0-17ubuntu2) ... 146s Selecting previously unselected package g++-13-aarch64-linux-gnu. 146s Preparing to unpack .../34-g++-13-aarch64-linux-gnu_13.2.0-17ubuntu2_arm64.deb ... 146s Unpacking g++-13-aarch64-linux-gnu (13.2.0-17ubuntu2) ... 146s Selecting previously unselected package g++-13. 146s Preparing to unpack .../35-g++-13_13.2.0-17ubuntu2_arm64.deb ... 146s Unpacking g++-13 (13.2.0-17ubuntu2) ... 146s Selecting previously unselected package g++-aarch64-linux-gnu. 146s Preparing to unpack .../36-g++-aarch64-linux-gnu_4%3a13.2.0-7ubuntu1_arm64.deb ... 146s Unpacking g++-aarch64-linux-gnu (4:13.2.0-7ubuntu1) ... 146s Selecting previously unselected package g++. 146s Preparing to unpack .../37-g++_4%3a13.2.0-7ubuntu1_arm64.deb ... 146s Unpacking g++ (4:13.2.0-7ubuntu1) ... 146s Selecting previously unselected package build-essential. 146s Preparing to unpack .../38-build-essential_12.10ubuntu1_arm64.deb ... 146s Unpacking build-essential (12.10ubuntu1) ... 146s Selecting previously unselected package libdebhelper-perl. 146s Preparing to unpack .../39-libdebhelper-perl_13.14.1ubuntu1_all.deb ... 146s Unpacking libdebhelper-perl (13.14.1ubuntu1) ... 146s Selecting previously unselected package libtool. 147s Preparing to unpack .../40-libtool_2.4.7-7_all.deb ... 147s Unpacking libtool (2.4.7-7) ... 147s Selecting previously unselected package dh-autoreconf. 147s Preparing to unpack .../41-dh-autoreconf_20_all.deb ... 147s Unpacking dh-autoreconf (20) ... 147s Selecting previously unselected package libarchive-zip-perl. 147s Preparing to unpack .../42-libarchive-zip-perl_1.68-1_all.deb ... 147s Unpacking libarchive-zip-perl (1.68-1) ... 147s Selecting previously unselected package libsub-override-perl. 147s Preparing to unpack .../43-libsub-override-perl_0.10-1_all.deb ... 147s Unpacking libsub-override-perl (0.10-1) ... 147s Selecting previously unselected package libfile-stripnondeterminism-perl. 147s Preparing to unpack .../44-libfile-stripnondeterminism-perl_1.13.1-1_all.deb ... 147s Unpacking libfile-stripnondeterminism-perl (1.13.1-1) ... 147s Selecting previously unselected package dh-strip-nondeterminism. 147s Preparing to unpack .../45-dh-strip-nondeterminism_1.13.1-1_all.deb ... 147s Unpacking dh-strip-nondeterminism (1.13.1-1) ... 147s Selecting previously unselected package libdw1:arm64. 147s Preparing to unpack .../46-libdw1_0.190-1_arm64.deb ... 147s Unpacking libdw1:arm64 (0.190-1) ... 147s Selecting previously unselected package debugedit. 147s Preparing to unpack .../47-debugedit_1%3a5.0-5_arm64.deb ... 147s Unpacking debugedit (1:5.0-5) ... 147s Selecting previously unselected package dwz. 147s Preparing to unpack .../48-dwz_0.15-1_arm64.deb ... 147s Unpacking dwz (0.15-1) ... 147s Selecting previously unselected package gettext. 147s Preparing to unpack .../49-gettext_0.21-14ubuntu1_arm64.deb ... 147s Unpacking gettext (0.21-14ubuntu1) ... 147s Selecting previously unselected package intltool-debian. 147s Preparing to unpack .../50-intltool-debian_0.35.0+20060710.6_all.deb ... 147s Unpacking intltool-debian (0.35.0+20060710.6) ... 147s Selecting previously unselected package po-debconf. 147s Preparing to unpack .../51-po-debconf_1.0.21+nmu1_all.deb ... 147s Unpacking po-debconf (1.0.21+nmu1) ... 147s Selecting previously unselected package debhelper. 147s Preparing to unpack .../52-debhelper_13.14.1ubuntu1_all.deb ... 147s Unpacking debhelper (13.14.1ubuntu1) ... 147s Selecting previously unselected package dh-python. 147s Preparing to unpack .../53-dh-python_6.20231223ubuntu2_all.deb ... 147s Unpacking dh-python (6.20231223ubuntu2) ... 147s Selecting previously unselected package liberror-perl. 147s Preparing to unpack .../54-liberror-perl_0.17029-2_all.deb ... 147s Unpacking liberror-perl (0.17029-2) ... 147s Selecting previously unselected package git-man. 147s Preparing to unpack .../55-git-man_1%3a2.43.0-1ubuntu5_all.deb ... 147s Unpacking git-man (1:2.43.0-1ubuntu5) ... 148s Selecting previously unselected package git. 148s Preparing to unpack .../56-git_1%3a2.43.0-1ubuntu5_arm64.deb ... 148s Unpacking git (1:2.43.0-1ubuntu5) ... 148s Selecting previously unselected package git-imerge. 148s Preparing to unpack .../57-git-imerge_1.2.0-5_all.deb ... 148s Unpacking git-imerge (1.2.0-5) ... 148s Selecting previously unselected package libjs-jquery. 148s Preparing to unpack .../58-libjs-jquery_3.6.1+dfsg+~3.5.14-1_all.deb ... 148s Unpacking libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 148s Selecting previously unselected package libjs-underscore. 148s Preparing to unpack .../59-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 148s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 148s Selecting previously unselected package libjs-sphinxdoc. 148s Preparing to unpack .../60-libjs-sphinxdoc_7.2.6-4_all.deb ... 148s Unpacking libjs-sphinxdoc (7.2.6-4) ... 148s Selecting previously unselected package libpkgconf3:arm64. 148s Preparing to unpack .../61-libpkgconf3_1.8.1-2_arm64.deb ... 148s Unpacking libpkgconf3:arm64 (1.8.1-2) ... 148s Selecting previously unselected package pkgconf-bin. 148s Preparing to unpack .../62-pkgconf-bin_1.8.1-2_arm64.deb ... 148s Unpacking pkgconf-bin (1.8.1-2) ... 148s Selecting previously unselected package pkgconf:arm64. 148s Preparing to unpack .../63-pkgconf_1.8.1-2_arm64.deb ... 148s Unpacking pkgconf:arm64 (1.8.1-2) ... 148s Selecting previously unselected package pkg-config:arm64. 148s Preparing to unpack .../64-pkg-config_1.8.1-2_arm64.deb ... 148s Unpacking pkg-config:arm64 (1.8.1-2) ... 148s Selecting previously unselected package pybuild-plugin-autopkgtest. 148s Preparing to unpack .../65-pybuild-plugin-autopkgtest_6.20231223ubuntu2_all.deb ... 148s Unpacking pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 149s Selecting previously unselected package python3-cachetools. 149s Preparing to unpack .../66-python3-cachetools_5.3.0-2_all.deb ... 149s Unpacking python3-cachetools (5.3.0-2) ... 149s Selecting previously unselected package python3-colorama. 149s Preparing to unpack .../67-python3-colorama_0.4.6-4_all.deb ... 149s Unpacking python3-colorama (0.4.6-4) ... 149s Selecting previously unselected package python3-distlib. 149s Preparing to unpack .../68-python3-distlib_0.3.8-1_all.deb ... 149s Unpacking python3-distlib (0.3.8-1) ... 149s Selecting previously unselected package python3-filelock. 149s Preparing to unpack .../69-python3-filelock_3.13.1-1_all.deb ... 149s Unpacking python3-filelock (3.13.1-1) ... 149s Selecting previously unselected package python3-packaging. 149s Preparing to unpack .../70-python3-packaging_23.2-1_all.deb ... 149s Unpacking python3-packaging (23.2-1) ... 149s Selecting previously unselected package python3-pip-whl. 149s Preparing to unpack .../71-python3-pip-whl_24.0+dfsg-1_all.deb ... 149s Unpacking python3-pip-whl (24.0+dfsg-1) ... 149s Selecting previously unselected package python3-platformdirs. 149s Preparing to unpack .../72-python3-platformdirs_4.2.0-1_all.deb ... 149s Unpacking python3-platformdirs (4.2.0-1) ... 149s Selecting previously unselected package python3-pluggy. 149s Preparing to unpack .../73-python3-pluggy_1.4.0-1_all.deb ... 149s Unpacking python3-pluggy (1.4.0-1) ... 149s Selecting previously unselected package python3-pyproject-api. 149s Preparing to unpack .../74-python3-pyproject-api_1.6.1-1_all.deb ... 149s Unpacking python3-pyproject-api (1.6.1-1) ... 149s Selecting previously unselected package python3-setuptools-whl. 149s Preparing to unpack .../75-python3-setuptools-whl_68.1.2-2_all.deb ... 149s Unpacking python3-setuptools-whl (68.1.2-2) ... 149s Selecting previously unselected package python3-wheel-whl. 149s Preparing to unpack .../76-python3-wheel-whl_0.42.0-1_all.deb ... 149s Unpacking python3-wheel-whl (0.42.0-1) ... 149s Selecting previously unselected package python3-virtualenv. 149s Preparing to unpack .../77-python3-virtualenv_20.25.0+ds-1_all.deb ... 149s Unpacking python3-virtualenv (20.25.0+ds-1) ... 149s Selecting previously unselected package python3-wheel. 149s Preparing to unpack .../78-python3-wheel_0.42.0-1_all.deb ... 149s Unpacking python3-wheel (0.42.0-1) ... 149s Selecting previously unselected package tox. 149s Preparing to unpack .../79-tox_4.13.0-1_all.deb ... 149s Unpacking tox (4.13.0-1) ... 149s Selecting previously unselected package autopkgtest-satdep. 149s Preparing to unpack .../80-1-autopkgtest-satdep.deb ... 149s Unpacking autopkgtest-satdep (0) ... 149s Setting up dh-python (6.20231223ubuntu2) ... 150s Setting up libdw1:arm64 (0.190-1) ... 150s Setting up python3-setuptools-whl (68.1.2-2) ... 150s Setting up python3-filelock (3.13.1-1) ... 150s Setting up python3-cachetools (5.3.0-2) ... 150s Setting up python3-colorama (0.4.6-4) ... 151s Setting up python3-pip-whl (24.0+dfsg-1) ... 151s Setting up libarchive-zip-perl (1.68-1) ... 151s Setting up libssl3t64:arm64 (3.0.13-0ubuntu2) ... 151s Setting up libdebhelper-perl (13.14.1ubuntu1) ... 151s Setting up libpsl5t64:arm64 (0.21.2-1.1) ... 151s Setting up linux-libc-dev:arm64 (6.8.0-11.11) ... 151s Setting up m4 (1.4.19-4) ... 151s Setting up python3-distlib (0.3.8-1) ... 151s Setting up libgomp1:arm64 (14-20240303-1ubuntu1) ... 151s Setting up python3-wheel (0.42.0-1) ... 151s Setting up python3-platformdirs (4.2.0-1) ... 152s Setting up liberror-perl (0.17029-2) ... 152s Setting up libnettle8t64:arm64 (3.9.1-2.2) ... 152s Setting up autotools-dev (20220109.1) ... 152s Setting up python3-packaging (23.2-1) ... 152s Setting up libtirpc-dev:arm64 (1.3.4+ds-1build1) ... 152s Setting up libpkgconf3:arm64 (1.8.1-2) ... 152s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 152s Setting up libmpc3:arm64 (1.3.1-1) ... 152s Setting up libatomic1:arm64 (14-20240303-1ubuntu1) ... 152s Setting up autopoint (0.21-14ubuntu1) ... 152s Setting up pkgconf-bin (1.8.1-2) ... 152s Setting up autoconf (2.71-3) ... 152s Setting up python3-pluggy (1.4.0-1) ... 152s Setting up libubsan1:arm64 (14-20240303-1ubuntu1) ... 152s Setting up dwz (0.15-1) ... 152s Setting up libhogweed6t64:arm64 (3.9.1-2.2) ... 152s Setting up libnsl-dev:arm64 (1.3.0-3) ... 152s Setting up libhwasan0:arm64 (14-20240303-1ubuntu1) ... 152s Setting up libcrypt-dev:arm64 (1:4.4.36-4) ... 152s Setting up libasan8:arm64 (14-20240303-1ubuntu1) ... 152s Setting up debugedit (1:5.0-5) ... 152s Setting up libsub-override-perl (0.10-1) ... 152s Setting up git-man (1:2.43.0-1ubuntu5) ... 152s Setting up libtsan2:arm64 (14-20240303-1ubuntu1) ... 152s Setting up libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 152s Setting up libisl23:arm64 (0.26-3) ... 152s Setting up libc-dev-bin (2.39-0ubuntu2) ... 152s Setting up python3-wheel-whl (0.42.0-1) ... 152s Setting up libcc1-0:arm64 (14-20240303-1ubuntu1) ... 152s Setting up liblsan0:arm64 (14-20240303-1ubuntu1) ... 152s Setting up libitm1:arm64 (14-20240303-1ubuntu1) ... 152s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 152s Setting up libgnutls30t64:arm64 (3.8.3-1.1ubuntu2) ... 152s Setting up automake (1:1.16.5-1.3ubuntu1) ... 152s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 152s Setting up libfile-stripnondeterminism-perl (1.13.1-1) ... 152s Setting up gettext (0.21-14ubuntu1) ... 152s Setting up cpp-13-aarch64-linux-gnu (13.2.0-17ubuntu2) ... 152s Setting up libcurl4t64:arm64 (8.5.0-2ubuntu7) ... 152s Setting up libcurl3t64-gnutls:arm64 (8.5.0-2ubuntu7) ... 152s Setting up python3-virtualenv (20.25.0+ds-1) ... 153s Setting up pkgconf:arm64 (1.8.1-2) ... 153s Setting up intltool-debian (0.35.0+20060710.6) ... 153s Setting up cpp-aarch64-linux-gnu (4:13.2.0-7ubuntu1) ... 153s Setting up pkg-config:arm64 (1.8.1-2) ... 153s Setting up git (1:2.43.0-1ubuntu5) ... 153s Setting up libjs-sphinxdoc (7.2.6-4) ... 153s Setting up dh-strip-nondeterminism (1.13.1-1) ... 153s Setting up libgcc-13-dev:arm64 (13.2.0-17ubuntu2) ... 153s Setting up libc6-dev:arm64 (2.39-0ubuntu2) ... 153s Setting up curl (8.5.0-2ubuntu7) ... 153s Setting up libstdc++-13-dev:arm64 (13.2.0-17ubuntu2) ... 153s Setting up cpp-13 (13.2.0-17ubuntu2) ... 153s Setting up po-debconf (1.0.21+nmu1) ... 153s Setting up python3-pyproject-api (1.6.1-1) ... 153s Setting up gcc-13-aarch64-linux-gnu (13.2.0-17ubuntu2) ... 153s Setting up git-imerge (1.2.0-5) ... 153s Setting up gcc-13 (13.2.0-17ubuntu2) ... 153s Setting up cpp (4:13.2.0-7ubuntu1) ... 154s Setting up g++-13-aarch64-linux-gnu (13.2.0-17ubuntu2) ... 154s Setting up gcc-aarch64-linux-gnu (4:13.2.0-7ubuntu1) ... 154s Setting up g++-13 (13.2.0-17ubuntu2) ... 154s Setting up tox (4.13.0-1) ... 154s Setting up libtool (2.4.7-7) ... 154s Setting up gcc (4:13.2.0-7ubuntu1) ... 154s Setting up dh-autoreconf (20) ... 154s Setting up g++-aarch64-linux-gnu (4:13.2.0-7ubuntu1) ... 154s Setting up debhelper (13.14.1ubuntu1) ... 154s Setting up g++ (4:13.2.0-7ubuntu1) ... 154s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 154s Setting up build-essential (12.10ubuntu1) ... 154s Setting up pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 154s Setting up autopkgtest-satdep (0) ... 154s Processing triggers for man-db (2.12.0-3) ... 156s Processing triggers for install-info (7.1-3) ... 156s Processing triggers for libc-bin (2.39-0ubuntu2) ... 162s (Reading database ... 81655 files and directories currently installed.) 162s Removing autopkgtest-satdep (0) ... 162s autopkgtest [10:13:44]: test pybuild-autopkgtest: pybuild-autopkgtest 162s autopkgtest [10:13:44]: test pybuild-autopkgtest: [----------------------- 163s pybuild-autopkgtest 164s I: pybuild base:305: cd /tmp/autopkgtest.Vac0jX/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.Vac0jX/build.vpl/src/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 165s py312: skip building and installing the package 165s py312: commands[0] /tmp/autopkgtest.Vac0jX/build.vpl/src> /bin/sh t/test-unconflicted 165s + dirname t/test-unconflicted 165s + cd t 165s + pwd 165s + dirname /tmp/autopkgtest.Vac0jX/build.vpl/src/t 165s + BASE=/tmp/autopkgtest.Vac0jX/build.vpl/src 165s + . /tmp/autopkgtest.Vac0jX/build.vpl/src/t/test-lib.sh 165s + GIT_IMERGE=git-imerge 165s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s + DESCRIPTION=git-imerge test repository without conflicts 165s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted git-imerge test repository without conflicts 165s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s + local description=git-imerge test repository without conflicts 165s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted git-imerge test repository without conflicts 165s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s + local description=git-imerge test repository without conflicts 165s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s hint: Using 'master' as the name for the initial branch. This default branch name 165s hint: is subject to change. To configure the initial branch name to use in all 165s hint: of your new repositories, which will suppress this warning, call: 165s hint: 165s hint: git config --global init.defaultBranch 165s hint: 165s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 165s hint: 'development'. The just-created branch can be renamed via this command: 165s hint: 165s hint: git branch -m 165s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted/.git/ 165s [master (root-commit) 780ddf5] m⇒0 165s 2 files changed, 2 insertions(+) 165s create mode 100644 a.txt 165s create mode 100644 b.txt 165s + echo git-imerge test repository without conflicts 165s + printf %s\n /*.out /*.css /*.html 165s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted/.git config user.name Loú User 165s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted/.git config user.email luser@example.com 165s + TIME=1112911993 165s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/unconflicted 165s + modify a.txt 0 165s + filename=a.txt 165s + text=0 165s + echo 0 165s + git add a.txt 165s + modify b.txt 0 165s + filename=b.txt 165s + text=0 165s + echo 0 165s + git add b.txt 165s + commit -m m⇒0 165s + TIME=1112911994 165s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 165s + git checkout -b a -- 165s Switched to a new branch 'a' 165s + seq 8 165s + modify a.txt 1 165s + filename=a.txt 165s + text=1 165s + echo 1 165s + git add a.txt 165s + commit -m a⇒1 165s + TIME=1112911995 165s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 165s [a b862e30] a⇒1 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 2 165s + filename=a.txt 165s + text=2 165s + echo 2 165s + git add a.txt 165s + commit -m a⇒2 165s + TIME=1112911996 165s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 165s [a dcbe282] a⇒2 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 3 165s + filename=a.txt 165s + text=3 165s + echo 3 165s + git add a.txt 165s + commit -m a⇒3 165s + TIME=1112911997 165s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 165s [a ecd8647] a⇒3 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 4 165s + filename=a.txt 165s + text=4 165s + echo 4 165s + git add a.txt 165s + commit -m a⇒4 165s + TIME=1112911998 165s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 165s [a 1634bab] a⇒4 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 5 165s + filename=a.txt 165s + text=5 165s + echo 5 165s + git add a.txt 165s + commit -m a⇒5 165s + TIME=1112911999 165s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 165s [a 909ce12] a⇒5 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 6 165s + filename=a.txt 165s + text=6 165s + echo 6 165s + git add a.txt 165s + commit -m a⇒6 165s + TIME=1112912000 165s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 165s [a f6520bf] a⇒6 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 7 165s + filename=a.txt 165s + text=7 165s + echo 7 165s + git add a.txt 165s + commit -m a⇒7 165s + TIME=1112912001 165s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 165s [a 6797186] a⇒7 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 8 165s + filename=a.txt 165s + text=8 165s + echo 8 165s + git add a.txt 165s + commit -m a⇒8 165s + TIME=1112912002 165s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 165s [a 49643dd] a⇒8 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + git checkout -b b master -- 165s Switched to a new branch 'b' 165s + seq 5 165s + modify b.txt 1 165s + filename=b.txt 165s + text=1 165s + echo 1 165s + git add b.txt 165s + commit -m b⇒1 165s + TIME=1112912003 165s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 165s [b d43305b] b⇒1 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify b.txt 2 165s + filename=b.txt 165s + text=2 165s + echo 2 165s + git add b.txt 165s + commit -m b⇒2 165s + TIME=1112912004 165s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 165s [b 853ee68] b⇒2 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify b.txt 3 165s + filename=b.txt 165s + text=3 165s + echo 3 165s + git add b.txt 165s + commit -m b⇒3 165s + TIME=1112912005 165s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 165s [b 03a2455] b⇒3 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify b.txt 4 165s + filename=b.txt 165s + text=4 165s + echo 4 165s + git add b.txt 165s + commit -m b⇒4 165s + TIME=1112912006 165s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 165s [b 484ea85] b⇒4 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify b.txt 5 165s + filename=b.txt 165s + text=5 165s + echo 5 165s + git add b.txt 165s + commit -m b⇒5 165s + TIME=1112912007 165s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 165s [b e22cd97] b⇒5 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 165s + git checkout a 165s Switched to branch 'a' 165s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 166s Attempting automerge of 8-5...success. 166s Autofilling 1-5...success. 166s Autofilling 2-5...success. 166s Autofilling 3-5...success. 166s Autofilling 4-5...success. 166s Autofilling 5-5...success. 166s Autofilling 6-5...success. 166s Autofilling 7-5...success. 166s Autofilling 8-1...success. 166s Autofilling 8-2...success. 166s Autofilling 8-3...success. 166s Autofilling 8-4...success. 166s Autofilling 8-5 (first way)...success. 166s Autofilling 8-5 (second way)...success. 166s The two ways of autofilling 8-5 agree. 166s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 166s Merge is complete! 166s + git-imerge list 166s * a-b 166s + git-imerge diagram --commits --frontier --html=imerge3.html 167s 0 5 8 167s | | | 167s 0 - ********* - a 167s *???????. 167s *???????. 167s *???????. 167s *???????. 167s 5 - *........ 167s | 167s b 167s 167s 0 5 8 167s | | | 167s 0 - ********* - a 167s *???????| 167s *???????| 167s *???????| 167s *???????| 167s 5 - *-------+ 167s | 167s b 167s 167s Key: 167s |,-,+ = rectangles forming current merge frontier 167s * = merge done manually 167s . = merge done automatically 167s # = conflict that is currently blocking progress 167s @ = merge was blocked but has been resolved 167s ? = no merge recorded 167s 167s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 167s Merge b into a (using imerge) 167s 167s # Please enter the commit message for your changes. Lines starting 167s # with '#' will be ignored, and an empty message aborts the commit. 167s # 167s # Date: Wed Mar 20 10:13:49 2024 +0000 167s # 167s # On branch a-b-merge 167s # Changes to be committed: 167s # modified: b.txt 167s # 167s [a-b-merge b76e9b3] Merge b into a (using imerge) 167s Date: Wed Mar 20 10:13:49 2024 +0000 167s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 167s + local refname=a-b-merge 167s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 167s + git rev-parse a-b-merge^{tree} 167s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 167s + git-imerge simplify --goal=rebase --branch=a-b-rebase 167s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 167s + local refname=a-b-rebase 167s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 167s + git rev-parse a-b-rebase^{tree} 167s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 167s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 168s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + local refname=a-b-rebase-with-history 168s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + git rev-parse a-b-rebase-with-history^{tree} 168s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + git-imerge simplify --goal=border --branch=a-b-border 168s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + local refname=a-b-border 168s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + git rev-parse a-b-border^{tree} 168s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 168s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + local refname=a-b-border-with-history 168s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + git rev-parse a-b-border-with-history^{tree} 168s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 168s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 169s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 169s + local refname=a-b-border-with-history2 169s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 169s + git rev-parse a-b-border-with-history2^{tree} 169s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 169s + git-imerge remove 169s + git checkout a 169s Switched to branch 'a' 169s + git-imerge start --goal=full --name=a-b b 169s Attempting to merge 1-1...success. 169s Attempting to merge 1-2...success. 169s Attempting to merge 1-3...success. 169s Attempting to merge 1-4...success. 169s Attempting to merge 1-5...success. 169s Attempting to merge 2-1...success. 169s Attempting to merge 2-2...success. 170s Attempting to merge 2-3...success. 170s Attempting to merge 2-4...success. 170s Attempting to merge 2-5...success. 170s Attempting to merge 3-1...success. 170s Attempting to merge 3-2...success. 170s Attempting to merge 3-3...success. 170s Attempting to merge 3-4...success. 170s Attempting to merge 3-5...success. 170s Attempting to merge 4-1...success. 170s Attempting to merge 4-2...success. 170s Attempting to merge 4-3...success. 170s Attempting to merge 4-4...success. 170s Attempting to merge 4-5...success. 170s Attempting to merge 5-1...success. 170s Attempting to merge 5-2...success. 170s Attempting to merge 5-3...success. 170s Attempting to merge 5-4...success. 170s Attempting to merge 5-5...success. 170s Attempting to merge 6-1...success. 170s Attempting to merge 6-2...success. 170s Attempting to merge 6-3...success. 170s Attempting to merge 6-4...success. 170s Attempting to merge 6-5...success. 170s Attempting to merge 7-1...success. 170s Attempting to merge 7-2...success. 170s Attempting to merge 7-3...success. 170s Attempting to merge 7-4...success. 170s Attempting to merge 7-5...success. 170s Attempting to merge 8-1...success. 170s Attempting to merge 8-2...success. 170s Attempting to merge 8-3...success. 171s Attempting to merge 8-4...success. 171s Attempting to merge 8-5...success. 171s Merge is complete! 171s + git-imerge list 171s * a-b 171s + git-imerge diagram --commits --frontier --html=imerge4.html 171s 0 5 8 171s | | | 171s 0 - ********* - a 171s *........ 171s *........ 171s *........ 171s *........ 171s 5 - *........ 171s | 171s b 171s 171s 0 5 8 171s | | | 171s 0 - ********* - a 171s *.......| 171s *.......| 171s *.......| 171s *.......| 171s 5 - *-------+ 171s | 171s b 171s 171s Key: 171s |,-,+ = rectangles forming current merge frontier 171s * = merge done manually 171s . = merge done automatically 171s # = conflict that is currently blocking progress 171s @ = merge was blocked but has been resolved 171s ? = no merge recorded 171s 171s + git-imerge finish --branch=a-b-full 171s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 171s + local refname=a-b-full 171s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 171s + git rev-parse a-b-full^{tree} 171s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 171s py312: commands[1] /tmp/autopkgtest.Vac0jX/build.vpl/src> /bin/sh t/test-conflicted 171s + dirname t/test-conflicted 171s + cd t 171s + pwd 171s + dirname /tmp/autopkgtest.Vac0jX/build.vpl/src/t 171s + BASE=/tmp/autopkgtest.Vac0jX/build.vpl/src 171s + . /tmp/autopkgtest.Vac0jX/build.vpl/src/t/test-lib.sh 171s + GIT_IMERGE=git-imerge 171s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 171s + test_conflict 4-3 171s + local conflict=4-3 171s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s + DESCRIPTION=git-imerge test repository with conflict at 4-3 171s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 171s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s + local description=git-imerge test repository with conflict at 4-3 171s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 171s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s + local description=git-imerge test repository with conflict at 4-3 171s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s hint: Using 'master' as the name for the initial branch. This default branch name 171s hint: is subject to change. To configure the initial branch name to use in all 171s hint: of your new repositories, which will suppress this warning, call: 171s hint: 171s hint: git config --global init.defaultBranch 171s hint: 171s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 171s hint: 'development'. The just-created branch can be renamed via this command: 171s hint: 171s hint: git branch -m 171s + echo git-imerge test repository with conflict at 4-3 171s + printf %s\n /*.out /*.css /*.html 171s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3/.git config user.name Loú User 171s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 171s + TIME=1112911993 171s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3 171s + modify c.txt 0 171s + filename=c.txt 171s + text=0 171s + echo 0 171s + git add c.txt 171s + modify d.txt 0 171s + filename=d.txt 171s + text=0 171s + echo 0 171s + git add d.txt 171s + modify conflict.txt original version 171s + filename=conflict.txt 171s + text=original version 171s + echo original version 171s + git add conflict.txt 171s + commit -m m⇒0 171s + TIME=1112911994 171s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 171s + git checkout -b c master -- 171s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-4-3/.git/ 171s [master (root-commit) d70e04b] m⇒0 171s 3 files changed, 3 insertions(+) 171s create mode 100644 c.txt 171s create mode 100644 conflict.txt 171s create mode 100644 d.txt 171s Switched to a new branch 'c' 171s + seq 9 171s + modify c.txt 1 171s + filename=c.txt 171s + text=1 171s + echo 1 171s + git add c.txt 171s + commit -m c⇒1 171s + TIME=1112911995 171s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 171s + modify c.txt 2 171s + filename=c.txt 171s + text=2 171s + echo 2 171s + git add c.txt 171s + commit -m c⇒2 171s + TIME=1112911996 171s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 171s [c 89e2141] c⇒1 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify c.txt 3 171s [c 7c431f2] c⇒2 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + filename=c.txt 171s + text=3 171s + echo 3 171s + git add c.txt 171s + commit -m c⇒3 171s + TIME=1112911997 171s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 171s [c f02ab24] c⇒3 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify c.txt 4 171s + filename=c.txt 171s + text=4 171s + echo 4 171s + git add c.txt 171s + modify conflict.txt c version 171s + filename=conflict.txt 171s + text=c version 171s + echo c version 171s + git add conflict.txt 171s + commit -m c⇒4 171s + TIME=1112911998 171s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 171s [c 3c091de] c⇒4 171s 2 files changed, 2 insertions(+), 2 deletions(-) 171s + modify c.txt 5 171s + filename=c.txt 171s + text=5 171s + echo 5 171s + git add c.txt 171s + commit -m c⇒5 171s + TIME=1112911999 171s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 171s [c a0ac37a] c⇒5 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify c.txt 6 171s + filename=c.txt 171s + text=6 171s + echo 6 171s + git add c.txt 171s + commit -m c⇒6 171s + TIME=1112912000 171s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 171s [c ed9fdfa] c⇒6 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify c.txt 7 171s + filename=c.txt 171s + text=7 171s + echo 7 171s + git add c.txt 171s + commit -m c⇒7 171s + TIME=1112912001 171s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 172s [c 1da7bf5] c⇒7 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + modify c.txt 8 172s + filename=c.txt 172s + text=8 172s + echo 8 172s + git add c.txt 172s + commit -m c⇒8 172s + TIME=1112912002 172s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 172s [c d8de99f] c⇒8 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + modify c.txt 9 172s + filename=c.txt 172s + text=9 172s + echo 9 172s + git add c.txt 172s + commit -m c⇒9 172s + TIME=1112912003 172s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 172s [c 9cde605] c⇒9 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + git checkout -b d master -- 172s Switched to a new branch 'd' 172s + seq 6 172s + modify d.txt 1 172s + filename=d.txt 172s + text=1 172s + echo 1 172s + git add d.txt 172s + commit -m d⇒1 172s + TIME=1112912004 172s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 172s [d bd5368a] d⇒1 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + modify d.txt 2 172s + filename=d.txt 172s + text=2 172s + echo 2 172s + git add d.txt 172s + commit -m d⇒2 172s + TIME=1112912005 172s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 172s [d 93e27e6] d⇒2 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + modify d.txt 3 172s + filename=d.txt 172s + text=3 172s + echo 3 172s + git add d.txt 172s + modify conflict.txt d version 172s + filename=conflict.txt 172s + text=d version 172s + echo d version 172s + git add conflict.txt 172s + commit -m d⇒3 172s + TIME=1112912006 172s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 172s [d 2bb1a7e] d⇒3 172s 2 files changed, 2 insertions(+), 2 deletions(-) 172s + modify d.txt 4 172s + filename=d.txt 172s + text=4 172s + echo 4 172s + git add d.txt 172s + commit -m d⇒4 172s + TIME=1112912007 172s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 172s [d 81f9c80] d⇒4 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + modify d.txt 5 172s + filename=d.txt 172s + text=5 172s + echo 5 172s + git add d.txt 172s + commit -m d⇒5 172s + TIME=1112912008 172s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 172s [d 3690dde] d⇒5 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + modify d.txt 6 172s + filename=d.txt 172s + text=6 172s + echo 6 172s + git add d.txt 172s + commit -m d⇒6 172s + TIME=1112912009 172s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 172s [d 8085853] d⇒6 172s 1 file changed, 1 insertion(+), 1 deletion(-) 172s + git checkout c 172s Switched to branch 'c' 172s + git-imerge init --name=c-d d 172s + git-imerge list 172s * c-d 172s + git-imerge diagram --commits --frontier --html=imerge0.html 172s 0 5 9 172s | | | 172s 0 - ********** - c 172s *????????? 172s *????????? 172s *????????? 172s *????????? 172s 5 - *????????? 172s 6 - *????????? 172s | 172s d 172s 172s 0 5 9 172s | | | 172s 0 - ********** - c 172s *????????? 172s *????????? 172s *????????? 172s *????????? 172s 5 - *????????? 172s 6 - *????????? 172s | 172s d 172s 172s Key: 172s |,-,+ = rectangles forming current merge frontier 172s * = merge done manually 172s . = merge done automatically 172s # = conflict that is currently blocking progress 172s @ = merge was blocked but has been resolved 172s ? = no merge recorded 172s 172s + + git-imerge autofill 172s tee autofill.out 173s Attempting automerge of 9-6...failure. 173s Attempting automerge of 1-1...success. 173s Attempting automerge of 1-4...success. 173s Attempting automerge of 1-6...success. 173s Attempting automerge of 9-6...failure. 173s Attempting automerge of 5-6...failure. 173s Attempting automerge of 3-6...success. 173s Attempting automerge of 4-6...failure. 173s Attempting automerge of 4-1...success. 173s Attempting automerge of 4-4...failure. 173s Attempting automerge of 4-3...failure. 173s Attempting automerge of 4-2...success. 173s Attempting automerge of 9-2...success. 173s Autofilling 1-6...success. 173s Autofilling 2-6...success. 173s Autofilling 3-1...success. 173s Autofilling 3-2...success. 173s Autofilling 3-3...success. 173s Autofilling 3-4...success. 173s Autofilling 3-5...success. 173s Autofilling 3-6 (first way)...success. 173s Autofilling 3-6 (second way)...success. 173s The two ways of autofilling 3-6 agree. 173s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 173s Autofilling 4-2...success. 173s Autofilling 5-2...success. 173s Autofilling 6-2...success. 173s Autofilling 7-2...success. 173s Autofilling 8-2...success. 173s Autofilling 9-1...success. 173s Autofilling 9-2 (first way)...success. 173s Autofilling 9-2 (second way)...success. 173s The two ways of autofilling 9-2 agree. 173s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 173s Attempting automerge of 9-6...failure. 173s Attempting automerge of 4-3...failure. 173s HEAD is now at 9cde605 c⇒9 173s Conflict; suggest manual merge of 4-3 173s + grep -q Traceback autofill.out 173s + grep -q suggest manual merge of 4-3 autofill.out 173s + git-imerge diagram --commits --frontier --html=imerge1.html 174s 0 5 9 174s | | | 174s 0 - ********** - c 174s *??.?????. 174s *??....... 174s *??.#????? 174s *??.?????? 174s 5 - *??.?????? 174s 6 - *...?????? 174s | 174s d 174s 174s 0 5 9 174s | | | 174s 0 - ********** - c 174s *??.?????| 174s *??.-----+ 174s *??|#????? 174s *??|?????? 174s 5 - *??|?????? 174s 6 - *--+?????? 174s | 174s d 174s 174s Key: 174s |,-,+ = rectangles forming current merge frontier 174s * = merge done manually 174s . = merge done automatically 174s # = conflict that is currently blocking progress 174s @ = merge was blocked but has been resolved 174s ? = no merge recorded 174s 174s + git-imerge continue --edit 174s Auto-merging conflict.txt 174s CONFLICT (content): Merge conflict in conflict.txt 174s Automatic merge failed; fix conflicts and then commit the result. 174s commit 3c091ded129a5edf9061360bab867edade996c93 174s Author: Loú User 174s Date: Thu Apr 7 22:13:18 2005 +0000 174s 174s c⇒4 174s Switched to branch 'imerge/c-d' 174s 174s Original first commit: 174s 174s Original second commit: 174s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 174s Author: Loú User 174s Date: Thu Apr 7 22:13:26 2005 +0000 174s 174s d⇒3 174s 174s There was a conflict merging commit 4-3, shown above. 174s Please resolve the conflict, commit the result, then type 174s 174s git-imerge continue 174s + echo merged version 174s + git add conflict.txt 174s + git-imerge continue --no-edit 174s [imerge/c-d 41d02e5] imerge 'c-d': manual merge 4-3 174s Merge has been recorded for merge 4-3. 174s Attempting automerge of 4-6...success. 174s Autofilling 4-4...success. 174s Autofilling 4-5...success. 174s Autofilling 4-6...success. 174s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 174s Attempting automerge of 9-6...success. 174s Autofilling 5-6...success. 174s Autofilling 6-6...success. 174s Autofilling 7-6...success. 174s Autofilling 8-6...success. 174s Autofilling 9-3...success. 174s Autofilling 9-4...success. 174s Autofilling 9-5...success. 175s Autofilling 9-6 (first way)...success. 175s Autofilling 9-6 (second way)...success. 175s The two ways of autofilling 9-6 agree. 175s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 175s Merge is complete! 175s + git-imerge diagram --commits --frontier --html=imerge2.html 175s 0 5 9 175s | | | 175s 0 - ********** - c 175s *??.?????. 175s *??....... 175s *??.*????. 175s *??..????. 175s 5 - *??..????. 175s 6 - *......... 175s | 175s d 175s 175s 0 5 9 175s | | | 175s 0 - ********** - c 175s *??.?????| 175s *??......| 175s *??.*????| 175s *??..????| 175s 5 - *??..????| 175s 6 - *--------+ 175s | 175s d 175s 175s Key: 175s |,-,+ = rectangles forming current merge frontier 175s * = merge done manually 175s . = merge done automatically 175s # = conflict that is currently blocking progress 175s @ = merge was blocked but has been resolved 175s ? = no merge recorded 175s 175s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 175s Merge d into c (using imerge) 175s 175s # Please enter the commit message for your changes. Lines starting 175s # with '#' will be ignored, and an empty message aborts the commit. 175s # 175s # Date: Wed Mar 20 10:13:57 2024 +0000 175s # 175s # On branch c-d-merge 175s # Changes to be committed: 175s # modified: conflict.txt 175s # modified: d.txt 175s # 175s [c-d-merge e29ddba] Merge d into c (using imerge) 175s Date: Wed Mar 20 10:13:57 2024 +0000 175s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 175s + local refname=c-d-merge 175s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 175s + git rev-parse c-d-merge^{tree} 175s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 175s + git-imerge simplify --goal=rebase --branch=c-d-rebase 175s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 175s + local refname=c-d-rebase 175s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 175s + git rev-parse c-d-rebase^{tree} 175s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 175s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 176s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + local refname=c-d-rebase-with-history 176s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git rev-parse c-d-rebase-with-history^{tree} 176s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git-imerge simplify --goal=border --branch=c-d-border 176s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + local refname=c-d-border 176s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git rev-parse c-d-border^{tree} 176s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 177s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + local refname=c-d-border-with-history 177s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git rev-parse c-d-border-with-history^{tree} 177s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 177s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + local refname=c-d-border-with-history2 177s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git rev-parse c-d-border-with-history2^{tree} 177s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git-imerge remove 177s + git checkout c 177s Switched to branch 'c' 177s + git-imerge start --goal=full --first-parent --name=c-d d 177s + tee start.out 178s Attempting to merge 1-1...success. 178s Attempting to merge 1-2...success. 178s Attempting to merge 1-3...success. 178s Attempting to merge 1-4...success. 178s Attempting to merge 1-5...success. 178s Attempting to merge 1-6...success. 178s Attempting to merge 2-1...success. 178s Attempting to merge 2-2...success. 178s Attempting to merge 2-3...success. 178s Attempting to merge 2-4...success. 178s Attempting to merge 2-5...success. 178s Attempting to merge 2-6...success. 178s Attempting to merge 3-1...success. 178s Attempting to merge 3-2...success. 178s Attempting to merge 3-3...success. 178s Attempting to merge 3-4...success. 178s Attempting to merge 3-5...success. 178s Attempting to merge 3-6...success. 178s Attempting to merge 4-1...success. 178s Attempting to merge 4-2...success. 178s Attempting to merge 4-3...conflict. 178s Attempting to merge 5-1...success. 178s Attempting to merge 5-2...success. 178s Attempting to merge 6-1...success. 178s Attempting to merge 6-2...success. 178s Attempting to merge 7-1...success. 178s Attempting to merge 7-2...success. 179s Attempting to merge 8-1...success. 179s Attempting to merge 8-2...success. 179s Attempting to merge 9-1...success. 179s Attempting to merge 9-2...success. 179s Previous HEAD position was 468d152 imerge 'c-d': automatic merge 9-2 179s Switched to branch 'imerge/c-d' 179s Auto-merging conflict.txt 179s CONFLICT (content): Merge conflict in conflict.txt 179s Automatic merge failed; fix conflicts and then commit the result. 179s 179s Original first commit: 179s commit 3c091ded129a5edf9061360bab867edade996c93 179s Author: Loú User 179s Date: Thu Apr 7 22:13:18 2005 +0000 179s 179s c⇒4 179s 179s Original second commit: 179s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 179s Author: Loú User 179s Date: Thu Apr 7 22:13:26 2005 +0000 179s 179s d⇒3 179s 179s There was a conflict merging commit 4-3, shown above. 179s Please resolve the conflict, commit the result, then type 179s 179s git-imerge continue 179s + grep -q Traceback start.out 179s + grep -q suggest manual merge of 4-3 autofill.out 179s + git-imerge diagram --commits --frontier --html=imerge3.html 179s 0 5 9 179s | | | 179s 0 - ********** - c 179s *......... 179s *......... 179s *...#????? 179s *...?????? 179s 5 - *...?????? 179s 6 - *...?????? 179s | 179s d 179s 179s 0 5 9 179s | | | 179s 0 - ********** - c 179s *........| 179s *...-----+ 179s *..|#????? 179s *..|?????? 179s 5 - *..|?????? 179s 6 - *--+?????? 179s | 179s d 179s 179s Key: 179s |,-,+ = rectangles forming current merge frontier 179s * = merge done manually 179s . = merge done automatically 179s # = conflict that is currently blocking progress 179s @ = merge was blocked but has been resolved 179s ? = no merge recorded 179s 179s + echo merged version 179s + git add conflict.txt 179s + GIT_EDITOR=cat git commit 179s imerge 'c-d': manual merge 4-3 179s 179s # Conflicts: 179s # conflict.txt 179s # 179s # It looks like you may be committing a merge. 179s # If this is not correct, please run 179s # git update-ref -d MERGE_HEAD 179s # and try again. 179s 179s 179s # Please enter the commit message for your changes. Lines starting 179s # with '#' will be ignored, and an empty message aborts the commit. 179s # 179s # On branch imerge/c-d 179s # All conflicts fixed but you are still merging. 179s # 179s # Changes to be committed: 179s # modified: conflict.txt 179s # modified: d.txt 179s # 179s [imerge/c-d 30bd0ea] imerge 'c-d': manual merge 4-3 179s + git-imerge continue --edit 179s Merge has been recorded for merge 4-3. 179s Attempting to merge 4-4...success. 179s Attempting to merge 4-5...success. 179s Attempting to merge 4-6...success. 179s Attempting to merge 5-3...success. 179s Attempting to merge 5-4...success. 179s Attempting to merge 5-5...success. 179s Attempting to merge 5-6...success. 179s Attempting to merge 6-3...success. 179s Attempting to merge 6-4...success. 180s Attempting to merge 6-5...success. 180s Attempting to merge 6-6...success. 180s Attempting to merge 7-3...success. 180s Attempting to merge 7-4...success. 180s Attempting to merge 7-5...success. 180s Attempting to merge 7-6...success. 180s Attempting to merge 8-3...success. 180s Attempting to merge 8-4...success. 180s Attempting to merge 8-5...success. 180s Attempting to merge 8-6...success. 180s Attempting to merge 9-3...success. 180s Attempting to merge 9-4...success. 180s Attempting to merge 9-5...success. 180s Attempting to merge 9-6...success. 180s Merge is complete! 180s + git-imerge diagram --commits --frontier --html=imerge4.html 180s 0 5 9 180s | | | 180s 0 - ********** - c 180s *......... 180s *......... 180s *...*..... 180s *......... 180s 5 - *......... 180s 6 - *......... 180s | 180s d 180s 180s 0 5 9 180s | | | 180s 0 - ********** - c 180s *........| 180s *........| 180s *...*....| 180s *........| 180s 5 - *........| 180s 6 - *--------+ 180s | 180s d 180s 180s Key: 180s |,-,+ = rectangles forming current merge frontier 180s * = merge done manually 180s . = merge done automatically 180s # = conflict that is currently blocking progress 180s @ = merge was blocked but has been resolved 180s ? = no merge recorded 180s 180s + git-imerge finish --branch=c-d-full 181s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 181s + local refname=c-d-full 181s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 181s + git rev-parse c-d-full^{tree} 181s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 181s + test_conflict 1-1 181s + local conflict=1-1 181s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s + DESCRIPTION=git-imerge test repository with conflict at 1-1 181s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 181s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s + local description=git-imerge test repository with conflict at 1-1 181s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 181s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s + local description=git-imerge test repository with conflict at 1-1 181s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s hint: Using 'master' as the name for the initial branch. This default branch name 181s hint: is subject to change. To configure the initial branch name to use in all 181s hint: of your new repositories, which will suppress this warning, call: 181s hint: 181s hint: git config --global init.defaultBranch 181s hint: 181s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 181s hint: 'development'. The just-created branch can be renamed via this command: 181s hint: 181s hint: git branch -m 181s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1/.git/ 181s [master (root-commit) d70e04b] m⇒0 181s 3 files changed, 3 insertions(+) 181s create mode 100644 c.txt 181s create mode 100644 conflict.txt 181s create mode 100644 d.txt 181s + echo git-imerge test repository with conflict at 1-1 181s + printf %s\n /*.out /*.css /*.html 181s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1/.git config user.name Loú User 181s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 181s + TIME=1112911993 181s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-1 181s + modify c.txt 0 181s + filename=c.txt 181s + text=0 181s + echo 0 181s + git add c.txt 181s + modify d.txt 0 181s + filename=d.txt 181s + text=0 181s + echo 0 181s + git add d.txt 181s + modify conflict.txt original version 181s + filename=conflict.txt 181s + text=original version 181s + echo original version 181s + git add conflict.txt 181s + commit -m m⇒0 181s + TIME=1112911994 181s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 181s + git checkout -b c master -- 181s Switched to a new branch 'c' 181s + seq 9 181s + modify c.txt 1 181s + filename=c.txt 181s + text=1 181s + echo 1 181s + git add c.txt 181s + modify conflict.txt c version 181s + filename=conflict.txt 181s + text=c version 181s + echo c version 181s + git add conflict.txt 181s + commit -m c⇒1 181s + TIME=1112911995 181s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 181s [c 2120f40] c⇒1 181s 2 files changed, 2 insertions(+), 2 deletions(-) 181s + modify c.txt 2 181s + filename=c.txt 181s + text=2 181s + echo 2 181s + git add c.txt 181s + commit -m c⇒2 181s + TIME=1112911996 181s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 181s [c 90cc7de] c⇒2 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify c.txt 3 181s + filename=c.txt 181s + text=3 181s + echo 3 181s + git add c.txt 181s + commit -m c⇒3 181s + TIME=1112911997 181s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 181s [c 2046ed2] c⇒3 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify c.txt 4 181s + filename=c.txt 181s + text=4 181s + echo 4 181s + git add c.txt 181s + commit -m c⇒4 181s + TIME=1112911998 181s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 181s [c 8a2cee9] c⇒4 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify c.txt 5 181s + filename=c.txt 181s + text=5 181s + echo 5 181s + git add c.txt 181s + commit -m c⇒5 181s + TIME=1112911999 181s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 181s [c ac16a05] c⇒5 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify c.txt 6 181s + filename=c.txt 181s + text=6 181s + echo 6 181s + git add c.txt 181s + commit -m c⇒6 181s + TIME=1112912000 181s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 181s [c 30dd2ae] c⇒6 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify c.txt 7 181s + filename=c.txt 181s + text=7 181s + echo 7 181s + git add c.txt 181s + commit -m c⇒7 181s [c 0883eb9] c⇒7 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + TIME=1112912001 181s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 181s + modify c.txt 8 181s + filename=c.txt 181s + text=8 181s + echo 8 181s + git add c.txt 181s + commit -m c⇒8 181s + TIME=1112912002 181s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 181s [c f661c06] c⇒8 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify c.txt 9 181s + filename=c.txt 181s + text=9 181s + echo 9 181s + git add c.txt 181s + commit -m c⇒9 181s + TIME=1112912003 181s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 181s [c 243e8ed] c⇒9 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + git checkout -b d master -- 181s Switched to a new branch 'd' 181s + seq 6 181s + modify d.txt 1 181s + filename=d.txt 181s + text=1 181s + echo 1 181s + git add d.txt 181s + modify conflict.txt d version 181s + filename=conflict.txt 181s + text=d version 181s + echo d version 181s + git add conflict.txt 181s + commit -m d⇒1 181s + TIME=1112912004 181s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 181s [d ac0427a] d⇒1 181s 2 files changed, 2 insertions(+), 2 deletions(-) 181s + modify d.txt 2 181s + filename=d.txt 181s + text=2 181s + echo 2 181s + git add d.txt 181s + commit -m d⇒2 181s + TIME=1112912005 181s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 181s [d 43c38c0] d⇒2 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify d.txt 3 181s + filename=d.txt 181s + text=3 181s + echo 3 181s + git add d.txt 181s + commit -m d⇒3 181s + TIME=1112912006 181s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 181s [d 0260058] d⇒3 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify d.txt 4 181s + filename=d.txt 181s + text=4 181s + echo 4 181s + git add d.txt 181s + commit -m d⇒4 181s + TIME=1112912007 181s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 181s [d 40fef44] d⇒4 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify d.txt 5 181s + filename=d.txt 181s + text=5 181s + echo 5 181s + git add d.txt 181s + commit -m d⇒5 181s + TIME=1112912008 181s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 181s [d b080a65] d⇒5 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + modify d.txt 6 181s + filename=d.txt 181s + text=6 181s + echo 6 181s + git add d.txt 181s + commit -m d⇒6 181s + TIME=1112912009 181s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 181s [d 200ce5c] d⇒6 181s 1 file changed, 1 insertion(+), 1 deletion(-) 181s + git checkout c 181s Switched to branch 'c' 181s + git-imerge init --name=c-d d 181s + git-imerge list 181s * c-d 181s + git-imerge diagram --commits --frontier --html=imerge0.html 182s 0 5 9 182s | | | 182s 0 - ********** - c 182s *????????? 182s *????????? 182s *????????? 182s *????????? 182s 5 - *????????? 182s 6 - *????????? 182s | 182s d 182s 182s 0 5 9 182s | | | 182s 0 - ********** - c 182s *????????? 182s *????????? 182s *????????? 182s *????????? 182s 5 - *????????? 182s 6 - *????????? 182s | 182s d 182s 182s Key: 182s |,-,+ = rectangles forming current merge frontier 182s * = merge done manually 182s . = merge done automatically 182s # = conflict that is currently blocking progress 182s @ = merge was blocked but has been resolved 182s ? = no merge recorded 182s 182s + + git-imerge autofilltee 182s autofill.out 182s Attempting automerge of 9-6...failure. 182s Attempting automerge of 1-1...failure. 182s HEAD is now at 243e8ed c⇒9 182s No progress was possible; suggest manual merge of 1-1 182s + grep -q Traceback autofill.out 182s + grep -q suggest manual merge of 1-1 autofill.out 182s + git-imerge diagram --commits --frontier --html=imerge1.html 182s 0 5 9 182s | | | 182s 0 - ********** - c 182s *#???????? 182s *????????? 182s *????????? 182s *????????? 182s 5 - *????????? 182s 6 - *????????? 182s | 182s d 182s 182s 0 5 9 182s | | | 182s 0 - ********** - c 182s *#???????? 182s *????????? 182s *????????? 182s *????????? 182s 5 - *????????? 182s 6 - *????????? 182s | 182s d 182s 182s Key: 182s |,-,+ = rectangles forming current merge frontier 182s * = merge done manually 182s . = merge done automatically 182s # = conflict that is currently blocking progress 182s @ = merge was blocked but has been resolved 182s ? = no merge recorded 182s 182s + git-imerge continue --edit 182s Switched to branch 'imerge/c-d' 182s Auto-merging conflict.txt 182s CONFLICT (content): Merge conflict in conflict.txt 182s Automatic merge failed; fix conflicts and then commit the result. 182s 182s Original first commit: 182s 182s Original second commit: 182s 182s There was a conflict merging commit 1-1, shown above. 182s Please resolve the conflict, commit the result, then type 182s 182s git-imerge continue 182s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 182s Author: Loú User 182s Date: Thu Apr 7 22:13:15 2005 +0000 182s 182s c⇒1 182s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 182s Author: Loú User 182s Date: Thu Apr 7 22:13:24 2005 +0000 182s 182s d⇒1 182s + echo merged version 182s + git add conflict.txt 182s + git-imerge continue --no-edit 183s [imerge/c-d 1363770] imerge 'c-d': manual merge 1-1 183s Merge has been recorded for merge 1-1. 183s Attempting automerge of 1-6...success. 183s Autofilling 1-2...success. 183s Autofilling 1-3...success. 183s Autofilling 1-4...success. 183s Autofilling 1-5...success. 183s Autofilling 1-6...success. 183s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 183s Attempting automerge of 9-6...success. 183s Autofilling 2-6...success. 183s Autofilling 3-6...success. 183s Autofilling 4-6...success. 183s Autofilling 5-6...success. 183s Autofilling 6-6...success. 183s Autofilling 7-6...success. 183s Autofilling 8-6...success. 183s Autofilling 9-1...success. 183s Autofilling 9-2...success. 183s Autofilling 9-3...success. 183s Autofilling 9-4...success. 183s Autofilling 9-5...success. 183s Autofilling 9-6 (first way)...success. 183s Autofilling 9-6 (second way)...success. 183s The two ways of autofilling 9-6 agree. 183s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 183s Merge is complete! 183s + git-imerge diagram --commits --frontier --html=imerge2.html 183s 0 5 9 183s | | | 183s 0 - ********** - c 183s **???????. 183s *.???????. 183s *.???????. 183s *.???????. 183s 5 - *.???????. 183s 6 - *......... 183s | 183s d 183s 183s 0 5 9 183s | | | 183s 0 - ********** - c 183s **???????| 183s *.???????| 183s *.???????| 183s *.???????| 183s 5 - *.???????| 183s 6 - *--------+ 183s | 183s d 183s 183s Key: 183s |,-,+ = rectangles forming current merge frontier 183s * = merge done manually 183s . = merge done automatically 183s # = conflict that is currently blocking progress 183s @ = merge was blocked but has been resolved 183s ? = no merge recorded 183s 184s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 184s Merge d into c (using imerge) 184s 184s # Please enter the commit message for your changes. Lines starting 184s # with '#' will be ignored, and an empty message aborts the commit. 184s # 184s # Date: Wed Mar 20 10:14:06 2024 +0000 184s # 184s # On branch c-d-merge 184s # Changes to be committed: 184s # modified: conflict.txt 184s # modified: d.txt 184s # 184s [c-d-merge b6d7ed7] Merge d into c (using imerge) 184s Date: Wed Mar 20 10:14:06 2024 +0000 184s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + local refname=c-d-merge 184s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git rev-parse c-d-merge^{tree} 184s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git-imerge simplify --goal=rebase --branch=c-d-rebase 184s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + local refname=c-d-rebase 184s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git rev-parse c-d-rebase^{tree} 184s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 185s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + local refname=c-d-rebase-with-history 185s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git rev-parse c-d-rebase-with-history^{tree} 185s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git-imerge simplify --goal=border --branch=c-d-border 185s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + local refname=c-d-border 185s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git rev-parse c-d-border^{tree} 185s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 185s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + local refname=c-d-border-with-history 185s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git rev-parse c-d-border-with-history^{tree} 185s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 186s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 186s + local refname=c-d-border-with-history2 186s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 186s + git rev-parse c-d-border-with-history2^{tree} 186s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 186s + git-imerge remove 186s + git checkout c 186s Switched to branch 'c' 186s + git-imerge+ start --goal=full --first-parent --name=c-d d 186s tee start.out 186s Attempting to merge 1-1...conflict. 186s Switched to branch 'imerge/c-d' 186s Auto-merging conflict.txt 186s CONFLICT (content): Merge conflict in conflict.txt 186s Automatic merge failed; fix conflicts and then commit the result. 186s 186s Original first commit: 186s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 186s Author: Loú User 186s Date: Thu Apr 7 22:13:15 2005 +0000 186s 186s c⇒1 186s 186s Original second commit: 186s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 186s Author: Loú User 186s Date: Thu Apr 7 22:13:24 2005 +0000 186s 186s d⇒1 186s 186s There was a conflict merging commit 1-1, shown above. 186s Please resolve the conflict, commit the result, then type 186s 186s git-imerge continue 186s + grep -q Traceback start.out 186s + grep -q suggest manual merge of 1-1 autofill.out 186s + git-imerge diagram --commits --frontier --html=imerge3.html 187s 0 5 9 187s | | | 187s 0 - ********** - c 187s *#???????? 187s *????????? 187s *????????? 187s *????????? 187s 5 - *????????? 187s 6 - *????????? 187s | 187s d 187s 187s 0 5 9 187s | | | 187s 0 - ********** - c 187s *#???????? 187s *????????? 187s *????????? 187s *????????? 187s 5 - *????????? 187s 6 - *????????? 187s | 187s d 187s 187s Key: 187s |,-,+ = rectangles forming current merge frontier 187s * = merge done manually 187s . = merge done automatically 187s # = conflict that is currently blocking progress 187s @ = merge was blocked but has been resolved 187s ? = no merge recorded 187s 187s + echo merged version 187s + git add conflict.txt 187s + GIT_EDITOR=cat git commit 187s imerge 'c-d': manual merge 1-1 187s 187s # Conflicts: 187s # conflict.txt 187s # 187s # It looks like you may be committing a merge. 187s # If this is not correct, please run 187s # git update-ref -d MERGE_HEAD 187s # and try again. 187s 187s 187s # Please enter the commit message for your changes. Lines starting 187s # with '#' will be ignored, and an empty message aborts the commit. 187s # 187s # On branch imerge/c-d 187s # All conflicts fixed but you are still merging. 187s # 187s # Changes to be committed: 187s # modified: conflict.txt 187s # modified: d.txt 187s # 187s [imerge/c-d 5c9fd23] imerge 'c-d': manual merge 1-1 187s + git-imerge continue --edit 187s Merge has been recorded for merge 1-1. 187s Attempting to merge 1-2...success. 187s Attempting to merge 1-3...success. 187s Attempting to merge 1-4...success. 187s Attempting to merge 1-5...success. 187s Attempting to merge 1-6...success. 187s Attempting to merge 2-1...success. 187s Attempting to merge 2-2...success. 187s Attempting to merge 2-3...success. 187s Attempting to merge 2-4...success. 187s Attempting to merge 2-5...success. 187s Attempting to merge 2-6...success. 187s Attempting to merge 3-1...success. 187s Attempting to merge 3-2...success. 187s Attempting to merge 3-3...success. 187s Attempting to merge 3-4...success. 187s Attempting to merge 3-5...success. 188s Attempting to merge 3-6...success. 188s Attempting to merge 4-1...success. 188s Attempting to merge 4-2...success. 188s Attempting to merge 4-3...success. 188s Attempting to merge 4-4...success. 188s Attempting to merge 4-5...success. 188s Attempting to merge 4-6...success. 188s Attempting to merge 5-1...success. 188s Attempting to merge 5-2...success. 188s Attempting to merge 5-3...success. 188s Attempting to merge 5-4...success. 188s Attempting to merge 5-5...success. 188s Attempting to merge 5-6...success. 188s Attempting to merge 6-1...success. 188s Attempting to merge 6-2...success. 188s Attempting to merge 6-3...success. 188s Attempting to merge 6-4...success. 188s Attempting to merge 6-5...success. 188s Attempting to merge 6-6...success. 188s Attempting to merge 7-1...success. 188s Attempting to merge 7-2...success. 188s Attempting to merge 7-3...success. 188s Attempting to merge 7-4...success. 188s Attempting to merge 7-5...success. 188s Attempting to merge 7-6...success. 188s Attempting to merge 8-1...success. 188s Attempting to merge 8-2...success. 188s Attempting to merge 8-3...success. 188s Attempting to merge 8-4...success. 189s Attempting to merge 8-5...success. 189s Attempting to merge 8-6...success. 189s Attempting to merge 9-1...success. 189s Attempting to merge 9-2...success. 189s Attempting to merge 9-3...success. 189s Attempting to merge 9-4...success. 189s Attempting to merge 9-5...success. 189s Attempting to merge 9-6...success. 189s Merge is complete! 189s + git-imerge diagram --commits --frontier --html=imerge4.html 189s 0 5 9 189s | | | 189s 0 - ********** - c 189s **........ 189s *......... 189s *......... 189s *......... 189s 5 - *......... 189s 6 - *......... 189s | 189s d 189s 189s 0 5 9 189s | | | 189s 0 - ********** - c 189s **.......| 189s *........| 189s *........| 189s *........| 189s 5 - *........| 189s 6 - *--------+ 189s | 189s d 189s 189s Key: 189s |,-,+ = rectangles forming current merge frontier 189s * = merge done manually 189s . = merge done automatically 189s # = conflict that is currently blocking progress 189s @ = merge was blocked but has been resolved 189s ? = no merge recorded 189s 189s + git-imerge finish --branch=c-d-full 189s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + local refname=c-d-full 189s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + git rev-parse c-d-full^{tree} 189s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + test_conflict 9-1 189s + local conflict=9-1 189s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s + DESCRIPTION=git-imerge test repository with conflict at 9-1 189s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 189s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s + local description=git-imerge test repository with conflict at 9-1 189s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 189s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s + local description=git-imerge test repository with conflict at 9-1 189s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s hint: Using 'master' as the name for the initial branch. This default branch name 189s hint: is subject to change. To configure the initial branch name to use in all 189s hint: of your new repositories, which will suppress this warning, call: 189s hint: 189s hint: git config --global init.defaultBranch 189s hint: 189s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 189s hint: 'development'. The just-created branch can be renamed via this command: 189s hint: 189s hint: git branch -m 189s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1/.git/ 189s + echo git-imerge test repository with conflict at 9-1 189s + printf %s\n /*.out /*.css /*.html 189s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1/.git config user.name Loú User 189s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 189s + TIME=1112911993 189s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-1 189s + modify c.txt 0 189s + filename=c.txt 189s + text=0 189s + echo 0 189s + git add c.txt 189s + modify d.txt 0 189s + filename=d.txt 189s + text=0 189s + echo 0 189s + git add d.txt 189s + modify conflict.txt original version 189s + filename=conflict.txt 189s + text=original version 189s + echo original version 189s + git add conflict.txt 189s + commit -m m⇒0 189s + TIME=1112911994 189s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 189s + git checkout -b c master -- 189s [master (root-commit) d70e04b] m⇒0 189s 3 files changed, 3 insertions(+) 189s create mode 100644 c.txt 189s create mode 100644 conflict.txt 189s create mode 100644 d.txt 189s Switched to a new branch 'c' 189s + seq 9 189s + modify c.txt 1 189s + filename=c.txt 189s + text=1 189s + echo 1 189s + git add c.txt 189s + commit -m c⇒1 189s + TIME=1112911995 189s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 189s [c 89e2141] c⇒1 189s 1 file changed, 1 insertion(+), 1 deletion(-) 189s + modify c.txt 2 189s + filename=c.txt 189s + text=2 189s + echo 2 189s + git add c.txt 189s + commit -m c⇒2 189s + TIME=1112911996 189s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 189s [c 7c431f2] c⇒2 189s 1 file changed, 1 insertion(+), 1 deletion(-) 189s + modify c.txt 3 189s + filename=c.txt 189s + text=3 189s + echo 3 189s + git add c.txt 189s + commit -m c⇒3 189s + TIME=1112911997 189s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 189s [c f02ab24] c⇒3 189s 1 file changed, 1 insertion(+), 1 deletion(-) 189s + modify c.txt 4 189s + filename=c.txt 189s + text=4 189s + echo 4 189s + git add c.txt 189s + commit -m c⇒4 189s + TIME=1112911998 189s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 190s [c ed9122f] c⇒4 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify c.txt 5 190s + filename=c.txt 190s + text=5 190s + echo 5 190s + git add c.txt 190s + commit -m c⇒5 190s + TIME=1112911999 190s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 190s [c 1d3bf09] c⇒5 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify c.txt 6 190s + filename=c.txt 190s + text=6 190s + echo 6 190s + git add c.txt 190s + commit -m c⇒6 190s + TIME=1112912000 190s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 190s [c f999ecd] c⇒6 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify c.txt 7 190s + filename=c.txt 190s + text=7 190s + echo 7 190s + git add c.txt 190s + commit -m c⇒7 190s + TIME=1112912001 190s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 190s [c 7050a8a] c⇒7 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify c.txt 8 190s + filename=c.txt 190s + text=8 190s + echo 8 190s + git add c.txt 190s + commit -m c⇒8 190s + TIME=1112912002 190s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 190s [c 9732e77] c⇒8 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify c.txt 9 190s + filename=c.txt 190s + text=9 190s + echo 9 190s + git add c.txt 190s + modify conflict.txt c version 190s + filename=conflict.txt 190s + text=c version 190s + echo c version 190s + git add conflict.txt 190s + commit -m c⇒9 190s + TIME=1112912003 190s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 190s [c 73a5eed] c⇒9 190s 2 files changed, 2 insertions(+), 2 deletions(-) 190s + git checkout -b d master -- 190s Switched to a new branch 'd' 190s + seq 6 190s + modify d.txt 1 190s + filename=d.txt 190s + text=1 190s + echo 1 190s + git add d.txt 190s + modify conflict.txt d version 190s + filename=conflict.txt 190s + text=d version 190s + echo d version 190s + git add conflict.txt 190s + commit -m d⇒1 190s + TIME=1112912004 190s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 190s [d ac0427a] d⇒1 190s 2 files changed, 2 insertions(+), 2 deletions(-) 190s + modify d.txt 2 190s + filename=d.txt 190s + text=2 190s + echo 2 190s + git add d.txt 190s + commit -m d⇒2 190s + TIME=1112912005 190s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 190s [d 43c38c0] d⇒2 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify d.txt 3 190s + filename=d.txt 190s + text=3 190s + echo 3 190s + git add d.txt 190s + commit -m d⇒3 190s + TIME=1112912006 190s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 190s [d 0260058] d⇒3 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify d.txt 4 190s + filename=d.txt 190s + text=4 190s + echo 4 190s + git add d.txt 190s + commit -m d⇒4 190s + TIME=1112912007 190s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 190s [d 40fef44] d⇒4 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify d.txt 5 190s + filename=d.txt 190s + text=5 190s + echo 5 190s + git add d.txt 190s + commit -m d⇒5 190s + TIME=1112912008 190s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 190s [d b080a65] d⇒5 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + modify d.txt 6 190s + filename=d.txt 190s + text=6 190s + echo 6 190s + git add d.txt 190s + commit -m d⇒6 190s + TIME=1112912009 190s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 190s [d 200ce5c] d⇒6 190s 1 file changed, 1 insertion(+), 1 deletion(-) 190s + git checkout c 190s Switched to branch 'c' 190s + git-imerge init --name=c-d d 190s + git-imerge list 190s * c-d 190s + git-imerge diagram --commits --frontier --html=imerge0.html 190s 0 5 9 190s | | | 190s 0 - ********** - c 190s *????????? 190s *????????? 190s *????????? 190s *????????? 190s 5 - *????????? 190s 6 - *????????? 190s | 190s d 190s 190s 0 5 9 190s | | | 190s 0 - ********** - c 190s *????????? 190s *????????? 190s *????????? 190s *????????? 190s 5 - *????????? 190s 6 - *????????? 190s | 190s d 190s 190s Key: 190s |,-,+ = rectangles forming current merge frontier 190s * = merge done manually 190s . = merge done automatically 190s # = conflict that is currently blocking progress 190s @ = merge was blocked but has been resolved 190s ? = no merge recorded 190s 191s + + tee autofill.out 191s git-imerge autofill 191s Attempting automerge of 9-6...failure. 191s Attempting automerge of 1-1...success. 191s Attempting automerge of 1-4...success. 191s Attempting automerge of 1-6...success. 191s Attempting automerge of 9-6...failure. 191s Attempting automerge of 5-6...success. 191s Attempting automerge of 7-6...success. 191s Attempting automerge of 8-6...success. 191s Attempting automerge of 9-1...failure. 191s Autofilling 1-6...success. 191s Autofilling 2-6...success. 191s Autofilling 3-6...success. 191s Autofilling 4-6...success. 191s Autofilling 5-6...success. 191s Autofilling 6-6...success. 191s Autofilling 7-6...success. 191s Autofilling 8-1...success. 191s Autofilling 8-2...success. 191s Autofilling 8-3...success. 191s Autofilling 8-4...success. 191s Autofilling 8-5...success. 191s Autofilling 8-6 (first way)...success. 191s Autofilling 8-6 (second way)...success. 191s The two ways of autofilling 8-6 agree. 191s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 191s Attempting automerge of 9-6...failure. 191s Attempting automerge of 9-1...failure. 192s HEAD is now at 73a5eed c⇒9 192s Conflict; suggest manual merge of 9-1 192s + grep -q Traceback autofill.out 192s + grep -q suggest manual merge of 9-1 autofill.out 192s + git-imerge diagram --commits --frontier --html=imerge1.html 192s 0 5 9 192s | | | 192s 0 - ********** - c 192s *???????.# 192s *???????.? 192s *???????.? 192s *???????.? 192s 5 - *???????.? 192s 6 - *........? 192s | 192s d 192s 192s 0 5 9 192s | | | 192s 0 - ********** - c 192s *???????|# 192s *???????|? 192s *???????|? 192s *???????|? 192s 5 - *???????|? 192s 6 - *-------+? 192s | 192s d 192s 192s Key: 192s |,-,+ = rectangles forming current merge frontier 192s * = merge done manually 192s . = merge done automatically 192s # = conflict that is currently blocking progress 192s @ = merge was blocked but has been resolved 192s ? = no merge recorded 192s 192s + git-imerge continue --edit 192s Switched to branch 'imerge/c-d' 192s Auto-merging conflict.txt 192s CONFLICT (content): Merge conflict in conflict.txt 192s Automatic merge failed; fix conflicts and then commit the result. 192s 192s Original first commit: 192s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 192s Author: Loú User 192s Date: Thu Apr 7 22:13:23 2005 +0000 192s 192s c⇒9 192s 192s Original second commit: 192s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 192s Author: Loú User 192s Date: Thu Apr 7 22:13:24 2005 +0000 192s 192s d⇒1 192s 192s There was a conflict merging commit 9-1, shown above. 192s Please resolve the conflict, commit the result, then type 192s 192s git-imerge continue 192s + echo merged version 192s + git add conflict.txt 192s + git-imerge continue --no-edit 192s [imerge/c-d 0aa778c] imerge 'c-d': manual merge 9-1 192s Merge has been recorded for merge 9-1. 192s Attempting automerge of 9-6...success. 192s Autofilling 9-2...success. 192s Autofilling 9-3...success. 192s Autofilling 9-4...success. 192s Autofilling 9-5...success. 192s Autofilling 9-6...success. 192s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 193s Merge is complete! 193s + git-imerge diagram --commits --frontier --html=imerge2.html 193s 0 5 9 193s | | | 193s 0 - ********** - c 193s *???????.* 193s *???????.. 193s *???????.. 193s *???????.. 193s 5 - *???????.. 193s 6 - *......... 193s | 193s d 193s 193s 0 5 9 193s | | | 193s 0 - ********** - c 193s *???????.* 193s *???????.| 193s *???????.| 193s *???????.| 193s 5 - *???????.| 193s 6 - *--------+ 193s | 193s d 193s 193s Key: 193s |,-,+ = rectangles forming current merge frontier 193s * = merge done manually 193s . = merge done automatically 193s # = conflict that is currently blocking progress 193s @ = merge was blocked but has been resolved 193s ? = no merge recorded 193s 193s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 193s Merge d into c (using imerge) 193s 193s # Please enter the commit message for your changes. Lines starting 193s # with '#' will be ignored, and an empty message aborts the commit. 193s # 193s # Date: Wed Mar 20 10:14:15 2024 +0000 193s # 193s # On branch c-d-merge 193s # Changes to be committed: 193s # modified: conflict.txt 193s # modified: d.txt 193s # 193s [c-d-merge 5bb2a63] Merge d into c (using imerge) 193s Date: Wed Mar 20 10:14:15 2024 +0000 193s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 193s + local refname=c-d-merge 193s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 193s + git rev-parse c-d-merge^{tree} 193s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 193s + git-imerge simplify --goal=rebase --branch=c-d-rebase 193s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 193s + local refname=c-d-rebase 193s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 193s + git rev-parse c-d-rebase^{tree} 193s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 193s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 194s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 194s + local refname=c-d-rebase-with-history 194s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 194s + git rev-parse c-d-rebase-with-history^{tree} 194s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 194s + git-imerge simplify --goal=border --branch=c-d-border 194s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 194s + local refname=c-d-border 194s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 194s + git rev-parse c-d-border^{tree} 194s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 194s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 195s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + local refname=c-d-border-with-history 195s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + git rev-parse c-d-border-with-history^{tree} 195s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 195s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + local refname=c-d-border-with-history2 195s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + git rev-parse c-d-border-with-history2^{tree} 195s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + git-imerge remove 195s + git checkout c 195s Switched to branch 'c' 195s + + git-imerge start --goal=full --first-parent --name=c-d d 195s tee start.out 196s Attempting to merge 1-1...success. 196s Attempting to merge 1-2...success. 196s Attempting to merge 1-3...success. 196s Attempting to merge 1-4...success. 196s Attempting to merge 1-5...success. 196s Attempting to merge 1-6...success. 196s Attempting to merge 2-1...success. 196s Attempting to merge 2-2...success. 196s Attempting to merge 2-3...success. 196s Attempting to merge 2-4...success. 196s Attempting to merge 2-5...success. 196s Attempting to merge 2-6...success. 196s Attempting to merge 3-1...success. 196s Attempting to merge 3-2...success. 196s Attempting to merge 3-3...success. 196s Attempting to merge 3-4...success. 196s Attempting to merge 3-5...success. 196s Attempting to merge 3-6...success. 196s Attempting to merge 4-1...success. 196s Attempting to merge 4-2...success. 196s Attempting to merge 4-3...success. 196s Attempting to merge 4-4...success. 196s Attempting to merge 4-5...success. 196s Attempting to merge 4-6...success. 197s Attempting to merge 5-1...success. 197s Attempting to merge 5-2...success. 197s Attempting to merge 5-3...success. 197s Attempting to merge 5-4...success. 197s Attempting to merge 5-5...success. 197s Attempting to merge 5-6...success. 197s Attempting to merge 6-1...success. 197s Attempting to merge 6-2...success. 197s Attempting to merge 6-3...success. 197s Attempting to merge 6-4...success. 197s Attempting to merge 6-5...success. 197s Attempting to merge 6-6...success. 197s Attempting to merge 7-1...success. 197s Attempting to merge 7-2...success. 197s Attempting to merge 7-3...success. 197s Attempting to merge 7-4...success. 197s Attempting to merge 7-5...success. 197s Attempting to merge 7-6...success. 197s Attempting to merge 8-1...success. 197s Attempting to merge 8-2...success. 197s Attempting to merge 8-3...success. 197s Attempting to merge 8-4...success. 197s Attempting to merge 8-5...success. 197s Attempting to merge 8-6...success. 197s Attempting to merge 9-1...conflict. 197s Switched to branch 'imerge/c-d' 197s Auto-merging conflict.txt 197s CONFLICT (content): Merge conflict in conflict.txt 197s Automatic merge failed; fix conflicts and then commit the result. 197s 197s Original first commit: 197s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 197s Author: Loú User 197s Date: Thu Apr 7 22:13:23 2005 +0000 197s 197s c⇒9 197s 197s Original second commit: 197s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 197s Author: Loú User 197s Date: Thu Apr 7 22:13:24 2005 +0000 197s 197s d⇒1 197s 197s There was a conflict merging commit 9-1, shown above. 197s Please resolve the conflict, commit the result, then type 197s 197s git-imerge continue 197s + grep -q Traceback start.out 197s + grep -q suggest manual merge of 9-1 autofill.out 197s + git-imerge diagram --commits --frontier --html=imerge3.html 198s 0 5 9 198s | | | 198s 0 - ********** - c 198s *........# 198s *........? 198s *........? 198s *........? 198s 5 - *........? 198s 6 - *........? 198s | 198s d 198s 198s 0 5 9 198s | | | 198s 0 - ********** - c 198s *.......|# 198s *.......|? 198s *.......|? 198s *.......|? 198s 5 - *.......|? 198s 6 - *-------+? 198s | 198s d 198s 198s Key: 198s |,-,+ = rectangles forming current merge frontier 198s * = merge done manually 198s . = merge done automatically 198s # = conflict that is currently blocking progress 198s @ = merge was blocked but has been resolved 198s ? = no merge recorded 198s 198s + echo merged version 198s + git add conflict.txt 198s + GIT_EDITOR=cat git commit 198s imerge 'c-d': manual merge 9-1 198s 198s # Conflicts: 198s # conflict.txt 198s # 198s # It looks like you may be committing a merge. 198s # If this is not correct, please run 198s # git update-ref -d MERGE_HEAD 198s # and try again. 198s 198s 198s # Please enter the commit message for your changes. Lines starting 198s # with '#' will be ignored, and an empty message aborts the commit. 198s # 198s # On branch imerge/c-d 198s # All conflicts fixed but you are still merging. 198s # 198s # Changes to be committed: 198s # modified: conflict.txt 198s # modified: d.txt 198s # 198s [imerge/c-d 2972fde] imerge 'c-d': manual merge 9-1 198s + git-imerge continue --edit 198s Merge has been recorded for merge 9-1. 198s Attempting to merge 9-2...success. 198s Attempting to merge 9-3...success. 198s Attempting to merge 9-4...success. 198s Attempting to merge 9-5...success. 198s Attempting to merge 9-6...success. 198s Merge is complete! 198s + git-imerge diagram --commits --frontier --html=imerge4.html 198s 0 5 9 198s | | | 198s 0 - ********** - c 198s *........* 198s *......... 198s *......... 198s *......... 198s 5 - *......... 198s 6 - *......... 198s | 198s d 198s 198s 0 5 9 198s | | | 198s 0 - ********** - c 198s *........* 198s *........| 198s *........| 198s *........| 198s 5 - *........| 198s 6 - *--------+ 198s | 198s d 198s 198s Key: 198s |,-,+ = rectangles forming current merge frontier 198s * = merge done manually 198s . = merge done automatically 198s # = conflict that is currently blocking progress 198s @ = merge was blocked but has been resolved 198s ? = no merge recorded 198s 198s + git-imerge finish --branch=c-d-full 199s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + local refname=c-d-full 199s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git rev-parse c-d-full^{tree} 199s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + test_conflict 1-6 199s + local conflict=1-6 199s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s + DESCRIPTION=git-imerge test repository with conflict at 1-6 199s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 199s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s + local description=git-imerge test repository with conflict at 1-6 199s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 199s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s + local description=git-imerge test repository with conflict at 1-6 199s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s hint: Using 'master' as the name for the initial branch. This default branch name 199s hint: is subject to change. To configure the initial branch name to use in all 199s hint: of your new repositories, which will suppress this warning, call: 199s hint: 199s hint: git config --global init.defaultBranch 199s hint: 199s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 199s hint: 'development'. The just-created branch can be renamed via this command: 199s hint: 199s hint: git branch -m 199s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6/.git/ 199s + echo git-imerge test repository with conflict at 1-6 199s + printf %s\n /*.out /*.css /*.html 199s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6/.git config user.name Loú User 199s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 199s + TIME=1112911993 199s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s [master (root-commit) d70e04b] m⇒0 199s 3 files changed, 3 insertions(+) 199s create mode 100644 c.txt 199s create mode 100644 conflict.txt 199s create mode 100644 d.txt 199s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-6 199s + modify c.txt 0 199s + filename=c.txt 199s + text=0 199s + echo 0 199s + git add c.txt 199s + modify d.txt 0 199s + filename=d.txt 199s + text=0 199s + echo 0 199s + git add d.txt 199s + modify conflict.txt original version 199s + filename=conflict.txt 199s + text=original version 199s + echo original version 199s + git add conflict.txt 199s + commit -m m⇒0 199s + TIME=1112911994 199s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 199s + git checkout -b c master -- 199s Switched to a new branch 'c' 199s + seq 9 199s + modify c.txt 1 199s + filename=c.txt 199s + text=1 199s + echo 1 199s + git add c.txt 199s + modify conflict.txt c version 199s + filename=conflict.txt 199s + text=c version 199s + echo c version 199s + git add conflict.txt 199s + commit -m c⇒1 199s + TIME=1112911995 199s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 199s [c 2120f40] c⇒1 199s 2 files changed, 2 insertions(+), 2 deletions(-) 199s + modify c.txt 2 199s + filename=c.txt 199s + text=2 199s + echo 2 199s + git add c.txt 199s + commit -m c⇒2 199s + TIME=1112911996 199s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 199s [c 90cc7de] c⇒2 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify c.txt 3 199s + filename=c.txt 199s + text=3 199s + echo 3 199s + git add c.txt 199s + commit -m c⇒3 199s + TIME=1112911997 199s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 199s [c 2046ed2] c⇒3 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify c.txt 4 199s + filename=c.txt 199s + text=4 199s + echo 4 199s + git add c.txt 199s + commit -m c⇒4 199s + TIME=1112911998 199s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 199s [c 8a2cee9] c⇒4 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify c.txt 5 199s + filename=c.txt 199s + text=5 199s + echo 5 199s + git add c.txt 199s + commit -m c⇒5 199s + TIME=1112911999 199s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 199s [c ac16a05] c⇒5 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify c.txt 6 199s + filename=c.txt 199s + text=6 199s + echo 6 199s + git add c.txt 199s + commit -m c⇒6 199s + TIME=1112912000 199s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 199s [c 30dd2ae] c⇒6 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify c.txt 7 199s + filename=c.txt 199s + text=7 199s + echo 7 199s + git add c.txt 199s + commit -m c⇒7 199s + TIME=1112912001 199s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 199s [c 0883eb9] c⇒7 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify c.txt 8 199s + filename=c.txt 199s + text=8 199s + echo 8 199s + git add c.txt 199s + commit -m c⇒8 199s + TIME=1112912002 199s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 199s [c f661c06] c⇒8 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify c.txt 9 199s + filename=c.txt 199s + text=9 199s + echo 9 199s + git add c.txt 199s + commit -m c⇒9 199s + TIME=1112912003 199s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 199s [c 243e8ed] c⇒9 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + git checkout -b d master -- 199s Switched to a new branch 'd' 199s + seq 6 199s + modify d.txt 1 199s + filename=d.txt 199s + text=1 199s + echo 1 199s + git add d.txt 199s + commit -m d⇒1 199s + TIME=1112912004 199s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 199s [d bd5368a] d⇒1 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify d.txt 2 199s + filename=d.txt 199s + text=2 199s + echo 2 199s + git add d.txt 199s + commit -m d⇒2 199s + TIME=1112912005 199s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 199s [d 93e27e6] d⇒2 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify d.txt 3 199s + filename=d.txt 199s + text=3 199s + echo 3 199s + git add d.txt 199s + commit -m d⇒3 199s + TIME=1112912006 199s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 199s [d 133f385] d⇒3 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify d.txt 4 199s + filename=d.txt 199s + text=4 199s + echo 4 199s + git add d.txt 199s [d 586472a] d⇒4 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + commit -m d⇒4 199s + TIME=1112912007 199s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 199s + modify d.txt 5 199s + filename=d.txt 199s + text=5 199s + echo 5 199s + git add d.txt 199s + commit -m d⇒5 199s + TIME=1112912008 199s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 199s [d 9522207] d⇒5 199s 1 file changed, 1 insertion(+), 1 deletion(-) 199s + modify d.txt 6 199s + filename=d.txt 199s + text=6 199s + echo 6 199s + git add d.txt 199s + modify conflict.txt d version 199s + filename=conflict.txt 199s + text=d version 199s + echo d version 199s + git add conflict.txt 199s + commit -m d⇒6 199s + TIME=1112912009 199s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 199s [d f7e451a] d⇒6 199s 2 files changed, 2 insertions(+), 2 deletions(-) 199s + git checkout c 199s Switched to branch 'c' 199s + git-imerge init --name=c-d d 199s + git-imerge list 200s * c-d 200s + git-imerge diagram --commits --frontier --html=imerge0.html 200s 0 5 9 200s | | | 200s 0 - ********** - c 200s *????????? 200s *????????? 200s *????????? 200s *????????? 200s 5 - *????????? 200s 6 - *????????? 200s | 200s d 200s 200s 0 5 9 200s | | | 200s 0 - ********** - c 200s *????????? 200s *????????? 200s *????????? 200s *????????? 200s 5 - *????????? 200s 6 - *????????? 200s | 200s d 200s 200s Key: 200s |,-,+ = rectangles forming current merge frontier 200s * = merge done manually 200s . = merge done automatically 200s # = conflict that is currently blocking progress 200s @ = merge was blocked but has been resolved 200s ? = no merge recorded 200s 200s + + tee autofill.out 200s git-imerge autofill 200s Attempting automerge of 9-6...failure. 200s Attempting automerge of 1-1...success. 200s Attempting automerge of 1-4...success. 200s Attempting automerge of 1-6...failure. 200s Attempting automerge of 1-5...success. 200s Attempting automerge of 9-5...success. 200s Autofilling 1-5...success. 200s Autofilling 2-5...success. 200s Autofilling 3-5...success. 200s Autofilling 4-5...success. 200s Autofilling 5-5...success. 200s Autofilling 6-5...success. 200s Autofilling 7-5...success. 200s Autofilling 8-5...success. 200s Autofilling 9-1...success. 201s Autofilling 9-2...success. 201s Autofilling 9-3...success. 201s Autofilling 9-4...success. 201s Autofilling 9-5 (first way)...success. 201s Autofilling 9-5 (second way)...success. 201s The two ways of autofilling 9-5 agree. 201s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 201s Attempting automerge of 9-6...failure. 201s Attempting automerge of 1-6...failure. 201s HEAD is now at 243e8ed c⇒9 201s Conflict; suggest manual merge of 1-6 201s + grep -q Traceback autofill.out 201s + grep -q suggest manual merge of 1-6 autofill.out 201s + git-imerge diagram --commits --frontier --html=imerge1.html 201s 0 5 9 201s | | | 201s 0 - ********** - c 201s *????????. 201s *????????. 201s *????????. 201s *????????. 201s 5 - *......... 201s 6 - *#???????? 201s | 201s d 201s 201s 0 5 9 201s | | | 201s 0 - ********** - c 201s *????????| 201s *????????| 201s *????????| 201s *????????| 201s 5 - *--------+ 201s 6 - *#???????? 201s | 201s d 201s 201s Key: 201s |,-,+ = rectangles forming current merge frontier 201s * = merge done manually 201s . = merge done automatically 201s # = conflict that is currently blocking progress 201s @ = merge was blocked but has been resolved 201s ? = no merge recorded 201s 201s + git-imerge continue --edit 201s Switched to branch 'imerge/c-d' 201s Auto-merging conflict.txt 201s CONFLICT (content): Merge conflict in conflict.txt 201s Automatic merge failed; fix conflicts and then commit the result. 201s 201s Original first commit: 201s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 201s Author: Loú User 201s Date: Thu Apr 7 22:13:15 2005 +0000 201s 201s c⇒1 201s 201s Original second commit: 201s commit f7e451a6c9656dda15641a9fbc591a602f158692 201s Author: Loú User 201s Date: Thu Apr 7 22:13:29 2005 +0000 201s 201s d⇒6 201s 201s There was a conflict merging commit 1-6, shown above. 201s Please resolve the conflict, commit the result, then type 201s 201s git-imerge continue 201s + echo merged version 201s + git add conflict.txt 201s + git-imerge continue --no-edit 202s [imerge/c-d 28593bc] imerge 'c-d': manual merge 1-6 202s Merge has been recorded for merge 1-6. 202s Attempting automerge of 9-6...success. 202s Autofilling 2-6...success. 202s Autofilling 3-6...success. 202s Autofilling 4-6...success. 202s Autofilling 5-6...success. 202s Autofilling 6-6...success. 202s Autofilling 7-6...success. 202s Autofilling 8-6...success. 202s Autofilling 9-6...success. 202s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 202s Merge is complete! 202s + git-imerge diagram --commits --frontier --html=imerge2.html 202s 0 5 9 202s | | | 202s 0 - ********** - c 202s *????????. 202s *????????. 202s *????????. 202s *????????. 202s 5 - *......... 202s 6 - **........ 202s | 202s d 202s 202s 0 5 9 202s | | | 202s 0 - ********** - c 202s *????????| 202s *????????| 202s *????????| 202s *????????| 202s 5 - *........| 202s 6 - **-------+ 202s | 202s d 202s 202s Key: 202s |,-,+ = rectangles forming current merge frontier 202s * = merge done manually 202s . = merge done automatically 202s # = conflict that is currently blocking progress 202s @ = merge was blocked but has been resolved 202s ? = no merge recorded 202s 202s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 202s Merge d into c (using imerge) 202s 202s # Please enter the commit message for your changes. Lines starting 202s # with '#' will be ignored, and an empty message aborts the commit. 202s # 202s # Date: Wed Mar 20 10:14:24 2024 +0000 202s # 202s # On branch c-d-merge 202s # Changes to be committed: 202s # modified: conflict.txt 202s # modified: d.txt 202s # 202s [c-d-merge 0742180] Merge d into c (using imerge) 202s Date: Wed Mar 20 10:14:24 2024 +0000 202s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 202s + local refname=c-d-merge 202s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 202s + git rev-parse c-d-merge^{tree} 202s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 202s + git-imerge simplify --goal=rebase --branch=c-d-rebase 203s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 203s + local refname=c-d-rebase 203s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 203s + git rev-parse c-d-rebase^{tree} 203s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 203s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 203s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 203s + local refname=c-d-rebase-with-history 203s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 203s + git rev-parse c-d-rebase-with-history^{tree} 203s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 203s + git-imerge simplify --goal=border --branch=c-d-border 204s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + local refname=c-d-border 204s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + git rev-parse c-d-border^{tree} 204s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 204s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + local refname=c-d-border-with-history 204s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + git rev-parse c-d-border-with-history^{tree} 204s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 204s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + local refname=c-d-border-with-history2 204s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + git rev-parse c-d-border-with-history2^{tree} 204s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 204s + git-imerge remove 205s + git checkout c 205s Switched to branch 'c' 205s + + tee start.out 205s git-imerge start --goal=full --first-parent --name=c-d d 205s Attempting to merge 1-1...success. 205s Attempting to merge 1-2...success. 205s Attempting to merge 1-3...success. 205s Attempting to merge 1-4...success. 205s Attempting to merge 1-5...success. 205s Attempting to merge 1-6...conflict. 205s Attempting to merge 2-1...success. 205s Attempting to merge 2-2...success. 205s Attempting to merge 2-3...success. 205s Attempting to merge 2-4...success. 205s Attempting to merge 2-5...success. 205s Attempting to merge 3-1...success. 205s Attempting to merge 3-2...success. 205s Attempting to merge 3-3...success. 205s Attempting to merge 3-4...success. 205s Attempting to merge 3-5...success. 205s Attempting to merge 4-1...success. 205s Attempting to merge 4-2...success. 206s Attempting to merge 4-3...success. 206s Attempting to merge 4-4...success. 206s Attempting to merge 4-5...success. 206s Attempting to merge 5-1...success. 206s Attempting to merge 5-2...success. 206s Attempting to merge 5-3...success. 206s Attempting to merge 5-4...success. 206s Attempting to merge 5-5...success. 206s Attempting to merge 6-1...success. 206s Attempting to merge 6-2...success. 206s Attempting to merge 6-3...success. 206s Attempting to merge 6-4...success. 206s Attempting to merge 6-5...success. 206s Attempting to merge 7-1...success. 206s Attempting to merge 7-2...success. 206s Attempting to merge 7-3...success. 206s Attempting to merge 7-4...success. 206s Attempting to merge 7-5...success. 206s Attempting to merge 8-1...success. 206s Attempting to merge 8-2...success. 206s Attempting to merge 8-3...success. 206s Attempting to merge 8-4...success. 206s Attempting to merge 8-5...success. 206s Attempting to merge 9-1...success. 206s Attempting to merge 9-2...success. 206s Attempting to merge 9-3...success. 206s Attempting to merge 9-4...success. 206s Attempting to merge 9-5...success. 206s Previous HEAD position was f01e952 imerge 'c-d': automatic merge 9-5 206s Switched to branch 'imerge/c-d' 206s Auto-merging conflict.txt 206s CONFLICT (content): Merge conflict in conflict.txt 206s Automatic merge failed; fix conflicts and then commit the result. 206s 206s Original first commit: 206s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 206s Author: Loú User 206s Date: Thu Apr 7 22:13:15 2005 +0000 206s 206s c⇒1 206s 206s Original second commit: 206s commit f7e451a6c9656dda15641a9fbc591a602f158692 206s Author: Loú User 206s Date: Thu Apr 7 22:13:29 2005 +0000 206s 206s d⇒6 206s 206s There was a conflict merging commit 1-6, shown above. 206s Please resolve the conflict, commit the result, then type 206s 206s git-imerge continue 207s + grep -q Traceback start.out 207s + grep -q suggest manual merge of 1-6 autofill.out 207s + git-imerge diagram --commits --frontier --html=imerge3.html 207s 0 5 9 207s | | | 207s 0 - ********** - c 207s *......... 207s *......... 207s *......... 207s *......... 207s 5 - *......... 207s 6 - *#???????? 207s | 207s d 207s 207s 0 5 9 207s | | | 207s 0 - ********** - c 207s *........| 207s *........| 207s *........| 207s *........| 207s 5 - *--------+ 207s 6 - *#???????? 207s | 207s d 207s 207s Key: 207s |,-,+ = rectangles forming current merge frontier 207s * = merge done manually 207s . = merge done automatically 207s # = conflict that is currently blocking progress 207s @ = merge was blocked but has been resolved 207s ? = no merge recorded 207s 207s + echo merged version 207s + git add conflict.txt 207s + GIT_EDITOR=cat git commit 207s imerge 'c-d': manual merge 1-6 207s 207s # Conflicts: 207s # conflict.txt 207s # 207s # It looks like you may be committing a merge. 207s # If this is not correct, please run 207s # git update-ref -d MERGE_HEAD 207s # and try again. 207s 207s 207s # Please enter the commit message for your changes. Lines starting 207s # with '#' will be ignored, and an empty message aborts the commit. 207s # 207s # On branch imerge/c-d 207s # All conflicts fixed but you are still merging. 207s # 207s # Changes to be committed: 207s # modified: conflict.txt 207s # modified: d.txt 207s # 207s + git-imerge continue --edit 207s [imerge/c-d 81e860c] imerge 'c-d': manual merge 1-6 207s Merge has been recorded for merge 1-6. 207s Attempting to merge 2-6...success. 207s Attempting to merge 3-6...success. 207s Attempting to merge 4-6...success. 207s Attempting to merge 5-6...success. 207s Attempting to merge 6-6...success. 207s Attempting to merge 7-6...success. 207s Attempting to merge 8-6...success. 207s Attempting to merge 9-6...success. 207s Merge is complete! 207s + git-imerge diagram --commits --frontier --html=imerge4.html 208s 0 5 9 208s | | | 208s 0 - ********** - c 208s *......... 208s *......... 208s *......... 208s *......... 208s 5 - *......... 208s 6 - **........ 208s | 208s d 208s 208s 0 5 9 208s | | | 208s 0 - ********** - c 208s *........| 208s *........| 208s *........| 208s *........| 208s 5 - *........| 208s 6 - **-------+ 208s | 208s d 208s 208s Key: 208s |,-,+ = rectangles forming current merge frontier 208s * = merge done manually 208s . = merge done automatically 208s # = conflict that is currently blocking progress 208s @ = merge was blocked but has been resolved 208s ? = no merge recorded 208s 208s + git-imerge finish --branch=c-d-full 208s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 208s + local refname=c-d-full 208s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 208s + git rev-parse c-d-full^{tree} 208s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 208s + test_conflict 9-6 208s + local conflict=9-6 208s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s + DESCRIPTION=git-imerge test repository with conflict at 9-6 208s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 208s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s + local description=git-imerge test repository with conflict at 9-6 208s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 208s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s + local description=git-imerge test repository with conflict at 9-6 208s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s hint: Using 'master' as the name for the initial branch. This default branch name 208s hint: is subject to change. To configure the initial branch name to use in all 208s hint: of your new repositories, which will suppress this warning, call: 208s hint: 208s hint: git config --global init.defaultBranch 208s hint: 208s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 208s hint: 'development'. The just-created branch can be renamed via this command: 208s hint: 208s hint: git branch -m 208s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6/.git/ 208s + echo git-imerge test repository with conflict at 9-6 208s + printf %s\n /*.out /*.css /*.html 208s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6/.git config user.name Loú User 208s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 208s + TIME=1112911993 208s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-6 208s + modify c.txt 0 208s + filename=c.txt 208s + text=0 208s + echo 0 208s + git add c.txt 208s + modify d.txt 0 208s + filename=d.txt 208s + text=0 208s + echo 0 208s + git add d.txt 208s + modify conflict.txt original version 208s + filename=conflict.txt 208s + text=original version 208s + echo original version 208s + git add conflict.txt 208s + commit -m m⇒0 208s [master (root-commit) d70e04b] m⇒0 208s 3 files changed, 3 insertions(+) 208s create mode 100644 c.txt 208s create mode 100644 conflict.txt 208s create mode 100644 d.txt 208s + TIME=1112911994 208s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 208s + git checkout -b c master -- 208s Switched to a new branch 'c' 208s + seq 9 208s + modify c.txt 1 208s + filename=c.txt 208s + text=1 208s + echo 1 208s + git add c.txt 208s + commit -m c⇒1 208s + TIME=1112911995 208s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 208s [c 89e2141] c⇒1 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 2 208s + filename=c.txt 208s + text=2 208s + echo 2 208s + git add c.txt 208s + commit -m c⇒2 208s + TIME=1112911996 208s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 208s [c 7c431f2] c⇒2 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 3 208s + filename=c.txt 208s + text=3 208s + echo 3 208s + git add c.txt 208s + commit -m c⇒3 208s + TIME=1112911997 208s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 208s [c f02ab24] c⇒3 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 4 208s + filename=c.txt 208s + text=4 208s + echo 4 208s + git add c.txt 208s + commit -m c⇒4 208s + TIME=1112911998 208s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 208s [c ed9122f] c⇒4 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 5 208s + filename=c.txt 208s + text=5 208s + echo 5 208s + git add c.txt 208s + commit -m c⇒5 208s + TIME=1112911999 208s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 208s [c 1d3bf09] c⇒5 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 6 208s + filename=c.txt 208s + text=6 208s + echo 6 208s + git add c.txt 208s + commit -m c⇒6 208s + TIME=1112912000 208s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 208s [c f999ecd] c⇒6 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 7 208s + filename=c.txt 208s + text=7 208s + echo 7 208s + git add c.txt 208s + commit -m c⇒7 208s + TIME=1112912001 208s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 208s [c 7050a8a] c⇒7 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 8 208s + filename=c.txt 208s + text=8 208s + echo 8 208s + git add c.txt 208s + commit -m c⇒8 208s + TIME=1112912002 208s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 208s [c 9732e77] c⇒8 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify c.txt 9 208s + filename=c.txt 208s + text=9 208s + echo 9 208s + git add c.txt 208s + modify conflict.txt c version 208s + filename=conflict.txt 208s + text=c version 208s + echo c version 208s + git add conflict.txt 208s + commit -m c⇒9 208s + TIME=1112912003 208s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 208s [c 73a5eed] c⇒9 208s 2 files changed, 2 insertions(+), 2 deletions(-) 208s + git checkout -b d master -- 208s Switched to a new branch 'd' 208s + seq 6 208s + modify d.txt 1 208s + filename=d.txt 208s + text=1 208s + echo 1 208s + git add d.txt 208s + commit -m d⇒1 208s + TIME=1112912004 208s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 208s [d bd5368a] d⇒1 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify d.txt 2 208s + filename=d.txt 208s + text=2 208s + echo 2 208s + git add d.txt 208s + commit -m d⇒2 208s + TIME=1112912005 208s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 208s [d 93e27e6] d⇒2 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify d.txt 3 208s + filename=d.txt 208s + text=3 208s + echo 3 208s + git add d.txt 208s + commit -m d⇒3 208s + TIME=1112912006 208s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 208s [d 133f385] d⇒3 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify d.txt 4 208s + filename=d.txt 208s + text=4 208s + echo 4 208s + git add d.txt 208s + commit -m d⇒4 208s + TIME=1112912007 208s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 208s [d 586472a] d⇒4 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify d.txt 5 208s + filename=d.txt 208s + text=5 208s + echo 5 208s + git add d.txt 208s + commit -m d⇒5 208s + TIME=1112912008 208s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 208s [d 9522207] d⇒5 208s 1 file changed, 1 insertion(+), 1 deletion(-) 208s + modify d.txt 6 208s + filename=d.txt 208s + text=6 208s + echo 6 208s + git add d.txt 208s + modify conflict.txt d version 208s + filename=conflict.txt 208s + text=d version 208s + echo d version 208s + git add conflict.txt 208s + commit -m d⇒6 208s + TIME=1112912009 208s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 208s [d f7e451a] d⇒6 208s 2 files changed, 2 insertions(+), 2 deletions(-) 208s + git checkout c 208s Switched to branch 'c' 208s + git-imerge init --name=c-d d 208s + git-imerge list 209s * c-d 209s + git-imerge diagram --commits --frontier --html=imerge0.html 209s 0 5 9 209s | | | 209s 0 - ********** - c 209s *????????? 209s *????????? 209s *????????? 209s *????????? 209s 5 - *????????? 209s 6 - *????????? 209s | 209s d 209s 209s 0 5 9 209s | | | 209s 0 - ********** - c 209s *????????? 209s *????????? 209s *????????? 209s *????????? 209s 5 - *????????? 209s 6 - *????????? 209s | 209s d 209s 209s Key: 209s |,-,+ = rectangles forming current merge frontier 209s * = merge done manually 209s . = merge done automatically 209s # = conflict that is currently blocking progress 209s @ = merge was blocked but has been resolved 209s ? = no merge recorded 209s 209s + + git-imerge autofilltee 209s autofill.out 209s Attempting automerge of 9-6...failure. 209s Attempting automerge of 1-1...success. 209s Attempting automerge of 1-4...success. 209s Attempting automerge of 1-6...success. 209s Attempting automerge of 9-6...failure. 209s Attempting automerge of 5-6...success. 209s Attempting automerge of 7-6...success. 209s Attempting automerge of 8-6...success. 209s Attempting automerge of 9-1...success. 209s Attempting automerge of 9-4...success. 209s Attempting automerge of 9-5...success. 209s Autofilling 1-6...success. 209s Autofilling 2-6...success. 209s Autofilling 3-6...success. 209s Autofilling 4-6...success. 210s Autofilling 5-6...success. 210s Autofilling 6-6...success. 210s Autofilling 7-6...success. 210s Autofilling 8-1...success. 210s Autofilling 8-2...success. 210s Autofilling 8-3...success. 210s Autofilling 8-4...success. 210s Autofilling 8-5...success. 210s Autofilling 8-6 (first way)...success. 210s Autofilling 8-6 (second way)...success. 210s The two ways of autofilling 8-6 agree. 210s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 210s Autofilling 9-1...success. 210s Autofilling 9-2...success. 210s Autofilling 9-3...success. 210s Autofilling 9-4...success. 210s Autofilling 9-5...success. 210s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 210s Attempting automerge of 9-6...failure. 210s Attempting automerge of 9-6...failure. 210s HEAD is now at 73a5eed c⇒9 210s Conflict; suggest manual merge of 9-6 210s + grep -q Traceback autofill.out 210s + grep -q suggest manual merge of 9-6 autofill.out 210s + git-imerge diagram --commits --frontier --html=imerge1.html 210s 0 5 9 210s | | | 210s 0 - ********** - c 210s *???????.. 210s *???????.. 210s *???????.. 210s *???????.. 210s 5 - *???????.. 210s 6 - *........# 210s | 210s d 210s 210s 0 5 9 210s | | | 210s 0 - ********** - c 210s *???????.| 210s *???????.| 210s *???????.| 210s *???????.| 210s 5 - *???????.+ 210s 6 - *-------+# 210s | 210s d 210s 210s Key: 210s |,-,+ = rectangles forming current merge frontier 210s * = merge done manually 210s . = merge done automatically 210s # = conflict that is currently blocking progress 210s @ = merge was blocked but has been resolved 210s ? = no merge recorded 210s 210s + git-imerge continue --edit 210s Switched to branch 'imerge/c-d' 210s Auto-merging conflict.txt 210s CONFLICT (content): Merge conflict in conflict.txt 210s Automatic merge failed; fix conflicts and then commit the result. 210s 210s Original first commit: 210s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 210s Author: Loú User 210s Date: Thu Apr 7 22:13:23 2005 +0000 210s 210s c⇒9 210s 210s Original second commit: 210s commit f7e451a6c9656dda15641a9fbc591a602f158692 210s Author: Loú User 210s Date: Thu Apr 7 22:13:29 2005 +0000 210s 210s d⇒6 210s 210s There was a conflict merging commit 9-6, shown above. 210s Please resolve the conflict, commit the result, then type 210s 210s git-imerge continue 211s + echo merged version 211s + git add conflict.txt 211s + git-imerge continue --no-edit 211s [imerge/c-d fb40202] imerge 'c-d': manual merge 9-6 211s Merge has been recorded for merge 9-6. 211s Merge is complete! 211s + git-imerge diagram --commits --frontier --html=imerge2.html 211s 0 5 9 211s | | | 211s 0 - ********** - c 211s *???????.. 211s *???????.. 211s *???????.. 211s *???????.. 211s 5 - *???????.. 211s 6 - *........* 211s | 211s d 211s 211s 0 5 9 211s | | | 211s 0 - ********** - c 211s *???????.| 211s *???????.| 211s *???????.| 211s *???????.| 211s 5 - *???????.| 211s 6 - *--------* 211s | 211s d 211s 211s Key: 211s |,-,+ = rectangles forming current merge frontier 211s * = merge done manually 211s . = merge done automatically 211s # = conflict that is currently blocking progress 211s @ = merge was blocked but has been resolved 211s ? = no merge recorded 211s 211s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 211s Merge d into c (using imerge) 211s 211s # Please enter the commit message for your changes. Lines starting 211s # with '#' will be ignored, and an empty message aborts the commit. 211s # 211s # Date: Wed Mar 20 10:14:33 2024 +0000 211s # 211s # On branch c-d-merge 211s # Changes to be committed: 211s # modified: conflict.txt 211s # modified: d.txt 211s # 211s [c-d-merge 6eb060c] Merge d into c (using imerge) 211s Date: Wed Mar 20 10:14:33 2024 +0000 211s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 211s + local refname=c-d-merge 211s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 211s + git rev-parse c-d-merge^{tree} 211s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 211s + git-imerge simplify --goal=rebase --branch=c-d-rebase 212s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 212s + local refname=c-d-rebase 212s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 212s + git rev-parse c-d-rebase^{tree} 212s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 212s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 212s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 212s + local refname=c-d-rebase-with-history 212s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 212s + git rev-parse c-d-rebase-with-history^{tree} 212s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 212s + git-imerge simplify --goal=border --branch=c-d-border 213s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + local refname=c-d-border 213s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + git rev-parse c-d-border^{tree} 213s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 213s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + local refname=c-d-border-with-history 213s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + git rev-parse c-d-border-with-history^{tree} 213s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 213s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + local refname=c-d-border-with-history2 213s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + git rev-parse c-d-border-with-history2^{tree} 213s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 213s + git-imerge remove 214s + git checkout c 214s Switched to branch 'c' 214s + git-imerge start --goal=full --first-parent --name=c-d d 214s + tee start.out 214s Attempting to merge 1-1...success. 214s Attempting to merge 1-2...success. 214s Attempting to merge 1-3...success. 214s Attempting to merge 1-4...success. 214s Attempting to merge 1-5...success. 214s Attempting to merge 1-6...success. 214s Attempting to merge 2-1...success. 214s Attempting to merge 2-2...success. 214s Attempting to merge 2-3...success. 214s Attempting to merge 2-4...success. 214s Attempting to merge 2-5...success. 214s Attempting to merge 2-6...success. 214s Attempting to merge 3-1...success. 214s Attempting to merge 3-2...success. 214s Attempting to merge 3-3...success. 214s Attempting to merge 3-4...success. 214s Attempting to merge 3-5...success. 214s Attempting to merge 3-6...success. 215s Attempting to merge 4-1...success. 215s Attempting to merge 4-2...success. 215s Attempting to merge 4-3...success. 215s Attempting to merge 4-4...success. 215s Attempting to merge 4-5...success. 215s Attempting to merge 4-6...success. 215s Attempting to merge 5-1...success. 215s Attempting to merge 5-2...success. 215s Attempting to merge 5-3...success. 215s Attempting to merge 5-4...success. 215s Attempting to merge 5-5...success. 215s Attempting to merge 5-6...success. 215s Attempting to merge 6-1...success. 215s Attempting to merge 6-2...success. 215s Attempting to merge 6-3...success. 215s Attempting to merge 6-4...success. 215s Attempting to merge 6-5...success. 215s Attempting to merge 6-6...success. 215s Attempting to merge 7-1...success. 215s Attempting to merge 7-2...success. 215s Attempting to merge 7-3...success. 215s Attempting to merge 7-4...success. 215s Attempting to merge 7-5...success. 215s Attempting to merge 7-6...success. 215s Attempting to merge 8-1...success. 215s Attempting to merge 8-2...success. 215s Attempting to merge 8-3...success. 215s Attempting to merge 8-4...success. 216s Attempting to merge 8-5...success. 216s Attempting to merge 8-6...success. 216s Attempting to merge 9-1...success. 216s Attempting to merge 9-2...success. 216s Attempting to merge 9-3...success. 216s Attempting to merge 9-4...success. 216s Attempting to merge 9-5...success. 216s Attempting to merge 9-6...conflict. 216s Switched to branch 'imerge/c-d' 216s Auto-merging conflict.txt 216s CONFLICT (content): Merge conflict in conflict.txt 216s Automatic merge failed; fix conflicts and then commit the result. 216s 216s Original first commit: 216s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 216s Author: Loú User 216s Date: Thu Apr 7 22:13:23 2005 +0000 216s 216s c⇒9 216s 216s Original second commit: 216s commit f7e451a6c9656dda15641a9fbc591a602f158692 216s Author: Loú User 216s Date: Thu Apr 7 22:13:29 2005 +0000 216s 216s d⇒6 216s 216s There was a conflict merging commit 9-6, shown above. 216s Please resolve the conflict, commit the result, then type 216s 216s git-imerge continue 216s + grep -q Traceback start.out 216s + grep -q suggest manual merge of 9-6 autofill.out 216s + git-imerge diagram --commits --frontier --html=imerge3.html 216s 0 5 9 216s | | | 216s 0 - ********** - c 216s *......... 216s *......... 216s *......... 216s *......... 216s 5 - *......... 216s 6 - *........# 216s | 216s d 216s 216s 0 5 9 216s | | | 216s 0 - ********** - c 216s *........| 216s *........| 216s *........| 216s *........| 216s 5 - *........+ 216s 6 - *-------+# 216s | 216s d 216s 216s Key: 216s |,-,+ = rectangles forming current merge frontier 216s * = merge done manually 216s . = merge done automatically 216s # = conflict that is currently blocking progress 216s @ = merge was blocked but has been resolved 216s ? = no merge recorded 216s 216s + echo merged version 216s + git add conflict.txt 216s + GIT_EDITOR=cat git commit 216s imerge 'c-d': manual merge 9-6 216s 216s # Conflicts: 216s # conflict.txt 216s # 216s # It looks like you may be committing a merge. 216s # If this is not correct, please run 216s # git update-ref -d MERGE_HEAD 216s # and try again. 216s 216s 216s # Please enter the commit message for your changes. Lines starting 216s # with '#' will be ignored, and an empty message aborts the commit. 216s # 216s # On branch imerge/c-d 216s # All conflicts fixed but you are still merging. 216s # 216s # Changes to be committed: 216s # modified: conflict.txt 216s # modified: d.txt 216s # 216s [imerge/c-d c4709ff] imerge 'c-d': manual merge 9-6 216s + git-imerge continue --edit 216s Merge has been recorded for merge 9-6. 216s Merge is complete! 216s + git-imerge diagram --commits --frontier --html=imerge4.html 217s 0 5 9 217s | | | 217s 0 - ********** - c 217s *......... 217s *......... 217s *......... 217s *......... 217s 5 - *......... 217s 6 - *........* 217s | 217s d 217s 217s 0 5 9 217s | | | 217s 0 - ********** - c 217s *........| 217s *........| 217s *........| 217s *........| 217s 5 - *........| 217s 6 - *--------* 217s | 217s d 217s 217s Key: 217s |,-,+ = rectangles forming current merge frontier 217s * = merge done manually 217s . = merge done automatically 217s # = conflict that is currently blocking progress 217s @ = merge was blocked but has been resolved 217s ? = no merge recorded 217s 217s + git-imerge finish --branch=c-d-full 217s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 217s + local refname=c-d-full 217s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 217s + git rev-parse c-d-full^{tree} 217s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 217s + test_conflict 1-2 217s + local conflict=1-2 217s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s + DESCRIPTION=git-imerge test repository with conflict at 1-2 217s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 217s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s + local description=git-imerge test repository with conflict at 1-2 217s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 217s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s + local description=git-imerge test repository with conflict at 1-2 217s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s hint: Using 'master' as the name for the initial branch. This default branch name 217s hint: is subject to change. To configure the initial branch name to use in all 217s hint: of your new repositories, which will suppress this warning, call: 217s hint: 217s hint: git config --global init.defaultBranch 217s hint: 217s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 217s hint: 'development'. The just-created branch can be renamed via this command: 217s hint: 217s hint: git branch -m 217s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2/.git/ 217s + echo git-imerge test repository with conflict at 1-2 217s + printf %s\n /*.out /*.css /*.html 217s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2/.git config user.name Loú User 217s [master (root-commit) d70e04b] m⇒0 217s 3 files changed, 3 insertions(+) 217s create mode 100644 c.txt 217s create mode 100644 conflict.txt 217s create mode 100644 d.txt 217s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 217s + TIME=1112911993 217s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-1-2 217s + modify c.txt 0 217s + filename=c.txt 217s + text=0 217s + echo 0 217s + git add c.txt 217s + modify d.txt 0 217s + filename=d.txt 217s + text=0 217s + echo 0 217s + git add d.txt 217s + modify conflict.txt original version 217s + filename=conflict.txt 217s + text=original version 217s + echo original version 217s + git add conflict.txt 217s + commit -m m⇒0 217s + TIME=1112911994 217s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 217s + git checkout -b c master -- 217s Switched to a new branch 'c' 217s + seq 9 217s + modify c.txt 1 217s + filename=c.txt 217s + text=1 217s + echo 1 217s + git add c.txt 217s + modify conflict.txt c version 217s + filename=conflict.txt 217s + text=c version 217s + echo c version 217s + git add conflict.txt 217s + commit -m c⇒1 217s + TIME=1112911995 217s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 217s [c 2120f40] c⇒1 217s 2 files changed, 2 insertions(+), 2 deletions(-) 217s + modify c.txt 2 217s + filename=c.txt 217s + text=2 217s + echo 2 217s + git add c.txt 217s + commit -m c⇒2 217s + TIME=1112911996 217s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 217s [c 90cc7de] c⇒2 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify c.txt 3 217s + filename=c.txt 217s + text=3 217s + echo 3 217s + git add c.txt 217s + commit -m c⇒3 217s + TIME=1112911997 217s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 217s [c 2046ed2] c⇒3 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify c.txt 4 217s + filename=c.txt 217s + text=4 217s + echo 4 217s + git add c.txt 217s + commit -m c⇒4 217s + TIME=1112911998 217s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 217s [c 8a2cee9] c⇒4 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify c.txt 5 217s + filename=c.txt 217s + text=5 217s + echo 5 217s + git add c.txt 217s + commit -m c⇒5 217s + TIME=1112911999 217s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 217s [c ac16a05] c⇒5 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify c.txt 6 217s + filename=c.txt 217s + text=6 217s + echo 6 217s + git add c.txt 217s + commit -m c⇒6 217s + TIME=1112912000 217s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 217s [c 30dd2ae] c⇒6 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify c.txt 7 217s + filename=c.txt 217s + text=7 217s + echo 7 217s + git add c.txt 217s + commit -m c⇒7 217s + TIME=1112912001 217s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 217s [c 0883eb9] c⇒7 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify c.txt 8 217s + filename=c.txt 217s + text=8 217s + echo 8 217s + git add c.txt 217s + commit -m c⇒8 217s + TIME=1112912002 217s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 217s [c f661c06] c⇒8 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify c.txt 9 217s + filename=c.txt 217s + text=9 217s + echo 9 217s + git add c.txt 217s + commit -m c⇒9 217s + TIME=1112912003 217s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 217s [c 243e8ed] c⇒9 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + git checkout -b d master -- 217s Switched to a new branch 'd' 217s + seq 6 217s + modify d.txt 1 217s + filename=d.txt 217s + text=1 217s + echo 1 217s + git add d.txt 217s + commit -m d⇒1 217s + TIME=1112912004 217s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 217s [d bd5368a] d⇒1 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify d.txt 2 217s + filename=d.txt 217s + text=2 217s + echo 2 217s + git add d.txt 217s + modify conflict.txt d version 217s + filename=conflict.txt 217s + text=d version 217s + echo d version 217s + git add conflict.txt 217s + commit -m d⇒2 217s + TIME=1112912005 217s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 217s [d 69efde8] d⇒2 217s 2 files changed, 2 insertions(+), 2 deletions(-) 217s + modify d.txt 3 217s + filename=d.txt 217s + text=3 217s + echo 3 217s + git add d.txt 217s + commit -m d⇒3 217s + TIME=1112912006 217s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 217s [d 3169557] d⇒3 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify d.txt 4 217s + filename=d.txt 217s + text=4 217s + echo 4 217s + git add d.txt 217s + commit -m d⇒4 217s + TIME=1112912007 217s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 217s [d 86c8052] d⇒4 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify d.txt 5 217s + filename=d.txt 217s + text=5 217s + echo 5 217s + git add d.txt 217s + commit -m d⇒5 217s + TIME=1112912008 217s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 217s [d 1700773] d⇒5 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s + modify d.txt 6 217s + filename=d.txt 217s + text=6 217s + echo 6 217s + git add d.txt 217s + commit -m d⇒6 217s + TIME=1112912009 217s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 217s + git checkout c 217s [d df2e493] d⇒6 217s 1 file changed, 1 insertion(+), 1 deletion(-) 217s Switched to branch 'c' 217s + git-imerge init --name=c-d d 218s + git-imerge list 218s * c-d 218s + git-imerge diagram --commits --frontier --html=imerge0.html 218s 0 5 9 218s | | | 218s 0 - ********** - c 218s *????????? 218s *????????? 218s *????????? 218s *????????? 218s 5 - *????????? 218s 6 - *????????? 218s | 218s d 218s 218s 0 5 9 218s | | | 218s 0 - ********** - c 218s *????????? 218s *????????? 218s *????????? 218s *????????? 218s 5 - *????????? 218s 6 - *????????? 218s | 218s d 218s 218s Key: 218s |,-,+ = rectangles forming current merge frontier 218s * = merge done manually 218s . = merge done automatically 218s # = conflict that is currently blocking progress 218s @ = merge was blocked but has been resolved 218s ? = no merge recorded 218s 218s + git-imerge+ autofill 218s tee autofill.out 218s Attempting automerge of 9-6...failure. 218s Attempting automerge of 1-1...success. 218s Attempting automerge of 1-4...failure. 218s Attempting automerge of 1-3...failure. 218s Attempting automerge of 1-2...failure. 218s Attempting automerge of 9-1...success. 218s Autofilling 1-1...success. 218s Autofilling 2-1...success. 219s Autofilling 3-1...success. 219s Autofilling 4-1...success. 219s Autofilling 5-1...success. 219s Autofilling 6-1...success. 219s Autofilling 7-1...success. 219s Autofilling 8-1...success. 219s Autofilling 9-1...success. 219s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 219s Attempting automerge of 9-6...failure. 219s Attempting automerge of 1-2...failure. 219s HEAD is now at 243e8ed c⇒9 219s Conflict; suggest manual merge of 1-2 219s + grep -q Traceback autofill.out 219s + grep -q suggest manual merge of 1-2 autofill.out 219s + git-imerge diagram --commits --frontier --html=imerge1.html 219s 0 5 9 219s | | | 219s 0 - ********** - c 219s *......... 219s *#???????? 219s *????????? 219s *????????? 219s 5 - *????????? 219s 6 - *????????? 219s | 219s d 219s 219s 0 5 9 219s | | | 219s 0 - ********** - c 219s *--------+ 219s *#???????? 219s *????????? 219s *????????? 219s 5 - *????????? 219s 6 - *????????? 219s | 219s d 219s 219s Key: 219s |,-,+ = rectangles forming current merge frontier 219s * = merge done manually 219s . = merge done automatically 219s # = conflict that is currently blocking progress 219s @ = merge was blocked but has been resolved 219s ? = no merge recorded 219s 219s + git-imerge continue --edit 219s Switched to branch 'imerge/c-d' 219s Auto-merging conflict.txt 219s CONFLICT (content): Merge conflict in conflict.txt 219s Automatic merge failed; fix conflicts and then commit the result. 219s 219s Original first commit: 219s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 219s Author: Loú User 219s Date: Thu Apr 7 22:13:15 2005 +0000 219s 219s c⇒1 219s 219s Original second commit: 219s commit 69efde8f66d581a765a3909ffacb9f895f95c345 219s Author: Loú User 219s Date: Thu Apr 7 22:13:25 2005 +0000 219s 219s d⇒2 219s 219s There was a conflict merging commit 1-2, shown above. 219s Please resolve the conflict, commit the result, then type 219s 219s git-imerge continue 219s + echo merged version 219s + git add conflict.txt 219s + git-imerge continue --no-edit 220s [imerge/c-d 54b9b9c] imerge 'c-d': manual merge 1-2 220s Merge has been recorded for merge 1-2. 220s Attempting automerge of 1-6...success. 220s Autofilling 1-3...success. 220s Autofilling 1-4...success. 220s Autofilling 1-5...success. 220s Autofilling 1-6...success. 220s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 220s Attempting automerge of 9-6...success. 220s Autofilling 2-6...success. 220s Autofilling 3-6...success. 220s Autofilling 4-6...success. 220s Autofilling 5-6...success. 220s Autofilling 6-6...success. 220s Autofilling 7-6...success. 220s Autofilling 8-6...success. 220s Autofilling 9-2...success. 220s Autofilling 9-3...success. 220s Autofilling 9-4...success. 220s Autofilling 9-5...success. 220s Autofilling 9-6 (first way)...success. 220s Autofilling 9-6 (second way)...success. 220s The two ways of autofilling 9-6 agree. 220s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 220s Merge is complete! 220s + git-imerge diagram --commits --frontier --html=imerge2.html 220s 0 5 9 220s | | | 220s 0 - ********** - c 220s *......... 220s **???????. 220s *.???????. 220s *.???????. 220s 5 - *.???????. 220s 6 - *......... 220s | 220s d 220s 220s 0 5 9 220s | | | 220s 0 - ********** - c 220s *........| 220s **???????| 220s *.???????| 220s *.???????| 220s 5 - *.???????| 220s 6 - *--------+ 220s | 220s d 220s 220s Key: 220s |,-,+ = rectangles forming current merge frontier 220s * = merge done manually 220s . = merge done automatically 220s # = conflict that is currently blocking progress 220s @ = merge was blocked but has been resolved 220s ? = no merge recorded 220s 220s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 221s Merge d into c (using imerge) 221s 221s # Please enter the commit message for your changes. Lines starting 221s # with '#' will be ignored, and an empty message aborts the commit. 221s # 221s # Date: Wed Mar 20 10:14:43 2024 +0000 221s # 221s # On branch c-d-merge 221s # Changes to be committed: 221s # modified: conflict.txt 221s # modified: d.txt 221s # 221s [c-d-merge 2f7801f] Merge d into c (using imerge) 221s Date: Wed Mar 20 10:14:43 2024 +0000 221s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + local refname=c-d-merge 221s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + git rev-parse c-d-merge^{tree} 221s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + git-imerge simplify --goal=rebase --branch=c-d-rebase 221s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + local refname=c-d-rebase 221s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + git rev-parse c-d-rebase^{tree} 221s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 221s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + local refname=c-d-rebase-with-history 221s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + git rev-parse c-d-rebase-with-history^{tree} 221s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 221s + git-imerge simplify --goal=border --branch=c-d-border 222s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 222s + local refname=c-d-border 222s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 222s + git rev-parse c-d-border^{tree} 222s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 222s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 222s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 222s + local refname=c-d-border-with-history 222s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 222s + git rev-parse c-d-border-with-history^{tree} 222s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 222s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 223s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 223s + local refname=c-d-border-with-history2 223s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 223s + git rev-parse c-d-border-with-history2^{tree} 223s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 223s + git-imerge remove 223s + git checkout c 223s Switched to branch 'c' 223s + + git-imergetee start --goal=full start.out --first-parent --name=c-d d 223s 223s Attempting to merge 1-1...success. 223s Attempting to merge 1-2...conflict. 224s Attempting to merge 2-1...success. 224s Attempting to merge 3-1...success. 224s Attempting to merge 4-1...success. 224s Attempting to merge 5-1...success. 224s Attempting to merge 6-1...success. 224s Attempting to merge 7-1...success. 224s Attempting to merge 8-1...success. 224s Attempting to merge 9-1...success. 224s Previous HEAD position was 9952be4 imerge 'c-d': automatic merge 9-1 224s Switched to branch 'imerge/c-d' 224s Auto-merging conflict.txt 224s CONFLICT (content): Merge conflict in conflict.txt 224s Automatic merge failed; fix conflicts and then commit the result. 224s 224s Original first commit: 224s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 224s Author: Loú User 224s Date: Thu Apr 7 22:13:15 2005 +0000 224s 224s c⇒1 224s 224s Original second commit: 224s commit 69efde8f66d581a765a3909ffacb9f895f95c345 224s Author: Loú User 224s Date: Thu Apr 7 22:13:25 2005 +0000 224s 224s d⇒2 224s 224s There was a conflict merging commit 1-2, shown above. 224s Please resolve the conflict, commit the result, then type 224s 224s git-imerge continue 224s + grep -q Traceback start.out 224s + grep -q suggest manual merge of 1-2 autofill.out 224s + git-imerge diagram --commits --frontier --html=imerge3.html 224s 0 5 9 224s | | | 224s 0 - ********** - c 224s *......... 224s *#???????? 224s *????????? 224s *????????? 224s 5 - *????????? 224s 6 - *????????? 224s | 224s d 224s 224s 0 5 9 224s | | | 224s 0 - ********** - c 224s *--------+ 224s *#???????? 224s *????????? 224s *????????? 224s 5 - *????????? 224s 6 - *????????? 224s | 224s d 224s 224s Key: 224s |,-,+ = rectangles forming current merge frontier 224s * = merge done manually 224s . = merge done automatically 224s # = conflict that is currently blocking progress 224s @ = merge was blocked but has been resolved 224s ? = no merge recorded 224s 224s + echo merged version 224s + git add conflict.txt 224s + GIT_EDITOR=cat git commit 224s imerge 'c-d': manual merge 1-2 224s 224s # Conflicts: 224s # conflict.txt 224s # 224s # It looks like you may be committing a merge. 224s # If this is not correct, please run 224s # git update-ref -d MERGE_HEAD 224s # and try again. 224s 224s 224s # Please enter the commit message for your changes. Lines starting 224s # with '#' will be ignored, and an empty message aborts the commit. 224s # 224s # On branch imerge/c-d 224s # All conflicts fixed but you are still merging. 224s # 224s # Changes to be committed: 224s # modified: conflict.txt 224s # modified: d.txt 224s # 224s [imerge/c-d 4294c83] imerge 'c-d': manual merge 1-2 224s + git-imerge continue --edit 224s Merge has been recorded for merge 1-2. 224s Attempting to merge 1-3...success. 224s Attempting to merge 1-4...success. 224s Attempting to merge 1-5...success. 224s Attempting to merge 1-6...success. 225s Attempting to merge 2-2...success. 225s Attempting to merge 2-3...success. 225s Attempting to merge 2-4...success. 225s Attempting to merge 2-5...success. 225s Attempting to merge 2-6...success. 225s Attempting to merge 3-2...success. 225s Attempting to merge 3-3...success. 225s Attempting to merge 3-4...success. 225s Attempting to merge 3-5...success. 225s Attempting to merge 3-6...success. 225s Attempting to merge 4-2...success. 225s Attempting to merge 4-3...success. 225s Attempting to merge 4-4...success. 225s Attempting to merge 4-5...success. 225s Attempting to merge 4-6...success. 225s Attempting to merge 5-2...success. 225s Attempting to merge 5-3...success. 225s Attempting to merge 5-4...success. 225s Attempting to merge 5-5...success. 225s Attempting to merge 5-6...success. 225s Attempting to merge 6-2...success. 225s Attempting to merge 6-3...success. 225s Attempting to merge 6-4...success. 225s Attempting to merge 6-5...success. 225s Attempting to merge 6-6...success. 225s Attempting to merge 7-2...success. 225s Attempting to merge 7-3...success. 225s Attempting to merge 7-4...success. 226s Attempting to merge 7-5...success. 226s Attempting to merge 7-6...success. 226s Attempting to merge 8-2...success. 226s Attempting to merge 8-3...success. 226s Attempting to merge 8-4...success. 226s Attempting to merge 8-5...success. 226s Attempting to merge 8-6...success. 226s Attempting to merge 9-2...success. 226s Attempting to merge 9-3...success. 226s Attempting to merge 9-4...success. 226s Attempting to merge 9-5...success. 226s Attempting to merge 9-6...success. 226s Merge is complete! 226s + git-imerge diagram --commits --frontier --html=imerge4.html 226s 0 5 9 226s | | | 226s 0 - ********** - c 226s *......... 226s **........ 226s *......... 226s *......... 226s 5 - *......... 226s 6 - *......... 226s | 226s d 226s 226s 0 5 9 226s | | | 226s 0 - ********** - c 226s *........| 226s **.......| 226s *........| 226s *........| 226s 5 - *........| 226s 6 - *--------+ 226s | 226s d 226s 226s Key: 226s |,-,+ = rectangles forming current merge frontier 226s * = merge done manually 226s . = merge done automatically 226s # = conflict that is currently blocking progress 226s @ = merge was blocked but has been resolved 226s ? = no merge recorded 226s 226s + git-imerge finish --branch=c-d-full 227s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + local refname=c-d-full 227s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git rev-parse c-d-full^{tree} 227s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + test_conflict 9-5 227s + local conflict=9-5 227s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s + DESCRIPTION=git-imerge test repository with conflict at 9-5 227s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 227s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s + local description=git-imerge test repository with conflict at 9-5 227s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 227s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s + local description=git-imerge test repository with conflict at 9-5 227s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s hint: Using 'master' as the name for the initial branch. This default branch name 227s hint: is subject to change. To configure the initial branch name to use in all 227s hint: of your new repositories, which will suppress this warning, call: 227s hint: 227s hint: git config --global init.defaultBranch 227s hint: 227s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 227s hint: 'development'. The just-created branch can be renamed via this command: 227s hint: 227s hint: git branch -m 227s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5/.git/ 227s + echo git-imerge test repository with conflict at 9-5 227s + printf %s\n /*.out /*.css /*.html 227s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5/.git config user.name Loú User 227s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 227s + TIME=1112911993 227s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-9-5 227s + modify c.txt 0 227s + filename=c.txt 227s + text=0 227s + echo 0 227s + git add c.txt 227s + modify d.txt 0 227s + filename=d.txt 227s + text=0 227s + echo 0 227s + git add d.txt 227s + modify conflict.txt original version 227s + filename=conflict.txt 227s + text=original version 227s + echo original version 227s + git add conflict.txt 227s + commit -m m⇒0 227s + TIME=1112911994 227s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 227s [master (root-commit) d70e04b] m⇒0 227s 3 files changed, 3 insertions(+) 227s create mode 100644 c.txt 227s create mode 100644 conflict.txt 227s create mode 100644 d.txt 227s + git checkout -b c master -- 227s Switched to a new branch 'c' 227s + seq 9 227s + modify c.txt 1 227s + filename=c.txt 227s + text=1 227s + echo 1 227s + git add c.txt 227s + commit -m c⇒1 227s + TIME=1112911995 227s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 227s [c 89e2141] c⇒1 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 2 227s + filename=c.txt 227s + text=2 227s + echo 2 227s + git add c.txt 227s + commit -m c⇒2 227s + TIME=1112911996 227s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 227s [c 7c431f2] c⇒2 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 3 227s + filename=c.txt 227s + text=3 227s + echo 3 227s + git add c.txt 227s + commit -m c⇒3 227s + TIME=1112911997 227s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 227s [c f02ab24] c⇒3 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 4 227s + filename=c.txt 227s + text=4 227s + echo 4 227s + git add c.txt 227s + commit -m c⇒4 227s + TIME=1112911998 227s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 227s [c ed9122f] c⇒4 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 5 227s + filename=c.txt 227s + text=5 227s + echo 5 227s + git add c.txt 227s + commit -m c⇒5 227s + TIME=1112911999 227s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 227s [c 1d3bf09] c⇒5 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 6 227s + filename=c.txt 227s + text=6 227s + echo 6 227s + git add c.txt 227s + commit -m c⇒6 227s + TIME=1112912000 227s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 227s [c f999ecd] c⇒6 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 7 227s + filename=c.txt 227s + text=7 227s + echo 7 227s + git add c.txt 227s + commit -m c⇒7 227s + TIME=1112912001 227s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 227s [c 7050a8a] c⇒7 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 8 227s + filename=c.txt 227s + text=8 227s + echo 8 227s + git add c.txt 227s + commit -m c⇒8 227s + TIME=1112912002 227s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 227s [c 9732e77] c⇒8 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify c.txt 9 227s + filename=c.txt 227s + text=9 227s + echo 9 227s + git add c.txt 227s + modify conflict.txt c version 227s + filename=conflict.txt 227s + text=c version 227s + echo c version 227s + git add conflict.txt 227s + commit -m c⇒9 227s + TIME=1112912003 227s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 227s [c 73a5eed] c⇒9 227s 2 files changed, 2 insertions(+), 2 deletions(-) 227s + git checkout -b d master -- 227s Switched to a new branch 'd' 227s + seq 6 227s + modify d.txt 1 227s + filename=d.txt 227s + text=1 227s + echo 1 227s + git add d.txt 227s + commit -m d⇒1 227s + TIME=1112912004 227s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 227s [d bd5368a] d⇒1 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify d.txt 2 227s + filename=d.txt 227s + text=2 227s + echo 2 227s + git add d.txt 227s + commit -m d⇒2 227s + TIME=1112912005 227s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 227s [d 93e27e6] d⇒2 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify d.txt 3 227s + filename=d.txt 227s + text=3 227s + echo 3 227s + git add d.txt 227s + commit -m d⇒3 227s + TIME=1112912006 227s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 227s + modify d.txt 4 227s + filename=d.txt 227s + text=4 227s + echo 4 227s + git add d.txt 227s [d 133f385] d⇒3 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + commit -m d⇒4 227s + TIME=1112912007 227s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 227s [d 586472a] d⇒4 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + modify d.txt 5 227s + filename=d.txt 227s + text=5 227s + echo 5 227s + git add d.txt 227s + modify conflict.txt d version 227s + filename=conflict.txt 227s + text=d version 227s + echo d version 227s + git add conflict.txt 227s + commit -m d⇒5 227s + TIME=1112912008 227s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 227s [d 0a6f956] d⇒5 227s 2 files changed, 2 insertions(+), 2 deletions(-) 227s + modify d.txt 6 227s + filename=d.txt 227s + text=6 227s + echo 6 227s + git add d.txt 227s + commit -m d⇒6 227s + TIME=1112912009 227s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 227s [d bfb30f0] d⇒6 227s 1 file changed, 1 insertion(+), 1 deletion(-) 227s + git checkout c 227s Switched to branch 'c' 227s + git-imerge init --name=c-d d 227s + git-imerge list 227s * c-d 227s + git-imerge diagram --commits --frontier --html=imerge0.html 228s 0 5 9 228s | | | 228s 0 - ********** - c 228s *????????? 228s *????????? 228s *????????? 228s *????????? 228s 5 - *????????? 228s 6 - *????????? 228s | 228s d 228s 228s 0 5 9 228s | | | 228s 0 - ********** - c 228s *????????? 228s *????????? 228s *????????? 228s *????????? 228s 5 - *????????? 228s 6 - *????????? 228s | 228s d 228s 228s Key: 228s |,-,+ = rectangles forming current merge frontier 228s * = merge done manually 228s . = merge done automatically 228s # = conflict that is currently blocking progress 228s @ = merge was blocked but has been resolved 228s ? = no merge recorded 228s 228s + + git-imerge autofill 228s tee autofill.out 228s Attempting automerge of 9-6...failure. 228s Attempting automerge of 1-1...success. 228s Attempting automerge of 1-4...success. 228s Attempting automerge of 1-6...success. 228s Attempting automerge of 9-6...failure. 228s Attempting automerge of 5-6...success. 228s Attempting automerge of 7-6...success. 228s Attempting automerge of 8-6...success. 228s Attempting automerge of 9-1...success. 228s Attempting automerge of 9-4...success. 228s Attempting automerge of 9-5...failure. 228s Autofilling 1-6...success. 228s Autofilling 2-6...success. 228s Autofilling 3-6...success. 228s Autofilling 4-6...success. 228s Autofilling 5-6...success. 228s Autofilling 6-6...success. 228s Autofilling 7-6...success. 228s Autofilling 8-1...success. 229s Autofilling 8-2...success. 229s Autofilling 8-3...success. 229s Autofilling 8-4...success. 229s Autofilling 8-5...success. 229s Autofilling 8-6 (first way)...success. 229s Autofilling 8-6 (second way)...success. 229s The two ways of autofilling 8-6 agree. 229s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 229s Autofilling 9-1...success. 229s Autofilling 9-2...success. 229s Autofilling 9-3...success. 229s Autofilling 9-4...success. 229s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 229s Attempting automerge of 9-6...failure. 229s Attempting automerge of 9-5...failure. 229s HEAD is now at 73a5eed c⇒9 229s Conflict; suggest manual merge of 9-5 229s + grep -q Traceback autofill.out 229s + grep -q suggest manual merge of 9-5 autofill.out 229s + git-imerge diagram --commits --frontier --html=imerge1.html 229s 0 5 9 229s | | | 229s 0 - ********** - c 229s *???????.. 229s *???????.. 229s *???????.. 229s *???????.. 229s 5 - *???????.# 229s 6 - *........? 229s | 229s d 229s 229s 0 5 9 229s | | | 229s 0 - ********** - c 229s *???????.| 229s *???????.| 229s *???????.| 229s *???????.+ 229s 5 - *???????|# 229s 6 - *-------+? 229s | 229s d 229s 229s Key: 229s |,-,+ = rectangles forming current merge frontier 229s * = merge done manually 229s . = merge done automatically 229s # = conflict that is currently blocking progress 229s @ = merge was blocked but has been resolved 229s ? = no merge recorded 229s 229s + git-imerge continue --edit 229s Switched to branch 'imerge/c-d' 229s Auto-merging conflict.txt 229s CONFLICT (content): Merge conflict in conflict.txt 229s Automatic merge failed; fix conflicts and then commit the result. 229s 229s Original first commit: 229s 229s Original second commit: 229s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 229s Author: Loú User 229s Date: Thu Apr 7 22:13:23 2005 +0000 229s 229s c⇒9 229s 229s There was a conflict merging commit 9-5, shown above. 229s Please resolve the conflict, commit the result, then type 229s 229s git-imerge continue 229s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 229s Author: Loú User 229s Date: Thu Apr 7 22:13:28 2005 +0000 229s 229s d⇒5 230s + echo merged version 230s + git add conflict.txt 230s + git-imerge continue --no-edit 230s [imerge/c-d e8eec5c] imerge 'c-d': manual merge 9-5 230s Merge has been recorded for merge 9-5. 230s Attempting automerge of 9-6...success. 230s Autofilling 9-6...success. 230s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 230s Merge is complete! 230s + git-imerge diagram --commits --frontier --html=imerge2.html 230s 0 5 9 230s | | | 230s 0 - ********** - c 230s *???????.. 230s *???????.. 230s *???????.. 230s *???????.. 230s 5 - *???????.* 230s 6 - *......... 230s | 230s d 230s 230s 0 5 9 230s | | | 230s 0 - ********** - c 230s *???????.| 230s *???????.| 230s *???????.| 230s *???????.| 230s 5 - *???????.* 230s 6 - *--------+ 230s | 230s d 230s 230s Key: 230s |,-,+ = rectangles forming current merge frontier 230s * = merge done manually 230s . = merge done automatically 230s # = conflict that is currently blocking progress 230s @ = merge was blocked but has been resolved 230s ? = no merge recorded 230s 230s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 230s Merge d into c (using imerge) 230s 230s # Please enter the commit message for your changes. Lines starting 230s # with '#' will be ignored, and an empty message aborts the commit. 230s # 230s # Date: Wed Mar 20 10:14:52 2024 +0000 230s # 230s # On branch c-d-merge 230s # Changes to be committed: 230s # modified: conflict.txt 230s # modified: d.txt 230s # 230s [c-d-merge 09e6065] Merge d into c (using imerge) 230s Date: Wed Mar 20 10:14:52 2024 +0000 230s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 230s + local refname=c-d-merge 230s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 230s + git rev-parse c-d-merge^{tree} 230s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 230s + git-imerge simplify --goal=rebase --branch=c-d-rebase 231s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + local refname=c-d-rebase 231s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git rev-parse c-d-rebase^{tree} 231s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 231s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + local refname=c-d-rebase-with-history 231s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git rev-parse c-d-rebase-with-history^{tree} 231s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git-imerge simplify --goal=border --branch=c-d-border 232s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + local refname=c-d-border 232s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git rev-parse c-d-border^{tree} 232s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 232s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + local refname=c-d-border-with-history 232s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git rev-parse c-d-border-with-history^{tree} 232s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 233s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + local refname=c-d-border-with-history2 233s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git rev-parse c-d-border-with-history2^{tree} 233s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git-imerge remove 233s + git checkout c 233s Switched to branch 'c' 233s + + tee start.out 233s git-imerge start --goal=full --first-parent --name=c-d d 233s Attempting to merge 1-1...success. 233s Attempting to merge 1-2...success. 233s Attempting to merge 1-3...success. 233s Attempting to merge 1-4...success. 233s Attempting to merge 1-5...success. 233s Attempting to merge 1-6...success. 233s Attempting to merge 2-1...success. 234s Attempting to merge 2-2...success. 234s Attempting to merge 2-3...success. 234s Attempting to merge 2-4...success. 234s Attempting to merge 2-5...success. 234s Attempting to merge 2-6...success. 234s Attempting to merge 3-1...success. 234s Attempting to merge 3-2...success. 234s Attempting to merge 3-3...success. 234s Attempting to merge 3-4...success. 234s Attempting to merge 3-5...success. 234s Attempting to merge 3-6...success. 234s Attempting to merge 4-1...success. 234s Attempting to merge 4-2...success. 234s Attempting to merge 4-3...success. 234s Attempting to merge 4-4...success. 234s Attempting to merge 4-5...success. 234s Attempting to merge 4-6...success. 234s Attempting to merge 5-1...success. 234s Attempting to merge 5-2...success. 234s Attempting to merge 5-3...success. 234s Attempting to merge 5-4...success. 234s Attempting to merge 5-5...success. 234s Attempting to merge 5-6...success. 234s Attempting to merge 6-1...success. 234s Attempting to merge 6-2...success. 234s Attempting to merge 6-3...success. 234s Attempting to merge 6-4...success. 234s Attempting to merge 6-5...success. 235s Attempting to merge 6-6...success. 235s Attempting to merge 7-1...success. 235s Attempting to merge 7-2...success. 235s Attempting to merge 7-3...success. 235s Attempting to merge 7-4...success. 235s Attempting to merge 7-5...success. 235s Attempting to merge 7-6...success. 235s Attempting to merge 8-1...success. 235s Attempting to merge 8-2...success. 235s Attempting to merge 8-3...success. 235s Attempting to merge 8-4...success. 235s Attempting to merge 8-5...success. 235s Attempting to merge 8-6...success. 235s Attempting to merge 9-1...success. 235s Attempting to merge 9-2...success. 235s Attempting to merge 9-3...success. 235s Attempting to merge 9-4...success. 235s Attempting to merge 9-5...conflict. 235s Switched to branch 'imerge/c-d' 235s Auto-merging conflict.txt 235s CONFLICT (content): Merge conflict in conflict.txt 235s Automatic merge failed; fix conflicts and then commit the result. 235s 235s Original first commit: 235s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 235s Author: Loú User 235s Date: Thu Apr 7 22:13:23 2005 +0000 235s 235s c⇒9 235s 235s Original second commit: 235s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 235s Author: Loú User 235s Date: Thu Apr 7 22:13:28 2005 +0000 235s 235s d⇒5 235s 235s There was a conflict merging commit 9-5, shown above. 235s Please resolve the conflict, commit the result, then type 235s 235s git-imerge continue 235s + grep -q Traceback start.out 235s + grep -q suggest manual merge of 9-5 autofill.out 235s + git-imerge diagram --commits --frontier --html=imerge3.html 235s 0 5 9 235s | | | 235s 0 - ********** - c 235s *......... 235s *......... 235s *......... 235s *......... 235s 5 - *........# 235s 6 - *........? 235s | 235s d 235s 235s 0 5 9 235s | | | 235s 0 - ********** - c 235s *........| 235s *........| 235s *........| 235s *........+ 235s 5 - *.......|# 235s 6 - *-------+? 235s | 235s d 235s 235s Key: 235s |,-,+ = rectangles forming current merge frontier 235s * = merge done manually 235s . = merge done automatically 235s # = conflict that is currently blocking progress 235s @ = merge was blocked but has been resolved 235s ? = no merge recorded 235s 236s + echo merged version 236s + git add conflict.txt 236s + GIT_EDITOR=cat git commit 236s imerge 'c-d': manual merge 9-5 236s 236s # Conflicts: 236s # conflict.txt 236s # 236s # It looks like you may be committing a merge. 236s # If this is not correct, please run 236s # git update-ref -d MERGE_HEAD 236s # and try again. 236s 236s 236s # Please enter the commit message for your changes. Lines starting 236s # with '#' will be ignored, and an empty message aborts the commit. 236s # 236s # On branch imerge/c-d 236s # All conflicts fixed but you are still merging. 236s # 236s # Changes to be committed: 236s # modified: conflict.txt 236s # modified: d.txt 236s # 236s + git-imerge continue --edit 236s [imerge/c-d ea8efb5] imerge 'c-d': manual merge 9-5 236s Merge has been recorded for merge 9-5. 236s Attempting to merge 9-6...success. 236s Merge is complete! 236s + git-imerge diagram --commits --frontier --html=imerge4.html 236s 0 5 9 236s | | | 236s 0 - ********** - c 236s *......... 236s *......... 236s *......... 236s *......... 236s 5 - *........* 236s 6 - *......... 236s | 236s d 236s 236s 0 5 9 236s | | | 236s 0 - ********** - c 236s *........| 236s *........| 236s *........| 236s *........| 236s 5 - *........* 236s 6 - *--------+ 236s | 236s d 236s 236s Key: 236s |,-,+ = rectangles forming current merge frontier 236s * = merge done manually 236s . = merge done automatically 236s # = conflict that is currently blocking progress 236s @ = merge was blocked but has been resolved 236s ? = no merge recorded 236s 236s + git-imerge finish --branch=c-d-full 236s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + local refname=c-d-full 236s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + git rev-parse c-d-full^{tree} 236s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + test_conflict 5-1 236s + local conflict=5-1 236s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s + DESCRIPTION=git-imerge test repository with conflict at 5-1 236s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 236s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s + local description=git-imerge test repository with conflict at 5-1 236s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 236s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s + local description=git-imerge test repository with conflict at 5-1 236s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s hint: Using 'master' as the name for the initial branch. This default branch name 236s hint: is subject to change. To configure the initial branch name to use in all 236s hint: of your new repositories, which will suppress this warning, call: 236s hint: 236s hint: git config --global init.defaultBranch 236s hint: 236s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 236s hint: 'development'. The just-created branch can be renamed via this command: 236s hint: 236s hint: git branch -m 236s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1/.git/ 236s + echo git-imerge test repository with conflict at 5-1 236s + printf %s\n /*.out /*.css /*.html 236s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1/.git config user.name Loú User 236s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 236s [master (root-commit) d70e04b] m⇒0 236s 3 files changed, 3 insertions(+) 236s create mode 100644 c.txt 236s create mode 100644 conflict.txt 236s create mode 100644 d.txt 236s + TIME=1112911993 236s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-5-1 236s + modify c.txt 0 236s + filename=c.txt 236s + text=0 236s + echo 0 236s + git add c.txt 236s + modify d.txt 0 236s + filename=d.txt 236s + text=0 236s + echo 0 236s + git add d.txt 236s + modify conflict.txt original version 236s + filename=conflict.txt 236s + text=original version 236s + echo original version 236s + git add conflict.txt 236s + commit -m m⇒0 236s + TIME=1112911994 236s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 236s + git checkout -b c master -- 236s Switched to a new branch 'c' 236s + seq 9 236s + modify c.txt 1 236s + filename=c.txt 236s + text=1 236s + echo 1 236s + git add c.txt 236s + commit -m c⇒1 236s + TIME=1112911995 236s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 236s [c 89e2141] c⇒1 236s 1 file changed, 1 insertion(+), 1 deletion(-) 236s + modify c.txt 2 236s + filename=c.txt 236s + text=2 236s + echo 2 236s + git add c.txt 236s + commit -m c⇒2 236s + TIME=1112911996 236s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 237s [c 7c431f2] c⇒2 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 3 237s + filename=c.txt 237s + text=3 237s + echo 3 237s + git add c.txt 237s + commit -m c⇒3 237s + TIME=1112911997 237s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 237s [c f02ab24] c⇒3 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 4 237s + filename=c.txt 237s + text=4 237s + echo 4 237s + git add c.txt 237s + commit -m c⇒4 237s + TIME=1112911998 237s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 237s [c ed9122f] c⇒4 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 5 237s + filename=c.txt 237s + text=5 237s + echo 5 237s + git add c.txt 237s + modify conflict.txt c version 237s + filename=conflict.txt 237s + text=c version 237s + echo c version 237s + git add conflict.txt 237s + commit -m c⇒5 237s + TIME=1112911999 237s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 237s [c 7e31f25] c⇒5 237s 2 files changed, 2 insertions(+), 2 deletions(-) 237s + modify c.txt 6 237s + filename=c.txt 237s + text=6 237s + echo 6 237s + git add c.txt 237s + commit -m c⇒6 237s + TIME=1112912000 237s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 237s [c df3c57a] c⇒6 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 7 237s + filename=c.txt 237s + text=7 237s + echo 7 237s + git add c.txt 237s + commit -m c⇒7 237s + TIME=1112912001 237s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 237s [c ea32d81] c⇒7 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 8 237s + filename=c.txt 237s + text=8 237s + echo 8 237s + git add c.txt 237s + commit -m c⇒8 237s + TIME=1112912002 237s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 237s [c 44473d6] c⇒8 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 9 237s + filename=c.txt 237s + text=9 237s + echo 9 237s + git add c.txt 237s + commit -m c⇒9 237s + TIME=1112912003 237s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 237s [c d8d80cf] c⇒9 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + git checkout -b d master -- 237s Switched to a new branch 'd' 237s + seq 6 237s + modify d.txt 1 237s + filename=d.txt 237s + text=1 237s + echo 1 237s + git add d.txt 237s + modify conflict.txt d version 237s + filename=conflict.txt 237s + text=d version 237s + echo d version 237s + git add conflict.txt 237s + commit -m d⇒1 237s + TIME=1112912004 237s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 237s [d ac0427a] d⇒1 237s 2 files changed, 2 insertions(+), 2 deletions(-) 237s + modify d.txt 2 237s + filename=d.txt 237s + text=2 237s + echo 2 237s + git add d.txt 237s + commit -m d⇒2 237s + TIME=1112912005 237s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 237s [d 43c38c0] d⇒2 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 3 237s + filename=d.txt 237s + text=3 237s + echo 3 237s + git add d.txt 237s + commit -m d⇒3 237s + TIME=1112912006 237s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 237s [d 0260058] d⇒3 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 4 237s + filename=d.txt 237s + text=4 237s + echo 4 237s + git add d.txt 237s + commit -m d⇒4 237s + TIME=1112912007 237s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 237s [d 40fef44] d⇒4 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 5 237s + filename=d.txt 237s + text=5 237s + echo 5 237s + git add d.txt 237s + commit -m d⇒5 237s + TIME=1112912008 237s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 237s [d b080a65] d⇒5 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 6 237s + filename=d.txt 237s + text=6 237s + echo 6 237s + git add d.txt 237s + commit -m d⇒6 237s + TIME=1112912009 237s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 237s [d 200ce5c] d⇒6 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + git checkout c 237s Switched to branch 'c' 237s + git-imerge init --name=c-d d 237s + git-imerge list 237s * c-d 237s + git-imerge diagram --commits --frontier --html=imerge0.html 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *????????? 237s *????????? 237s *????????? 237s *????????? 237s 5 - *????????? 237s 6 - *????????? 237s | 237s d 237s 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *????????? 237s *????????? 237s *????????? 237s *????????? 237s 5 - *????????? 237s 6 - *????????? 237s | 237s d 237s 237s Key: 237s |,-,+ = rectangles forming current merge frontier 237s * = merge done manually 237s . = merge done automatically 237s # = conflict that is currently blocking progress 237s @ = merge was blocked but has been resolved 237s ? = no merge recorded 237s 238s + + tee autofill.out 238s git-imerge autofill 238s Attempting automerge of 9-6...failure. 238s Attempting automerge of 1-1...success. 238s Attempting automerge of 1-4...success. 238s Attempting automerge of 1-6...success. 238s Attempting automerge of 9-6...failure. 238s Attempting automerge of 5-6...failure. 238s Attempting automerge of 3-6...success. 238s Attempting automerge of 4-6...success. 238s Attempting automerge of 5-1...failure. 238s Autofilling 1-6...success. 238s Autofilling 2-6...success. 238s Autofilling 3-6...success. 238s Autofilling 4-1...success. 238s Autofilling 4-2...success. 238s Autofilling 4-3...success. 238s Autofilling 4-4...success. 238s Autofilling 4-5...success. 238s Autofilling 4-6 (first way)...success. 238s Autofilling 4-6 (second way)...success. 238s The two ways of autofilling 4-6 agree. 238s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 238s Attempting automerge of 9-6...failure. 238s Attempting automerge of 5-1...failure. 238s HEAD is now at d8d80cf c⇒9 238s Conflict; suggest manual merge of 5-1 238s + grep -q Traceback autofill.out 238s + grep -q suggest manual merge of 5-1 autofill.out 238s + git-imerge diagram --commits --frontier --html=imerge1.html 239s 0 5 9 239s | | | 239s 0 - ********** - c 239s *???.#???? 239s *???.????? 239s *???.????? 239s *???.????? 239s 5 - *???.????? 239s 6 - *....????? 239s | 239s d 239s 239s 0 5 9 239s | | | 239s 0 - ********** - c 239s *???|#???? 239s *???|????? 239s *???|????? 239s *???|????? 239s 5 - *???|????? 239s 6 - *---+????? 239s | 239s d 239s 239s Key: 239s |,-,+ = rectangles forming current merge frontier 239s * = merge done manually 239s . = merge done automatically 239s # = conflict that is currently blocking progress 239s @ = merge was blocked but has been resolved 239s ? = no merge recorded 239s 239s + git-imerge continue --edit 239s Switched to branch 'imerge/c-d' 239s Auto-merging conflict.txt 239s CONFLICT (content): Merge conflict in conflict.txt 239s Automatic merge failed; fix conflicts and then commit the result. 239s 239s Original first commit: 239s commit 7e31f254c318decc434628f023dac0703f3d2b9e 239s Author: Loú User 239s Date: Thu Apr 7 22:13:19 2005 +0000 239s 239s c⇒5 239s 239s Original second commit: 239s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 239s Author: Loú User 239s Date: Thu Apr 7 22:13:24 2005 +0000 239s 239s d⇒1 239s 239s There was a conflict merging commit 5-1, shown above. 239s Please resolve the conflict, commit the result, then type 239s 239s git-imerge continue 239s + echo merged version 239s + git add conflict.txt 239s + git-imerge continue --no-edit 239s [imerge/c-d ac7a780] imerge 'c-d': manual merge 5-1 239s Merge has been recorded for merge 5-1. 239s Attempting automerge of 5-6...success. 239s Autofilling 5-2...success. 239s Autofilling 5-3...success. 239s Autofilling 5-4...success. 239s Autofilling 5-5...success. 239s Autofilling 5-6...success. 239s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 239s Attempting automerge of 9-6...success. 239s Autofilling 6-6...success. 239s Autofilling 7-6...success. 239s Autofilling 8-6...success. 240s Autofilling 9-1...success. 240s Autofilling 9-2...success. 240s Autofilling 9-3...success. 240s Autofilling 9-4...success. 240s Autofilling 9-5...success. 240s Autofilling 9-6 (first way)...success. 240s Autofilling 9-6 (second way)...success. 240s The two ways of autofilling 9-6 agree. 240s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 240s Merge is complete! 240s + git-imerge diagram --commits --frontier --html=imerge2.html 240s 0 5 9 240s | | | 240s 0 - ********** - c 240s *???.*???. 240s *???..???. 240s *???..???. 240s *???..???. 240s 5 - *???..???. 240s 6 - *......... 240s | 240s d 240s 240s 0 5 9 240s | | | 240s 0 - ********** - c 240s *???.*???| 240s *???..???| 240s *???..???| 240s *???..???| 240s 5 - *???..???| 240s 6 - *--------+ 240s | 240s d 240s 240s Key: 240s |,-,+ = rectangles forming current merge frontier 240s * = merge done manually 240s . = merge done automatically 240s # = conflict that is currently blocking progress 240s @ = merge was blocked but has been resolved 240s ? = no merge recorded 240s 240s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 240s Merge d into c (using imerge) 240s 240s # Please enter the commit message for your changes. Lines starting 240s # with '#' will be ignored, and an empty message aborts the commit. 240s # 240s # Date: Wed Mar 20 10:15:02 2024 +0000 240s # 240s # On branch c-d-merge 240s # Changes to be committed: 240s # modified: conflict.txt 240s # modified: d.txt 240s # 240s [c-d-merge df018cf] Merge d into c (using imerge) 240s Date: Wed Mar 20 10:15:02 2024 +0000 240s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + local refname=c-d-merge 240s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git rev-parse c-d-merge^{tree} 240s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git-imerge simplify --goal=rebase --branch=c-d-rebase 241s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + local refname=c-d-rebase 241s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git rev-parse c-d-rebase^{tree} 241s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 241s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + local refname=c-d-rebase-with-history 241s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git rev-parse c-d-rebase-with-history^{tree} 241s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git-imerge simplify --goal=border --branch=c-d-border 241s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + local refname=c-d-border 241s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git rev-parse c-d-border^{tree} 241s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 242s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + local refname=c-d-border-with-history 242s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git rev-parse c-d-border-with-history^{tree} 242s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 243s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + local refname=c-d-border-with-history2 243s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git rev-parse c-d-border-with-history2^{tree} 243s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git-imerge remove 243s + git checkout c 243s Switched to branch 'c' 243s + git-imerge start --goal=full --first-parent --name=c-d d 243s + tee start.out 243s Attempting to merge 1-1...success. 243s Attempting to merge 1-2...success. 243s Attempting to merge 1-3...success. 243s Attempting to merge 1-4...success. 243s Attempting to merge 1-5...success. 243s Attempting to merge 1-6...success. 243s Attempting to merge 2-1...success. 243s Attempting to merge 2-2...success. 243s Attempting to merge 2-3...success. 243s Attempting to merge 2-4...success. 243s Attempting to merge 2-5...success. 244s Attempting to merge 2-6...success. 244s Attempting to merge 3-1...success. 244s Attempting to merge 3-2...success. 244s Attempting to merge 3-3...success. 244s Attempting to merge 3-4...success. 244s Attempting to merge 3-5...success. 244s Attempting to merge 3-6...success. 244s Attempting to merge 4-1...success. 244s Attempting to merge 4-2...success. 244s Attempting to merge 4-3...success. 244s Attempting to merge 4-4...success. 244s Attempting to merge 4-5...success. 244s Attempting to merge 4-6...success. 244s Attempting to merge 5-1...conflict. 244s Switched to branch 'imerge/c-d' 244s Auto-merging conflict.txt 244s CONFLICT (content): Merge conflict in conflict.txt 244s Automatic merge failed; fix conflicts and then commit the result. 244s 244s Original first commit: 244s commit 7e31f254c318decc434628f023dac0703f3d2b9e 244s Author: Loú User 244s Date: Thu Apr 7 22:13:19 2005 +0000 244s 244s c⇒5 244s 244s Original second commit: 244s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 244s Author: Loú User 244s Date: Thu Apr 7 22:13:24 2005 +0000 244s 244s d⇒1 244s 244s There was a conflict merging commit 5-1, shown above. 244s Please resolve the conflict, commit the result, then type 244s 244s git-imerge continue 244s + grep -q Traceback start.out 244s + grep -q suggest manual merge of 5-1 autofill.out 244s + git-imerge diagram --commits --frontier --html=imerge3.html 244s 0 5 9 244s | | | 244s 0 - ********** - c 244s *....#???? 244s *....????? 244s *....????? 244s *....????? 244s 5 - *....????? 244s 6 - *....????? 244s | 244s d 244s 244s 0 5 9 244s | | | 244s 0 - ********** - c 244s *...|#???? 244s *...|????? 244s *...|????? 244s *...|????? 244s 5 - *...|????? 244s 6 - *---+????? 244s | 244s d 244s 244s Key: 244s |,-,+ = rectangles forming current merge frontier 244s * = merge done manually 244s . = merge done automatically 244s # = conflict that is currently blocking progress 244s @ = merge was blocked but has been resolved 244s ? = no merge recorded 244s 244s + echo merged version 244s + git add conflict.txt 244s + GIT_EDITOR=cat git commit 244s imerge 'c-d': manual merge 5-1 244s 244s # Conflicts: 244s # conflict.txt 244s # 244s # It looks like you may be committing a merge. 244s # If this is not correct, please run 244s # git update-ref -d MERGE_HEAD 244s # and try again. 244s 244s 244s # Please enter the commit message for your changes. Lines starting 244s # with '#' will be ignored, and an empty message aborts the commit. 244s # 244s # On branch imerge/c-d 244s # All conflicts fixed but you are still merging. 244s # 244s # Changes to be committed: 244s # modified: conflict.txt 244s # modified: d.txt 244s # 244s [imerge/c-d 2e23926] imerge 'c-d': manual merge 5-1 244s + git-imerge continue --edit 245s Merge has been recorded for merge 5-1. 245s Attempting to merge 5-2...success. 245s Attempting to merge 5-3...success. 245s Attempting to merge 5-4...success. 245s Attempting to merge 5-5...success. 245s Attempting to merge 5-6...success. 245s Attempting to merge 6-1...success. 245s Attempting to merge 6-2...success. 245s Attempting to merge 6-3...success. 245s Attempting to merge 6-4...success. 245s Attempting to merge 6-5...success. 245s Attempting to merge 6-6...success. 245s Attempting to merge 7-1...success. 245s Attempting to merge 7-2...success. 245s Attempting to merge 7-3...success. 245s Attempting to merge 7-4...success. 245s Attempting to merge 7-5...success. 245s Attempting to merge 7-6...success. 245s Attempting to merge 8-1...success. 245s Attempting to merge 8-2...success. 245s Attempting to merge 8-3...success. 245s Attempting to merge 8-4...success. 245s Attempting to merge 8-5...success. 245s Attempting to merge 8-6...success. 245s Attempting to merge 9-1...success. 245s Attempting to merge 9-2...success. 246s Attempting to merge 9-3...success. 246s Attempting to merge 9-4...success. 246s Attempting to merge 9-5...success. 246s Attempting to merge 9-6...success. 246s Merge is complete! 246s + git-imerge diagram --commits --frontier --html=imerge4.html 246s 0 5 9 246s | | | 246s 0 - ********** - c 246s *....*.... 246s *......... 246s *......... 246s *......... 246s 5 - *......... 246s 6 - *......... 246s | 246s d 246s 246s 0 5 9 246s | | | 246s 0 - ********** - c 246s *....*...| 246s *........| 246s *........| 246s *........| 246s 5 - *........| 246s 6 - *--------+ 246s | 246s d 246s 246s Key: 246s |,-,+ = rectangles forming current merge frontier 246s * = merge done manually 246s . = merge done automatically 246s # = conflict that is currently blocking progress 246s @ = merge was blocked but has been resolved 246s ? = no merge recorded 246s 246s + git-imerge finish --branch=c-d-full 246s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + local refname=c-d-full 246s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git rev-parse c-d-full^{tree} 246s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + test_conflict 6-6 246s + local conflict=6-6 246s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s + DESCRIPTION=git-imerge test repository with conflict at 6-6 246s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 246s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s + local description=git-imerge test repository with conflict at 6-6 246s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 246s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s + local description=git-imerge test repository with conflict at 6-6 246s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s hint: Using 'master' as the name for the initial branch. This default branch name 246s hint: is subject to change. To configure the initial branch name to use in all 246s hint: of your new repositories, which will suppress this warning, call: 246s hint: 246s hint: git config --global init.defaultBranch 246s hint: 246s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 246s hint: 'development'. The just-created branch can be renamed via this command: 246s hint: 246s hint: git branch -m 246s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6/.git/ 246s + echo git-imerge test repository with conflict at 6-6 246s + printf %s\n /*.out /*.css /*.html 246s [master (root-commit) d70e04b] m⇒0 246s 3 files changed, 3 insertions(+) 246s create mode 100644 c.txt 246s create mode 100644 conflict.txt 246s create mode 100644 d.txt 246s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6/.git config user.name Loú User 246s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 246s + TIME=1112911993 246s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/conflicted-6-6 246s + modify c.txt 0 246s + filename=c.txt 246s + text=0 246s + echo 0 246s + git add c.txt 246s + modify d.txt 0 246s + filename=d.txt 246s + text=0 246s + echo 0 246s + git add d.txt 246s + modify conflict.txt original version 246s + filename=conflict.txt 246s + text=original version 246s + echo original version 246s + git add conflict.txt 246s + commit -m m⇒0 246s + TIME=1112911994 246s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 246s + git checkout -b c master -- 246s Switched to a new branch 'c' 246s + seq 9 246s + modify c.txt 1 246s + filename=c.txt 246s + text=1 246s + echo 1 246s + git add c.txt 246s + commit -m c⇒1 246s + TIME=1112911995 246s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 246s [c 89e2141] c⇒1 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 2 246s + filename=c.txt 246s + text=2 246s + echo 2 246s + git add c.txt 246s + commit -m c⇒2 246s + TIME=1112911996 246s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 246s [c 7c431f2] c⇒2 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 3 246s + filename=c.txt 246s + text=3 246s + echo 3 246s + git add c.txt 246s + commit -m c⇒3 246s + TIME=1112911997 246s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 246s [c f02ab24] c⇒3 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 4 246s + filename=c.txt 246s + text=4 246s + echo 4 246s + git add c.txt 246s + commit -m c⇒4 246s + TIME=1112911998 246s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 246s [c ed9122f] c⇒4 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 5 246s + filename=c.txt 246s + text=5 246s + echo 5 246s + git add c.txt 246s + commit -m c⇒5 246s + TIME=1112911999 246s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 246s [c 1d3bf09] c⇒5 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 6 246s + filename=c.txt 246s + text=6 246s + echo 6 246s + git add c.txt 246s + modify conflict.txt c version 246s + filename=conflict.txt 246s + text=c version 246s + echo c version 246s + git add conflict.txt 246s + commit -m c⇒6 246s + TIME=1112912000 246s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 246s [c fe4fed8] c⇒6 246s 2 files changed, 2 insertions(+), 2 deletions(-) 246s + modify c.txt 7 246s + filename=c.txt 246s + text=7 246s + echo 7 246s + git add c.txt 246s + commit -m c⇒7 246s + TIME=1112912001 246s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 246s [c ec255ea] c⇒7 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 8 246s + filename=c.txt 246s + text=8 246s + echo 8 246s + git add c.txt 246s + commit -m c⇒8 246s + TIME=1112912002 246s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 246s [c 7459ac3] c⇒8 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 9 246s + filename=c.txt 246s + text=9 246s + echo 9 246s + git add c.txt 246s + commit -m c⇒9 246s + TIME=1112912003 246s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 246s [c 70408c8] c⇒9 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + git checkout -b d master -- 246s Switched to a new branch 'd' 246s + seq 6 246s + modify d.txt 1 246s + filename=d.txt 246s + text=1 246s + echo 1 246s + git add d.txt 246s + commit -m d⇒1 246s + TIME=1112912004 246s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 246s [d bd5368a] d⇒1 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify d.txt 2 246s + filename=d.txt 246s + text=2 246s + echo 2 246s + git add d.txt 246s + commit -m d⇒2 246s + TIME=1112912005 246s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 246s [d 93e27e6] d⇒2 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify d.txt 3 246s + filename=d.txt 246s + text=3 246s + echo 3 246s + git add d.txt 246s + commit -m d⇒3 246s + TIME=1112912006 246s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 246s [d 133f385] d⇒3 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify d.txt 4 246s + filename=d.txt 246s + text=4 246s + echo 4 246s + git add d.txt 247s + commit -m d⇒4 247s + TIME=1112912007 247s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 247s [d 586472a] d⇒4 247s 1 file changed, 1 insertion(+), 1 deletion(-) 247s + modify d.txt 5 247s + filename=d.txt 247s + text=5 247s + echo 5 247s + git add d.txt 247s + commit -m d⇒5 247s + TIME=1112912008 247s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 247s [d 9522207] d⇒5 247s 1 file changed, 1 insertion(+), 1 deletion(-) 247s + modify d.txt 6 247s + filename=d.txt 247s + text=6 247s + echo 6 247s + git add d.txt 247s + modify conflict.txt d version 247s + filename=conflict.txt 247s + text=d version 247s + echo d version 247s + git add conflict.txt 247s + commit -m d⇒6 247s + TIME=1112912009 247s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 247s [d f7e451a] d⇒6 247s 2 files changed, 2 insertions(+), 2 deletions(-) 247s + git checkout c 247s Switched to branch 'c' 247s + git-imerge init --name=c-d d 247s + git-imerge list 247s * c-d 247s + git-imerge diagram --commits --frontier --html=imerge0.html 247s 0 5 9 247s | | | 247s 0 - ********** - c 247s *????????? 247s *????????? 247s *????????? 247s *????????? 247s 5 - *????????? 247s 6 - *????????? 247s | 247s d 247s 247s 0 5 9 247s | | | 247s 0 - ********** - c 247s *????????? 247s *????????? 247s *????????? 247s *????????? 247s 5 - *????????? 247s 6 - *????????? 247s | 247s d 247s 247s Key: 247s |,-,+ = rectangles forming current merge frontier 247s * = merge done manually 247s . = merge done automatically 247s # = conflict that is currently blocking progress 247s @ = merge was blocked but has been resolved 247s ? = no merge recorded 247s 247s + + tee autofill.out 247s git-imerge autofill 248s Attempting automerge of 9-6...failure. 248s Attempting automerge of 1-1...success. 248s Attempting automerge of 1-4...success. 248s Attempting automerge of 1-6...success. 248s Attempting automerge of 9-6...failure. 248s Attempting automerge of 5-6...success. 248s Attempting automerge of 7-6...failure. 248s Attempting automerge of 6-6...failure. 248s Attempting automerge of 6-1...success. 248s Attempting automerge of 6-4...success. 248s Attempting automerge of 6-5...success. 248s Attempting automerge of 9-5...success. 248s Autofilling 1-6...success. 248s Autofilling 2-6...success. 248s Autofilling 3-6...success. 248s Autofilling 4-6...success. 248s Autofilling 5-1...success. 248s Autofilling 5-2...success. 248s Autofilling 5-3...success. 248s Autofilling 5-4...success. 248s Autofilling 5-5...success. 248s Autofilling 5-6 (first way)...success. 248s Autofilling 5-6 (second way)...success. 248s The two ways of autofilling 5-6 agree. 248s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 248s Autofilling 6-5...success. 248s Autofilling 7-5...success. 248s Autofilling 8-5...success. 248s Autofilling 9-1...success. 248s Autofilling 9-2...success. 248s Autofilling 9-3...success. 248s Autofilling 9-4...success. 248s Autofilling 9-5 (first way)...success. 248s Autofilling 9-5 (second way)...success. 248s The two ways of autofilling 9-5 agree. 248s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 248s Attempting automerge of 9-6...failure. 249s Attempting automerge of 6-6...failure. 249s HEAD is now at 70408c8 c⇒9 249s Conflict; suggest manual merge of 6-6 249s + grep -q Traceback autofill.out 249s + grep -q suggest manual merge of 6-6 autofill.out 249s + git-imerge diagram --commits --frontier --html=imerge1.html 249s 0 5 9 249s | | | 249s 0 - ********** - c 249s *????.???. 249s *????.???. 249s *????.???. 249s *????.???. 249s 5 - *????..... 249s 6 - *.....#??? 249s | 249s d 249s 249s 0 5 9 249s | | | 249s 0 - ********** - c 249s *????.???| 249s *????.???| 249s *????.???| 249s *????.???| 249s 5 - *????.---+ 249s 6 - *----+#??? 249s | 249s d 249s 249s Key: 249s |,-,+ = rectangles forming current merge frontier 249s * = merge done manually 249s . = merge done automatically 249s # = conflict that is currently blocking progress 249s @ = merge was blocked but has been resolved 249s ? = no merge recorded 249s 249s + git-imerge continue --edit 249s Switched to branch 'imerge/c-d' 249s Auto-merging conflict.txt 249s CONFLICT (content): Merge conflict in conflict.txt 249s Automatic merge failed; fix conflicts and then commit the result. 249s 249s Original first commit: 249s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 249s Author: Loú User 249s Date: Thu Apr 7 22:13:20 2005 +0000 249s 249s c⇒6 249s 249s Original second commit: 249s commit f7e451a6c9656dda15641a9fbc591a602f158692 249s Author: Loú User 249s Date: Thu Apr 7 22:13:29 2005 +0000 249s 249s d⇒6 249s 249s There was a conflict merging commit 6-6, shown above. 249s Please resolve the conflict, commit the result, then type 249s 249s git-imerge continue 249s + echo merged version 249s + git add conflict.txt 249s + git-imerge continue --no-edit 249s [imerge/c-d c07bc4e] imerge 'c-d': manual merge 6-6 249s Merge has been recorded for merge 6-6. 249s Attempting automerge of 9-6...success. 249s Autofilling 7-6...success. 249s Autofilling 8-6...success. 250s Autofilling 9-6...success. 250s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 250s Merge is complete! 250s + git-imerge diagram --commits --frontier --html=imerge2.html 250s 0 5 9 250s | | | 250s 0 - ********** - c 250s *????.???. 250s *????.???. 250s *????.???. 250s *????.???. 250s 5 - *????..... 250s 6 - *.....*... 250s | 250s d 250s 250s 0 5 9 250s | | | 250s 0 - ********** - c 250s *????.???| 250s *????.???| 250s *????.???| 250s *????.???| 250s 5 - *????....| 250s 6 - *-----*--+ 250s | 250s d 250s 250s Key: 250s |,-,+ = rectangles forming current merge frontier 250s * = merge done manually 250s . = merge done automatically 250s # = conflict that is currently blocking progress 250s @ = merge was blocked but has been resolved 250s ? = no merge recorded 250s 250s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 250s Merge d into c (using imerge) 250s 250s # Please enter the commit message for your changes. Lines starting 250s # with '#' will be ignored, and an empty message aborts the commit. 250s # 250s # Date: Wed Mar 20 10:15:12 2024 +0000 250s # 250s # On branch c-d-merge 250s # Changes to be committed: 250s # modified: conflict.txt 250s # modified: d.txt 250s # 250s [c-d-merge 175b7a6] Merge d into c (using imerge) 250s Date: Wed Mar 20 10:15:12 2024 +0000 250s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + local refname=c-d-merge 250s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git rev-parse c-d-merge^{tree} 250s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git-imerge simplify --goal=rebase --branch=c-d-rebase 250s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + local refname=c-d-rebase 250s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git rev-parse c-d-rebase^{tree} 250s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 251s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + local refname=c-d-rebase-with-history 251s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + git rev-parse c-d-rebase-with-history^{tree} 251s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + git-imerge simplify --goal=border --branch=c-d-border 251s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + local refname=c-d-border 251s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + git rev-parse c-d-border^{tree} 251s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 252s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 252s + local refname=c-d-border-with-history 252s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 252s + git rev-parse c-d-border-with-history^{tree} 252s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 252s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 252s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 252s + local refname=c-d-border-with-history2 252s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 252s + git rev-parse c-d-border-with-history2^{tree} 252s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 252s + git-imerge remove 252s + git checkout c 252s Switched to branch 'c' 252s + git-imerge start --goal=full --first-parent --name=c-d d 252s + tee start.out 253s Attempting to merge 1-1...success. 253s Attempting to merge 1-2...success. 253s Attempting to merge 1-3...success. 253s Attempting to merge 1-4...success. 253s Attempting to merge 1-5...success. 253s Attempting to merge 1-6...success. 253s Attempting to merge 2-1...success. 253s Attempting to merge 2-2...success. 253s Attempting to merge 2-3...success. 253s Attempting to merge 2-4...success. 253s Attempting to merge 2-5...success. 253s Attempting to merge 2-6...success. 253s Attempting to merge 3-1...success. 253s Attempting to merge 3-2...success. 253s Attempting to merge 3-3...success. 253s Attempting to merge 3-4...success. 253s Attempting to merge 3-5...success. 253s Attempting to merge 3-6...success. 253s Attempting to merge 4-1...success. 254s Attempting to merge 4-2...success. 254s Attempting to merge 4-3...success. 254s Attempting to merge 4-4...success. 254s Attempting to merge 4-5...success. 254s Attempting to merge 4-6...success. 254s Attempting to merge 5-1...success. 254s Attempting to merge 5-2...success. 254s Attempting to merge 5-3...success. 254s Attempting to merge 5-4...success. 254s Attempting to merge 5-5...success. 254s Attempting to merge 5-6...success. 254s Attempting to merge 6-1...success. 254s Attempting to merge 6-2...success. 254s Attempting to merge 6-3...success. 254s Attempting to merge 6-4...success. 254s Attempting to merge 6-5...success. 254s Attempting to merge 6-6...conflict. 254s Attempting to merge 7-1...success. 254s Attempting to merge 7-2...success. 254s Attempting to merge 7-3...success. 254s Attempting to merge 7-4...success. 254s Attempting to merge 7-5...success. 254s Attempting to merge 8-1...success. 254s Attempting to merge 8-2...success. 254s Attempting to merge 8-3...success. 254s Attempting to merge 8-4...success. 254s Attempting to merge 8-5...success. 254s Attempting to merge 9-1...success. 255s Attempting to merge 9-2...success. 255s Attempting to merge 9-3...success. 255s Attempting to merge 9-4...success. 255s Attempting to merge 9-5...success. 255s Previous HEAD position was c13329d imerge 'c-d': automatic merge 9-5 255s Switched to branch 'imerge/c-d' 255s Auto-merging conflict.txt 255s CONFLICT (content): Merge conflict in conflict.txt 255s Automatic merge failed; fix conflicts and then commit the result. 255s 255s Original first commit: 255s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 255s Author: Loú User 255s Date: Thu Apr 7 22:13:20 2005 +0000 255s 255s c⇒6 255s 255s Original second commit: 255s commit f7e451a6c9656dda15641a9fbc591a602f158692 255s Author: Loú User 255s Date: Thu Apr 7 22:13:29 2005 +0000 255s 255s d⇒6 255s 255s There was a conflict merging commit 6-6, shown above. 255s Please resolve the conflict, commit the result, then type 255s 255s git-imerge continue 255s + grep -q Traceback start.out 255s + grep -q suggest manual merge of 6-6 autofill.out 255s + git-imerge diagram --commits --frontier --html=imerge3.html 255s 0 5 9 255s | | | 255s 0 - ********** - c 255s *......... 255s *......... 255s *......... 255s *......... 255s 5 - *......... 255s 6 - *.....#??? 255s | 255s d 255s 255s 0 5 9 255s | | | 255s 0 - ********** - c 255s *........| 255s *........| 255s *........| 255s *........| 255s 5 - *.....---+ 255s 6 - *----+#??? 255s | 255s d 255s 255s Key: 255s |,-,+ = rectangles forming current merge frontier 255s * = merge done manually 255s . = merge done automatically 255s # = conflict that is currently blocking progress 255s @ = merge was blocked but has been resolved 255s ? = no merge recorded 255s 255s + echo merged version 255s + git add conflict.txt 255s + GIT_EDITOR=cat git commit 255s imerge 'c-d': manual merge 6-6 255s 255s # Conflicts: 255s # conflict.txt 255s # 255s # It looks like you may be committing a merge. 255s # If this is not correct, please run 255s # git update-ref -d MERGE_HEAD 255s # and try again. 255s 255s 255s # Please enter the commit message for your changes. Lines starting 255s # with '#' will be ignored, and an empty message aborts the commit. 255s # 255s # On branch imerge/c-d 255s # All conflicts fixed but you are still merging. 255s # 255s # Changes to be committed: 255s # modified: conflict.txt 255s # modified: d.txt 255s # 255s [imerge/c-d b3ed12a] imerge 'c-d': manual merge 6-6 255s + git-imerge continue --edit 255s Merge has been recorded for merge 6-6. 255s Attempting to merge 7-6...success. 255s Attempting to merge 8-6...success. 255s Attempting to merge 9-6...success. 255s Merge is complete! 255s + git-imerge diagram --commits --frontier --html=imerge4.html 256s 0 5 9 256s | | | 256s 0 - ********** - c 256s *......... 256s *......... 256s *......... 256s *......... 256s 5 - *......... 256s 6 - *.....*... 256s | 256s d 256s 256s 0 5 9 256s | | | 256s 0 - ********** - c 256s *........| 256s *........| 256s *........| 256s *........| 256s 5 - *........| 256s 6 - *-----*--+ 256s | 256s d 256s 256s Key: 256s |,-,+ = rectangles forming current merge frontier 256s * = merge done manually 256s . = merge done automatically 256s # = conflict that is currently blocking progress 256s @ = merge was blocked but has been resolved 256s ? = no merge recorded 256s 256s + git-imerge finish --branch=c-d-full 256s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 256s + local refname=c-d-full 256s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 256s + git rev-parse c-d-full^{tree} 256s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 256s py312: commands[2] /tmp/autopkgtest.Vac0jX/build.vpl/src> /bin/sh t/test-really-conflicted 256s + dirname t/test-really-conflicted 256s + cd t 256s + pwd 256s + dirname /tmp/autopkgtest.Vac0jX/build.vpl/src/t 256s + BASE=/tmp/autopkgtest.Vac0jX/build.vpl/src 256s + . /tmp/autopkgtest.Vac0jX/build.vpl/src/t/test-lib.sh 256s + GIT_IMERGE=git-imerge 256s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s + DESCRIPTION=git-imerge test repository with multiple conflicts 256s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 256s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s + local description=git-imerge test repository with multiple conflicts 256s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 256s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s + local description=git-imerge test repository with multiple conflicts 256s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s hint: Using 'master' as the name for the initial branch. This default branch name 256s hint: is subject to change. To configure the initial branch name to use in all 256s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted/.git/ 256s hint: of your new repositories, which will suppress this warning, call: 256s hint: 256s hint: git config --global init.defaultBranch 256s hint: 256s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 256s hint: 'development'. The just-created branch can be renamed via this command: 256s hint: 256s hint: git branch -m 256s + echo git-imerge test repository with multiple conflicts 256s + printf %s\n /*.out /*.css /*.html 256s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted/.git config user.name Loú User 256s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted/.git config user.email luser@example.com 256s + TIME=1112911993 256s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/really-conflicted 256s + modify c.txt 0 256s + filename=c.txt 256s + text=0 256s + echo 0 256s + git add c.txt 256s + modify d.txt 0 256s + filename=d.txt 256s + text=0 256s + echo 0 256s + git add d.txt 256s + seq 0 7 256s + modify conflict0.txt original version 256s + filename=conflict0.txt 256s + text=original version 256s + echo original version 256s + git add conflict0.txt 256s + modify conflict1.txt original version 256s + filename=conflict1.txt 256s + text=original version 256s + echo original version 256s + git add conflict1.txt 256s + modify conflict2.txt original version 256s + filename=conflict2.txt 256s + text=original version 256s + echo original version 256s + git add conflict2.txt 256s + modify conflict3.txt original version 256s + filename=conflict3.txt 256s + text=original version 256s + echo original version 256s + git add conflict3.txt 256s + modify conflict4.txt original version 256s + filename=conflict4.txt 256s + text=original version 256s + echo original version 256s + git add conflict4.txt 256s + modify conflict5.txt original version 256s + filename=conflict5.txt 256s + text=original version 256s + echo original version 256s + git add conflict5.txt 256s + modify conflict6.txt original version 256s + filename=conflict6.txt 256s + text=original version 256s + echo original version 256s + git add conflict6.txt 256s + modify conflict7.txt original version 256s + filename=conflict7.txt 256s + text=original version 256s + echo original version 256s + git add conflict7.txt 256s + commit -m m⇒0 256s + TIME=1112911994 256s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 256s [master (root-commit) 8e21fbd] m⇒0 256s 10 files changed, 10 insertions(+) 256s create mode 100644 c.txt 256s create mode 100644 conflict0.txt 256s create mode 100644 conflict1.txt 256s create mode 100644 conflict2.txt 256s create mode 100644 conflict3.txt 256s create mode 100644 conflict4.txt 256s create mode 100644 conflict5.txt 256s create mode 100644 conflict6.txt 256s create mode 100644 conflict7.txt 256s create mode 100644 d.txt 256s + git checkout -b c master -- 256s Switched to a new branch 'c' 256s + modify c.txt 1 256s + filename=c.txt 256s + text=1 256s + echo 1 256s + git add c.txt 256s + modify conflict0.txt c version 256s + filename=conflict0.txt 256s + text=c version 256s + echo c version 256s + git add conflict0.txt 256s + modify conflict4.txt c version 256s + filename=conflict4.txt 256s + text=c version 256s + echo c version 256s + git add conflict4.txt 256s + commit -m c⇒1 256s + TIME=1112911995 256s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 256s [c 4e6007a] c⇒1 256s 3 files changed, 3 insertions(+), 3 deletions(-) 256s + modify c.txt 2 256s + filename=c.txt 256s + text=2 256s + echo 2 256s + git add c.txt 256s + commit -m c⇒2 256s + TIME=1112911996 256s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 256s [c c2b7c49] c⇒2 256s 1 file changed, 1 insertion(+), 1 deletion(-) 256s + modify c.txt 3 256s + filename=c.txt 256s + text=3 256s + echo 3 256s + git add c.txt 256s + commit -m c⇒3 256s + TIME=1112911997 256s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 256s [c 42ad55a] c⇒3 256s 1 file changed, 1 insertion(+), 1 deletion(-) 256s + modify c.txt 4 256s + filename=c.txt 256s + text=4 256s + echo 4 256s + git add c.txt 256s + modify conflict1.txt c version 256s + filename=conflict1.txt 256s + text=c version 256s + echo c version 256s + git add conflict1.txt 256s + commit -m c⇒4 256s + TIME=1112911998 256s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 256s [c a891793] c⇒4 256s 2 files changed, 2 insertions(+), 2 deletions(-) 256s + modify c.txt 5 256s + filename=c.txt 256s + text=5 256s + echo 5 256s + git add c.txt 256s + modify conflict3.txt c version 256s + filename=conflict3.txt 256s + text=c version 256s + echo c version 256s + git add conflict3.txt 256s + modify conflict6.txt c version 256s + filename=conflict6.txt 256s + text=c version 256s + echo c version 256s + git add conflict6.txt 256s + commit -m c⇒5 256s + TIME=1112911999 256s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 256s [c c21441d] c⇒5 256s 3 files changed, 3 insertions(+), 3 deletions(-) 256s + modify c.txt 6 256s + filename=c.txt 256s + text=6 256s + echo 6 256s + git add c.txt 256s + modify conflict5.txt c version 256s + filename=conflict5.txt 256s + text=c version 256s + echo c version 256s + git add conflict5.txt 256s + commit -m c⇒6 256s + TIME=1112912000 256s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 256s [c a797a66] c⇒6 256s 2 files changed, 2 insertions(+), 2 deletions(-) 256s + modify c.txt 7 256s + filename=c.txt 256s + text=7 256s + echo 7 256s + git add c.txt 256s + modify conflict2.txt c version 256s + filename=conflict2.txt 256s + text=c version 256s + echo c version 256s + git add conflict2.txt 256s + commit -m c⇒7 256s + TIME=1112912001 256s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 256s [c c0e1537] c⇒7 256s 2 files changed, 2 insertions(+), 2 deletions(-) 256s + modify c.txt 8 256s + filename=c.txt 256s + text=8 256s + echo 8 256s + git add c.txt 256s + commit -m c⇒8 256s + TIME=1112912002 256s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 256s [c 9f3e7c8] c⇒8 256s 1 file changed, 1 insertion(+), 1 deletion(-) 256s + modify c.txt 9 256s + filename=c.txt 256s + text=9 256s + echo 9 256s + git add c.txt 256s + modify conflict7.txt c version 256s + filename=conflict7.txt 256s + text=c version 256s + echo c version 256s + git add conflict7.txt 256s + commit -m c⇒9 256s + TIME=1112912003 256s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 256s [c ccbfccb] c⇒9 256s 2 files changed, 2 insertions(+), 2 deletions(-) 256s + git checkout -b d master -- 256s Switched to a new branch 'd' 256s + modify d.txt 1 256s + filename=d.txt 256s + text=1 256s + echo 1 256s + git add d.txt 256s + modify conflict0.txt d version 256s + filename=conflict0.txt 256s + text=d version 256s + echo d version 256s + git add conflict0.txt 256s + modify conflict6.txt d version 256s + filename=conflict6.txt 256s + text=d version 256s + echo d version 256s + git add conflict6.txt 256s + commit -m d⇒1 256s + TIME=1112912004 256s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 256s [d 8c3c065] d⇒1 256s 3 files changed, 3 insertions(+), 3 deletions(-) 256s + modify d.txt 2 256s + filename=d.txt 256s + text=2 256s + echo 2 256s + git add d.txt 256s + modify conflict1.txt d version 256s + filename=conflict1.txt 256s + text=d version 256s + echo d version 256s + git add conflict1.txt 256s + modify conflict2.txt d version 256s + filename=conflict2.txt 256s + text=d version 256s + echo d version 256s + git add conflict2.txt 257s + commit -m d⇒2 257s + TIME=1112912005 257s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 257s [d 820b787] d⇒2 257s 3 files changed, 3 insertions(+), 3 deletions(-) 257s + modify d.txt 3 257s + filename=d.txt 257s + text=3 257s + echo 3 257s + git add d.txt 257s + commit -m d⇒3 257s + TIME=1112912006 257s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 257s [d 821c792] d⇒3 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify d.txt 4 257s + filename=d.txt 257s + text=4 257s + echo 4 257s + git add d.txt 257s [d c2a1456] d⇒4 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + commit -m d⇒4 257s + TIME=1112912007 257s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 257s + modify d.txt 5 257s + filename=d.txt 257s + text=5 257s + echo 5 257s + git add d.txt 257s + modify conflict3.txt d version 257s + filename=conflict3.txt 257s + text=d version 257s + echo d version 257s + git add conflict3.txt 257s + commit -m d⇒5 257s + TIME=1112912008 257s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 257s [d c3e3890] d⇒5 257s 2 files changed, 2 insertions(+), 2 deletions(-) 257s + modify d.txt 6 257s + filename=d.txt 257s + text=6 257s + echo 6 257s + git add d.txt 257s + modify conflict4.txt d version 257s + filename=conflict4.txt 257s + text=d version 257s + echo d version 257s + git add conflict4.txt 257s + commit -m d⇒6 257s + TIME=1112912009 257s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 257s [d b2f5c5e] d⇒6 257s 2 files changed, 2 insertions(+), 2 deletions(-) 257s + modify d.txt 7 257s + filename=d.txt 257s + text=7 257s + echo 7 257s + git add d.txt 257s + modify conflict5.txt d version 257s + filename=conflict5.txt 257s + text=d version 257s + echo d version 257s + git add conflict5.txt 257s + commit -m d⇒7 257s + TIME=1112912010 257s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 257s [d 892af56] d⇒7 257s 2 files changed, 2 insertions(+), 2 deletions(-) 257s + modify d.txt 8 257s + filename=d.txt 257s + text=8 257s + echo 8 257s + git add d.txt 257s + modify conflict7.txt d version 257s + filename=conflict7.txt 257s + text=d version 257s + echo d version 257s + git add conflict7.txt 257s + commit -m d⇒8 257s + TIME=1112912011 257s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 257s [d 67099d0] d⇒8 257s 2 files changed, 2 insertions(+), 2 deletions(-) 257s + git checkout c 257s Switched to branch 'c' 257s + git-imerge init --name=c-d d 257s + git-imerge diagram --commits --frontier 257s 0 5 9 257s | | | 257s 0 - ********** - c 257s *????????? 257s *????????? 257s *????????? 257s *????????? 257s 5 - *????????? 257s *????????? 257s *????????? 257s 8 - *????????? 257s | 257s d 257s 257s 0 5 9 257s | | | 257s 0 - ********** - c 257s *????????? 257s *????????? 257s *????????? 257s *????????? 257s 5 - *????????? 257s *????????? 257s *????????? 257s 8 - *????????? 257s | 257s d 257s 257s Key: 257s |,-,+ = rectangles forming current merge frontier 257s * = merge done manually 257s . = merge done automatically 257s # = conflict that is currently blocking progress 257s @ = merge was blocked but has been resolved 257s ? = no merge recorded 257s 257s + conflict_count=0 257s + true 257s + git-imerge continue --no-edit 257s + tee autofill.out 257s Attempting automerge of 9-8...failure. 258s Attempting automerge of 1-1...failure. 258s Switched to branch 'imerge/c-d' 258s Auto-merging conflict0.txt 258s CONFLICT (content): Merge conflict in conflict0.txt 258s Automatic merge failed; fix conflicts and then commit the result. 258s 258s Original first commit: 258s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 258s Author: Loú User 258s Date: Thu Apr 7 22:13:15 2005 +0000 258s 258s c⇒1 258s 258s Original second commit: 258s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 258s Author: Loú User 258s Date: Thu Apr 7 22:13:24 2005 +0000 258s 258s d⇒1 258s 258s There was a conflict merging commit 1-1, shown above. 258s Please resolve the conflict, commit the result, then type 258s 258s git-imerge continue 258s + grep -q Traceback autofill.out 258s + git-imerge diagram --frontier 258s 0 5 9 258s | | | 258s 0 - ********** - c 258s *#???????? 258s *????????? 258s *????????? 258s *????????? 258s 5 - *????????? 258s *????????? 258s *????????? 258s 8 - *????????? 258s | 258s d 258s 258s Key: 258s |,-,+ = rectangles forming current merge frontier 258s * = merge done manually 258s . = merge done automatically 258s # = conflict that is currently blocking progress 258s @ = merge was blocked but has been resolved 258s ? = no merge recorded 258s 258s + grep -q There was a conflict merging autofill.out 258s + seq 0 7 258s + grep -q ==== conflict0.txt 258s + modify conflict0.txt merged version 258s + filename=conflict0.txt 258s + text=merged version 258s + echo merged version 258s + git add conflict0.txt 258s + conflict_count=1 258s + grep -q ==== conflict1.txt 258s + grep -q ==== conflict2.txt 258s + grep -q ==== conflict3.txt 258s + grep -q ==== conflict4.txt 258s + grep -q ==== conflict5.txt 258s + grep -q ==== conflict6.txt 258s + grep -q ==== conflict7.txt 258s + true 258s + git-imerge continue --no-edit 258s + tee autofill.out 258s [imerge/c-d 7998cb7] imerge 'c-d': manual merge 1-1 258s Merge has been recorded for merge 1-1. 258s Attempting automerge of 1-8...failure. 258s Attempting automerge of 1-2...success. 258s Attempting automerge of 1-6...failure. 258s Attempting automerge of 1-4...success. 258s Attempting automerge of 1-5...success. 258s Autofilling 1-2...success. 258s Autofilling 1-3...success. 258s Autofilling 1-4...success. 258s Autofilling 1-5...success. 258s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 258s Attempting automerge of 1-8...failure. 259s Attempting automerge of 1-6...failure. 259s Attempting automerge of 9-5...failure. 259s Attempting automerge of 2-1...success. 259s Attempting automerge of 2-4...success. 259s Attempting automerge of 2-5...success. 259s Attempting automerge of 9-5...failure. 259s Attempting automerge of 6-5...failure. 259s Attempting automerge of 4-5...failure. 259s Attempting automerge of 3-5...success. 259s Attempting automerge of 4-1...success. 259s Attempting automerge of 4-3...failure. 259s Attempting automerge of 4-2...failure. 259s Attempting automerge of 9-1...failure. 259s Attempting automerge of 7-1...failure. 259s Attempting automerge of 6-1...failure. 259s Attempting automerge of 5-1...failure. 259s Autofilling 2-5...success. 259s Autofilling 3-1...success. 259s Autofilling 3-2...success. 259s Autofilling 3-3...success. 259s Autofilling 3-4...success. 259s Autofilling 3-5 (first way)...success. 259s Autofilling 3-5 (second way)...success. 259s The two ways of autofilling 3-5 agree. 259s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 259s Autofilling 4-1...success. 259s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 259s Attempting automerge of 4-5...failure. 259s Attempting automerge of 4-2...failure. 259s Attempting automerge of 9-1...failure. 259s Attempting automerge of 5-1...failure. 259s Previous HEAD position was c21441d c⇒5 259s Switched to branch 'imerge/c-d' 259s Auto-merging conflict4.txt 259s CONFLICT (content): Merge conflict in conflict4.txt 259s Automatic merge failed; fix conflicts and then commit the result. 259s 259s Original first commit: 259s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 259s Author: Loú User 259s Date: Thu Apr 7 22:13:15 2005 +0000 259s 259s c⇒1 259s 259s Original second commit: 259s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 259s Author: Loú User 259s Date: Thu Apr 7 22:13:29 2005 +0000 259s 259s d⇒6 259s 259s There was a conflict merging commit 1-6, shown above. 259s Please resolve the conflict, commit the result, then type 259s 259s git-imerge continue 259s + grep -q Traceback autofill.out 259s + git-imerge diagram --frontier 260s 0 5 9 260s | | | 260s 0 - ********** - c 260s **?.+#???? 260s *.?|#????? 260s *.?|?????? 260s *.?|?????? 260s 5 - *--+?????? 260s *#???????? 260s *????????? 260s 8 - *????????? 260s | 260s d 260s 260s Key: 260s |,-,+ = rectangles forming current merge frontier 260s * = merge done manually 260s . = merge done automatically 260s # = conflict that is currently blocking progress 260s @ = merge was blocked but has been resolved 260s ? = no merge recorded 260s 260s + grep -q There was a conflict merging autofill.out 260s + seq 0 7 260s + grep -q ==== conflict0.txt 260s + grep -q ==== conflict1.txt 260s + grep -q ==== conflict2.txt 260s + grep -q ==== conflict3.txt 260s + grep -q ==== conflict4.txt 260s + modify conflict4.txt merged version 260s + filename=conflict4.txt 260s + text=merged version 260s + echo merged version 260s + git add conflict4.txt 260s + conflict_count=2 260s + grep -q ==== conflict5.txt 260s + grep -q ==== conflict6.txt 260s + grep -q ==== conflict7.txt 260s + true 260s + git-imerge continue --no-edit 260s + tee autofill.out 260s [imerge/c-d 57d3128] imerge 'c-d': manual merge 1-6 260s Merge has been recorded for merge 1-6. 260s Attempting automerge of 1-8...success. 260s Autofilling 1-7...success. 260s Autofilling 1-8...success. 260s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 260s Attempting automerge of 3-8...success. 260s Autofilling 2-8...success. 260s Autofilling 3-6...success. 260s Autofilling 3-7...success. 260s Autofilling 3-8 (first way)...success. 260s Autofilling 3-8 (second way)...success. 260s The two ways of autofilling 3-8 agree. 260s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 260s Warning: you are leaving 1 commit behind, not connected to 260s any of your branches: 260s 260s beba56d imerge 'c-d': automatic merge 3-8 260s 260s If you want to keep it by creating a new branch, this may be a good time 260s to do so with: 260s 260s git branch beba56d 260s 260s Switched to branch 'imerge/c-d' 260s Auto-merging conflict1.txt 260s CONFLICT (content): Merge conflict in conflict1.txt 260s Automatic merge failed; fix conflicts and then commit the result. 260s 260s Original first commit: 260s commit a89179336bb40a4ca90903425239a9ef3ce659bd 260s Author: Loú User 260s Date: Thu Apr 7 22:13:18 2005 +0000 260s 260s c⇒4 260s 260s Original second commit: 260s commit 820b787e86e22612af7a061db842dc95e9f1d49f 260s Author: Loú User 260s Date: Thu Apr 7 22:13:25 2005 +0000 260s 260s d⇒2 260s 260s There was a conflict merging commit 4-2, shown above. 260s Please resolve the conflict, commit the result, then type 260s 260s git-imerge continue 260s + grep -q Traceback autofill.out 260s + git-imerge diagram --frontier 261s 0 5 9 261s | | | 261s 0 - ********** - c 261s **?.+#???? 261s *.?|#????? 261s *.?|?????? 261s *.?|?????? 261s 5 - *..|?????? 261s **?|?????? 261s *.?|?????? 261s 8 - *--+?????? 261s | 261s d 261s 261s Key: 261s |,-,+ = rectangles forming current merge frontier 261s * = merge done manually 261s . = merge done automatically 261s # = conflict that is currently blocking progress 261s @ = merge was blocked but has been resolved 261s ? = no merge recorded 261s 261s + grep -q There was a conflict merging autofill.out 261s + seq 0 7 261s + grep -q ==== conflict0.txt 261s + grep -q ==== conflict1.txt 261s + modify conflict1.txt merged version 261s + filename=conflict1.txt 261s + text=merged version 261s + echo merged version 261s + git add conflict1.txt 261s + conflict_count=3 261s + grep -q ==== conflict2.txt 261s + grep -q ==== conflict3.txt 261s + grep -q ==== conflict4.txt 261s + grep -q ==== conflict5.txt 261s + grep -q ==== conflict6.txt 261s + grep -q ==== conflict7.txt 261s + true 261s + git-imerge continue --no-edit 261s + tee autofill.out 261s [imerge/c-d f4b1c9f] imerge 'c-d': manual merge 4-2 261s Merge has been recorded for merge 4-2. 261s Attempting automerge of 4-8...success. 261s Autofilling 4-3...success. 261s Autofilling 4-4...success. 261s Autofilling 4-5...success. 261s Autofilling 4-6...success. 261s Autofilling 4-7...success. 261s Autofilling 4-8...success. 261s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 261s Previous HEAD position was 78d8162 imerge 'c-d': automatic merge 4-8 261s Switched to branch 'imerge/c-d' 261s Auto-merging conflict6.txt 261s CONFLICT (content): Merge conflict in conflict6.txt 261s Automatic merge failed; fix conflicts and then commit the result. 261s 261s Original first commit: 261s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 261s Author: Loú User 261s Date: Thu Apr 7 22:13:19 2005 +0000 261s 261s c⇒5 261s 261s Original second commit: 261s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 261s Author: Loú User 261s Date: Thu Apr 7 22:13:24 2005 +0000 261s 261s d⇒1 261s 261s There was a conflict merging commit 5-1, shown above. 261s Please resolve the conflict, commit the result, then type 261s 261s git-imerge continue 261s + grep -q Traceback autofill.out 261s + git-imerge diagram --frontier 262s 0 5 9 262s | | | 262s 0 - ********** - c 262s **?.|#???? 262s *.?.*????? 262s *.?.|????? 262s *.?.|????? 262s 5 - *...|????? 262s **?.|????? 262s *.?.|????? 262s 8 - *---+????? 262s | 262s d 262s 262s Key: 262s |,-,+ = rectangles forming current merge frontier 262s * = merge done manually 262s . = merge done automatically 262s # = conflict that is currently blocking progress 262s @ = merge was blocked but has been resolved 262s ? = no merge recorded 262s 262s + grep -q There was a conflict merging autofill.out 262s + seq 0 7 262s + grep -q ==== conflict0.txt 262s + grep -q ==== conflict1.txt 262s + grep -q ==== conflict2.txt 262s + grep -q ==== conflict3.txt 262s + grep -q ==== conflict4.txt 262s + grep -q ==== conflict5.txt 262s + grep -q ==== conflict6.txt 262s + modify conflict6.txt merged version 262s + filename=conflict6.txt 262s + text=merged version 262s + echo merged version 262s + git add conflict6.txt 262s + conflict_count=4 262s + grep -q ==== conflict7.txt 262s + true 262s + git-imerge continue --no-edit 262s + tee autofill.out 262s [imerge/c-d b90aa00] imerge 'c-d': manual merge 5-1 262s Merge has been recorded for merge 5-1. 262s Attempting automerge of 5-8...failure. 262s Attempting automerge of 5-2...success. 262s Attempting automerge of 5-6...failure. 262s Attempting automerge of 5-4...success. 262s Attempting automerge of 5-5...failure. 262s Autofilling 5-2...success. 262s Autofilling 5-3...success. 262s Autofilling 5-4...success. 262s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 262s Attempting automerge of 5-8...failure. 262s Attempting automerge of 5-5...failure. 262s Attempting automerge of 9-4...failure. 262s Attempting automerge of 6-1...success. 262s Attempting automerge of 6-3...success. 262s Attempting automerge of 6-4...success. 262s Attempting automerge of 9-4...failure. 262s Attempting automerge of 8-4...failure. 262s Attempting automerge of 7-4...failure. 263s Attempting automerge of 7-1...success. 263s Attempting automerge of 7-3...failure. 263s Attempting automerge of 7-2...failure. 263s Attempting automerge of 9-1...success. 263s Autofilling 6-1...success. 263s Autofilling 6-2...success. 263s Autofilling 6-3...success. 263s Autofilling 6-4...success. 263s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 263s Autofilling 7-1...success. 263s Autofilling 8-1...success. 263s Autofilling 9-1...success. 263s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 263s Attempting automerge of 9-4...failure. 263s Attempting automerge of 7-2...failure. 263s Previous HEAD position was 7b6244a imerge 'c-d': automatic merge 7-1 263s Switched to branch 'imerge/c-d' 263s Auto-merging conflict3.txt 263s CONFLICT (content): Merge conflict in conflict3.txt 263s Automatic merge failed; fix conflicts and then commit the result. 263s 263s Original first commit: 263s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 263s Author: Loú User 263s Date: Thu Apr 7 22:13:19 2005 +0000 263s 263s c⇒5 263s 263s Original second commit: 263s commit c3e3890b9e3c756c1d8f7e345184d576739be079 263s Author: Loú User 263s Date: Thu Apr 7 22:13:28 2005 +0000 263s 263s d⇒5 263s 263s There was a conflict merging commit 5-5, shown above. 263s Please resolve the conflict, commit the result, then type 263s 263s git-imerge continue 263s + grep -q Traceback autofill.out 263s + git-imerge diagram --frontier 263s 0 5 9 263s | | | 263s 0 - ********** - c 263s **?..*.--+ 263s *.?.*.|#?? 263s *.?...|??? 263s *.?..-+??? 263s 5 - *...|#???? 263s **?.|????? 263s *.?.|????? 263s 8 - *---+????? 263s | 263s d 263s 263s Key: 263s |,-,+ = rectangles forming current merge frontier 263s * = merge done manually 263s . = merge done automatically 263s # = conflict that is currently blocking progress 263s @ = merge was blocked but has been resolved 263s ? = no merge recorded 263s 263s + grep -q There was a conflict merging autofill.out 263s + seq 0 7 263s + grep -q ==== conflict0.txt 263s + grep -q ==== conflict1.txt 263s + grep -q ==== conflict2.txt 263s + grep -q ==== conflict3.txt 263s + modify conflict3.txt merged version 263s + filename=conflict3.txt 263s + text=merged version 263s + echo merged version 263s + git add conflict3.txt 263s + conflict_count=5 263s + grep -q ==== conflict4.txt 263s + grep -q ==== conflict5.txt 263s + grep -q ==== conflict6.txt 263s + grep -q ==== conflict7.txt 263s + true 263s + git-imerge continue --no-edit 263s + tee autofill.out 264s [imerge/c-d 7b1536d] imerge 'c-d': manual merge 5-5 264s Merge has been recorded for merge 5-5. 264s Attempting automerge of 5-8...success. 264s Autofilling 5-6...success. 264s Autofilling 5-7...success. 264s Autofilling 5-8...success. 264s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 264s Attempting automerge of 6-8...failure. 264s Attempting automerge of 6-5...success. 264s Attempting automerge of 6-7...failure. 264s Attempting automerge of 6-6...success. 264s Autofilling 6-5...success. 264s Autofilling 6-6...success. 264s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 264s Attempting automerge of 6-8...failure. 264s Attempting automerge of 6-7...failure. 264s Switched to branch 'imerge/c-d' 264s Auto-merging conflict5.txt 264s CONFLICT (content): Merge conflict in conflict5.txt 264s Automatic merge failed; fix conflicts and then commit the result. 264s 264s Original first commit: 264s commit a797a66a0e4b89690099557280641efeac302bcf 264s Author: Loú User 264s Date: Thu Apr 7 22:13:20 2005 +0000 264s 264s c⇒6 264s 264s Original second commit: 264s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 264s Author: Loú User 264s Date: Thu Apr 7 22:13:30 2005 +0000 264s 264s d⇒7 264s 264s There was a conflict merging commit 6-7, shown above. 264s Please resolve the conflict, commit the result, then type 264s 264s git-imerge continue 264s + grep -q Traceback autofill.out 264s + git-imerge diagram --frontier 264s 0 5 9 264s | | | 264s 0 - ********** - c 264s **?..*.--+ 264s *.?.*.|#?? 264s *.?...|??? 264s *.?...|??? 264s 5 - *....*|??? 264s **?...+??? 264s *.?..|#??? 264s 8 - *----+???? 264s | 264s d 264s 264s Key: 264s |,-,+ = rectangles forming current merge frontier 264s * = merge done manually 264s . = merge done automatically 264s # = conflict that is currently blocking progress 264s @ = merge was blocked but has been resolved 264s ? = no merge recorded 264s 264s + grep -q There was a conflict merging autofill.out 265s + seq 0 7 265s + grep -q ==== conflict0.txt 265s + grep -q ==== conflict1.txt 265s + grep -q ==== conflict2.txt 265s + grep -q ==== conflict3.txt 265s + grep -q ==== conflict4.txt 265s + grep -q ==== conflict5.txt 265s + modify conflict5.txt merged version 265s + filename=conflict5.txt 265s + text=merged version 265s + echo merged version 265s + git add conflict5.txt 265s + conflict_count=6 265s + grep -q ==== conflict6.txt 265s + grep -q ==== conflict7.txt 265s + true 265s + git-imerge continue --no-edit 265s + tee autofill.out 265s [imerge/c-d ef299cc] imerge 'c-d': manual merge 6-7 265s Merge has been recorded for merge 6-7. 265s Attempting automerge of 6-8...success. 265s Autofilling 6-8...success. 265s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 265s Previous HEAD position was a7fde8a imerge 'c-d': automatic merge 6-8 265s Switched to branch 'imerge/c-d' 265s Auto-merging conflict2.txt 265s CONFLICT (content): Merge conflict in conflict2.txt 265s Automatic merge failed; fix conflicts and then commit the result. 265s 265s Original first commit: 265s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 265s Author: Loú User 265s Date: Thu Apr 7 22:13:21 2005 +0000 265s 265s c⇒7 265s 265s Original second commit: 265s commit 820b787e86e22612af7a061db842dc95e9f1d49f 265s Author: Loú User 265s Date: Thu Apr 7 22:13:25 2005 +0000 265s 265s d⇒2 265s 265s There was a conflict merging commit 7-2, shown above. 265s Please resolve the conflict, commit the result, then type 265s 265s git-imerge continue 265s + grep -q Traceback autofill.out 265s + git-imerge diagram --frontier 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s **?..*.--+ 265s *.?.*.|#?? 265s *.?...|??? 265s *.?...|??? 265s 5 - *....*|??? 265s **?...|??? 265s *.?...*??? 265s 8 - *-----+??? 265s | 265s d 265s 265s Key: 265s |,-,+ = rectangles forming current merge frontier 265s * = merge done manually 265s . = merge done automatically 265s # = conflict that is currently blocking progress 265s @ = merge was blocked but has been resolved 265s ? = no merge recorded 265s 265s + grep -q There was a conflict merging autofill.out 265s + seq 0 7 265s + grep -q ==== conflict0.txt 265s + grep -q ==== conflict1.txt 265s + grep -q ==== conflict2.txt 265s + modify conflict2.txt merged version 265s + filename=conflict2.txt 265s + text=merged version 265s + echo merged version 265s + git add conflict2.txt 265s + conflict_count=7 265s + grep -q ==== conflict3.txt 265s + grep -q ==== conflict4.txt 265s + grep -q ==== conflict5.txt 265s + grep -q ==== conflict6.txt 265s + grep -q ==== conflict7.txt 265s + true 265s + git-imerge continue --no-edit 265s + tee autofill.out 265s [imerge/c-d 2d55d37] imerge 'c-d': manual merge 7-2 265s Merge has been recorded for merge 7-2. 266s Attempting automerge of 7-8...success. 266s Autofilling 7-3...success. 266s Autofilling 7-4...success. 266s Autofilling 7-5...success. 266s Autofilling 7-6...success. 266s Autofilling 7-7...success. 266s Autofilling 7-8...success. 266s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 266s Attempting automerge of 9-8...failure. 266s Attempting automerge of 8-2...success. 266s Attempting automerge of 8-6...success. 266s Attempting automerge of 8-8...success. 266s Attempting automerge of 9-8...failure. 266s Attempting automerge of 9-2...success. 266s Attempting automerge of 9-5...success. 266s Attempting automerge of 9-7...success. 266s Autofilling 8-2...success. 266s Autofilling 8-3...success. 266s Autofilling 8-4...success. 266s Autofilling 8-5...success. 266s Autofilling 8-6...success. 266s Autofilling 8-7...success. 266s Autofilling 8-8...success. 266s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 266s Autofilling 9-2...success. 266s Autofilling 9-3...success. 266s Autofilling 9-4...success. 266s Autofilling 9-5...success. 266s Autofilling 9-6...success. 266s Autofilling 9-7...success. 266s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 266s Attempting automerge of 9-8...failure. 266s Attempting automerge of 9-8...failure. 266s Switched to branch 'imerge/c-d' 266s Auto-merging conflict7.txt 266s CONFLICT (content): Merge conflict in conflict7.txt 266s Automatic merge failed; fix conflicts and then commit the result. 266s 266s Original first commit: 267s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 267s Author: Loú User 267s Date: Thu Apr 7 22:13:23 2005 +0000 267s 267s c⇒9 267s 267s Original second commit: 267s commit 67099d078100141fbe4063d46a6408200f4ff311 267s Author: Loú User 267s Date: Thu Apr 7 22:13:31 2005 +0000 267s 267s d⇒8 267s 267s There was a conflict merging commit 9-8, shown above. 267s Please resolve the conflict, commit the result, then type 267s 267s git-imerge continue 267s + grep -q Traceback autofill.out 267s + git-imerge diagram --frontier 267s 0 5 9 267s | | | 267s 0 - ********** - c 267s **?..*...| 267s *.?.*..*.| 267s *.?......| 267s *.?......| 267s 5 - *....*...| 267s **?......| 267s *.?...*..+ 267s 8 - *-------+# 267s | 267s d 267s 267s Key: 267s |,-,+ = rectangles forming current merge frontier 267s * = merge done manually 267s . = merge done automatically 267s # = conflict that is currently blocking progress 267s @ = merge was blocked but has been resolved 267s ? = no merge recorded 267s 267s + grep -q There was a conflict merging autofill.out 267s + seq 0 7 267s + grep -q ==== conflict0.txt 267s + grep -q ==== conflict1.txt 267s + grep -q ==== conflict2.txt 267s + grep -q ==== conflict3.txt 267s + grep -q ==== conflict4.txt 267s + grep -q ==== conflict5.txt 267s + grep -q ==== conflict6.txt 267s + grep -q ==== conflict7.txt 267s + modify conflict7.txt merged version 267s + filename=conflict7.txt 267s + text=merged version 267s + echo merged version 267s + git add conflict7.txt 267s + conflict_count=8 267s + true 267s + git-imerge continue --no-edit 267s + tee autofill.out 267s [imerge/c-d 1666a7f] imerge 'c-d': manual merge 9-8 267s Merge has been recorded for merge 9-8. 267s Merge is complete! 267s + grep -q Traceback autofill.out 267s + git-imerge diagram --frontier 267s 0 5 9 267s | | | 267s 0 - ********** - c 267s **?..*...| 267s *.?.*..*.| 267s *.?......| 267s *.?......| 267s 5 - *....*...| 267s **?......| 267s *.?...*..| 267s 8 - *--------* 267s | 267s d 267s 267s Key: 267s |,-,+ = rectangles forming current merge frontier 267s * = merge done manually 267s . = merge done automatically 267s # = conflict that is currently blocking progress 267s @ = merge was blocked but has been resolved 267s ? = no merge recorded 267s 267s + grep -q There was a conflict merging autofill.out 267s + break 267s + test 8 -ne 8 267s + git-imerge diagram --commits 268s + + diff -u - diagram.out 268s cat 268s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 268s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 268s Merge d into c (using imerge) 268s 268s # Please enter the commit message for your changes. Lines starting 268s # with '#' will be ignored, and an empty message aborts the commit. 268s # 268s # Date: Wed Mar 20 10:15:30 2024 +0000 268s # 268s # On branch c-d-merge 268s # Changes to be committed: 268s # modified: conflict0.txt 268s # modified: conflict1.txt 268s # modified: conflict2.txt 268s # modified: conflict3.txt 268s # modified: conflict4.txt 268s # modified: conflict5.txt 268s # modified: conflict6.txt 268s # modified: conflict7.txt 268s # modified: d.txt 268s # 268s [c-d-merge a0a55b8] Merge d into c (using imerge) 268s Date: Wed Mar 20 10:15:30 2024 +0000 268s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 268s + local refname=c-d-merge 268s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 268s + git rev-parse c-d-merge^{tree} 268s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 268s + git-imerge simplify --goal=rebase --branch=c-d-rebase 268s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 268s + local refname=c-d-rebase 268s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 268s + git rev-parse c-d-rebase^{tree} 268s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 268s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 269s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 269s + local refname=c-d-rebase-with-history 269s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 269s + git rev-parse c-d-rebase-with-history^{tree} 269s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 269s + git-imerge simplify --goal=border --branch=c-d-border 269s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 269s + local refname=c-d-border 269s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 269s + git rev-parse c-d-border^{tree} 269s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 269s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 270s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 270s + local refname=c-d-border-with-history 270s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 270s + git rev-parse c-d-border-with-history^{tree} 270s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 270s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 270s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 270s + local refname=c-d-border-with-history2 270s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 270s + git rev-parse c-d-border-with-history2^{tree} 270s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 270s + git-imerge remove 271s py312: commands[3] /tmp/autopkgtest.Vac0jX/build.vpl/src> /bin/sh t/test-duplicated 271s + dirname t/test-duplicated 271s + cd t 271s + pwd 271s + dirname /tmp/autopkgtest.Vac0jX/build.vpl/src/t 271s + BASE=/tmp/autopkgtest.Vac0jX/build.vpl/src 271s + . /tmp/autopkgtest.Vac0jX/build.vpl/src/t/test-lib.sh 271s + GIT_IMERGE=git-imerge 271s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s + DESCRIPTION=git-imerge test repository with duplicate commits 271s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated git-imerge test repository with duplicate commits 271s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s + local description=git-imerge test repository with duplicate commits 271s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated git-imerge test repository with duplicate commits 271s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s + local description=git-imerge test repository with duplicate commits 271s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s hint: Using 'master' as the name for the initial branch. This default branch name 271s hint: is subject to change. To configure the initial branch name to use in all 271s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated/.git/ 271s [master (root-commit) a733afa] m⇒0 271s 1 file changed, 1 insertion(+) 271s create mode 100644 a.txt 271s hint: of your new repositories, which will suppress this warning, call: 271s hint: 271s hint: git config --global init.defaultBranch 271s hint: 271s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 271s hint: 'development'. The just-created branch can be renamed via this command: 271s hint: 271s hint: git branch -m 271s + echo git-imerge test repository with duplicate commits 271s + printf %s\n /*.out /*.css /*.html 271s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated/.git config user.name Loú User 271s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated/.git config user.email luser@example.com 271s + TIME=1112911993 271s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/duplicated 271s + modify a.txt 0 271s + filename=a.txt 271s + text=0 271s + echo 0 271s + git add a.txt 271s + commit -m m⇒0 271s + TIME=1112911994 271s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 271s + git checkout -b a -- 271s Switched to a new branch 'a' 271s + seq 3 271s + modify a.txt 1 271s + filename=a.txt 271s + text=1 271s + echo 1 271s + git add a.txt 271s + commit -m a⇒1 on branch a 271s + TIME=1112911995 271s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 271s [a 2f1f75a] a⇒1 on branch a 271s 1 file changed, 1 insertion(+), 1 deletion(-) 271s + modify a.txt 2 271s + filename=a.txt 271s + text=2 271s + echo 2 271s + git add a.txt 271s + commit -m a⇒2 on branch a 271s + TIME=1112911996 271s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 271s [a 4700669] a⇒2 on branch a 271s 1 file changed, 1 insertion(+), 1 deletion(-) 271s + modify a.txt 3 271s + filename=a.txt 271s + text=3 271s + echo 3 271s + git add a.txt 271s + commit -m a⇒3 on branch a 271s + TIME=1112911997 271s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 271s [a 621c381] a⇒3 on branch a 271s 1 file changed, 1 insertion(+), 1 deletion(-) 271s + git checkout -b b master -- 271s Switched to a new branch 'b' 271s + seq 4 271s + modify a.txt 1 271s + filename=a.txt 271s + text=1 271s + echo 1 271s + git add a.txt 271s + commit -m a⇒1 on branch b 271s + TIME=1112911998 271s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 271s [b 62a5c56] a⇒1 on branch b 271s 1 file changed, 1 insertion(+), 1 deletion(-) 271s + modify a.txt 2 271s + filename=a.txt 271s + text=2 271s + echo 2 271s + git add a.txt 271s + commit -m a⇒2 on branch b 271s + TIME=1112911999 271s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 271s [b f846281] a⇒2 on branch b 271s 1 file changed, 1 insertion(+), 1 deletion(-) 271s + modify a.txt 3 271s + filename=a.txt 271s + text=3 271s + echo 3 271s + git add a.txt 271s [b a4b2c2b] a⇒3 on branch b 271s 1 file changed, 1 insertion(+), 1 deletion(-) 271s + commit -m a⇒3 on branch b 271s + TIME=1112912000 271s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 271s + modify a.txt 4 271s + filename=a.txt 271s + text=4 271s + echo 4 271s + git add a.txt 271s + commit -m a⇒4 on branch b 271s + TIME=1112912001 271s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 271s [b 5b24553] a⇒4 on branch b 271s 1 file changed, 1 insertion(+), 1 deletion(-) 271s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 271s + git checkout a 271s Switched to branch 'a' 271s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 271s Attempting automerge of 3-4...failure. 271s Attempting automerge of 1-1...success. 271s Attempting automerge of 1-3...failure. 271s Attempting automerge of 1-2...failure. 271s Attempting automerge of 3-1...failure. 271s Attempting automerge of 2-1...failure. 271s Autofilling 1-1...success. 271s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 271s Attempting automerge of 1-4...success. 272s Autofilling 1-2...success. 272s Autofilling 1-3...success. 272s Autofilling 1-4...success. 272s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 272s Attempting automerge of 3-4...failure. 272s Attempting automerge of 2-1...success. 272s Attempting automerge of 2-3...failure. 272s Attempting automerge of 2-2...success. 272s Attempting automerge of 3-2...failure. 272s Attempting automerge of 3-1...success. 272s Autofilling 2-1...success. 272s Autofilling 2-2...success. 272s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 272s Autofilling 3-1...success. 272s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 272s Attempting automerge of 2-4...success. 272s Autofilling 2-3...success. 272s Autofilling 2-4...success. 272s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 272s Attempting automerge of 3-4...failure. 272s Attempting automerge of 3-2...success. 272s Attempting automerge of 3-4...failure. 272s Attempting automerge of 3-3...success. 272s Autofilling 3-2...success. 272s Autofilling 3-3...success. 272s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 272s Attempting automerge of 3-4...success. 272s Autofilling 3-4...success. 272s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 272s Merge is complete! 272s + git-imerge diagram --commits --frontier --html=imerge5.html 272s 0 3 272s | | 272s 0 - **** - a 272s *... 272s *... 272s *... 272s 4 - *... 272s | 272s b 272s 272s 0 3 272s | | 272s 0 - **** - a 272s *..| 272s *..| 272s *..| 272s 4 - *--+ 272s | 272s b 272s 272s Key: 272s |,-,+ = rectangles forming current merge frontier 272s * = merge done manually 272s . = merge done automatically 272s # = conflict that is currently blocking progress 272s @ = merge was blocked but has been resolved 272s ? = no merge recorded 272s 272s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 273s Merge b into a (using imerge) 273s 273s # Please enter the commit message for your changes. Lines starting 273s # with '#' will be ignored, and an empty message aborts the commit. 273s # 273s # Date: Wed Mar 20 10:15:35 2024 +0000 273s # 273s # On branch a-b-merge 273s # Changes to be committed: 273s # modified: a.txt 273s # 273s [a-b-merge 199b339] Merge b into a (using imerge) 273s Date: Wed Mar 20 10:15:35 2024 +0000 273s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + local refname=a-b-merge 273s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + git rev-parse a-b-merge^{tree} 273s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + git-imerge simplify --goal=rebase --branch=a-b-rebase 273s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + local refname=a-b-rebase 273s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + git rev-parse a-b-rebase^{tree} 273s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 273s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + local refname=a-b-rebase-with-history 273s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + git rev-parse a-b-rebase-with-history^{tree} 273s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 273s + git-imerge simplify --goal=border --branch=a-b-border 274s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 274s + local refname=a-b-border 274s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 274s + git rev-parse a-b-border^{tree} 274s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 274s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 274s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 274s + local refname=a-b-border-with-history 274s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 274s + git rev-parse a-b-border-with-history^{tree} 274s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 274s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 275s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-border-with-history2 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-border-with-history2^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git checkout a 275s Switched to branch 'a' 275s + git-imerge start --goal=full --name=a-b b 275s Attempting to merge 1-1...success. 275s Attempting to merge 1-2...success. 275s Attempting to merge 1-3...success. 275s Attempting to merge 1-4...success. 275s Attempting to merge 2-1...success. 275s Attempting to merge 2-2...success. 275s Attempting to merge 2-3...success. 275s Attempting to merge 2-4...success. 275s Attempting to merge 3-1...success. 275s Attempting to merge 3-2...success. 275s Attempting to merge 3-3...success. 275s Attempting to merge 3-4...success. 275s Merge is complete! 275s + git-imerge list 276s * a-b 276s + git-imerge diagram --commits --frontier --html=imerge6.html 276s 0 3 276s | | 276s 0 - **** - a 276s *... 276s *... 276s *... 276s 4 - *... 276s | 276s b 276s 276s 0 3 276s | | 276s 0 - **** - a 276s *..| 276s *..| 276s *..| 276s 4 - *--+ 276s | 276s b 276s 276s Key: 276s |,-,+ = rectangles forming current merge frontier 276s * = merge done manually 276s . = merge done automatically 276s # = conflict that is currently blocking progress 276s @ = merge was blocked but has been resolved 276s ? = no merge recorded 276s 276s + git-imerge finish --branch=a-b-full 276s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 276s + local refname=a-b-full 276s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 276s + git rev-parse a-b-full^{tree} 276s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 276s py312: commands[4] /tmp/autopkgtest.Vac0jX/build.vpl/src> /bin/sh t/test-flip-flop 276s + dirname t/test-flip-flop 276s + cd t 276s + pwd 276s + dirname /tmp/autopkgtest.Vac0jX/build.vpl/src/t 276s + BASE=/tmp/autopkgtest.Vac0jX/build.vpl/src 276s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1/.git/ 276s + . /tmp/autopkgtest.Vac0jX/build.vpl/src/t/test-lib.sh 276s + GIT_IMERGE=git-imerge 276s + flip_flop_test 1 276s + local n=1 276s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 276s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 276s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s + local description=git-imerge test repository with a commit and its revert at n=1 276s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 276s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s + local description=git-imerge test repository with a commit and its revert at n=1 276s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s hint: Using 'master' as the name for the initial branch. This default branch name 276s hint: is subject to change. To configure the initial branch name to use in all 276s hint: of your new repositories, which will suppress this warning, call: 276s hint: 276s hint: git config --global init.defaultBranch 276s hint: 276s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 276s hint: 'development'. The just-created branch can be renamed via this command: 276s hint: 276s hint: git branch -m 276s + echo git-imerge test repository with a commit and its revert at n=1 276s + printf %s\n /*.out /*.css /*.html 276s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1/.git config user.name Loú User 276s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 276s + TIME=1112911993 276s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-1 276s + modify a.txt 0 276s + filename=a.txt 276s + text=0 276s + echo 0 276s + git add a.txt 276s + commit -m m⇒0 276s + TIME=1112911994 276s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 276s [master (root-commit) a733afa] m⇒0 276s 1 file changed, 1 insertion(+) 276s create mode 100644 a.txt 276s + git checkout -b a -- 276s Switched to a new branch 'a' 276s + modify a.txt 1 276s + filename=a.txt 276s + text=1 276s + echo 1 276s + git add a.txt 276s + commit -m a⇒1 on branch a 276s + TIME=1112911995 276s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 276s + modify a.txt 2 276s [a 2f1f75a] a⇒1 on branch a 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + filename=a.txt 276s + text=2 276s + echo 2 276s + git add a.txt 276s + commit -m a⇒2 on branch a 276s + TIME=1112911996 276s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 276s + modify a.txt 3 276s [a 4700669] a⇒2 on branch a 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + filename=a.txt 276s + text=3 276s + echo 3 276s + git add a.txt 276s + commit -m a⇒3 on branch a 276s + TIME=1112911997 276s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 276s + git checkout -b b master -- 276s [a 621c381] a⇒3 on branch a 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s Switched to a new branch 'b' 276s + modify b.txt 1 276s + filename=b.txt 276s + text=1 276s + echo 1 276s + git add b.txt 276s + msg=b⇒1 276s + test 1 = 1 276s + modify a.txt X 276s + filename=a.txt 276s + text=X 276s + echo X 276s + git add a.txt 276s + msg=b⇒1 and a⇒X 276s + test 1 = 2 276s + commit -m b⇒1 and a⇒X on branch b 276s + TIME=1112911998 276s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 276s + modify b.txt 2 276s + filename=b.txt 276s + text=2 276s + echo 2 276s + git add b.txt 276s [b 044a3fa] b⇒1 and a⇒X on branch b 276s 2 files changed, 2 insertions(+), 1 deletion(-) 276s create mode 100644 b.txt 276s + msg=b⇒2 276s + test 2 = 1 276s + test 2 = 2 276s + modify a.txt 0 276s + filename=a.txt 276s + text=0 276s + echo 0 276s + git add a.txt 276s + msg=b⇒2 and a⇒0 276s + commit -m b⇒2 and a⇒0 on branch b 276s + TIME=1112911999 276s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 276s [b 7851975] b⇒2 and a⇒0 on branch b 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s + modify b.txt 3 276s + filename=b.txt 276s + text=3 276s + echo 3 276s + git add b.txt 276s + msg=b⇒3 276s + test 3 = 1 276s + test 3 = 2 276s + commit -m b⇒3 on branch b 276s + TIME=1112912000 276s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 276s [b 6fe24f0] b⇒3 on branch b 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify b.txt 4 276s + filename=b.txt 276s + text=4 276s + echo 4 276s + git add b.txt 276s + msg=b⇒4 276s + test 4 = 1 276s + test 4 = 2 276s + commit -m b⇒4 on branch b 276s + TIME=1112912001 276s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 276s [b 2dc5eb7] b⇒4 on branch b 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + test_merge b-into-a-1 a b 1-1 1-2 276s + local name=b-into-a-1 276s + local dst=a 276s + local src=b 276s + local conflict1=1-1 276s + local conflict2=1-2 276s + git checkout a 276s Switched to branch 'a' 276s + + git-imerge merge --branch=b-into-a-1 b 276s tee imerge-b-into-a-1-1.out 277s Attempting automerge of 3-4...success. 277s Autofilling 1-4...success. 277s Autofilling 2-4...success. 277s Autofilling 3-1...unexpected conflict. Backtracking... 277s Autofilling 1-4...success. 277s Autofilling 2-1...unexpected conflict. Backtracking... 277s Autofilling 1-1...unexpected conflict. Backtracking... 277s Switched to branch 'imerge/b' 277s Auto-merging a.txt 277s CONFLICT (content): Merge conflict in a.txt 277s Automatic merge failed; fix conflicts and then commit the result. 277s 277s Original first commit: 277s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 277s Author: Loú User 277s Date: Thu Apr 7 22:13:15 2005 +0000 277s 277s a⇒1 on branch a 277s 277s Original second commit: 277s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 277s Author: Loú User 277s Date: Thu Apr 7 22:13:18 2005 +0000 277s 277s b⇒1 and a⇒X on branch b 277s 277s There was a conflict merging commit 1-1, shown above. 277s Please resolve the conflict, commit the result, then type 277s 277s git-imerge continue 277s + git-imerge diagram --commits --frontier 277s 0 3 277s | | 277s 0 - **** - a 277s *#?? 277s *??? 277s *??? 277s 4 - *??? 277s | 277s b 277s 277s 0 3 277s | | 277s 0 - **** - a 277s *#?? 277s *??? 277s *??? 277s 4 - *??? 277s | 277s b 277s 277s Key: 277s |,-,+ = rectangles forming current merge frontier 277s * = merge done manually 277s . = merge done automatically 277s # = conflict that is currently blocking progress 277s @ = merge was blocked but has been resolved 277s ? = no merge recorded 277s 277s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 277s + echo 1 277s + git add a.txt 277s + + git-imerge continue --no-edit 277s tee imerge-b-into-a-1-2.out 277s [imerge/b 33e7fb8] imerge 'b': manual merge 1-1 277s Merge has been recorded for merge 1-1. 277s Attempting automerge of 1-4...failure. 277s Attempting automerge of 1-2...failure. 277s Attempting automerge of 3-1...success. 278s Autofilling 2-1...success. 278s Autofilling 3-1...success. 278s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 278s Previous HEAD position was 63d8cde imerge 'b': automatic merge 3-1 278s Switched to branch 'imerge/b' 278s Auto-merging a.txt 278s CONFLICT (content): Merge conflict in a.txt 278s Automatic merge failed; fix conflicts and then commit the result. 278s 278s Original first commit: 278s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 278s Author: Loú User 278s Date: Thu Apr 7 22:13:15 2005 +0000 278s 278s a⇒1 on branch a 278s 278s Original second commit: 278s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 278s Author: Loú User 278s Date: Thu Apr 7 22:13:19 2005 +0000 278s 278s b⇒2 and a⇒0 on branch b 278s 278s There was a conflict merging commit 1-2, shown above. 278s Please resolve the conflict, commit the result, then type 278s 278s git-imerge continue 278s + git-imerge diagram --commits --frontier 278s 0 3 278s | | 278s 0 - **** - a 278s **.. 278s *#?? 278s *??? 278s 4 - *??? 278s | 278s b 278s 278s 0 3 278s | | 278s 0 - **** - a 278s **-+ 278s *#?? 278s *??? 278s 4 - *??? 278s | 278s b 278s 278s Key: 278s |,-,+ = rectangles forming current merge frontier 278s * = merge done manually 278s . = merge done automatically 278s # = conflict that is currently blocking progress 278s @ = merge was blocked but has been resolved 278s ? = no merge recorded 278s 278s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 278s + echo 1 278s + git add a.txt 278s + + teegit-imerge continue imerge-b-into-a-1-3.out --no-edit 278s 278s [imerge/b 897b9fb] imerge 'b': manual merge 1-2 278s Merge has been recorded for merge 1-2. 278s Attempting automerge of 1-4...success. 278s Autofilling 1-3...success. 278s Autofilling 1-4...success. 278s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 278s Attempting automerge of 3-4...success. 278s Autofilling 2-4...success. 278s Autofilling 3-2...success. 278s Autofilling 3-3...success. 278s Autofilling 3-4 (first way)...success. 278s Autofilling 3-4 (second way)...success. 278s The two ways of autofilling 3-4 agree. 278s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 278s Merge is complete! 278s + grep -q Merge is complete imerge-b-into-a-1-3.out 278s + git-imerge diagram --commits --frontier 279s 0 3 279s | | 279s 0 - **** - a 279s **.. 279s **?. 279s *.?. 279s 4 - *... 279s | 279s b 279s 279s 0 3 279s | | 279s 0 - **** - a 279s **.| 279s **?| 279s *.?| 279s 4 - *--+ 279s | 279s b 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s + GIT_EDITOR=cat git-imerge finish 279s Merge b into a (using imerge) 279s 279s # Please enter the commit message for your changes. Lines starting 279s # with '#' will be ignored, and an empty message aborts the commit. 279s # 279s # Date: Wed Mar 20 10:15:41 2024 +0000 279s # 279s # On branch b-into-a-1 279s # Changes to be committed: 279s # new file: b.txt 279s # 279s [b-into-a-1 fef4bfc] Merge b into a (using imerge) 279s Date: Wed Mar 20 10:15:41 2024 +0000 279s + test_merge a-into-b-1 b a 1-1 2-1 279s + local name=a-into-b-1 279s + local dst=b 279s + local src=a 279s + local conflict1=1-1 279s + local conflict2=2-1 279s + git checkout b 279s Switched to branch 'b' 279s + git-imerge merge --branch=a-into-b-1 a 279s + tee imerge-a-into-b-1-1.out 279s Attempting automerge of 4-3...success. 279s Autofilling 1-3...unexpected conflict. Backtracking... 279s Autofilling 1-2...unexpected conflict. Backtracking... 279s Autofilling 1-1...unexpected conflict. Backtracking... 279s Switched to branch 'imerge/a' 279s Auto-merging a.txt 279s CONFLICT (content): Merge conflict in a.txt 279s Automatic merge failed; fix conflicts and then commit the result. 279s 279s Original first commit: 279s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 279s Author: Loú User 279s Date: Thu Apr 7 22:13:18 2005 +0000 279s 279s b⇒1 and a⇒X on branch b 279s 279s Original second commit: 279s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 279s Author: Loú User 279s Date: Thu Apr 7 22:13:15 2005 +0000 279s 279s a⇒1 on branch a 279s 279s There was a conflict merging commit 1-1, shown above. 279s Please resolve the conflict, commit the result, then type 279s 279s git-imerge continue 279s + git-imerge diagram --commits --frontier 280s 0 4 280s | | 280s 0 - ***** - b 280s *#??? 280s *???? 280s 3 - *???? 280s | 280s a 280s 280s 0 4 280s | | 280s 0 - ***** - b 280s *#??? 280s *???? 280s 3 - *???? 280s | 280s a 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 280s + echo 1 280s + git add a.txt 280s + + tee imerge-a-into-b-1-2.out 280s git-imerge continue --no-edit 280s [imerge/a 50a2edc] imerge 'a': manual merge 1-1 280s Merge has been recorded for merge 1-1. 280s Attempting automerge of 1-3...success. 280s Autofilling 1-2...success. 280s Autofilling 1-3...success. 280s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 280s Attempting automerge of 4-3...failure. 280s Attempting automerge of 2-1...failure. 280s Switched to branch 'imerge/a' 280s Auto-merging a.txt 280s CONFLICT (content): Merge conflict in a.txt 280s Automatic merge failed; fix conflicts and then commit the result. 280s 280s Original first commit: 280s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 280s Author: Loú User 280s Date: Thu Apr 7 22:13:19 2005 +0000 280s 280s b⇒2 and a⇒0 on branch b 280s 280s Original second commit: 280s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 280s Author: Loú User 280s Date: Thu Apr 7 22:13:15 2005 +0000 280s 280s a⇒1 on branch a 280s 280s There was a conflict merging commit 2-1, shown above. 280s Please resolve the conflict, commit the result, then type 280s 280s git-imerge continue 280s + git-imerge diagram --commits --frontier 280s 0 4 280s | | 280s 0 - ***** - b 280s **#?? 280s *.??? 280s 3 - *.??? 280s | 280s a 280s 280s 0 4 280s | | 280s 0 - ***** - b 280s **#?? 280s *|??? 280s 3 - *+??? 280s | 280s a 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 280s + echo 1 280s + git add a.txt 280s + + git-imergetee continue --no-edit 280s imerge-a-into-b-1-3.out 281s [imerge/a 4f62f62] imerge 'a': manual merge 2-1 281s Merge has been recorded for merge 2-1. 281s Attempting automerge of 2-3...success. 281s Autofilling 2-2...success. 281s Autofilling 2-3...success. 281s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 281s Attempting automerge of 4-3...success. 281s Autofilling 3-3...success. 281s Autofilling 4-1...success. 281s Autofilling 4-2...success. 281s Autofilling 4-3 (first way)...success. 281s Autofilling 4-3 (second way)...success. 281s The two ways of autofilling 4-3 agree. 281s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 281s Merge is complete! 281s + grep -q Merge is complete imerge-a-into-b-1-3.out 281s + git-imerge diagram --commits --frontier 281s 0 4 281s | | 281s 0 - ***** - b 281s ***?. 281s *..?. 281s 3 - *.... 281s | 281s a 281s 281s 0 4 281s | | 281s 0 - ***** - b 281s ***?| 281s *..?| 281s 3 - *---+ 281s | 281s a 281s 281s Key: 281s |,-,+ = rectangles forming current merge frontier 281s * = merge done manually 281s . = merge done automatically 281s # = conflict that is currently blocking progress 281s @ = merge was blocked but has been resolved 281s ? = no merge recorded 281s 281s + GIT_EDITOR=cat git-imerge finish 282s Merge a into b (using imerge) 282s 282s # Please enter the commit message for your changes. Lines starting 282s # with '#' will be ignored, and an empty message aborts the commit. 282s # 282s # Date: Wed Mar 20 10:15:43 2024 +0000 282s # 282s # On branch a-into-b-1 282s # Changes to be committed: 282s # modified: a.txt 282s # 282s [a-into-b-1 8b27b27] Merge a into b (using imerge) 282s Date: Wed Mar 20 10:15:43 2024 +0000 282s + flip_flop_test 2 282s + local n=2 282s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 282s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 282s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s + local description=git-imerge test repository with a commit and its revert at n=2 282s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 282s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s + local description=git-imerge test repository with a commit and its revert at n=2 282s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s hint: Using 'master' as the name for the initial branch. This default branch name 282s hint: is subject to change. To configure the initial branch name to use in all 282s hint: of your new repositories, which will suppress this warning, call: 282s hint: 282s hint: git config --global init.defaultBranch 282s hint: 282s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 282s hint: 'development'. The just-created branch can be renamed via this command: 282s hint: 282s hint: git branch -m 282s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2/.git/ 282s + echo git-imerge test repository with a commit and its revert at n=2 282s + printf %s\n /*.out /*.css /*.html 282s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2/.git config user.name Loú User 282s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 282s + TIME=1112911993 282s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-2 282s + modify a.txt 0 282s + filename=a.txt 282s + text=0 282s + echo 0 282s + git add a.txt 282s + commit -m m⇒0 282s + TIME=1112911994 282s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 282s + git checkout -b a -- 282s Switched to a new branch 'a' 282s + modify a.txt 1 282s + filename=a.txt 282s + text=1 282s + echo 1 282s + git add a.txt 282s + commit -m a⇒1 on branch a 282s + TIME=1112911995 282s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 282s [master (root-commit) a733afa] m⇒0 282s 1 file changed, 1 insertion(+) 282s create mode 100644 a.txt 282s [a 2f1f75a] a⇒1 on branch a 282s 1 file changed, 1 insertion(+), 1 deletion(-) 282s + modify a.txt 2 282s + filename=a.txt 282s + text=2 282s + echo 2 282s + git add a.txt 282s + commit -m a⇒2 on branch a 282s + TIME=1112911996 282s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 282s + modify a.txt 3 282s + filename=a.txt 282s + text=3 282s + echo 3 282s + git add a.txt 282s [a 4700669] a⇒2 on branch a 282s 1 file changed, 1 insertion(+), 1 deletion(-) 282s + commit -m a⇒3 on branch a 282s + TIME=1112911997 282s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 282s [a 621c381] a⇒3 on branch a 282s 1 file changed, 1 insertion(+), 1 deletion(-) 282s + git checkout -b b master -- 282s Switched to a new branch 'b' 282s + modify b.txt 1 282s + filename=b.txt 282s + text=1 282s + echo 1 282s + git add b.txt 282s + msg=b⇒1 282s + test 1 = 2 282s + test 1 = 3 282s + commit -m b⇒1 on branch b 282s + TIME=1112911998 282s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 282s + modify b.txt 2 282s + filename=b.txt 282s + text=2 282s + echo 2 282s + git add b.txt 282s + msg=b⇒2 282s + test 2 = 2 282s + modify a.txt X 282s + filename=a.txt 282s + text=X 282s + echo X 282s + git add a.txt 282s [b 1f7d097] b⇒1 on branch b 282s 1 file changed, 1 insertion(+) 282s create mode 100644 b.txt 282s + msg=b⇒2 and a⇒X 282s + test 2 = 3 282s + commit -m b⇒2 and a⇒X on branch b 282s + TIME=1112911999 282s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 282s + modify b.txt 3 282s + filename=b.txt 282s + text=3 282s + echo 3 282s + git add b.txt 282s [b 48df77d] b⇒2 and a⇒X on branch b 282s 2 files changed, 2 insertions(+), 2 deletions(-) 282s + msg=b⇒3 282s + test 3 = 2 282s + test 3 = 3 282s + modify a.txt 0 282s + filename=a.txt 282s + text=0 282s + echo 0 282s + git add a.txt 282s + msg=b⇒3 and a⇒0 282s + commit -m b⇒3 and a⇒0 on branch b 282s + TIME=1112912000 282s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 282s + modify b.txt 4 282s [b f3ef019] b⇒3 and a⇒0 on branch b 282s 2 files changed, 2 insertions(+), 2 deletions(-) 282s + filename=b.txt 282s + text=4 282s + echo 4 282s + git add b.txt 282s + msg=b⇒4 282s + test 4 = 2 282s + test 4 = 3 282s + commit -m b⇒4 on branch b 282s + TIME=1112912001 282s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 282s [b 69d0c21] b⇒4 on branch b 282s 1 file changed, 1 insertion(+), 1 deletion(-) 282s + test_merge b-into-a-2 a b 1-2 1-3 282s + local name=b-into-a-2 282s + local dst=a 282s + local src=b 282s + local conflict1=1-2 282s + local conflict2=1-3 282s + git checkout a 282s Switched to branch 'a' 282s + + git-imerge merge --branch=b-into-a-2 b 282s tee imerge-b-into-a-2-1.out 282s Attempting automerge of 3-4...success. 282s Autofilling 1-4...success. 282s Autofilling 2-4...success. 282s Autofilling 3-1...success. 282s Autofilling 3-2...unexpected conflict. Backtracking... 282s Autofilling 1-4...success. 282s Autofilling 2-1...success. 282s Autofilling 2-2...unexpected conflict. Backtracking... 282s Autofilling 1-1...success. 282s Autofilling 1-2...unexpected conflict. Backtracking... 282s Autofilling 1-1...success. 282s Autofilling 2-1...success. 282s Autofilling 3-1...success. 282s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 282s Attempting automerge of 3-4...success. 282s Autofilling 1-4...success. 283s Autofilling 2-4...success. 283s Autofilling 3-2...unexpected conflict. Backtracking... 283s Autofilling 1-4...success. 283s Autofilling 2-2...unexpected conflict. Backtracking... 283s Autofilling 1-2...unexpected conflict. Backtracking... 283s Switched to branch 'imerge/b' 283s Auto-merging a.txt 283s CONFLICT (content): Merge conflict in a.txt 283s Automatic merge failed; fix conflicts and then commit the result. 283s 283s Original first commit: 283s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 283s Author: Loú User 283s Date: Thu Apr 7 22:13:15 2005 +0000 283s 283s a⇒1 on branch a 283s 283s Original second commit: 283s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 283s Author: Loú User 283s Date: Thu Apr 7 22:13:19 2005 +0000 283s 283s b⇒2 and a⇒X on branch b 283s 283s There was a conflict merging commit 1-2, shown above. 283s Please resolve the conflict, commit the result, then type 283s 283s git-imerge continue 283s + git-imerge diagram --commits --frontier 283s 0 3 283s | | 283s 0 - **** - a 283s *... 283s *#?? 283s *??? 283s 4 - *??? 283s | 283s b 283s 283s 0 3 283s | | 283s 0 - **** - a 283s *--+ 283s *#?? 283s *??? 283s 4 - *??? 283s | 283s b 283s 283s Key: 283s |,-,+ = rectangles forming current merge frontier 283s * = merge done manually 283s . = merge done automatically 283s # = conflict that is currently blocking progress 283s @ = merge was blocked but has been resolved 283s ? = no merge recorded 283s 283s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 283s + echo 1 283s + git add a.txt 283s + + git-imerge continue --no-edit 283s tee imerge-b-into-a-2-2.out 283s [imerge/b 11aaa2a] imerge 'b': manual merge 1-2 283s Merge has been recorded for merge 1-2. 283s Attempting automerge of 1-4...failure. 283s Attempting automerge of 1-3...failure. 283s Attempting automerge of 3-2...success. 283s Autofilling 2-2...success. 283s Autofilling 3-2...success. 283s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 283s Previous HEAD position was 50614f5 imerge 'b': automatic merge 3-2 283s Switched to branch 'imerge/b' 283s Auto-merging a.txt 283s CONFLICT (content): Merge conflict in a.txt 283s Automatic merge failed; fix conflicts and then commit the result. 283s 283s Original first commit: 283s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 283s Author: Loú User 283s Date: Thu Apr 7 22:13:15 2005 +0000 283s 283s a⇒1 on branch a 283s 283s Original second commit: 283s commit f3ef01986be02ef5e40589b283c0385471ecca7d 283s Author: Loú User 283s Date: Thu Apr 7 22:13:20 2005 +0000 283s 283s b⇒3 and a⇒0 on branch b 283s 283s There was a conflict merging commit 1-3, shown above. 283s Please resolve the conflict, commit the result, then type 283s 283s git-imerge continue 283s + git-imerge diagram --commits --frontier 284s 0 3 284s | | 284s 0 - **** - a 284s *... 284s **.. 284s *#?? 284s 4 - *??? 284s | 284s b 284s 284s 0 3 284s | | 284s 0 - **** - a 284s *..| 284s **-+ 284s *#?? 284s 4 - *??? 284s | 284s b 284s 284s Key: 284s |,-,+ = rectangles forming current merge frontier 284s * = merge done manually 284s . = merge done automatically 284s # = conflict that is currently blocking progress 284s @ = merge was blocked but has been resolved 284s ? = no merge recorded 284s 284s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 284s + echo 1 284s + git add a.txt 284s + + git-imergetee continue --no-edit 284s imerge-b-into-a-2-3.out 284s [imerge/b 55c21d0] imerge 'b': manual merge 1-3 284s Merge has been recorded for merge 1-3. 284s Attempting automerge of 1-4...success. 284s Autofilling 1-4...success. 284s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 284s Attempting automerge of 3-4...success. 284s Autofilling 2-4...success. 284s Autofilling 3-3...success. 284s Autofilling 3-4 (first way)...success. 284s Autofilling 3-4 (second way)...success. 284s The two ways of autofilling 3-4 agree. 284s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 284s Merge is complete! 284s + grep -q Merge is complete imerge-b-into-a-2-3.out 284s + git-imerge diagram --commits --frontier 285s 0 3 285s | | 285s 0 - **** - a 285s *... 285s **.. 285s **?. 285s 4 - *... 285s | 285s b 285s 285s 0 3 285s | | 285s 0 - **** - a 285s *..| 285s **.| 285s **?| 285s 4 - *--+ 285s | 285s b 285s 285s Key: 285s |,-,+ = rectangles forming current merge frontier 285s * = merge done manually 285s . = merge done automatically 285s # = conflict that is currently blocking progress 285s @ = merge was blocked but has been resolved 285s ? = no merge recorded 285s 285s + GIT_EDITOR=cat git-imerge finish 285s Merge b into a (using imerge) 285s 285s # Please enter the commit message for your changes. Lines starting 285s # with '#' will be ignored, and an empty message aborts the commit. 285s # 285s # Date: Wed Mar 20 10:15:47 2024 +0000 285s # 285s # On branch b-into-a-2 285s # Changes to be committed: 285s # new file: b.txt 285s # 285s [b-into-a-2 56bb511] Merge b into a (using imerge) 285s Date: Wed Mar 20 10:15:47 2024 +0000 285s + test_merge a-into-b-2 b a 2-1 3-1 285s + local name=a-into-b-2 285s + local dst=b 285s + local src=a 285s + local conflict1=2-1 285s + local conflict2=3-1 285s + git checkout b 285s Switched to branch 'b' 285s + git-imerge+ merge --branch=a-into-b-2 a 285s tee imerge-a-into-b-2-1.out 285s Attempting automerge of 4-3...success. 285s Autofilling 1-3...success. 285s Autofilling 2-3...unexpected conflict. Backtracking... 285s Autofilling 1-1...success. 285s Autofilling 1-2...success. 285s Autofilling 1-3...success. 285s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 285s Autofilling 2-2...unexpected conflict. Backtracking... 285s Autofilling 2-1...unexpected conflict. Backtracking... 285s Switched to branch 'imerge/a' 285s Auto-merging a.txt 285s CONFLICT (content): Merge conflict in a.txt 285s Automatic merge failed; fix conflicts and then commit the result. 285s 285s Original first commit: 285s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 285s Author: Loú User 285s Date: Thu Apr 7 22:13:19 2005 +0000 285s 285s b⇒2 and a⇒X on branch b 285s 285s Original second commit: 285s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 285s Author: Loú User 285s Date: Thu Apr 7 22:13:15 2005 +0000 285s 285s a⇒1 on branch a 285s 285s There was a conflict merging commit 2-1, shown above. 285s Please resolve the conflict, commit the result, then type 285s 285s git-imerge continue 285s + git-imerge diagram --commits --frontier 286s 0 4 286s | | 286s 0 - ***** - b 286s *.#?? 286s *.??? 286s 3 - *.??? 286s | 286s a 286s 286s 0 4 286s | | 286s 0 - ***** - b 286s *|#?? 286s *|??? 286s 3 - *+??? 286s | 286s a 286s 286s Key: 286s |,-,+ = rectangles forming current merge frontier 286s * = merge done manually 286s . = merge done automatically 286s # = conflict that is currently blocking progress 286s @ = merge was blocked but has been resolved 286s ? = no merge recorded 286s 286s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 286s + echo 1 286s + git add a.txt 286s + + git-imergetee continue --no-edit 286s imerge-a-into-b-2-2.out 286s [imerge/a 5e1d7da] imerge 'a': manual merge 2-1 286s Merge has been recorded for merge 2-1. 286s Attempting automerge of 2-3...success. 286s Autofilling 2-2...success. 286s Autofilling 2-3...success. 286s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 286s Attempting automerge of 4-3...failure. 286s Attempting automerge of 3-1...failure. 286s Switched to branch 'imerge/a' 286s Auto-merging a.txt 286s CONFLICT (content): Merge conflict in a.txt 286s Automatic merge failed; fix conflicts and then commit the result. 286s 286s Original first commit: 286s commit f3ef01986be02ef5e40589b283c0385471ecca7d 286s Author: Loú User 286s Date: Thu Apr 7 22:13:20 2005 +0000 286s 286s b⇒3 and a⇒0 on branch b 286s 286s Original second commit: 286s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 286s Author: Loú User 286s Date: Thu Apr 7 22:13:15 2005 +0000 286s 286s a⇒1 on branch a 286s 286s There was a conflict merging commit 3-1, shown above. 286s Please resolve the conflict, commit the result, then type 286s 286s git-imerge continue 286s + git-imerge diagram --commits --frontier 286s 0 4 286s | | 286s 0 - ***** - b 286s *.*#? 286s *..?? 286s 3 - *..?? 286s | 286s a 286s 286s 0 4 286s | | 286s 0 - ***** - b 286s *.*#? 286s *.|?? 286s 3 - *-+?? 286s | 286s a 286s 286s Key: 286s |,-,+ = rectangles forming current merge frontier 286s * = merge done manually 286s . = merge done automatically 286s # = conflict that is currently blocking progress 286s @ = merge was blocked but has been resolved 286s ? = no merge recorded 286s 286s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 286s + echo 1 286s + git add a.txt 286s + + git-imerge continue --no-edit 286s tee imerge-a-into-b-2-3.out 287s [imerge/a d86f7e0] imerge 'a': manual merge 3-1 287s Merge has been recorded for merge 3-1. 287s Attempting automerge of 3-3...success. 287s Autofilling 3-2...success. 287s Autofilling 3-3...success. 287s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 287s Attempting automerge of 4-3...success. 287s Autofilling 4-1...success. 287s Autofilling 4-2...success. 287s Autofilling 4-3...success. 287s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 287s Merge is complete! 287s + grep -q Merge is complete imerge-a-into-b-2-3.out 287s + git-imerge diagram --commits --frontier 287s 0 4 287s | | 287s 0 - ***** - b 287s *.**. 287s *.... 287s 3 - *.... 287s | 287s a 287s 287s 0 4 287s | | 287s 0 - ***** - b 287s *.**| 287s *...| 287s 3 - *---+ 287s | 287s a 287s 287s Key: 287s |,-,+ = rectangles forming current merge frontier 287s * = merge done manually 287s . = merge done automatically 287s # = conflict that is currently blocking progress 287s @ = merge was blocked but has been resolved 287s ? = no merge recorded 287s 287s + GIT_EDITOR=cat git-imerge finish 287s Merge a into b (using imerge) 287s 287s # Please enter the commit message for your changes. Lines starting 287s # with '#' will be ignored, and an empty message aborts the commit. 287s # 287s # Date: Wed Mar 20 10:15:49 2024 +0000 287s # 287s # On branch a-into-b-2 287s # Changes to be committed: 287s # modified: a.txt 287s # 287s [a-into-b-2 99e8b51] Merge a into b (using imerge) 287s Date: Wed Mar 20 10:15:49 2024 +0000 287s + flip_flop_test 3 287s + local n=3 287s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 287s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 287s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s + local description=git-imerge test repository with a commit and its revert at n=3 287s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 287s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s + local description=git-imerge test repository with a commit and its revert at n=3 287s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s hint: Using 'master' as the name for the initial branch. This default branch name 287s hint: is subject to change. To configure the initial branch name to use in all 287s hint: of your new repositories, which will suppress this warning, call: 287s hint: 287s hint: git config --global init.defaultBranch 287s hint: 287s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 287s hint: 'development'. The just-created branch can be renamed via this command: 287s hint: 287s hint: git branch -m 287s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3/.git/ 287s + echo git-imerge test repository with a commit and its revert at n=3 287s + printf %s\n /*.out /*.css /*.html 287s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3/.git config user.name Loú User 287s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 287s + TIME=1112911993 287s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/flip-flop-3 287s + modify a.txt 0 287s + filename=a.txt 287s + text=0 287s + echo 0 287s + git add a.txt 287s + commit -m m⇒0 287s + TIME=1112911994 287s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 287s [master (root-commit) a733afa] m⇒0 287s 1 file changed, 1 insertion(+) 287s create mode 100644 a.txt 287s + git checkout -b a -- 287s Switched to a new branch 'a' 287s + modify a.txt 1 287s + filename=a.txt 287s + text=1 287s + echo 1 287s + git add a.txt 287s + commit -m a⇒1 on branch a 287s + TIME=1112911995 287s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 287s [a 2f1f75a] a⇒1 on branch a 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s + modify a.txt 2 287s + filename=a.txt 287s + text=2 287s + echo 2 287s + git add a.txt 287s + commit -m a⇒2 on branch a 287s + TIME=1112911996 287s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 287s [a 4700669] a⇒2 on branch a 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s + modify a.txt 3 287s + filename=a.txt 287s + text=3 287s + echo 3 287s + git add a.txt 287s + commit -m a⇒3 on branch a 287s + TIME=1112911997 287s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 287s [a 621c381] a⇒3 on branch a 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s + git checkout -b b master -- 287s Switched to a new branch 'b' 287s + modify b.txt 1 287s + filename=b.txt 287s + text=1 287s + echo 1 287s + git add b.txt 287s + msg=b⇒1 287s + test 1 = 3 287s + test 1 = 4 287s + commit -m b⇒1 on branch b 287s + TIME=1112911998 287s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 287s [b 1f7d097] b⇒1 on branch b 287s 1 file changed, 1 insertion(+) 287s create mode 100644 b.txt 287s + modify b.txt 2 287s + filename=b.txt 287s + text=2 287s + echo 2 287s + git add b.txt 287s + msg=b⇒2 287s + test 2 = 3 287s + test 2 = 4 287s + commit -m b⇒2 on branch b 287s + TIME=1112911999 287s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 287s [b ce671e9] b⇒2 on branch b 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s + modify b.txt 3 287s + filename=b.txt 287s + text=3 287s + echo 3 287s + git add b.txt 287s + msg=b⇒3 287s + test 3 = 3 287s + modify a.txt X 287s + filename=a.txt 287s + text=X 287s + echo X 287s + git add a.txt 287s + msg=b⇒3 and a⇒X 287s + test 3 = 4 287s + commit -m b⇒3 and a⇒X on branch b 287s + TIME=1112912000 287s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 287s [b d40495e] b⇒3 and a⇒X on branch b 287s 2 files changed, 2 insertions(+), 2 deletions(-) 287s + modify b.txt 4 287s + filename=b.txt 287s + text=4 287s + echo 4 287s + git add b.txt 287s + msg=b⇒4 287s + test 4 = 3 287s + test 4 = 4 287s + modify a.txt 0 287s + filename=a.txt 287s + text=0 287s + echo 0 287s + git add a.txt 287s + msg=b⇒4 and a⇒0 288s + commit -m b⇒4 and a⇒0 on branch b 288s + TIME=1112912001 288s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 288s [b eb736f2] b⇒4 and a⇒0 on branch b 288s 2 files changed, 2 insertions(+), 2 deletions(-) 288s + test_merge b-into-a-3 a b 1-3 1-4 288s + local name=b-into-a-3 288s + local dst=a 288s + local src=b 288s + local conflict1=1-3 288s + local conflict2=1-4 288s + git checkout a 288s Switched to branch 'a' 288s + git-imerge merge --branch=b-into-a-3 b 288s + tee imerge-b-into-a-3-1.out 288s Attempting automerge of 3-4...success. 288s Autofilling 1-4...success. 288s Autofilling 2-4...success. 288s Autofilling 3-1...success. 288s Autofilling 3-2...success. 288s Autofilling 3-3...unexpected conflict. Backtracking... 288s Autofilling 1-4...success. 288s Autofilling 2-1...success. 288s Autofilling 2-2...success. 288s Autofilling 2-3...unexpected conflict. Backtracking... 288s Autofilling 1-1...success. 288s Autofilling 1-2...success. 288s Autofilling 1-3...unexpected conflict. Backtracking... 288s Autofilling 1-2...success. 288s Autofilling 2-2...success. 288s Autofilling 3-1...success. 288s Autofilling 3-2 (first way)...success. 288s Autofilling 3-2 (second way)...success. 288s The two ways of autofilling 3-2 agree. 288s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 288s Attempting automerge of 3-4...success. 288s Autofilling 1-4...success. 288s Autofilling 2-4...success. 288s Autofilling 3-3...unexpected conflict. Backtracking... 288s Autofilling 1-4...success. 288s Autofilling 2-3...unexpected conflict. Backtracking... 288s Autofilling 1-3...unexpected conflict. Backtracking... 288s Switched to branch 'imerge/b' 288s Auto-merging a.txt 288s CONFLICT (content): Merge conflict in a.txt 288s Automatic merge failed; fix conflicts and then commit the result. 288s 288s Original first commit: 288s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 288s Author: Loú User 288s Date: Thu Apr 7 22:13:15 2005 +0000 288s 288s a⇒1 on branch a 288s 288s Original second commit: 288s commit d40495ed379f376841e517047f90b663e8c7c7e1 288s Author: Loú User 288s Date: Thu Apr 7 22:13:20 2005 +0000 288s 288s b⇒3 and a⇒X on branch b 288s 288s There was a conflict merging commit 1-3, shown above. 288s Please resolve the conflict, commit the result, then type 288s 288s git-imerge continue 288s + git-imerge diagram --commits --frontier 289s 0 3 289s | | 289s 0 - **** - a 289s *??. 289s *... 289s *#?? 289s 4 - *??? 289s | 289s b 289s 289s 0 3 289s | | 289s 0 - **** - a 289s *??| 289s *--+ 289s *#?? 289s 4 - *??? 289s | 289s b 289s 289s Key: 289s |,-,+ = rectangles forming current merge frontier 289s * = merge done manually 289s . = merge done automatically 289s # = conflict that is currently blocking progress 289s @ = merge was blocked but has been resolved 289s ? = no merge recorded 289s 289s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 289s + echo 1 289s + git add a.txt 289s + + git-imerge continue --no-edit 289s tee imerge-b-into-a-3-2.out 289s [imerge/b d7e59b2] imerge 'b': manual merge 1-3 289s Merge has been recorded for merge 1-3. 289s Attempting automerge of 1-4...failure. 289s Attempting automerge of 1-4...failure. 289s Attempting automerge of 3-3...success. 289s Autofilling 2-3...success. 289s Autofilling 3-3...success. 289s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 289s Previous HEAD position was 7dedce5 imerge 'b': automatic merge 3-3 289s Switched to branch 'imerge/b' 289s Auto-merging a.txt 289s CONFLICT (content): Merge conflict in a.txt 289s Automatic merge failed; fix conflicts and then commit the result. 289s 289s Original first commit: 289s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 289s Author: Loú User 289s Date: Thu Apr 7 22:13:15 2005 +0000 289s 289s a⇒1 on branch a 289s 289s Original second commit: 289s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 289s Author: Loú User 289s Date: Thu Apr 7 22:13:21 2005 +0000 289s 289s b⇒4 and a⇒0 on branch b 289s 289s There was a conflict merging commit 1-4, shown above. 289s Please resolve the conflict, commit the result, then type 289s 289s git-imerge continue 289s + git-imerge diagram --commits --frontier 289s 0 3 289s | | 289s 0 - **** - a 289s *??. 289s *... 289s **.. 289s 4 - *#?? 289s | 289s b 289s 289s 0 3 289s | | 289s 0 - **** - a 289s *??| 289s *..| 289s **-+ 289s 4 - *#?? 289s | 289s b 289s 289s Key: 289s |,-,+ = rectangles forming current merge frontier 289s * = merge done manually 289s . = merge done automatically 289s # = conflict that is currently blocking progress 289s @ = merge was blocked but has been resolved 289s ? = no merge recorded 289s 289s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 289s + echo 1 289s + git add a.txt 289s + + git-imergetee continue --no-edit 289s imerge-b-into-a-3-3.out 290s [imerge/b 6df7a43] imerge 'b': manual merge 1-4 290s Merge has been recorded for merge 1-4. 290s Attempting automerge of 3-4...success. 290s Autofilling 2-4...success. 290s Autofilling 3-4...success. 290s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 290s Merge is complete! 290s + grep -q Merge is complete imerge-b-into-a-3-3.out 290s + git-imerge diagram --commits --frontier 290s 0 3 290s | | 290s 0 - **** - a 290s *??. 290s *... 290s **.. 290s 4 - **.. 290s | 290s b 290s 290s 0 3 290s | | 290s 0 - **** - a 290s *??| 290s *..| 290s **.| 290s 4 - **-+ 290s | 290s b 290s 290s Key: 290s |,-,+ = rectangles forming current merge frontier 290s * = merge done manually 290s . = merge done automatically 290s # = conflict that is currently blocking progress 290s @ = merge was blocked but has been resolved 290s ? = no merge recorded 290s 290s + GIT_EDITOR=cat git-imerge finish 290s Merge b into a (using imerge) 290s 290s # Please enter the commit message for your changes. Lines starting 290s # with '#' will be ignored, and an empty message aborts the commit. 290s # 290s # Date: Wed Mar 20 10:15:52 2024 +0000 290s # 290s # On branch b-into-a-3 290s # Changes to be committed: 290s # new file: b.txt 290s # 290s [b-into-a-3 ddc343b] Merge b into a (using imerge) 290s Date: Wed Mar 20 10:15:52 2024 +0000 290s + test_merge a-into-b-3 b a 3-1 4-1 290s + local name=a-into-b-3 290s + local dst=b 290s + local src=a 290s + local conflict1=3-1 290s + local conflict2=4-1 290s + git checkout b 290s Switched to branch 'b' 290s + git-imerge merge --branch=a-into-b-3 a 290s + tee imerge-a-into-b-3-1.out 291s Attempting automerge of 4-3...success. 291s Autofilling 1-3...success. 291s Autofilling 2-3...success. 291s Autofilling 3-3...unexpected conflict. Backtracking... 291s Autofilling 1-3...success. 291s Autofilling 2-1...success. 291s Autofilling 2-2...success. 291s Autofilling 2-3 (first way)...success. 291s Autofilling 2-3 (second way)...success. 291s The two ways of autofilling 2-3 agree. 291s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 291s Autofilling 3-2...unexpected conflict. Backtracking... 291s Autofilling 3-1...unexpected conflict. Backtracking... 291s Switched to branch 'imerge/a' 291s Auto-merging a.txt 291s CONFLICT (content): Merge conflict in a.txt 291s Automatic merge failed; fix conflicts and then commit the result. 291s 291s Original first commit: 291s commit d40495ed379f376841e517047f90b663e8c7c7e1 291s Author: Loú User 291s Date: Thu Apr 7 22:13:20 2005 +0000 291s 291s b⇒3 and a⇒X on branch b 291s 291s Original second commit: 291s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 291s Author: Loú User 291s Date: Thu Apr 7 22:13:15 2005 +0000 291s 291s a⇒1 on branch a 291s 291s There was a conflict merging commit 3-1, shown above. 291s Please resolve the conflict, commit the result, then type 291s 291s git-imerge continue 291s + git-imerge diagram --commits --frontier 291s 0 4 291s | | 291s 0 - ***** - b 291s *?.#? 291s *?.?? 291s 3 - *..?? 291s | 291s a 291s 291s 0 4 291s | | 291s 0 - ***** - b 291s *?|#? 291s *?|?? 291s 3 - *-+?? 291s | 291s a 291s 291s Key: 291s |,-,+ = rectangles forming current merge frontier 291s * = merge done manually 291s . = merge done automatically 291s # = conflict that is currently blocking progress 291s @ = merge was blocked but has been resolved 291s ? = no merge recorded 291s 291s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 291s + echo 1 291s + git add a.txt 291s + + tee imerge-a-into-b-3-2.out 291s git-imerge continue --no-edit 291s [imerge/a 5a0a9e1] imerge 'a': manual merge 3-1 291s Merge has been recorded for merge 3-1. 292s Attempting automerge of 3-3...success. 292s Autofilling 3-2...success. 292s Autofilling 3-3...success. 292s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 292s Attempting automerge of 4-3...failure. 292s Attempting automerge of 4-1...failure. 292s Switched to branch 'imerge/a' 292s Auto-merging a.txt 292s CONFLICT (content): Merge conflict in a.txt 292s Automatic merge failed; fix conflicts and then commit the result. 292s 292s Original first commit: 292s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 292s Author: Loú User 292s Date: Thu Apr 7 22:13:21 2005 +0000 292s 292s b⇒4 and a⇒0 on branch b 292s 292s Original second commit: 292s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 292s Author: Loú User 292s Date: Thu Apr 7 22:13:15 2005 +0000 292s 292s a⇒1 on branch a 292s 292s There was a conflict merging commit 4-1, shown above. 292s Please resolve the conflict, commit the result, then type 292s 292s git-imerge continue 292s + git-imerge diagram --commits --frontier 292s 0 4 292s | | 292s 0 - ***** - b 292s *?.*# 292s *?..? 292s 3 - *...? 292s | 292s a 292s 292s 0 4 292s | | 292s 0 - ***** - b 292s *?.*# 292s *?.|? 292s 3 - *--+? 292s | 292s a 292s 292s Key: 292s |,-,+ = rectangles forming current merge frontier 292s * = merge done manually 292s . = merge done automatically 292s # = conflict that is currently blocking progress 292s @ = merge was blocked but has been resolved 292s ? = no merge recorded 292s 292s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 292s + echo 1 292s + git add a.txt 292s + + tee imerge-a-into-b-3-3.out 292s git-imerge continue --no-edit 292s [imerge/a ca7a7d4] imerge 'a': manual merge 4-1 292s Merge has been recorded for merge 4-1. 292s Attempting automerge of 4-3...success. 292s Autofilling 4-2...success. 292s Autofilling 4-3...success. 292s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 292s Merge is complete! 292s + grep -q Merge is complete imerge-a-into-b-3-3.out 292s + git-imerge diagram --commits --frontier 292s 0 4 292s | | 292s 0 - ***** - b 292s *?.** 292s *?... 292s 3 - *.... 292s | 292s a 292s 292s 0 4 292s | | 292s 0 - ***** - b 292s *?.** 292s *?..| 292s 3 - *---+ 292s | 292s a 292s 292s Key: 292s |,-,+ = rectangles forming current merge frontier 292s * = merge done manually 292s . = merge done automatically 292s # = conflict that is currently blocking progress 292s @ = merge was blocked but has been resolved 292s ? = no merge recorded 292s 293s + GIT_EDITOR=cat git-imerge finish 293s Merge a into b (using imerge) 293s 293s # Please enter the commit message for your changes. Lines starting 293s # with '#' will be ignored, and an empty message aborts the commit. 293s # 293s # Date: Wed Mar 20 10:15:55 2024 +0000 293s # 293s # On branch a-into-b-3 293s # Changes to be committed: 293s # modified: a.txt 293s # 293s [a-into-b-3 63728fa] Merge a into b (using imerge) 293s Date: Wed Mar 20 10:15:55 2024 +0000 293s py312: commands[5] /tmp/autopkgtest.Vac0jX/build.vpl/src> /bin/sh t/test-drop 293s + dirname t/test-drop 293s + cd t 293s + pwd 293s + dirname /tmp/autopkgtest.Vac0jX/build.vpl/src/t 293s + BASE=/tmp/autopkgtest.Vac0jX/build.vpl/src 293s + . /tmp/autopkgtest.Vac0jX/build.vpl/src/t/test-lib.sh 293s + GIT_IMERGE=git-imerge 293s + TMP=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s + DESCRIPTION=git-imerge drop test repository 293s + init_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop git-imerge drop test repository 293s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s + local description=git-imerge drop test repository 293s + delete_test_repo /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop git-imerge drop test repository 293s + local path=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s + local description=git-imerge drop test repository 293s + test -d /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s + mkdir -p /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s + git init /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s hint: Using 'master' as the name for the initial branch. This default branch name 293s hint: is subject to change. To configure the initial branch name to use in all 293s hint: of your new repositories, which will suppress this warning, call: 293s hint: 293s hint: git config --global init.defaultBranch 293s hint: 293s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 293s hint: 'development'. The just-created branch can be renamed via this command: 293s hint: 293s hint: git branch -m 293s Initialized empty Git repository in /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop/.git/ 293s + echo git-imerge drop test repository 293s + printf %s\n /*.out /*.css /*.html 293s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop/.git config user.name Loú User 293s + git --git-dir=/tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop/.git config user.email luser@example.com 293s + TIME=1112911993 293s + ln -s /tmp/autopkgtest.Vac0jX/build.vpl/src/imerge.css /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s + cd /tmp/autopkgtest.Vac0jX/build.vpl/src/t/tmp/drop 293s + modify a.txt 0 293s + filename=a.txt 293s + text=0 293s + echo 0 293s + git add a.txt 293s + commit -m m⇒0 293s + TIME=1112911994 293s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 293s [master (root-commit) a733afa] m⇒0 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a.txt 293s + seq 6 293s + modify a1.txt 1 293s + filename=a1.txt 293s + text=1 293s + echo 1 293s + git add a1.txt 293s + commit -m a1⇒1 293s + TIME=1112911995 293s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 293s [master 389a4ba] a1⇒1 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a1.txt 293s + modify a2.txt 2 293s + filename=a2.txt 293s + text=2 293s + echo 2 293s + git add a2.txt 293s + commit -m a2⇒2 293s + TIME=1112911996 293s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 293s [master 4785218] a2⇒2 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a2.txt 293s + modify a3.txt 3 293s + filename=a3.txt 293s + text=3 293s + echo 3 293s + git add a3.txt 293s + commit -m a3⇒3 293s + TIME=1112911997 293s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 293s [master 34bdde3] a3⇒3 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a3.txt 293s + modify a4.txt 4 293s + filename=a4.txt 293s + text=4 293s + echo 4 293s + git add a4.txt 293s + commit -m a4⇒4 293s + TIME=1112911998 293s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 293s + modify a5.txt 5 293s + filename=a5.txt 293s + text=5 293s + echo 5 293s + git add a5.txt 293s [master c793a5a] a4⇒4 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a4.txt 293s + commit -m a5⇒5 293s + TIME=1112911999 293s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 293s [master b42f60c] a5⇒5 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a5.txt 293s + modify a6.txt 6 293s + filename=a6.txt 293s + text=6 293s + echo 6 293s + git add a6.txt 293s + commit -m a6⇒6 293s + TIME=1112912000 293s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 293s [master 9d6aec5] a6⇒6 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a6.txt 293s + git checkout -b dropped master 293s Switched to a new branch 'dropped' 293s + git-imerge drop HEAD~5..HEAD~3 293s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 293s 293s You are in 'detached HEAD' state. You can look around, make experimental 293s changes and commit them, and you can discard any commits you make in this 293s state without impacting any branches by switching back to a branch. 293s 293s If you want to create a new branch to retain commits you create, you may 293s do so (now or later) by using -c with the switch command. Example: 293s 293s git switch -c 293s 293s Or undo this operation with: 293s 293s git switch - 293s 293s Turn off this advice by setting config variable advice.detachedHead to false 293s 293s HEAD is now at 34bdde3 a3⇒3 293s [detached HEAD a3132b7] Revert "a3⇒3" 293s Date: Wed Mar 20 10:15:55 2024 +0000 293s 1 file changed, 1 deletion(-) 293s delete mode 100644 a3.txt 293s [detached HEAD c8181bc] Revert "a2⇒2" 293s Date: Wed Mar 20 10:15:55 2024 +0000 293s 1 file changed, 1 deletion(-) 293s delete mode 100644 a2.txt 293s Attempting automerge of 3-2...success. 293s Autofilling 1-2...success. 293s Autofilling 2-2...success. 293s Autofilling 3-1...success. 293s Autofilling 3-2 (first way)...success. 293s Autofilling 3-2 (second way)...success. 293s The two ways of autofilling 3-2 agree. 293s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='c8181bc63e44c413bb20253f5a331751d75c7afe', goal='drop')[0:4,0:3]. 293s Merge is complete! 293s + git-imerge diagram --commits --frontier --html=imerge-drop.html 294s 0 3 294s | | 294s 0 - **** - dropped 294s *??. 294s 2 - *... 294s | 294s c8181bc63e44c413bb20253f5a331751d75c7afe 294s 294s 0 3 294s | | 294s 0 - **** - dropped 294s *??| 294s 2 - *--+ 294s | 294s c8181bc63e44c413bb20253f5a331751d75c7afe 294s 294s Key: 294s |,-,+ = rectangles forming current merge frontier 294s * = merge done manually 294s . = merge done automatically 294s # = conflict that is currently blocking progress 294s @ = merge was blocked but has been resolved 294s ? = no merge recorded 294s 294s + git-imerge finish 294s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 294s + local refname=dropped 294s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 294s + git rev-parse dropped^{tree} 294s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 294s + git checkout -b reverted master 294s Switched to a new branch 'reverted' 294s + git-imerge revert HEAD~5..HEAD~3 294s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 294s 294s You are in 'detached HEAD' state. You can look around, make experimental 294s changes and commit them, and you can discard any commits you make in this 294s state without impacting any branches by switching back to a branch. 294s 294s If you want to create a new branch to retain commits you create, you may 294s do so (now or later) by using -c with the switch command. Example: 294s 294s git switch -c 294s 294s Or undo this operation with: 294s 294s git switch - 294s 294s Turn off this advice by setting config variable advice.detachedHead to false 294s 294s HEAD is now at 34bdde3 a3⇒3 294s [detached HEAD 404b528] Revert "a3⇒3" 294s Date: Wed Mar 20 10:15:56 2024 +0000 294s 1 file changed, 1 deletion(-) 294s delete mode 100644 a3.txt 294s [detached HEAD 09dd4d4] Revert "a2⇒2" 294s Date: Wed Mar 20 10:15:56 2024 +0000 294s 1 file changed, 1 deletion(-) 294s delete mode 100644 a2.txt 294s Attempting automerge of 3-2...success. 294s Autofilling 1-2...success. 294s Autofilling 2-2...success. 294s Autofilling 3-1...success. 294s Autofilling 3-2 (first way)...success. 294s Autofilling 3-2 (second way)...success. 294s The two ways of autofilling 3-2 agree. 294s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='09dd4d4470ecc9a5b1728334ae0b0ec74aab7837', goal='revert')[0:4,0:3]. 295s Merge is complete! 295s + git-imerge diagram --commits --frontier --html=imerge-revert.html 295s 0 3 295s | | 295s 0 - **** - reverted 295s *??. 295s 2 - *... 295s | 295s 09dd4d4470ecc9a5b1728334ae0b0ec74aab7837 295s 295s 0 3 295s | | 295s 0 - **** - reverted 295s *??| 295s 2 - *--+ 295s | 295s 09dd4d4470ecc9a5b1728334ae0b0ec74aab7837 295s 295s Key: 295s |,-,+ = rectangles forming current merge frontier 295s * = merge done manually 295s . = merge done automatically 295s # = conflict that is currently blocking progress 295s @ = merge was blocked but has been resolved 295s ? = no merge recorded 295s 295s + git-imerge finish 295s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 295s + local refname=reverted 295s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 295s + git rev-parse reverted^{tree} 295s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 295s py312: OK (130.46=setup[0.48]+cmd[6.23,84.76,14.61,5.48,16.64,2.26] seconds) 295s congratulations :) (130.66 seconds) 296s autopkgtest [10:15:58]: test pybuild-autopkgtest: -----------------------] 296s pybuild-autopkgtest PASS 296s autopkgtest [10:15:58]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 297s autopkgtest [10:15:59]: @@@@@@@@@@@@@@@@@@@@ summary 297s pybuild-autopkgtest PASS 312s Creating nova instance adt-noble-arm64-git-imerge-20240320-101101-juju-7f2275-prod-proposed-migration-environment-2 from image adt/ubuntu-noble-arm64-server-20240319.img (UUID bd25b89b-8264-4402-95d9-d9c88f21f275)...