0s autopkgtest [09:52:04]: starting date and time: 2025-12-03 09:52:04+0000 0s autopkgtest [09:52:04]: git checkout: 508d4a25 a-v-ssh wait_for_ssh: demote "ssh connection failed" to a debug message 0s autopkgtest [09:52:04]: host juju-7f2275-prod-proposed-migration-environment-9; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.c28mjcto/out --timeout-copy=6000 --setup-commands 'ln -s /dev/null /etc/systemd/system/bluetooth.service; printf "http_proxy=http://squid.internal:3128\nhttps_proxy=http://squid.internal:3128\nno_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,internal,login.ubuntu.com,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com\n" >> /etc/environment' --apt-pocket=proposed=src:python3-defaults --apt-upgrade git-imerge --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=python3-defaults/3.13.9-2 -- lxd -r lxd-armhf-10.145.243.227 lxd-armhf-10.145.243.227:autopkgtest/ubuntu/resolute/armhf 25s autopkgtest [09:52:29]: testbed dpkg architecture: armhf 27s autopkgtest [09:52:31]: testbed apt version: 3.1.12 32s autopkgtest [09:52:36]: @@@@@@@@@@@@@@@@@@@@ test bed setup 35s autopkgtest [09:52:39]: testbed release detected to be: None 44s autopkgtest [09:52:48]: updating testbed package index (apt update) 47s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 47s Get:2 http://ftpmaster.internal/ubuntu resolute InRelease [124 kB] 47s Get:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease [124 kB] 47s Get:4 http://ftpmaster.internal/ubuntu resolute-security InRelease [124 kB] 47s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [981 kB] 48s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [147 kB] 48s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [25.2 kB] 48s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf Packages [186 kB] 48s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf Packages [678 kB] 48s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse armhf Packages [8468 B] 48s Get:11 http://ftpmaster.internal/ubuntu resolute/multiverse Sources [305 kB] 48s Get:12 http://ftpmaster.internal/ubuntu resolute/universe Sources [21.4 MB] 54s Get:13 http://ftpmaster.internal/ubuntu resolute/main Sources [1414 kB] 54s Get:14 http://ftpmaster.internal/ubuntu resolute/main armhf Packages [1366 kB] 55s Get:15 http://ftpmaster.internal/ubuntu resolute/universe armhf Packages [15.5 MB] 57s Get:16 http://ftpmaster.internal/ubuntu resolute/multiverse armhf Packages [175 kB] 59s Fetched 42.6 MB in 13s (3337 kB/s) 60s Reading package lists... 66s autopkgtest [09:53:10]: upgrading testbed (apt dist-upgrade and autopurge) 69s Reading package lists... 70s Building dependency tree... 70s Reading state information... 70s Calculating upgrade... 70s The following packages will be upgraded: 70s libpython3-stdlib python3 python3-gdbm python3-minimal 71s 4 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 71s Need to get 72.9 kB of archives. 71s After this operation, 2048 B of additional disk space will be used. 71s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf python3-minimal armhf 3.13.9-2 [28.1 kB] 72s Get:2 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf python3 armhf 3.13.9-2 [23.0 kB] 72s Get:3 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf libpython3-stdlib armhf 3.13.9-2 [10.8 kB] 72s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf python3-gdbm armhf 3.13.9-2 [11.0 kB] 72s Fetched 72.9 kB in 1s (63.5 kB/s) 72s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 65928 files and directories currently installed.) 72s Preparing to unpack .../python3-minimal_3.13.9-2_armhf.deb ... 72s Unpacking python3-minimal (3.13.9-2) over (3.13.7-1) ... 72s Setting up python3-minimal (3.13.9-2) ... 73s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 65928 files and directories currently installed.) 73s Preparing to unpack .../python3_3.13.9-2_armhf.deb ... 73s Unpacking python3 (3.13.9-2) over (3.13.7-1) ... 73s Preparing to unpack .../libpython3-stdlib_3.13.9-2_armhf.deb ... 73s Unpacking libpython3-stdlib:armhf (3.13.9-2) over (3.13.7-1) ... 73s Preparing to unpack .../python3-gdbm_3.13.9-2_armhf.deb ... 73s Unpacking python3-gdbm (3.13.9-2) over (3.13.9-1) ... 73s Setting up python3-gdbm (3.13.9-2) ... 73s Setting up libpython3-stdlib:armhf (3.13.9-2) ... 73s Setting up python3 (3.13.9-2) ... 73s Processing triggers for man-db (2.13.1-1) ... 76s Reading package lists... 76s Building dependency tree... 76s Reading state information... 76s Solving dependencies... 77s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 79s autopkgtest [09:53:23]: rebooting testbed after setup commands that affected boot 131s autopkgtest [09:54:15]: testbed running kernel: Linux 6.8.0-87-generic #88~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Tue Oct 14 14:00:09 UTC 2 166s autopkgtest [09:54:50]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 185s Get:1 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (dsc) [1896 B] 185s Get:2 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 185s Get:3 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (diff) [3144 B] 185s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 185s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 185s gpgv: Can't check signature: No public key 185s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 185s autopkgtest [09:55:09]: testing package git-imerge version 1.2.0-5 190s autopkgtest [09:55:14]: build not needed 193s autopkgtest [09:55:17]: test pybuild-autopkgtest: preparing testbed 196s Reading package lists... 196s Building dependency tree... 196s Reading state information... 196s Solving dependencies... 196s The following NEW packages will be installed: 196s autoconf automake autopoint autotools-dev build-essential cpp cpp-15 196s cpp-15-arm-linux-gnueabihf cpp-arm-linux-gnueabihf debhelper debugedit 196s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-15 196s g++-15-arm-linux-gnueabihf g++-arm-linux-gnueabihf gcc gcc-15 196s gcc-15-arm-linux-gnueabihf gcc-arm-linux-gnueabihf gettext git git-imerge 196s git-man intltool-debian libarchive-zip-perl libasan8 libc-dev-bin libc6-dev 196s libcc1-0 libcrypt-dev libdebhelper-perl libdw1t64 liberror-perl 196s libfile-stripnondeterminism-perl libgcc-15-dev libgomp1 libisl23 196s libjs-jquery libjs-sphinxdoc libjs-underscore libmpc3 libpkgconf3 196s libstdc++-15-dev libtool libubsan1 linux-libc-dev m4 pkg-config pkgconf 196s pkgconf-bin po-debconf pybuild-plugin-autopkgtest python3-cachetools 196s python3-colorama python3-distlib python3-filelock python3-pip-whl 196s python3-platformdirs python3-pluggy python3-pyproject-api 197s python3-setuptools-whl python3-virtualenv python3-wheel rpcsvc-proto tox 199s 0 upgraded, 69 newly installed, 0 to remove and 0 not upgraded. 199s Need to get 68.2 MB of archives. 199s After this operation, 209 MB of additional disk space will be used. 199s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf m4 armhf 1.4.20-2 [212 kB] 200s Get:2 http://ftpmaster.internal/ubuntu resolute/main armhf autoconf all 2.72-3.1ubuntu1 [384 kB] 201s Get:3 http://ftpmaster.internal/ubuntu resolute/main armhf autotools-dev all 20240727.1 [43.4 kB] 201s Get:4 http://ftpmaster.internal/ubuntu resolute/main armhf automake all 1:1.18.1-3 [582 kB] 201s Get:5 http://ftpmaster.internal/ubuntu resolute/main armhf autopoint all 0.23.2-1 [620 kB] 201s Get:6 http://ftpmaster.internal/ubuntu resolute/main armhf libc-dev-bin armhf 2.42-2ubuntu2 [21.8 kB] 201s Get:7 http://ftpmaster.internal/ubuntu resolute/main armhf linux-libc-dev armhf 6.17.0-6.6 [1772 kB] 202s Get:8 http://ftpmaster.internal/ubuntu resolute/main armhf libcrypt-dev armhf 1:4.5.1-1 [128 kB] 202s Get:9 http://ftpmaster.internal/ubuntu resolute/main armhf rpcsvc-proto armhf 1.4.3-1 [62.3 kB] 202s Get:10 http://ftpmaster.internal/ubuntu resolute/main armhf libc6-dev armhf 2.42-2ubuntu2 [1416 kB] 203s Get:11 http://ftpmaster.internal/ubuntu resolute/main armhf libisl23 armhf 0.27-1 [546 kB] 203s Get:12 http://ftpmaster.internal/ubuntu resolute/main armhf libmpc3 armhf 1.3.1-2 [47.0 kB] 203s Get:13 http://ftpmaster.internal/ubuntu resolute/main armhf cpp-15-arm-linux-gnueabihf armhf 15.2.0-9ubuntu1 [10.1 MB] 205s Get:14 http://ftpmaster.internal/ubuntu resolute/main armhf cpp-15 armhf 15.2.0-9ubuntu1 [1032 B] 205s Get:15 http://ftpmaster.internal/ubuntu resolute/main armhf cpp-arm-linux-gnueabihf armhf 4:15.2.0-4ubuntu1 [5756 B] 205s Get:16 http://ftpmaster.internal/ubuntu resolute/main armhf cpp armhf 4:15.2.0-4ubuntu1 [22.4 kB] 205s Get:17 http://ftpmaster.internal/ubuntu resolute/main armhf libcc1-0 armhf 15.2.0-9ubuntu1 [43.5 kB] 205s Get:18 http://ftpmaster.internal/ubuntu resolute/main armhf libgomp1 armhf 15.2.0-9ubuntu1 [129 kB] 205s Get:19 http://ftpmaster.internal/ubuntu resolute/main armhf libasan8 armhf 15.2.0-9ubuntu1 [2951 kB] 205s Get:20 http://ftpmaster.internal/ubuntu resolute/main armhf libubsan1 armhf 15.2.0-9ubuntu1 [1187 kB] 205s Get:21 http://ftpmaster.internal/ubuntu resolute/main armhf libgcc-15-dev armhf 15.2.0-9ubuntu1 [897 kB] 205s Get:22 http://ftpmaster.internal/ubuntu resolute/main armhf gcc-15-arm-linux-gnueabihf armhf 15.2.0-9ubuntu1 [19.5 MB] 206s Get:23 http://ftpmaster.internal/ubuntu resolute/main armhf gcc-15 armhf 15.2.0-9ubuntu1 [496 kB] 206s Get:24 http://ftpmaster.internal/ubuntu resolute/main armhf gcc-arm-linux-gnueabihf armhf 4:15.2.0-4ubuntu1 [1220 B] 206s Get:25 http://ftpmaster.internal/ubuntu resolute/main armhf gcc armhf 4:15.2.0-4ubuntu1 [5022 B] 206s Get:26 http://ftpmaster.internal/ubuntu resolute/main armhf libstdc++-15-dev armhf 15.2.0-9ubuntu1 [2637 kB] 206s Get:27 http://ftpmaster.internal/ubuntu resolute/main armhf g++-15-arm-linux-gnueabihf armhf 15.2.0-9ubuntu1 [11.4 MB] 206s Get:28 http://ftpmaster.internal/ubuntu resolute/main armhf g++-15 armhf 15.2.0-9ubuntu1 [24.3 kB] 206s Get:29 http://ftpmaster.internal/ubuntu resolute/main armhf g++-arm-linux-gnueabihf armhf 4:15.2.0-4ubuntu1 [968 B] 206s Get:30 http://ftpmaster.internal/ubuntu resolute/main armhf g++ armhf 4:15.2.0-4ubuntu1 [1086 B] 206s Get:31 http://ftpmaster.internal/ubuntu resolute/main armhf build-essential armhf 12.12ubuntu2 [5256 B] 206s Get:32 http://ftpmaster.internal/ubuntu resolute/main armhf libdebhelper-perl all 13.24.2ubuntu1 [95.7 kB] 206s Get:33 http://ftpmaster.internal/ubuntu resolute/main armhf libtool all 2.5.4-7 [169 kB] 206s Get:34 http://ftpmaster.internal/ubuntu resolute/main armhf dh-autoreconf all 21 [12.5 kB] 206s Get:35 http://ftpmaster.internal/ubuntu resolute/main armhf libarchive-zip-perl all 1.68-1 [90.2 kB] 206s Get:36 http://ftpmaster.internal/ubuntu resolute/main armhf libfile-stripnondeterminism-perl all 1.15.0-1 [20.5 kB] 207s Get:37 http://ftpmaster.internal/ubuntu resolute/main armhf dh-strip-nondeterminism all 1.15.0-1 [5090 B] 207s Get:38 http://ftpmaster.internal/ubuntu resolute/main armhf libdw1t64 armhf 0.194-1 [254 kB] 207s Get:39 http://ftpmaster.internal/ubuntu resolute/main armhf debugedit armhf 1:5.2-3 [48.9 kB] 207s Get:40 http://ftpmaster.internal/ubuntu resolute/main armhf dwz armhf 0.16-2 [114 kB] 207s Get:41 http://ftpmaster.internal/ubuntu resolute/main armhf gettext armhf 0.23.2-1 [1059 kB] 207s Get:42 http://ftpmaster.internal/ubuntu resolute/main armhf intltool-debian all 0.35.0+20060710.6build1 [24.1 kB] 207s Get:43 http://ftpmaster.internal/ubuntu resolute/main armhf po-debconf all 1.0.21+nmu1 [233 kB] 207s Get:44 http://ftpmaster.internal/ubuntu resolute/main armhf debhelper all 13.24.2ubuntu1 [896 kB] 207s Get:45 http://ftpmaster.internal/ubuntu resolute/universe armhf dh-python all 6.20251029 [120 kB] 207s Get:46 http://ftpmaster.internal/ubuntu resolute/main armhf liberror-perl all 0.17030-1 [23.5 kB] 207s Get:47 http://ftpmaster.internal/ubuntu resolute/main armhf git-man all 1:2.51.0-1ubuntu1 [1179 kB] 207s Get:48 http://ftpmaster.internal/ubuntu resolute/main armhf git armhf 1:2.51.0-1ubuntu1 [4649 kB] 207s Get:49 http://ftpmaster.internal/ubuntu resolute/universe armhf git-imerge all 1.2.0-5 [49.5 kB] 207s Get:50 http://ftpmaster.internal/ubuntu resolute/main armhf libjs-jquery all 3.7.1+dfsg+~3.5.33-1build1 [321 kB] 207s Get:51 http://ftpmaster.internal/ubuntu resolute/main armhf libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 207s Get:52 http://ftpmaster.internal/ubuntu resolute/main armhf libjs-sphinxdoc all 8.2.3-1ubuntu2 [28.0 kB] 207s Get:53 http://ftpmaster.internal/ubuntu resolute/main armhf libpkgconf3 armhf 1.8.1-4build1 [26.6 kB] 207s Get:54 http://ftpmaster.internal/ubuntu resolute/main armhf pkgconf-bin armhf 1.8.1-4build1 [21.4 kB] 207s Get:55 http://ftpmaster.internal/ubuntu resolute/main armhf pkgconf armhf 1.8.1-4build1 [16.8 kB] 207s Get:56 http://ftpmaster.internal/ubuntu resolute/main armhf pkg-config armhf 1.8.1-4build1 [7494 B] 207s Get:57 http://ftpmaster.internal/ubuntu resolute/universe armhf pybuild-plugin-autopkgtest all 6.20251029 [1746 B] 207s Get:58 http://ftpmaster.internal/ubuntu resolute/main armhf python3-cachetools all 5.3.3-1 [10.3 kB] 207s Get:59 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-colorama all 0.4.6-4 [32.1 kB] 207s Get:60 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-distlib all 0.4.0-1 [267 kB] 207s Get:61 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-filelock all 3.18.0-1 [13.0 kB] 207s Get:62 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-pip-whl all 25.1.1+dfsg-1ubuntu2 [1430 kB] 207s Get:63 http://ftpmaster.internal/ubuntu resolute/main armhf python3-platformdirs all 4.4.0-1 [16.9 kB] 207s Get:64 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-pluggy all 1.6.0-1 [21.0 kB] 207s Get:65 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-pyproject-api all 1.9.1-1 [52.9 kB] 207s Get:66 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-setuptools-whl all 78.1.1-0.1 [1174 kB] 207s Get:67 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-virtualenv all 20.35.4+ds-1 [76.1 kB] 207s Get:68 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-wheel all 0.46.1-2 [22.1 kB] 207s Get:69 http://ftpmaster.internal/ubuntu resolute/universe armhf tox all 4.25.0-1 [323 kB] 208s Fetched 68.2 MB in 11s (6418 kB/s) 208s Selecting previously unselected package m4. 208s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 65928 files and directories currently installed.) 208s Preparing to unpack .../00-m4_1.4.20-2_armhf.deb ... 208s Unpacking m4 (1.4.20-2) ... 208s Selecting previously unselected package autoconf. 208s Preparing to unpack .../01-autoconf_2.72-3.1ubuntu1_all.deb ... 208s Unpacking autoconf (2.72-3.1ubuntu1) ... 208s Selecting previously unselected package autotools-dev. 208s Preparing to unpack .../02-autotools-dev_20240727.1_all.deb ... 208s Unpacking autotools-dev (20240727.1) ... 208s Selecting previously unselected package automake. 208s Preparing to unpack .../03-automake_1%3a1.18.1-3_all.deb ... 208s Unpacking automake (1:1.18.1-3) ... 208s Selecting previously unselected package autopoint. 208s Preparing to unpack .../04-autopoint_0.23.2-1_all.deb ... 208s Unpacking autopoint (0.23.2-1) ... 208s Selecting previously unselected package libc-dev-bin. 208s Preparing to unpack .../05-libc-dev-bin_2.42-2ubuntu2_armhf.deb ... 208s Unpacking libc-dev-bin (2.42-2ubuntu2) ... 209s Selecting previously unselected package linux-libc-dev:armhf. 209s Preparing to unpack .../06-linux-libc-dev_6.17.0-6.6_armhf.deb ... 209s Unpacking linux-libc-dev:armhf (6.17.0-6.6) ... 209s Selecting previously unselected package libcrypt-dev:armhf. 209s Preparing to unpack .../07-libcrypt-dev_1%3a4.5.1-1_armhf.deb ... 209s Unpacking libcrypt-dev:armhf (1:4.5.1-1) ... 209s Selecting previously unselected package rpcsvc-proto. 209s Preparing to unpack .../08-rpcsvc-proto_1.4.3-1_armhf.deb ... 209s Unpacking rpcsvc-proto (1.4.3-1) ... 209s Selecting previously unselected package libc6-dev:armhf. 209s Preparing to unpack .../09-libc6-dev_2.42-2ubuntu2_armhf.deb ... 209s Unpacking libc6-dev:armhf (2.42-2ubuntu2) ... 209s Selecting previously unselected package libisl23:armhf. 209s Preparing to unpack .../10-libisl23_0.27-1_armhf.deb ... 209s Unpacking libisl23:armhf (0.27-1) ... 209s Selecting previously unselected package libmpc3:armhf. 209s Preparing to unpack .../11-libmpc3_1.3.1-2_armhf.deb ... 209s Unpacking libmpc3:armhf (1.3.1-2) ... 209s Selecting previously unselected package cpp-15-arm-linux-gnueabihf. 209s Preparing to unpack .../12-cpp-15-arm-linux-gnueabihf_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking cpp-15-arm-linux-gnueabihf (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package cpp-15. 209s Preparing to unpack .../13-cpp-15_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking cpp-15 (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package cpp-arm-linux-gnueabihf. 209s Preparing to unpack .../14-cpp-arm-linux-gnueabihf_4%3a15.2.0-4ubuntu1_armhf.deb ... 209s Unpacking cpp-arm-linux-gnueabihf (4:15.2.0-4ubuntu1) ... 209s Selecting previously unselected package cpp. 209s Preparing to unpack .../15-cpp_4%3a15.2.0-4ubuntu1_armhf.deb ... 209s Unpacking cpp (4:15.2.0-4ubuntu1) ... 209s Selecting previously unselected package libcc1-0:armhf. 209s Preparing to unpack .../16-libcc1-0_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking libcc1-0:armhf (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package libgomp1:armhf. 209s Preparing to unpack .../17-libgomp1_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking libgomp1:armhf (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package libasan8:armhf. 209s Preparing to unpack .../18-libasan8_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking libasan8:armhf (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package libubsan1:armhf. 209s Preparing to unpack .../19-libubsan1_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking libubsan1:armhf (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package libgcc-15-dev:armhf. 209s Preparing to unpack .../20-libgcc-15-dev_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking libgcc-15-dev:armhf (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package gcc-15-arm-linux-gnueabihf. 209s Preparing to unpack .../21-gcc-15-arm-linux-gnueabihf_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking gcc-15-arm-linux-gnueabihf (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package gcc-15. 209s Preparing to unpack .../22-gcc-15_15.2.0-9ubuntu1_armhf.deb ... 209s Unpacking gcc-15 (15.2.0-9ubuntu1) ... 209s Selecting previously unselected package gcc-arm-linux-gnueabihf. 209s Preparing to unpack .../23-gcc-arm-linux-gnueabihf_4%3a15.2.0-4ubuntu1_armhf.deb ... 209s Unpacking gcc-arm-linux-gnueabihf (4:15.2.0-4ubuntu1) ... 210s Selecting previously unselected package gcc. 210s Preparing to unpack .../24-gcc_4%3a15.2.0-4ubuntu1_armhf.deb ... 210s Unpacking gcc (4:15.2.0-4ubuntu1) ... 210s Selecting previously unselected package libstdc++-15-dev:armhf. 210s Preparing to unpack .../25-libstdc++-15-dev_15.2.0-9ubuntu1_armhf.deb ... 210s Unpacking libstdc++-15-dev:armhf (15.2.0-9ubuntu1) ... 210s Selecting previously unselected package g++-15-arm-linux-gnueabihf. 210s Preparing to unpack .../26-g++-15-arm-linux-gnueabihf_15.2.0-9ubuntu1_armhf.deb ... 210s Unpacking g++-15-arm-linux-gnueabihf (15.2.0-9ubuntu1) ... 210s Selecting previously unselected package g++-15. 210s Preparing to unpack .../27-g++-15_15.2.0-9ubuntu1_armhf.deb ... 210s Unpacking g++-15 (15.2.0-9ubuntu1) ... 210s Selecting previously unselected package g++-arm-linux-gnueabihf. 210s Preparing to unpack .../28-g++-arm-linux-gnueabihf_4%3a15.2.0-4ubuntu1_armhf.deb ... 210s Unpacking g++-arm-linux-gnueabihf (4:15.2.0-4ubuntu1) ... 210s Selecting previously unselected package g++. 210s Preparing to unpack .../29-g++_4%3a15.2.0-4ubuntu1_armhf.deb ... 210s Unpacking g++ (4:15.2.0-4ubuntu1) ... 210s Selecting previously unselected package build-essential. 210s Preparing to unpack .../30-build-essential_12.12ubuntu2_armhf.deb ... 210s Unpacking build-essential (12.12ubuntu2) ... 210s Selecting previously unselected package libdebhelper-perl. 210s Preparing to unpack .../31-libdebhelper-perl_13.24.2ubuntu1_all.deb ... 210s Unpacking libdebhelper-perl (13.24.2ubuntu1) ... 210s Selecting previously unselected package libtool. 210s Preparing to unpack .../32-libtool_2.5.4-7_all.deb ... 210s Unpacking libtool (2.5.4-7) ... 210s Selecting previously unselected package dh-autoreconf. 210s Preparing to unpack .../33-dh-autoreconf_21_all.deb ... 210s Unpacking dh-autoreconf (21) ... 210s Selecting previously unselected package libarchive-zip-perl. 210s Preparing to unpack .../34-libarchive-zip-perl_1.68-1_all.deb ... 210s Unpacking libarchive-zip-perl (1.68-1) ... 210s Selecting previously unselected package libfile-stripnondeterminism-perl. 210s Preparing to unpack .../35-libfile-stripnondeterminism-perl_1.15.0-1_all.deb ... 210s Unpacking libfile-stripnondeterminism-perl (1.15.0-1) ... 210s Selecting previously unselected package dh-strip-nondeterminism. 210s Preparing to unpack .../36-dh-strip-nondeterminism_1.15.0-1_all.deb ... 211s Unpacking dh-strip-nondeterminism (1.15.0-1) ... 211s Selecting previously unselected package libdw1t64:armhf. 211s Preparing to unpack .../37-libdw1t64_0.194-1_armhf.deb ... 211s Unpacking libdw1t64:armhf (0.194-1) ... 211s Selecting previously unselected package debugedit. 211s Preparing to unpack .../38-debugedit_1%3a5.2-3_armhf.deb ... 211s Unpacking debugedit (1:5.2-3) ... 211s Selecting previously unselected package dwz. 211s Preparing to unpack .../39-dwz_0.16-2_armhf.deb ... 211s Unpacking dwz (0.16-2) ... 211s Selecting previously unselected package gettext. 211s Preparing to unpack .../40-gettext_0.23.2-1_armhf.deb ... 211s Unpacking gettext (0.23.2-1) ... 211s Selecting previously unselected package intltool-debian. 211s Preparing to unpack .../41-intltool-debian_0.35.0+20060710.6build1_all.deb ... 211s Unpacking intltool-debian (0.35.0+20060710.6build1) ... 211s Selecting previously unselected package po-debconf. 211s Preparing to unpack .../42-po-debconf_1.0.21+nmu1_all.deb ... 211s Unpacking po-debconf (1.0.21+nmu1) ... 211s Selecting previously unselected package debhelper. 211s Preparing to unpack .../43-debhelper_13.24.2ubuntu1_all.deb ... 211s Unpacking debhelper (13.24.2ubuntu1) ... 211s Selecting previously unselected package dh-python. 211s Preparing to unpack .../44-dh-python_6.20251029_all.deb ... 211s Unpacking dh-python (6.20251029) ... 211s Selecting previously unselected package liberror-perl. 211s Preparing to unpack .../45-liberror-perl_0.17030-1_all.deb ... 211s Unpacking liberror-perl (0.17030-1) ... 211s Selecting previously unselected package git-man. 211s Preparing to unpack .../46-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 211s Unpacking git-man (1:2.51.0-1ubuntu1) ... 211s Selecting previously unselected package git. 211s Preparing to unpack .../47-git_1%3a2.51.0-1ubuntu1_armhf.deb ... 211s Unpacking git (1:2.51.0-1ubuntu1) ... 211s Selecting previously unselected package git-imerge. 211s Preparing to unpack .../48-git-imerge_1.2.0-5_all.deb ... 211s Unpacking git-imerge (1.2.0-5) ... 211s Selecting previously unselected package libjs-jquery. 211s Preparing to unpack .../49-libjs-jquery_3.7.1+dfsg+~3.5.33-1build1_all.deb ... 211s Unpacking libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 211s Selecting previously unselected package libjs-underscore. 211s Preparing to unpack .../50-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 211s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 211s Selecting previously unselected package libjs-sphinxdoc. 211s Preparing to unpack .../51-libjs-sphinxdoc_8.2.3-1ubuntu2_all.deb ... 211s Unpacking libjs-sphinxdoc (8.2.3-1ubuntu2) ... 211s Selecting previously unselected package libpkgconf3:armhf. 211s Preparing to unpack .../52-libpkgconf3_1.8.1-4build1_armhf.deb ... 211s Unpacking libpkgconf3:armhf (1.8.1-4build1) ... 211s Selecting previously unselected package pkgconf-bin. 211s Preparing to unpack .../53-pkgconf-bin_1.8.1-4build1_armhf.deb ... 211s Unpacking pkgconf-bin (1.8.1-4build1) ... 211s Selecting previously unselected package pkgconf:armhf. 211s Preparing to unpack .../54-pkgconf_1.8.1-4build1_armhf.deb ... 211s Unpacking pkgconf:armhf (1.8.1-4build1) ... 211s Selecting previously unselected package pkg-config:armhf. 211s Preparing to unpack .../55-pkg-config_1.8.1-4build1_armhf.deb ... 212s Unpacking pkg-config:armhf (1.8.1-4build1) ... 212s Selecting previously unselected package pybuild-plugin-autopkgtest. 212s Preparing to unpack .../56-pybuild-plugin-autopkgtest_6.20251029_all.deb ... 212s Unpacking pybuild-plugin-autopkgtest (6.20251029) ... 212s Selecting previously unselected package python3-cachetools. 212s Preparing to unpack .../57-python3-cachetools_5.3.3-1_all.deb ... 212s Unpacking python3-cachetools (5.3.3-1) ... 212s Selecting previously unselected package python3-colorama. 212s Preparing to unpack .../58-python3-colorama_0.4.6-4_all.deb ... 212s Unpacking python3-colorama (0.4.6-4) ... 212s Selecting previously unselected package python3-distlib. 212s Preparing to unpack .../59-python3-distlib_0.4.0-1_all.deb ... 212s Unpacking python3-distlib (0.4.0-1) ... 212s Selecting previously unselected package python3-filelock. 212s Preparing to unpack .../60-python3-filelock_3.18.0-1_all.deb ... 212s Unpacking python3-filelock (3.18.0-1) ... 212s Selecting previously unselected package python3-pip-whl. 212s Preparing to unpack .../61-python3-pip-whl_25.1.1+dfsg-1ubuntu2_all.deb ... 212s Unpacking python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 212s Selecting previously unselected package python3-platformdirs. 212s Preparing to unpack .../62-python3-platformdirs_4.4.0-1_all.deb ... 212s Unpacking python3-platformdirs (4.4.0-1) ... 212s Selecting previously unselected package python3-pluggy. 212s Preparing to unpack .../63-python3-pluggy_1.6.0-1_all.deb ... 212s Unpacking python3-pluggy (1.6.0-1) ... 212s Selecting previously unselected package python3-pyproject-api. 212s Preparing to unpack .../64-python3-pyproject-api_1.9.1-1_all.deb ... 212s Unpacking python3-pyproject-api (1.9.1-1) ... 212s Selecting previously unselected package python3-setuptools-whl. 212s Preparing to unpack .../65-python3-setuptools-whl_78.1.1-0.1_all.deb ... 212s Unpacking python3-setuptools-whl (78.1.1-0.1) ... 212s Selecting previously unselected package python3-virtualenv. 212s Preparing to unpack .../66-python3-virtualenv_20.35.4+ds-1_all.deb ... 212s Unpacking python3-virtualenv (20.35.4+ds-1) ... 212s Selecting previously unselected package python3-wheel. 212s Preparing to unpack .../67-python3-wheel_0.46.1-2_all.deb ... 212s Unpacking python3-wheel (0.46.1-2) ... 212s Selecting previously unselected package tox. 212s Preparing to unpack .../68-tox_4.25.0-1_all.deb ... 212s Unpacking tox (4.25.0-1) ... 212s Setting up dh-python (6.20251029) ... 212s Setting up python3-setuptools-whl (78.1.1-0.1) ... 212s Setting up python3-filelock (3.18.0-1) ... 212s Setting up python3-cachetools (5.3.3-1) ... 213s Setting up python3-colorama (0.4.6-4) ... 213s Setting up python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 213s Setting up libarchive-zip-perl (1.68-1) ... 213s Setting up libdebhelper-perl (13.24.2ubuntu1) ... 213s Setting up linux-libc-dev:armhf (6.17.0-6.6) ... 213s Setting up m4 (1.4.20-2) ... 213s Setting up python3-distlib (0.4.0-1) ... 213s Setting up libgomp1:armhf (15.2.0-9ubuntu1) ... 213s Setting up python3-wheel (0.46.1-2) ... 213s Setting up python3-platformdirs (4.4.0-1) ... 213s Setting up libdw1t64:armhf (0.194-1) ... 213s Setting up liberror-perl (0.17030-1) ... 213s Setting up autotools-dev (20240727.1) ... 213s Setting up libpkgconf3:armhf (1.8.1-4build1) ... 213s Setting up rpcsvc-proto (1.4.3-1) ... 213s Setting up libmpc3:armhf (1.3.1-2) ... 213s Setting up autopoint (0.23.2-1) ... 213s Setting up pkgconf-bin (1.8.1-4build1) ... 213s Setting up autoconf (2.72-3.1ubuntu1) ... 213s Setting up python3-pluggy (1.6.0-1) ... 213s Setting up libubsan1:armhf (15.2.0-9ubuntu1) ... 213s Setting up dwz (0.16-2) ... 213s Setting up libcrypt-dev:armhf (1:4.5.1-1) ... 214s Setting up libasan8:armhf (15.2.0-9ubuntu1) ... 214s Setting up debugedit (1:5.2-3) ... 214s Setting up git-man (1:2.51.0-1ubuntu1) ... 214s Setting up libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 214s Setting up libisl23:armhf (0.27-1) ... 214s Setting up libc-dev-bin (2.42-2ubuntu2) ... 214s Setting up cpp-15-arm-linux-gnueabihf (15.2.0-9ubuntu1) ... 214s Setting up libcc1-0:armhf (15.2.0-9ubuntu1) ... 214s Setting up cpp-arm-linux-gnueabihf (4:15.2.0-4ubuntu1) ... 214s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 214s Setting up automake (1:1.18.1-3) ... 214s update-alternatives: using /usr/bin/automake-1.18 to provide /usr/bin/automake (automake) in auto mode 214s Setting up libfile-stripnondeterminism-perl (1.15.0-1) ... 214s Setting up gettext (0.23.2-1) ... 214s Setting up libgcc-15-dev:armhf (15.2.0-9ubuntu1) ... 214s Setting up gcc-15-arm-linux-gnueabihf (15.2.0-9ubuntu1) ... 214s Setting up python3-virtualenv (20.35.4+ds-1) ... 214s Setting up pkgconf:armhf (1.8.1-4build1) ... 214s Setting up intltool-debian (0.35.0+20060710.6build1) ... 214s Setting up pkg-config:armhf (1.8.1-4build1) ... 214s Setting up git (1:2.51.0-1ubuntu1) ... 214s Setting up libjs-sphinxdoc (8.2.3-1ubuntu2) ... 214s Setting up dh-strip-nondeterminism (1.15.0-1) ... 214s Setting up cpp-15 (15.2.0-9ubuntu1) ... 214s Setting up cpp (4:15.2.0-4ubuntu1) ... 214s Setting up libc6-dev:armhf (2.42-2ubuntu2) ... 214s Setting up gcc-arm-linux-gnueabihf (4:15.2.0-4ubuntu1) ... 214s Setting up po-debconf (1.0.21+nmu1) ... 214s Setting up python3-pyproject-api (1.9.1-1) ... 214s Setting up git-imerge (1.2.0-5) ... 214s Setting up gcc-15 (15.2.0-9ubuntu1) ... 214s Setting up libstdc++-15-dev:armhf (15.2.0-9ubuntu1) ... 214s Setting up tox (4.25.0-1) ... 214s Setting up libtool (2.5.4-7) ... 214s Setting up g++-15-arm-linux-gnueabihf (15.2.0-9ubuntu1) ... 214s Setting up gcc (4:15.2.0-4ubuntu1) ... 214s Setting up dh-autoreconf (21) ... 214s Setting up g++-15 (15.2.0-9ubuntu1) ... 214s Setting up g++-arm-linux-gnueabihf (4:15.2.0-4ubuntu1) ... 214s Setting up debhelper (13.24.2ubuntu1) ... 214s Setting up g++ (4:15.2.0-4ubuntu1) ... 214s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 214s Setting up build-essential (12.12ubuntu2) ... 214s Setting up pybuild-plugin-autopkgtest (6.20251029) ... 214s Processing triggers for install-info (7.2-5) ... 215s Processing triggers for libc-bin (2.42-2ubuntu2) ... 215s Processing triggers for man-db (2.13.1-1) ... 225s autopkgtest [09:55:49]: test pybuild-autopkgtest: pybuild-autopkgtest 225s autopkgtest [09:55:49]: test pybuild-autopkgtest: [----------------------- 227s pybuild-autopkgtest 228s I: pybuild base:317: cd /tmp/autopkgtest.PHPuZd/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.PHPuZd/build.vZB/src/tox.ini --sitepackages -e py313 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 228s + dirname t/test-unconflicted 228s + cd t 228s + pwd 228s + dirname /tmp/autopkgtest.PHPuZd/build.vZB/src/t 228s py313: skip building and installing the package 228s py313: commands[0] /tmp/autopkgtest.PHPuZd/build.vZB/src> /bin/sh t/test-unconflicted 228s + BASE=/tmp/autopkgtest.PHPuZd/build.vZB/src 228s + . /tmp/autopkgtest.PHPuZd/build.vZB/src/t/test-lib.sh 228s + GIT_IMERGE=git-imerge 228s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 228s + DESCRIPTION=git-imerge test repository without conflicts 228s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted git-imerge test repository without conflicts 228s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 228s + local description=git-imerge test repository without conflicts 228s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted git-imerge test repository without conflicts 228s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 228s + local description=git-imerge test repository without conflicts 228s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 228s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 229s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 229s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted/.git/ 229s hint: Using 'master' as the name for the initial branch. This default branch name 229s hint: is subject to change. To configure the initial branch name to use in all 229s hint: of your new repositories, which will suppress this warning, call: 229s hint: 229s hint: git config --global init.defaultBranch 229s hint: 229s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 229s hint: 'development'. The just-created branch can be renamed via this command: 229s hint: 229s hint: git branch -m 229s hint: 229s hint: Disable this message with "git config set advice.defaultBranchName false" 229s + echo git-imerge test repository without conflicts 229s + printf %s\n /*.out /*.css /*.html 229s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted/.git config user.name Loú User 229s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted/.git config user.email luser@example.com 229s + TIME=1112911993 229s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 229s [master (root-commit) 780ddf5] m⇒0 229s 2 files changed, 2 insertions(+) 229s create mode 100644 a.txt 229s create mode 100644 b.txt 229s [a b862e30] a⇒1 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [a dcbe282] a⇒2 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [a ecd8647] a⇒3 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [a 1634bab] a⇒4 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [a 909ce12] a⇒5 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/unconflicted 229s + modify a.txt 0 229s + filename=a.txt 229s + text=0 229s + echo 0 229s + git add a.txt 229s + modify b.txt 0 229s + filename=b.txt 229s + text=0 229s + echo 0 229s + git add b.txt 229s + commit -m m⇒0 229s + TIME=1112911994 229s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 229s + git checkout -b a -- 229s Switched to a new branch 'a' 229s + seq 8 229s + modify a.txt 1 229s + filename=a.txt 229s + text=1 229s + echo 1 229s + git add a.txt 229s + commit -m a⇒1 229s + TIME=1112911995 229s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 229s + modify a.txt 2 229s + filename=a.txt 229s + text=2 229s + echo 2 229s + git add a.txt 229s + commit -m a⇒2 229s + TIME=1112911996 229s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 229s + modify a.txt 3 229s + filename=a.txt 229s + text=3 229s + echo 3 229s + git add a.txt 229s + commit -m a⇒3 229s + TIME=1112911997 229s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 229s + modify a.txt 4 229s + filename=a.txt 229s + text=4 229s + echo 4 229s + git add a.txt 229s + commit -m a⇒4 229s + TIME=1112911998 229s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 229s [a f6520bf] a⇒6 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s + modify a.txt 5 229s + filename=a.txt 229s + text=5 229s + echo 5 229s + git add a.txt 229s + commit -m a⇒5 229s + TIME=1112911999 229s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 229s [a 6797186] a⇒7 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s + modify a.txt 6 229s + filename=a.txt 229s + text=6 229s + echo 6 229s + git add a.txt 229s + commit -m a⇒6 229s + TIME=1112912000 229s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 229s + modify a.txt 7 229s + filename=a.txt 229s + text=7 229s + echo 7 229s + git add a.txt 229s + commit -m a⇒7 229s + TIME=1112912001 229s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 229s + modify a.txt 8 229s + filename=a.txt 229s + text=8 229s + echo 8 229s + git add a.txt 229s + commit -m a⇒8 229s + TIME=1112912002 229s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 229s [a 49643dd] a⇒8 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s + git checkout -b b master -- 229s Switched to a new branch 'b' 229s + seq 5 229s + modify b.txt 1 229s + filename=b.txt 229s + text=1 229s + echo 1 229s + git add b.txt 229s [b d43305b] b⇒1 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [b 853ee68] b⇒2 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [b 03a2455] b⇒3 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [b 484ea85] b⇒4 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s [b e22cd97] b⇒5 229s 1 file changed, 1 insertion(+), 1 deletion(-) 229s + commit -m b⇒1 229s + TIME=1112912003 229s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 229s + modify b.txt 2 229s + filename=b.txt 229s + text=2 229s + echo 2 229s + git add b.txt 229s + commit -m b⇒2 229s + TIME=1112912004 229s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 229s + modify b.txt 3 229s + filename=b.txt 229s + text=3 229s + echo 3 229s + git add b.txt 229s + commit -m b⇒3 229s + TIME=1112912005 229s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 229s + modify b.txt 4 229s + filename=b.txt 229s + text=4 229s + echo 4 229s + git add b.txt 229s + commit -m b⇒4 229s + TIME=1112912006 229s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 229s + modify b.txt 5 229s + filename=b.txt 229s + text=5 229s + echo 5 229s + git add b.txt 229s + commit -m b⇒5 229s + TIME=1112912007 229s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 229s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 229s + git checkout a 229s Switched to branch 'a' 229s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 229s Attempting automerge of 8-5...success. 229s Autofilling 1-5...success. 229s Autofilling 2-5...success. 229s Autofilling 3-5...success. 229s Autofilling 4-5...success. 229s Autofilling 5-5...success. 229s Autofilling 6-5...success. 229s Autofilling 7-5...success. 229s Autofilling 8-1...success. 229s Autofilling 8-2...success. 229s Autofilling 8-3...success. 229s Autofilling 8-4...success. 229s Autofilling 8-5 (first way)...success. 229s Autofilling 8-5 (second way)...success. 229s The two ways of autofilling 8-5 agree. 229s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 229s Merge is complete! 229s + git-imerge list 229s * a-b 229s + git-imerge diagram --commits --frontier --html=imerge3.html 229s 0 5 8 229s | | | 229s 0 - ********* - a 229s *???????. 229s *???????. 229s *???????. 229s *???????. 229s 5 - *........ 229s | 229s b 229s 229s 0 5 8 229s | | | 229s 0 - ********* - a 229s *???????| 229s *???????| 229s *???????| 229s *???????| 229s 5 - *-------+ 229s | 229s b 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_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 229s Merge b into a (using imerge) 229s 229s # Please enter the commit message for your changes. Lines starting 229s # with '#' will be ignored, and an empty message aborts the commit. 229s # 229s # Date: Wed Dec 3 09:55:53 2025 +0000 229s # 229s # On branch a-b-merge 229s # Changes to be committed: 229s # modified: b.txt 229s # 229s [a-b-merge fccac38] Merge b into a (using imerge) 229s Date: Wed Dec 3 09:55:53 2025 +0000 229s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 229s + local refname=a-b-merge 229s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 229s + git rev-parse a-b-merge^{tree} 229s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 229s + git-imerge simplify --goal=rebase --branch=a-b-rebase 230s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + local refname=a-b-rebase 230s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git rev-parse a-b-rebase^{tree} 230s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 230s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + local refname=a-b-rebase-with-history 230s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git rev-parse a-b-rebase-with-history^{tree} 230s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git-imerge simplify --goal=border --branch=a-b-border 230s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + local refname=a-b-border 230s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git rev-parse a-b-border^{tree} 230s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 230s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + local refname=a-b-border-with-history 230s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git rev-parse a-b-border-with-history^{tree} 230s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 230s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + local refname=a-b-border-with-history2 230s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git rev-parse a-b-border-with-history2^{tree} 230s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 230s + git-imerge remove 230s + git checkout a 230s Switched to branch 'a' 230s + git-imerge start --goal=full --name=a-b b 231s Attempting to merge 1-1...success. 231s Attempting to merge 1-2...success. 231s Attempting to merge 1-3...success. 231s Attempting to merge 1-4...success. 231s Attempting to merge 1-5...success. 231s Attempting to merge 2-1...success. 231s Attempting to merge 2-2...success. 231s Attempting to merge 2-3...success. 231s Attempting to merge 2-4...success. 231s Attempting to merge 2-5...success. 231s Attempting to merge 3-1...success. 231s Attempting to merge 3-2...success. 231s Attempting to merge 3-3...success. 231s Attempting to merge 3-4...success. 231s Attempting to merge 3-5...success. 231s Attempting to merge 4-1...success. 231s Attempting to merge 4-2...success. 231s Attempting to merge 4-3...success. 231s Attempting to merge 4-4...success. 231s Attempting to merge 4-5...success. 231s Attempting to merge 5-1...success. 231s Attempting to merge 5-2...success. 231s Attempting to merge 5-3...success. 231s Attempting to merge 5-4...success. 231s Attempting to merge 5-5...success. 231s Attempting to merge 6-1...success. 231s Attempting to merge 6-2...success. 231s Attempting to merge 6-3...success. 231s Attempting to merge 6-4...success. 231s Attempting to merge 6-5...success. 231s Attempting to merge 7-1...success. 231s Attempting to merge 7-2...success. 231s Attempting to merge 7-3...success. 231s Attempting to merge 7-4...success. 231s Attempting to merge 7-5...success. 231s Attempting to merge 8-1...success. 231s Attempting to merge 8-2...success. 231s Attempting to merge 8-3...success. 231s Attempting to merge 8-4...success. 231s Attempting to merge 8-5...success. 231s Merge is complete! 231s + git-imerge list 231s * a-b 231s + git-imerge diagram --commits --frontier --html=imerge4.html 232s 0 5 8 232s | | | 232s 0 - ********* - a 232s *........ 232s *........ 232s *........ 232s *........ 232s 5 - *........ 232s | 232s b 232s 232s 0 5 8 232s | | | 232s 0 - ********* - a 232s *.......| 232s *.......| 232s *.......| 232s *.......| 232s 5 - *-------+ 232s | 232s b 232s 232s Key: 232s |,-,+ = rectangles forming current merge frontier 232s * = merge done manually 232s . = merge done automatically 232s # = conflict that is currently blocking progress 232s @ = merge was blocked but has been resolved 232s ? = no merge recorded 232s 232s + git-imerge finish --branch=a-b-full 232s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 232s + local refname=a-b-full 232s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 232s + git rev-parse a-b-full^{tree} 232s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 232s + dirname t/test-conflicted 232s py313: commands[1] /tmp/autopkgtest.PHPuZd/build.vZB/src> /bin/sh t/test-conflicted 232s + cd t 232s + pwd 232s + dirname /tmp/autopkgtest.PHPuZd/build.vZB/src/t 232s + BASE=/tmp/autopkgtest.PHPuZd/build.vZB/src 232s + . /tmp/autopkgtest.PHPuZd/build.vZB/src/t/test-lib.sh 232s + GIT_IMERGE=git-imerge 232s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + test_conflict 4-3 232s + local conflict=4-3 232s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s + DESCRIPTION=git-imerge test repository with conflict at 4-3 232s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 232s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s + local description=git-imerge test repository with conflict at 4-3 232s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 232s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s + local description=git-imerge test repository with conflict at 4-3 232s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s hint: Using 'master' as the name for the initial branch. This default branch name 232s hint: is subject to change. To configure the initial branch name to use in all 232s hint: of your new repositories, which will suppress this warning, call: 232s hint: 232s hint: git config --global init.defaultBranch 232s hint: 232s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 232s hint: 'development'. The just-created branch can be renamed via this command: 232s hint: 232s hint: git branch -m 232s hint: 232s hint: Disable this message with "git config set advice.defaultBranchName false" 232s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3/.git/ 232s + echo git-imerge test repository with conflict at 4-3 232s + printf %s\n /*.out /*.css /*.html 232s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3/.git config user.name Loú User 232s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 232s + TIME=1112911993 232s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-4-3 232s + modify c.txt 0 232s + filename=c.txt 232s + text=0 232s + echo 0 232s + git add c.txt 232s + modify d.txt 0 232s + filename=d.txt 232s + text=0 232s + echo 0 232s + git add d.txt 232s + modify conflict.txt original version 232s + filename=conflict.txt 232s + text=original version 232s + echo original version 232s + git add conflict.txt 232s + commit -m m⇒0 232s + TIME=1112911994 232s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 232s [master (root-commit) d70e04b] m⇒0 232s 3 files changed, 3 insertions(+) 232s create mode 100644 c.txt 232s create mode 100644 conflict.txt 232s create mode 100644 d.txt 232s + git checkout -b c master -- 232s Switched to a new branch 'c' 232s + seq 9 232s + modify c.txt 1 232s + filename=c.txt 232s + text=1 232s + echo 1 232s + git add c.txt 232s + commit -m c⇒1 232s + TIME=1112911995 232s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 232s [c 89e2141] c⇒1 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify c.txt 2 232s + filename=c.txt 232s + text=2 232s + echo 2 232s + git add c.txt 232s + commit -m c⇒2 232s + TIME=1112911996 232s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 232s [c 7c431f2] c⇒2 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify c.txt 3 232s + filename=c.txt 232s + text=3 232s + echo 3 232s + git add c.txt 232s + commit -m c⇒3 232s + TIME=1112911997 232s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 232s + modify c.txt 4 232s + filename=c.txt 232s + text=4 232s + echo 4 232s + git add c.txt 232s [c f02ab24] c⇒3 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify conflict.txt c version 232s + filename=conflict.txt 232s + text=c version 232s + echo c version 232s + git add conflict.txt 232s + commit -m c⇒4 232s + TIME=1112911998 232s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 232s + modify c.txt 5 232s + filename=c.txt 232s + text=5 232s + echo 5 232s + git add c.txt 232s [c 3c091de] c⇒4 232s 2 files changed, 2 insertions(+), 2 deletions(-) 232s + commit -m c⇒5 232s + TIME=1112911999 232s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 232s + modify c.txt 6 232s + filename=c.txt 232s + text=6 232s + echo 6 232s + git add c.txt 232s [c a0ac37a] c⇒5 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + commit -m c⇒6 232s + TIME=1112912000 232s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 232s [c ed9fdfa] c⇒6 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify c.txt 7 232s + filename=c.txt 232s + text=7 232s + echo 7 232s + git add c.txt 232s + commit -m c⇒7 232s + TIME=1112912001 232s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 232s + modify c.txt 8 232s + filename=c.txt 232s + text=8 232s + echo 8 232s + git add c.txt 232s [c 1da7bf5] c⇒7 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + commit -m c⇒8 232s + TIME=1112912002 232s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 232s [c d8de99f] c⇒8 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify c.txt 9 232s + filename=c.txt 232s + text=9 232s + echo 9 232s + git add c.txt 232s + commit -m c⇒9 232s + TIME=1112912003 232s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 232s [c 9cde605] c⇒9 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + git checkout -b d master -- 232s Switched to a new branch 'd' 232s + seq 6 232s + modify d.txt 1 232s + filename=d.txt 232s + text=1 232s + echo 1 232s + git add d.txt 232s + commit -m d⇒1 232s + TIME=1112912004 232s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 232s [d bd5368a] d⇒1 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify d.txt 2 232s + filename=d.txt 232s + text=2 232s + echo 2 232s + git add d.txt 232s + commit -m d⇒2 232s + TIME=1112912005 232s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 232s [d 93e27e6] d⇒2 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify d.txt 3 232s + filename=d.txt 232s + text=3 232s + echo 3 232s + git add d.txt 232s + modify conflict.txt d version 232s + filename=conflict.txt 232s + text=d version 232s + echo d version 232s + git add conflict.txt 232s + commit -m d⇒3 232s + TIME=1112912006 232s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 232s + modify d.txt 4 232s + filename=d.txt 232s + text=4 232s + echo 4 232s + git add d.txt 232s + commit -m d⇒4 232s + TIME=1112912007 232s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 232s [d 2bb1a7e] d⇒3 232s 2 files changed, 2 insertions(+), 2 deletions(-) 232s + modify d.txt 5 232s + filename=d.txt 232s + text=5 232s + echo 5 232s + git add d.txt 232s + commit -m d⇒5 232s + TIME=1112912008 232s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 232s [d 81f9c80] d⇒4 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s [d 3690dde] d⇒5 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + modify d.txt 6 232s + filename=d.txt 232s + text=6 232s + echo 6 232s + git add d.txt 232s + commit -m d⇒6 232s + TIME=1112912009 232s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 232s + git checkout c 232s Switched to branch 'c' 232s [d 8085853] d⇒6 232s 1 file changed, 1 insertion(+), 1 deletion(-) 232s + git-imerge init --name=c-d d 232s + git-imerge list 232s * c-d 232s + git-imerge diagram --commits --frontier --html=imerge0.html 232s 0 5 9 232s | | | 232s 0 - ********** - c 232s *????????? 232s *????????? 232s *????????? 232s *????????? 232s 5 - *????????? 232s 6 - *????????? 232s | 232s d 232s 232s 0 5 9 232s | | | 232s 0 - ********** - c 232s *????????? 232s *????????? 232s *????????? 232s *????????? 232s 5 - *????????? 232s 6 - *????????? 232s | 232s d 232s 232s Key: 232s |,-,+ = rectangles forming current merge frontier 232s * = merge done manually 232s . = merge done automatically 232s # = conflict that is currently blocking progress 232s @ = merge was blocked but has been resolved 232s ? = no merge recorded 232s 232s + git-imerge autofill 232s + tee autofill.out 232s Attempting automerge of 9-6...failure. 232s Attempting automerge of 1-1...success. 232s Attempting automerge of 1-4...success. 232s Attempting automerge of 1-6...success. 232s Attempting automerge of 9-6...failure. 232s Attempting automerge of 5-6...failure. 232s Attempting automerge of 3-6...success. 232s Attempting automerge of 4-6...failure. 232s Attempting automerge of 4-1...success. 233s Attempting automerge of 4-4...failure. 233s Attempting automerge of 4-3...failure. 233s Attempting automerge of 4-2...success. 233s Attempting automerge of 9-2...success. 233s Autofilling 1-6...success. 233s Autofilling 2-6...success. 233s Autofilling 3-1...success. 233s Autofilling 3-2...success. 233s Autofilling 3-3...success. 233s Autofilling 3-4...success. 233s Autofilling 3-5...success. 233s Autofilling 3-6 (first way)...success. 233s Autofilling 3-6 (second way)...success. 233s The two ways of autofilling 3-6 agree. 233s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 233s Autofilling 4-2...success. 233s Autofilling 5-2...success. 233s Autofilling 6-2...success. 233s Autofilling 7-2...success. 233s Autofilling 8-2...success. 233s Autofilling 9-1...success. 233s Autofilling 9-2 (first way)...success. 233s Autofilling 9-2 (second way)...success. 233s The two ways of autofilling 9-2 agree. 233s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 233s Attempting automerge of 9-6...failure. 233s Attempting automerge of 4-3...failure. 233s HEAD is now at 9cde605 c⇒9 233s Conflict; suggest manual merge of 4-3 233s + grep -q Traceback autofill.out 233s + grep -q suggest manual merge of 4-3 autofill.out 233s + git-imerge diagram --commits --frontier --html=imerge1.html 233s 0 5 9 233s | | | 233s 0 - ********** - c 233s *??.?????. 233s *??....... 233s *??.#????? 233s *??.?????? 233s 5 - *??.?????? 233s 6 - *...?????? 233s | 233s d 233s 233s 0 5 9 233s | | | 233s 0 - ********** - c 233s *??.?????| 233s *??.-----+ 233s *??|#????? 233s *??|?????? 233s 5 - *??|?????? 233s 6 - *--+?????? 233s | 233s d 233s 233s Key: 233s |,-,+ = rectangles forming current merge frontier 233s * = merge done manually 233s . = merge done automatically 233s # = conflict that is currently blocking progress 233s @ = merge was blocked but has been resolved 233s ? = no merge recorded 233s 233s + git-imerge continue --edit 233s Switched to branch 'imerge/c-d' 233s Auto-merging conflict.txt 233s CONFLICT (content): Merge conflict in conflict.txt 233s Automatic merge failed; fix conflicts and then commit the result. 233s 233s Original first commit: 233s 233s Original second commit: 233s commit 3c091ded129a5edf9061360bab867edade996c93 233s Author: Loú User 233s Date: Thu Apr 7 22:13:18 2005 +0000 233s 233s c⇒4 233s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 233s Author: Loú User 233s Date: Thu Apr 7 22:13:26 2005 +0000 233s 233s d⇒3 233s 233s There was a conflict merging commit 4-3, shown above. 233s Please resolve the conflict, commit the result, then type 233s 233s git-imerge continue 233s + echo merged version 233s + git add conflict.txt 233s + git-imerge continue --no-edit 233s [imerge/c-d 3dce4b3] imerge 'c-d': manual merge 4-3 233s Merge has been recorded for merge 4-3. 233s Attempting automerge of 4-6...success. 233s Autofilling 4-4...success. 233s Autofilling 4-5...success. 233s Autofilling 4-6...success. 233s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 233s Attempting automerge of 9-6...success. 233s Autofilling 5-6...success. 233s Autofilling 6-6...success. 233s Autofilling 7-6...success. 233s Autofilling 8-6...success. 233s Autofilling 9-3...success. 233s Autofilling 9-4...success. 233s Autofilling 9-5...success. 233s Autofilling 9-6 (first way)...success. 233s Autofilling 9-6 (second way)...success. 233s The two ways of autofilling 9-6 agree. 233s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 234s Merge is complete! 234s + git-imerge diagram --commits --frontier --html=imerge2.html 234s 0 5 9 234s | | | 234s 0 - ********** - c 234s *??.?????. 234s *??....... 234s *??.*????. 234s *??..????. 234s 5 - *??..????. 234s 6 - *......... 234s | 234s d 234s 234s 0 5 9 234s | | | 234s 0 - ********** - c 234s *??.?????| 234s *??......| 234s *??.*????| 234s *??..????| 234s 5 - *??..????| 234s 6 - *--------+ 234s | 234s d 234s 234s Key: 234s |,-,+ = rectangles forming current merge frontier 234s * = merge done manually 234s . = merge done automatically 234s # = conflict that is currently blocking progress 234s @ = merge was blocked but has been resolved 234s ? = no merge recorded 234s 234s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 234s Merge d into c (using imerge) 234s 234s # Please enter the commit message for your changes. Lines starting 234s # with '#' will be ignored, and an empty message aborts the commit. 234s # 234s # Date: Wed Dec 3 09:55:58 2025 +0000 234s # 234s # On branch c-d-merge 234s # Changes to be committed: 234s # modified: conflict.txt 234s # modified: d.txt 234s # 234s [c-d-merge e475e0a] Merge d into c (using imerge) 234s Date: Wed Dec 3 09:55:58 2025 +0000 234s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + local refname=c-d-merge 234s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git rev-parse c-d-merge^{tree} 234s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git-imerge simplify --goal=rebase --branch=c-d-rebase 234s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + local refname=c-d-rebase 234s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git rev-parse c-d-rebase^{tree} 234s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 234s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + local refname=c-d-rebase-with-history 234s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git rev-parse c-d-rebase-with-history^{tree} 234s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git-imerge simplify --goal=border --branch=c-d-border 234s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + local refname=c-d-border 234s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git rev-parse c-d-border^{tree} 234s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 235s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + local refname=c-d-border-with-history 235s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git rev-parse c-d-border-with-history^{tree} 235s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 235s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + local refname=c-d-border-with-history2 235s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git rev-parse c-d-border-with-history2^{tree} 235s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git-imerge remove 235s Attempting to merge 1-1...success. 235s Attempting to merge 1-2...success. 235s Attempting to merge 1-3...success. 235s Attempting to merge 1-4...success. 235s + git checkout c 235s Switched to branch 'c' 235s + git-imerge start --goal=full --first-parent --name=c-d d 235s + tee start.out 235s Attempting to merge 1-5...success. 235s Attempting to merge 1-6...success. 235s Attempting to merge 2-1...success. 235s Attempting to merge 2-2...success. 235s Attempting to merge 2-3...success. 235s Attempting to merge 2-4...success. 235s Attempting to merge 2-5...success. 235s Attempting to merge 2-6...success. 235s Attempting to merge 3-1...success. 235s Attempting to merge 3-2...success. 235s Attempting to merge 3-3...success. 236s Attempting to merge 3-4...success. 236s Attempting to merge 3-5...success. 236s Attempting to merge 3-6...success. 236s Attempting to merge 4-1...success. 236s Attempting to merge 4-2...success. 236s + grep -q Traceback start.out 236s + grep -q suggest manual merge of 4-3 autofill.out 236s + git-imerge diagram --commits --frontier --html=imerge3.html 236s + echo merged version 236s + git add conflict.txt 236s + GIT_EDITOR=cat git commit 236s + git-imerge continue --edit 236s Attempting to merge 4-3...conflict. 236s Attempting to merge 5-1...success. 236s Attempting to merge 5-2...success. 236s Attempting to merge 6-1...success. 236s Attempting to merge 6-2...success. 236s Attempting to merge 7-1...success. 236s Attempting to merge 7-2...success. 236s Attempting to merge 8-1...success. 236s Attempting to merge 8-2...success. 236s Attempting to merge 9-1...success. 236s Attempting to merge 9-2...success. 236s Previous HEAD position was 0c3bbb5 imerge 'c-d': automatic merge 9-2 236s Switched to branch 'imerge/c-d' 236s Auto-merging conflict.txt 236s CONFLICT (content): Merge conflict in conflict.txt 236s Automatic merge failed; fix conflicts and then commit the result. 236s 236s Original first commit: 236s commit 3c091ded129a5edf9061360bab867edade996c93 236s Author: Loú User 236s Date: Thu Apr 7 22:13:18 2005 +0000 236s 236s c⇒4 236s 236s Original second commit: 236s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 236s Author: Loú User 236s Date: Thu Apr 7 22:13:26 2005 +0000 236s 236s d⇒3 236s 236s There was a conflict merging commit 4-3, shown above. 236s Please resolve the conflict, commit the result, then type 236s 236s git-imerge continue 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 imerge 'c-d': manual merge 4-3 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 [imerge/c-d 179251b] imerge 'c-d': manual merge 4-3 236s Merge has been recorded for merge 4-3. 236s Attempting to merge 4-4...success. 236s Attempting to merge 4-5...success. 236s Attempting to merge 4-6...success. 236s Attempting to merge 5-3...success. 236s Attempting to merge 5-4...success. 236s Attempting to merge 5-5...success. 236s Attempting to merge 5-6...success. 236s Attempting to merge 6-3...success. 236s Attempting to merge 6-4...success. 236s Attempting to merge 6-5...success. 236s Attempting to merge 6-6...success. 236s Attempting to merge 7-3...success. 236s Attempting to merge 7-4...success. 236s Attempting to merge 7-5...success. 236s Attempting to merge 7-6...success. 236s Attempting to merge 8-3...success. 236s Attempting to merge 8-4...success. 236s Attempting to merge 8-5...success. 236s Attempting to merge 8-6...success. 236s Attempting to merge 9-3...success. 236s Attempting to merge 9-4...success. 236s Attempting to merge 9-5...success. 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 237s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 237s + local refname=c-d-full 237s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 237s + git rev-parse c-d-full^{tree} 237s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 237s + test_conflict 1-1 237s + local conflict=1-1 237s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s + DESCRIPTION=git-imerge test repository with conflict at 1-1 237s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 237s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s + local description=git-imerge test repository with conflict at 1-1 237s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 237s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s + local description=git-imerge test repository with conflict at 1-1 237s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s hint: Using 'master' as the name for the initial branch. This default branch name 237s hint: is subject to change. To configure the initial branch name to use in all 237s hint: of your new repositories, which will suppress this warning, call: 237s hint: 237s hint: git config --global init.defaultBranch 237s hint: 237s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 237s hint: 'development'. The just-created branch can be renamed via this command: 237s hint: 237s hint: git branch -m 237s hint: 237s hint: Disable this message with "git config set advice.defaultBranchName false" 237s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1/.git/ 237s + echo git-imerge test repository with conflict at 1-1 237s + printf %s\n /*.out /*.css /*.html 237s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1/.git config user.name Loú User 237s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 237s [master (root-commit) d70e04b] m⇒0 237s 3 files changed, 3 insertions(+) 237s create mode 100644 c.txt 237s create mode 100644 conflict.txt 237s create mode 100644 d.txt 237s [c 2120f40] c⇒1 237s 2 files changed, 2 insertions(+), 2 deletions(-) 237s [c 90cc7de] c⇒2 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [c 2046ed2] c⇒3 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + TIME=1112911993 237s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-1 237s + modify c.txt 0 237s + filename=c.txt 237s + text=0 237s + echo 0 237s + git add c.txt 237s + modify d.txt 0 237s + filename=d.txt 237s + text=0 237s + echo 0 237s + git add d.txt 237s + modify conflict.txt original version 237s + filename=conflict.txt 237s + text=original version 237s + echo original version 237s + git add conflict.txt 237s + commit -m m⇒0 237s + TIME=1112911994 237s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 237s + git checkout -b c master -- 237s Switched to a new branch 'c' 237s + seq 9 237s + modify c.txt 1 237s + filename=c.txt 237s + text=1 237s + echo 1 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⇒1 237s + TIME=1112911995 237s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 237s + modify c.txt 2 237s + filename=c.txt 237s + text=2 237s + echo 2 237s + git add c.txt 237s + commit -m c⇒2 237s + TIME=1112911996 237s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 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 + 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 + modify c.txt 5 237s + filename=c.txt 237s + text=5 237s + echo 5 237s + git add c.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 8a2cee9] c⇒4 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 6 237s + filename=c.txt 237s + text=6 237s + echo 6 237s + git add c.txt 237s [c ac16a05] c⇒5 237s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + modify c.txt 7 237s + filename=c.txt 237s + text=7 237s [c 30dd2ae] c⇒6 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [c 0883eb9] c⇒7 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [c f661c06] c⇒8 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [c 243e8ed] c⇒9 237s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + 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 + 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 + 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 + 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 [d ac0427a] d⇒1 237s 2 files changed, 2 insertions(+), 2 deletions(-) 237s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 237s + modify d.txt 3 237s + filename=d.txt 237s + text=3 237s + echo 3 237s + git add d.txt 237s [d 43c38c0] d⇒2 237s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d 40fef44] d⇒4 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [d b080a65] d⇒5 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [d 200ce5c] d⇒6 237s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + 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 + 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 + 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 237s + git-imerge autofill 237s + tee autofill.out 237s Attempting automerge of 9-6...failure. 237s Attempting automerge of 1-1...failure. 237s HEAD is now at 243e8ed c⇒9 237s No progress was possible; suggest manual merge of 1-1 237s + grep -q Traceback autofill.out 237s + grep -q suggest manual merge of 1-1 autofill.out 237s + git-imerge diagram --commits --frontier --html=imerge1.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 237s + git-imerge continue --edit 237s Switched to branch 'imerge/c-d' 237s 237s Original first commit: 237s 237s Original second commit: 237s 237s There was a conflict merging commit 1-1, shown above. 237s Please resolve the conflict, commit the result, then type 237s 237s git-imerge continue 237s Auto-merging conflict.txt 237s CONFLICT (content): Merge conflict in conflict.txt 237s Automatic merge failed; fix conflicts and then commit the result. 237s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 237s Author: Loú User 237s Date: Thu Apr 7 22:13:15 2005 +0000 237s 237s c⇒1 237s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 237s Author: Loú User 237s Date: Thu Apr 7 22:13:24 2005 +0000 237s 237s d⇒1 238s + echo merged version 238s + git add conflict.txt 238s + git-imerge continue --no-edit 238s [imerge/c-d 7edc01e] imerge 'c-d': manual merge 1-1 238s Merge has been recorded for merge 1-1. 238s Attempting automerge of 1-6...success. 238s Autofilling 1-2...success. 238s Autofilling 1-3...success. 238s Autofilling 1-4...success. 238s Autofilling 1-5...success. 238s Autofilling 1-6...success. 238s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 238s Attempting automerge of 9-6...success. 238s Autofilling 2-6...success. 238s Autofilling 3-6...success. 238s Autofilling 4-6...success. 238s Autofilling 5-6...success. 238s Autofilling 6-6...success. 238s Autofilling 7-6...success. 238s Autofilling 8-6...success. 238s Autofilling 9-1...success. 238s Autofilling 9-2...success. 238s Autofilling 9-3...success. 238s Autofilling 9-4...success. 238s Autofilling 9-5...success. 238s Autofilling 9-6 (first way)...success. 238s Autofilling 9-6 (second way)...success. 238s The two ways of autofilling 9-6 agree. 238s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 238s Merge is complete! 238s + git-imerge diagram --commits --frontier --html=imerge2.html 238s 0 5 9 238s | | | 238s 0 - ********** - c 238s **???????. 238s *.???????. 238s *.???????. 238s *.???????. 238s 5 - *.???????. 238s 6 - *......... 238s | 238s d 238s 238s 0 5 9 238s | | | 238s 0 - ********** - c 238s **???????| 238s *.???????| 238s *.???????| 238s *.???????| 238s 5 - *.???????| 238s 6 - *--------+ 238s | 238s d 238s 238s Key: 238s |,-,+ = rectangles forming current merge frontier 238s * = merge done manually 238s . = merge done automatically 238s # = conflict that is currently blocking progress 238s @ = merge was blocked but has been resolved 238s ? = no merge recorded 238s 238s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 238s Merge d into c (using imerge) 238s 238s # Please enter the commit message for your changes. Lines starting 238s # with '#' will be ignored, and an empty message aborts the commit. 238s # 238s # Date: Wed Dec 3 09:56:02 2025 +0000 238s # 238s # On branch c-d-merge 238s # Changes to be committed: 238s # modified: conflict.txt 238s # modified: d.txt 238s # 238s [c-d-merge df04942] Merge d into c (using imerge) 238s Date: Wed Dec 3 09:56:02 2025 +0000 238s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + local refname=c-d-merge 238s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + git rev-parse c-d-merge^{tree} 238s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + git-imerge simplify --goal=rebase --branch=c-d-rebase 238s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + local refname=c-d-rebase 238s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + git rev-parse c-d-rebase^{tree} 238s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 239s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-rebase-with-history 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-rebase-with-history^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge simplify --goal=border --branch=c-d-border 239s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-border 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-border^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 239s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-border-with-history 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-border-with-history^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 239s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-border-with-history2 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-border-with-history2^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge remove 239s + git checkout c 239s Switched to branch 'c' 239s + git-imerge start --goal=full --first-parent --name=c-d d 239s + tee start.out 240s Attempting to merge 1-1...conflict. 240s Switched to branch 'imerge/c-d' 240s Auto-merging conflict.txt 240s CONFLICT (content): Merge conflict in conflict.txt 240s Automatic merge failed; fix conflicts and then commit the result. 240s 240s Original first commit: 240s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 240s Author: Loú User 240s Date: Thu Apr 7 22:13:15 2005 +0000 240s 240s c⇒1 240s 240s Original second commit: 240s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 240s Author: Loú User 240s Date: Thu Apr 7 22:13:24 2005 +0000 240s 240s d⇒1 240s 240s There was a conflict merging commit 1-1, shown above. 240s Please resolve the conflict, commit the result, then type 240s 240s git-imerge continue 240s + grep -q Traceback start.out 240s + grep -q suggest manual merge of 1-1 autofill.out 240s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 240s + git add conflict.txt 240s + GIT_EDITOR=cat git commit 240s imerge 'c-d': manual merge 1-1 240s 240s # Conflicts: 240s # conflict.txt 240s # 240s # It looks like you may be committing a merge. 240s # If this is not correct, please run 240s # git update-ref -d MERGE_HEAD 240s # and try again. 240s 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 # On branch imerge/c-d 240s # All conflicts fixed but you are still merging. 240s # 240s # Changes to be committed: 240s # modified: conflict.txt 240s # modified: d.txt 240s # 240s [imerge/c-d 825e956] imerge 'c-d': manual merge 1-1 240s + git-imerge continue --edit 240s Merge has been recorded for merge 1-1. 240s Attempting to merge 1-2...success. 240s Attempting to merge 1-3...success. 240s Attempting to merge 1-4...success. 240s Attempting to merge 1-5...success. 240s Attempting to merge 1-6...success. 240s Attempting to merge 2-1...success. 240s Attempting to merge 2-2...success. 240s Attempting to merge 2-3...success. 240s Attempting to merge 2-4...success. 240s Attempting to merge 2-5...success. 240s Attempting to merge 2-6...success. 240s Attempting to merge 3-1...success. 240s Attempting to merge 3-2...success. 240s Attempting to merge 3-3...success. 240s Attempting to merge 3-4...success. 240s Attempting to merge 3-5...success. 240s Attempting to merge 3-6...success. 240s Attempting to merge 4-1...success. 240s Attempting to merge 4-2...success. 240s Attempting to merge 4-3...success. 240s Attempting to merge 4-4...success. 240s Attempting to merge 4-5...success. 240s Attempting to merge 4-6...success. 240s Attempting to merge 5-1...success. 240s Attempting to merge 5-2...success. 240s Attempting to merge 5-3...success. 240s Attempting to merge 5-4...success. 240s Attempting to merge 5-5...success. 240s Attempting to merge 5-6...success. 240s Attempting to merge 6-1...success. 240s Attempting to merge 6-2...success. 240s Attempting to merge 6-3...success. 240s Attempting to merge 6-4...success. 240s Attempting to merge 6-5...success. 240s Attempting to merge 6-6...success. 241s Attempting to merge 7-1...success. 241s Attempting to merge 7-2...success. 241s Attempting to merge 7-3...success. 241s Attempting to merge 7-4...success. 241s Attempting to merge 7-5...success. 241s Attempting to merge 7-6...success. 241s Attempting to merge 8-1...success. 241s Attempting to merge 8-2...success. 241s Attempting to merge 8-3...success. 241s Attempting to merge 8-4...success. 241s Attempting to merge 8-5...success. 241s Attempting to merge 8-6...success. 241s Attempting to merge 9-1...success. 241s Attempting to merge 9-2...success. 241s Attempting to merge 9-3...success. 241s Attempting to merge 9-4...success. 241s Attempting to merge 9-5...success. 241s Attempting to merge 9-6...success. 241s Merge is complete! 241s + git-imerge diagram --commits --frontier --html=imerge4.html 241s 0 5 9 241s | | | 241s 0 - ********** - c 241s **........ 241s *......... 241s *......... 241s *......... 241s 5 - *......... 241s 6 - *......... 241s | 241s d 241s 241s 0 5 9 241s | | | 241s 0 - ********** - c 241s **.......| 241s *........| 241s *........| 241s *........| 241s 5 - *........| 241s 6 - *--------+ 241s | 241s d 241s 241s Key: 241s |,-,+ = rectangles forming current merge frontier 241s * = merge done manually 241s . = merge done automatically 241s # = conflict that is currently blocking progress 241s @ = merge was blocked but has been resolved 241s ? = no merge recorded 241s 241s + git-imerge finish --branch=c-d-full 241s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + local refname=c-d-full 241s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git rev-parse c-d-full^{tree} 241s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + test_conflict 9-1 241s + local conflict=9-1 241s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s + DESCRIPTION=git-imerge test repository with conflict at 9-1 241s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 241s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s + local description=git-imerge test repository with conflict at 9-1 241s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 241s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s + local description=git-imerge test repository with conflict at 9-1 241s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s hint: Using 'master' as the name for the initial branch. This default branch name 241s hint: is subject to change. To configure the initial branch name to use in all 241s hint: of your new repositories, which will suppress this warning, call: 241s hint: 241s hint: git config --global init.defaultBranch 241s hint: 241s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 241s hint: 'development'. The just-created branch can be renamed via this command: 241s hint: 241s hint: git branch -m 241s hint: 241s hint: Disable this message with "git config set advice.defaultBranchName false" 241s + echo git-imerge test repository with conflict at 9-1 241s + printf %s\n /*.out /*.css /*.html 241s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1/.git config user.name Loú User 241s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 241s + TIME=1112911993 241s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1/.git/ 241s [master (root-commit) d70e04b] m⇒0 241s 3 files changed, 3 insertions(+) 241s create mode 100644 c.txt 241s create mode 100644 conflict.txt 241s create mode 100644 d.txt 241s [c 89e2141] c⇒1 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s [c 7c431f2] c⇒2 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s [c f02ab24] c⇒3 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-1 241s + modify c.txt 0 241s + filename=c.txt 241s + text=0 241s + echo 0 241s + git add c.txt 241s + modify d.txt 0 241s + filename=d.txt 241s + text=0 241s + echo 0 241s + git add d.txt 241s + modify conflict.txt original version 241s + filename=conflict.txt 241s + text=original version 241s + echo original version 241s + git add conflict.txt 241s + commit -m m⇒0 241s + TIME=1112911994 241s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 241s + git checkout -b c master -- 241s Switched to a new branch 'c' 241s + seq 9 241s + modify c.txt 1 241s + filename=c.txt 241s + text=1 241s + echo 1 241s + git add c.txt 241s + commit -m c⇒1 241s + TIME=1112911995 241s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 241s + modify c.txt 2 241s + filename=c.txt 241s + text=2 241s + echo 2 241s + git add c.txt 241s + commit -m c⇒2 241s + TIME=1112911996 241s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 241s + modify c.txt 3 241s + filename=c.txt 241s + text=3 241s + echo 3 241s + git add c.txt 241s + commit -m c⇒3 241s + TIME=1112911997 241s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 241s + modify c.txt 4 241s + filename=c.txt 241s + text=4 241s + echo 4 241s + git add c.txt 241s + commit -m c⇒4 241s + TIME=1112911998 241s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 241s + modify c.txt 5 241s + filename=c.txt 241s + text=5 241s + echo 5 241s + git add c.txt 241s [c ed9122f] c⇒4 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m c⇒5 241s + TIME=1112911999 241s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 241s + modify c.txt 6 241s + filename=c.txt 241s + text=6 241s + echo 6 241s + git add c.txt 241s [c 1d3bf09] c⇒5 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m c⇒6 241s + TIME=1112912000 241s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 241s [c f999ecd] c⇒6 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify c.txt 7 241s + filename=c.txt 241s + text=7 241s + echo 7 241s + git add c.txt 241s [c 7050a8a] c⇒7 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m c⇒7 241s + TIME=1112912001 241s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 241s + modify c.txt 8 241s + filename=c.txt 241s + text=8 241s + echo 8 241s + git add c.txt 241s [c 9732e77] c⇒8 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s [c 73a5eed] c⇒9 241s 2 files changed, 2 insertions(+), 2 deletions(-) 241s [d ac0427a] d⇒1 241s 2 files changed, 2 insertions(+), 2 deletions(-) 241s [d 43c38c0] d⇒2 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s [d 0260058] d⇒3 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m c⇒8 241s + TIME=1112912002 241s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 241s + modify c.txt 9 241s + filename=c.txt 241s + text=9 241s + echo 9 241s + git add c.txt 241s + modify conflict.txt c version 241s + filename=conflict.txt 241s + text=c version 241s + echo c version 241s + git add conflict.txt 241s + commit -m c⇒9 241s + TIME=1112912003 241s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 241s + git checkout -b d master -- 241s Switched to a new branch 'd' 241s + seq 6 241s + modify d.txt 1 241s + filename=d.txt 241s + text=1 241s + echo 1 241s + git add d.txt 241s + modify conflict.txt d version 241s + filename=conflict.txt 241s + text=d version 241s + echo d version 241s + git add conflict.txt 241s + commit -m d⇒1 241s + TIME=1112912004 241s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 241s + modify d.txt 2 241s + filename=d.txt 241s + text=2 241s + echo 2 241s + git add d.txt 241s + commit -m d⇒2 241s + TIME=1112912005 241s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 241s + modify d.txt 3 241s + filename=d.txt 241s + text=3 241s + echo 3 241s + git add d.txt 241s + commit -m d⇒3 241s + TIME=1112912006 241s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 241s + modify d.txt 4 241s + filename=d.txt 241s + text=4 241s + echo 4 241s + git add d.txt 241s [d 40fef44] d⇒4 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m d⇒4 241s + TIME=1112912007 241s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 241s + modify d.txt 5 241s + filename=d.txt 241s + text=5 241s + echo 5 241s + git add d.txt 241s + commit -m d⇒5 241s + TIME=1112912008 241s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 241s [d b080a65] d⇒5 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify d.txt 6 241s + filename=d.txt 241s + text=6 241s + echo 6 241s + git add d.txt 241s + commit -m d⇒6 241s + TIME=1112912009 241s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 241s [d 200ce5c] d⇒6 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + git checkout c 241s Switched to branch 'c' 241s + git-imerge init --name=c-d d 241s + git-imerge list 242s * c-d 242s + git-imerge diagram --commits --frontier --html=imerge0.html 242s 0 5 9 242s | | | 242s 0 - ********** - c 242s *????????? 242s *????????? 242s *????????? 242s *????????? 242s 5 - *????????? 242s 6 - *????????? 242s | 242s d 242s 242s 0 5 9 242s | | | 242s 0 - ********** - c 242s *????????? 242s *????????? 242s *????????? 242s *????????? 242s 5 - *????????? 242s 6 - *????????? 242s | 242s d 242s 242s Key: 242s |,-,+ = rectangles forming current merge frontier 242s * = merge done manually 242s . = merge done automatically 242s # = conflict that is currently blocking progress 242s @ = merge was blocked but has been resolved 242s ? = no merge recorded 242s 242s + git-imerge autofill 242s + tee autofill.out 242s Attempting automerge of 9-6...failure. 242s Attempting automerge of 1-1...success. 242s Attempting automerge of 1-4...success. 242s Attempting automerge of 1-6...success. 242s Attempting automerge of 9-6...failure. 242s Attempting automerge of 5-6...success. 242s Attempting automerge of 7-6...success. 242s Attempting automerge of 8-6...success. 242s Attempting automerge of 9-1...failure. 242s Autofilling 1-6...success. 242s Autofilling 2-6...success. 242s Autofilling 3-6...success. 242s Autofilling 4-6...success. 242s Autofilling 5-6...success. 242s Autofilling 6-6...success. 242s Autofilling 7-6...success. 242s Autofilling 8-1...success. 242s Autofilling 8-2...success. 242s Autofilling 8-3...success. 242s Autofilling 8-4...success. 242s Autofilling 8-5...success. 242s Autofilling 8-6 (first way)...success. 242s Autofilling 8-6 (second way)...success. 242s The two ways of autofilling 8-6 agree. 242s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 242s Attempting automerge of 9-6...failure. 242s Attempting automerge of 9-1...failure. 242s HEAD is now at 73a5eed c⇒9 242s Conflict; suggest manual merge of 9-1 242s + grep -q Traceback autofill.out 242s + grep -q suggest manual merge of 9-1 autofill.out 242s + git-imerge diagram --commits --frontier --html=imerge1.html 242s 0 5 9 242s | | | 242s 0 - ********** - c 242s *???????.# 242s *???????.? 242s *???????.? 242s *???????.? 242s 5 - *???????.? 242s 6 - *........? 242s | 242s d 242s 242s 0 5 9 242s | | | 242s 0 - ********** - c 242s *???????|# 242s *???????|? 242s *???????|? 242s *???????|? 242s 5 - *???????|? 242s 6 - *-------+? 242s | 242s d 242s 242s Key: 242s |,-,+ = rectangles forming current merge frontier 242s * = merge done manually 242s . = merge done automatically 242s # = conflict that is currently blocking progress 242s @ = merge was blocked but has been resolved 242s ? = no merge recorded 242s 242s + git-imerge continue --edit 242s Switched to branch 'imerge/c-d' 242s 242s Original first commit: 242s 242s Original second commit: 242s 242s There was a conflict merging commit 9-1, shown above. 242s Please resolve the conflict, commit the result, then type 242s 242s git-imerge continue 242s + echo merged version 242s + git add conflict.txt 242s + git-imerge continue --no-edit 242s Auto-merging conflict.txt 242s CONFLICT (content): Merge conflict in conflict.txt 242s Automatic merge failed; fix conflicts and then commit the result. 242s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 242s Author: Loú User 242s Date: Thu Apr 7 22:13:23 2005 +0000 242s 242s c⇒9 242s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 242s Author: Loú User 242s Date: Thu Apr 7 22:13:24 2005 +0000 242s 242s d⇒1 243s Merge has been recorded for merge 9-1. 243s [imerge/c-d e6f1366] imerge 'c-d': manual merge 9-1 243s Attempting automerge of 9-6...success. 243s Autofilling 9-2...success. 243s Autofilling 9-3...success. 243s Autofilling 9-4...success. 243s Autofilling 9-5...success. 243s Autofilling 9-6...success. 243s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 243s Merge is complete! 243s + git-imerge diagram --commits --frontier --html=imerge2.html 243s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 243s 0 5 9 243s | | | 243s 0 - ********** - c 243s *???????.* 243s *???????.. 243s *???????.. 243s *???????.. 243s 5 - *???????.. 243s 6 - *......... 243s | 243s d 243s 243s 0 5 9 243s | | | 243s 0 - ********** - c 243s *???????.* 243s *???????.| 243s *???????.| 243s *???????.| 243s 5 - *???????.| 243s 6 - *--------+ 243s | 243s d 243s 243s Key: 243s |,-,+ = rectangles forming current merge frontier 243s * = merge done manually 243s . = merge done automatically 243s # = conflict that is currently blocking progress 243s @ = merge was blocked but has been resolved 243s ? = no merge recorded 243s 243s Merge d into c (using imerge) 243s 243s # Please enter the commit message for your changes. Lines starting 243s # with '#' will be ignored, and an empty message aborts the commit. 243s # 243s # Date: Wed Dec 3 09:56:07 2025 +0000 243s # 243s # On branch c-d-merge 243s # Changes to be committed: 243s # modified: conflict.txt 243s # modified: d.txt 243s # 243s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + local refname=c-d-merge 243s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git rev-parse c-d-merge^{tree} 243s [c-d-merge 3d582c5] Merge d into c (using imerge) 243s Date: Wed Dec 3 09:56:07 2025 +0000 243s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git-imerge simplify --goal=rebase --branch=c-d-rebase 243s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + local refname=c-d-rebase 243s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git rev-parse c-d-rebase^{tree} 243s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 243s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + local refname=c-d-rebase-with-history 243s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git rev-parse c-d-rebase-with-history^{tree} 243s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git-imerge simplify --goal=border --branch=c-d-border 243s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + local refname=c-d-border 243s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git rev-parse c-d-border^{tree} 243s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 244s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + local refname=c-d-border-with-history 244s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + git rev-parse c-d-border-with-history^{tree} 244s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 244s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + local refname=c-d-border-with-history2 244s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + git rev-parse c-d-border-with-history2^{tree} 244s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + git-imerge remove 244s + git checkout c 244s Switched to branch 'c' 244s + git-imerge start --goal=full --first-parent --name=c-d d 244s + tee start.out 244s Attempting to merge 1-1...success. 244s Attempting to merge 1-2...success. 244s Attempting to merge 1-3...success. 244s Attempting to merge 1-4...success. 244s Attempting to merge 1-5...success. 244s Attempting to merge 1-6...success. 244s Attempting to merge 2-1...success. 244s Attempting to merge 2-2...success. 244s Attempting to merge 2-3...success. 244s Attempting to merge 2-4...success. 244s 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. 245s Attempting to merge 4-1...success. 245s Attempting to merge 4-2...success. 245s Attempting to merge 4-3...success. 245s Attempting to merge 4-4...success. 245s Attempting to merge 4-5...success. 245s Attempting to merge 4-6...success. 245s Attempting to merge 5-1...success. 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...conflict. 245s Switched to branch 'imerge/c-d' 245s Auto-merging conflict.txt 245s CONFLICT (content): Merge conflict in conflict.txt 245s Automatic merge failed; fix conflicts and then commit the result. 245s 245s Original first commit: 245s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 245s Author: Loú User 245s Date: Thu Apr 7 22:13:23 2005 +0000 245s 245s c⇒9 245s 245s Original second commit: 245s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 245s Author: Loú User 245s Date: Thu Apr 7 22:13:24 2005 +0000 245s 245s d⇒1 245s 245s There was a conflict merging commit 9-1, shown above. 245s Please resolve the conflict, commit the result, then type 245s 245s git-imerge continue 245s + grep -q Traceback start.out 245s + grep -q suggest manual merge of 9-1 autofill.out 245s + git-imerge diagram --commits --frontier --html=imerge3.html 245s 0 5 9 245s | | | 245s 0 - ********** - c 245s *........# 245s *........? 245s *........? 245s *........? 245s 5 - *........? 245s 6 - *........? 245s | 245s d 245s 245s 0 5 9 245s | | | 245s 0 - ********** - c 245s *.......|# 245s *.......|? 245s *.......|? 245s *.......|? 245s 5 - *.......|? 245s 6 - *-------+? 245s | 245s d 245s 245s Key: 245s |,-,+ = rectangles forming current merge frontier 245s * = merge done manually 245s . = merge done automatically 245s # = conflict that is currently blocking progress 245s @ = merge was blocked but has been resolved 245s ? = no merge recorded 245s 245s + echo merged version 245s + git add conflict.txt 245s + GIT_EDITOR=cat git commit 245s imerge 'c-d': manual merge 9-1 245s 245s # Conflicts: 245s # conflict.txt 245s # 245s # It looks like you may be committing a merge. 245s # If this is not correct, please run 245s # git update-ref -d MERGE_HEAD 245s # and try again. 245s 245s 245s # Please enter the commit message for your changes. Lines starting 245s # with '#' will be ignored, and an empty message aborts the commit. 245s # 245s # On branch imerge/c-d 245s # All conflicts fixed but you are still merging. 245s # 245s # Changes to be committed: 245s # modified: conflict.txt 245s # modified: d.txt 245s # 245s [imerge/c-d 1abacd0] imerge 'c-d': manual merge 9-1 245s + git-imerge continue --edit 245s Merge has been recorded for merge 9-1. 246s 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 1-6 246s + local conflict=1-6 246s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 246s + DESCRIPTION=git-imerge test repository with conflict at 1-6 246s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 246s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 246s + local description=git-imerge test repository with conflict at 1-6 246s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 246s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 246s + local description=git-imerge test repository with conflict at 1-6 246s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 246s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 246s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-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 hint: 246s hint: Disable this message with "git config set advice.defaultBranchName false" 246s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6/.git/ 246s + echo git-imerge test repository with conflict at 1-6 246s + printf %s\n /*.out /*.css /*.html 246s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6/.git config user.name Loú User 246s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 246s + TIME=1112911993 246s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 246s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-6 246s + modify c.txt 0 246s + filename=c.txt 246s + text=0 246s + echo 0 246s + git add c.txt 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 [c 2120f40] c⇒1 246s 2 files changed, 2 insertions(+), 2 deletions(-) 246s [c 90cc7de] c⇒2 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c 2046ed2] c⇒3 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c 8a2cee9] c⇒4 246s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + 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⇒1 246s + TIME=1112911995 246s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 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 + 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 + 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 + 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 ac16a05] 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 + 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 30dd2ae] c⇒6 246s 1 file changed, 1 insertion(+), 1 deletion(-) 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 0883eb9] 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 f661c06] c⇒8 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 9 246s + filename=c.txt 246s + text=9 246s [c 243e8ed] c⇒9 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d bd5368a] d⇒1 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d 93e27e6] d⇒2 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d 133f385] d⇒3 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d 586472a] d⇒4 246s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + 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 + 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 + 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 + modify d.txt 4 246s + filename=d.txt 246s + text=4 246s + echo 4 246s + git add d.txt 246s + commit -m d⇒4 246s + TIME=1112912007 246s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 246s + modify d.txt 5 246s + filename=d.txt 246s + text=5 246s + echo 5 246s + git add d.txt 246s + commit -m d⇒5 246s + TIME=1112912008 246s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 246s [d 9522207] d⇒5 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify d.txt 6 246s + filename=d.txt 246s + text=6 246s + echo 6 246s + git add d.txt 246s + modify conflict.txt d version 246s + filename=conflict.txt 246s + text=d version 246s + echo d version 246s + git add conflict.txt 246s + commit -m d⇒6 246s + TIME=1112912009 246s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 246s [d f7e451a] d⇒6 246s 2 files changed, 2 insertions(+), 2 deletions(-) 246s + git checkout c 246s Switched to branch 'c' 246s + git-imerge init --name=c-d d 246s + git-imerge list 246s * c-d 246s + git-imerge diagram --commits --frontier --html=imerge0.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 + tee autofill.out 246s + git-imerge autofill 246s Attempting automerge of 9-6...failure. 246s Attempting automerge of 1-1...success. 246s Attempting automerge of 1-4...success. 246s Attempting automerge of 1-6...failure. 246s Attempting automerge of 1-5...success. 246s Attempting automerge of 9-5...success. 247s Autofilling 1-5...success. 247s Autofilling 2-5...success. 247s Autofilling 3-5...success. 247s Autofilling 4-5...success. 247s Autofilling 5-5...success. 247s Autofilling 6-5...success. 247s Autofilling 7-5...success. 247s Autofilling 8-5...success. 247s Autofilling 9-1...success. 247s Autofilling 9-2...success. 247s Autofilling 9-3...success. 247s Autofilling 9-4...success. 247s Autofilling 9-5 (first way)...success. 247s Autofilling 9-5 (second way)...success. 247s The two ways of autofilling 9-5 agree. 247s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 247s Attempting automerge of 9-6...failure. 247s Attempting automerge of 1-6...failure. 247s HEAD is now at 243e8ed c⇒9 247s Conflict; suggest manual merge of 1-6 247s + grep -q Traceback autofill.out 247s + grep -q suggest manual merge of 1-6 autofill.out 247s + git-imerge diagram --commits --frontier --html=imerge1.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 + git-imerge continue --edit 247s Switched to branch 'imerge/c-d' 247s Auto-merging conflict.txt 247s CONFLICT (content): Merge conflict in conflict.txt 247s Automatic merge failed; fix conflicts and then commit the result. 247s 247s Original first commit: 247s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 247s Author: Loú User 247s Date: Thu Apr 7 22:13:15 2005 +0000 247s 247s c⇒1 247s 247s Original second commit: 247s 247s There was a conflict merging commit 1-6, shown above. 247s Please resolve the conflict, commit the result, then type 247s 247s git-imerge continue 247s commit f7e451a6c9656dda15641a9fbc591a602f158692 247s Author: Loú User 247s Date: Thu Apr 7 22:13:29 2005 +0000 247s 247s d⇒6 247s + echo merged version 247s + git add conflict.txt 247s + git-imerge continue --no-edit 247s [imerge/c-d 71ad946] imerge 'c-d': manual merge 1-6 247s Merge has been recorded for merge 1-6. 247s Attempting automerge of 9-6...success. 247s Autofilling 2-6...success. 247s Autofilling 3-6...success. 247s Autofilling 4-6...success. 247s Autofilling 5-6...success. 247s Autofilling 6-6...success. 247s Autofilling 7-6...success. 247s Autofilling 8-6...success. 247s Autofilling 9-6...success. 247s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 247s Merge is complete! 247s + git-imerge diagram --commits --frontier --html=imerge2.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 + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 248s Merge d into c (using imerge) 248s 248s # Please enter the commit message for your changes. Lines starting 248s # with '#' will be ignored, and an empty message aborts the commit. 248s # 248s # Date: Wed Dec 3 09:56:12 2025 +0000 248s # 248s # On branch c-d-merge 248s # Changes to be committed: 248s # modified: conflict.txt 248s # modified: d.txt 248s # 248s [c-d-merge e19f9dc] Merge d into c (using imerge) 248s Date: Wed Dec 3 09:56:12 2025 +0000 248s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + local refname=c-d-merge 248s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git rev-parse c-d-merge^{tree} 248s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git-imerge simplify --goal=rebase --branch=c-d-rebase 248s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + local refname=c-d-rebase 248s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git rev-parse c-d-rebase^{tree} 248s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 248s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + local refname=c-d-rebase-with-history 248s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git rev-parse c-d-rebase-with-history^{tree} 248s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git-imerge simplify --goal=border --branch=c-d-border 248s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + local refname=c-d-border 248s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git rev-parse c-d-border^{tree} 248s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 248s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + local refname=c-d-border-with-history 248s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git rev-parse c-d-border-with-history^{tree} 248s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 249s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + local refname=c-d-border-with-history2 249s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git rev-parse c-d-border-with-history2^{tree} 249s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git-imerge remove 249s + git checkout c 249s Switched to branch 'c' 249s + git-imerge start --goal=full --first-parent --name=c-d d 249s + tee start.out 249s Attempting to merge 1-1...success. 249s Attempting to merge 1-2...success. 249s Attempting to merge 1-3...success. 249s Attempting to merge 1-4...success. 249s Attempting to merge 1-5...success. 249s Attempting to merge 1-6...conflict. 249s Attempting to merge 2-1...success. 249s Attempting to merge 2-2...success. 249s Attempting to merge 2-3...success. 249s Attempting to merge 2-4...success. 249s Attempting to merge 2-5...success. 249s Attempting to merge 3-1...success. 249s Attempting to merge 3-2...success. 249s Attempting to merge 3-3...success. 249s Attempting to merge 3-4...success. 249s Attempting to merge 3-5...success. 249s Attempting to merge 4-1...success. 249s Attempting to merge 4-2...success. 249s Attempting to merge 4-3...success. 249s Attempting to merge 4-4...success. 249s Attempting to merge 4-5...success. 249s Attempting to merge 5-1...success. 249s Attempting to merge 5-2...success. 249s Attempting to merge 5-3...success. 249s Attempting to merge 5-4...success. 249s Attempting to merge 5-5...success. 249s Attempting to merge 6-1...success. 249s Attempting to merge 6-2...success. 250s Attempting to merge 6-3...success. 250s Attempting to merge 6-4...success. 250s Attempting to merge 6-5...success. 250s Attempting to merge 7-1...success. 250s Attempting to merge 7-2...success. 250s Attempting to merge 7-3...success. 250s Attempting to merge 7-4...success. 250s Attempting to merge 7-5...success. 250s Attempting to merge 8-1...success. 250s Attempting to merge 8-2...success. 250s Attempting to merge 8-3...success. 250s Attempting to merge 8-4...success. 250s Attempting to merge 8-5...success. 250s Attempting to merge 9-1...success. 250s Attempting to merge 9-2...success. 250s Attempting to merge 9-3...success. 250s Attempting to merge 9-4...success. 250s Attempting to merge 9-5...success. 250s Previous HEAD position was 22fa50d imerge 'c-d': automatic merge 9-5 250s Switched to branch 'imerge/c-d' 250s Auto-merging conflict.txt 250s CONFLICT (content): Merge conflict in conflict.txt 250s Automatic merge failed; fix conflicts and then commit the result. 250s 250s Original first commit: 250s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 250s Author: Loú User 250s Date: Thu Apr 7 22:13:15 2005 +0000 250s 250s c⇒1 250s 250s Original second commit: 250s commit f7e451a6c9656dda15641a9fbc591a602f158692 250s Author: Loú User 250s Date: Thu Apr 7 22:13:29 2005 +0000 250s 250s d⇒6 250s 250s There was a conflict merging commit 1-6, shown above. 250s Please resolve the conflict, commit the result, then type 250s 250s git-imerge continue 250s + grep -q Traceback start.out 250s + grep -q suggest manual merge of 1-6 autofill.out 250s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 250s + git add conflict.txt 250s + GIT_EDITOR=cat git commit 250s imerge 'c-d': manual merge 1-6 250s 250s # Conflicts: 250s # conflict.txt 250s # 250s # It looks like you may be committing a merge. 250s # If this is not correct, please run 250s # git update-ref -d MERGE_HEAD 250s # and try again. 250s 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 # On branch imerge/c-d 250s # All conflicts fixed but you are still merging. 250s # 250s # Changes to be committed: 250s # modified: conflict.txt 250s # modified: d.txt 250s # 250s [imerge/c-d b3a5563] imerge 'c-d': manual merge 1-6 250s + git-imerge continue --edit 250s Merge has been recorded for merge 1-6. 250s Attempting to merge 2-6...success. 250s Attempting to merge 3-6...success. 250s Attempting to merge 4-6...success. 250s Attempting to merge 5-6...success. 250s Attempting to merge 6-6...success. 250s Attempting to merge 7-6...success. 250s Attempting to merge 8-6...success. 250s Attempting to merge 9-6...success. 250s Merge is complete! 250s + git-imerge diagram --commits --frontier --html=imerge4.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-imerge finish --branch=c-d-full 251s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + local refname=c-d-full 251s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + git rev-parse c-d-full^{tree} 251s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + test_conflict 9-6 251s + local conflict=9-6 251s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s + DESCRIPTION=git-imerge test repository with conflict at 9-6 251s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 251s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s + local description=git-imerge test repository with conflict at 9-6 251s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 251s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s + local description=git-imerge test repository with conflict at 9-6 251s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s hint: Using 'master' as the name for the initial branch. This default branch name 251s hint: is subject to change. To configure the initial branch name to use in all 251s hint: of your new repositories, which will suppress this warning, call: 251s hint: 251s hint: git config --global init.defaultBranch 251s hint: 251s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 251s hint: 'development'. The just-created branch can be renamed via this command: 251s hint: 251s hint: git branch -m 251s hint: 251s hint: Disable this message with "git config set advice.defaultBranchName false" 251s + echo git-imerge test repository with conflict at 9-6 251s + printf %s\n /*.out /*.css /*.html 251s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6/.git config user.name Loú User 251s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6/.git/ 251s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 251s + TIME=1112911993 251s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-6 251s + modify c.txt 0 251s + filename=c.txt 251s + text=0 251s [master (root-commit) d70e04b] m⇒0 251s 3 files changed, 3 insertions(+) 251s create mode 100644 c.txt 251s create mode 100644 conflict.txt 251s create mode 100644 d.txt 251s [c 89e2141] c⇒1 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c 7c431f2] c⇒2 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c f02ab24] c⇒3 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c ed9122f] c⇒4 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + echo 0 251s + git add c.txt 251s + modify d.txt 0 251s + filename=d.txt 251s + text=0 251s + echo 0 251s + git add d.txt 251s + modify conflict.txt original version 251s + filename=conflict.txt 251s + text=original version 251s + echo original version 251s + git add conflict.txt 251s + commit -m m⇒0 251s + TIME=1112911994 251s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 251s + git checkout -b c master -- 251s Switched to a new branch 'c' 251s + seq 9 251s + modify c.txt 1 251s + filename=c.txt 251s + text=1 251s + echo 1 251s + git add c.txt 251s + commit -m c⇒1 251s + TIME=1112911995 251s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 251s + modify c.txt 2 251s + filename=c.txt 251s + text=2 251s + echo 2 251s + git add c.txt 251s + commit -m c⇒2 251s + TIME=1112911996 251s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 251s + modify c.txt 3 251s + filename=c.txt 251s + text=3 251s + echo 3 251s + git add c.txt 251s + commit -m c⇒3 251s + TIME=1112911997 251s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 251s + modify c.txt 4 251s + filename=c.txt 251s + text=4 251s + echo 4 251s + git add c.txt 251s + commit -m c⇒4 251s + TIME=1112911998 251s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 251s + modify c.txt 5 251s + filename=c.txt 251s + text=5 251s + echo 5 251s + git add c.txt 251s + commit -m c⇒5 251s + TIME=1112911999 251s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 251s [c 1d3bf09] c⇒5 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify c.txt 6 251s + filename=c.txt 251s + text=6 251s + echo 6 251s + git add c.txt 251s + commit -m c⇒6 251s + TIME=1112912000 251s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 251s [c f999ecd] c⇒6 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify c.txt 7 251s + filename=c.txt 251s + text=7 251s + echo 7 251s + git add c.txt 251s + commit -m c⇒7 251s + TIME=1112912001 251s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 251s [c 7050a8a] c⇒7 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify c.txt 8 251s + filename=c.txt 251s + text=8 251s + echo 8 251s + git add c.txt 251s + commit -m c⇒8 251s + TIME=1112912002 251s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 251s [c 9732e77] c⇒8 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify c.txt 9 251s + filename=c.txt 251s + text=9 251s + echo 9 251s + git add c.txt 251s + modify conflict.txt c version 251s + filename=conflict.txt 251s + text=c version 251s + echo c version 251s + git add conflict.txt 251s + commit -m c⇒9 251s + TIME=1112912003 251s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 251s [c 73a5eed] c⇒9 251s 2 files changed, 2 insertions(+), 2 deletions(-) 251s + git checkout -b d master -- 251s [d bd5368a] d⇒1 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [d 93e27e6] d⇒2 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s Switched to a new branch 'd' 251s + seq 6 251s + modify d.txt 1 251s + filename=d.txt 251s + text=1 251s + echo 1 251s + git add d.txt 251s + commit -m d⇒1 251s + TIME=1112912004 251s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 251s + modify d.txt 2 251s + filename=d.txt 251s + text=2 251s + echo 2 251s + git add d.txt 251s + commit -m d⇒2 251s + TIME=1112912005 251s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 251s + modify d.txt 3 251s + filename=d.txt 251s + text=3 251s + echo 3 251s + git add d.txt 251s + commit -m d⇒3 251s + TIME=1112912006 251s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 251s [d 133f385] d⇒3 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify d.txt 4 251s + filename=d.txt 251s + text=4 251s + echo 4 251s + git add d.txt 251s + commit -m d⇒4 251s + TIME=1112912007 251s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 251s [d 586472a] d⇒4 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify d.txt 5 251s + filename=d.txt 251s + text=5 251s + echo 5 251s + git add d.txt 251s + commit -m d⇒5 251s + TIME=1112912008 251s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 251s [d 9522207] d⇒5 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify d.txt 6 251s + filename=d.txt 251s + text=6 251s + echo 6 251s + git add d.txt 251s + modify conflict.txt d version 251s + filename=conflict.txt 251s + text=d version 251s + echo d version 251s + git add conflict.txt 251s + commit -m d⇒6 251s + TIME=1112912009 251s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 251s [d f7e451a] d⇒6 251s 2 files changed, 2 insertions(+), 2 deletions(-) 251s + git checkout c 251s Switched to branch 'c' 251s + git-imerge init --name=c-d d 251s + git-imerge list 251s * c-d 251s + git-imerge diagram --commits --frontier --html=imerge0.html 251s 0 5 9 251s | | | 251s 0 - ********** - c 251s *????????? 251s *????????? 251s *????????? 251s *????????? 251s 5 - *????????? 251s 6 - *????????? 251s | 251s d 251s 251s 0 5 9 251s | | | 251s 0 - ********** - c 251s *????????? 251s *????????? 251s *????????? 251s *????????? 251s 5 - *????????? 251s 6 - *????????? 251s | 251s d 251s 251s Key: 251s |,-,+ = rectangles forming current merge frontier 251s * = merge done manually 251s . = merge done automatically 251s # = conflict that is currently blocking progress 251s @ = merge was blocked but has been resolved 251s ? = no merge recorded 251s 251s + git-imerge autofill 251s + tee autofill.out 251s Attempting automerge of 9-6...failure. 251s Attempting automerge of 1-1...success. 251s Attempting automerge of 1-4...success. 251s Attempting automerge of 1-6...success. 251s Attempting automerge of 9-6...failure. 251s Attempting automerge of 5-6...success. 251s Attempting automerge of 7-6...success. 251s Attempting automerge of 8-6...success. 251s Attempting automerge of 9-1...success. 251s Attempting automerge of 9-4...success. 251s Attempting automerge of 9-5...success. 251s Autofilling 1-6...success. 251s Autofilling 2-6...success. 251s Autofilling 3-6...success. 251s Autofilling 4-6...success. 251s Autofilling 5-6...success. 251s Autofilling 6-6...success. 251s Autofilling 7-6...success. 251s Autofilling 8-1...success. 251s Autofilling 8-2...success. 251s Autofilling 8-3...success. 251s Autofilling 8-4...success. 252s Autofilling 8-5...success. 252s Autofilling 8-6 (first way)...success. 252s Autofilling 8-6 (second way)...success. 252s The two ways of autofilling 8-6 agree. 252s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 252s Autofilling 9-1...success. 252s Autofilling 9-2...success. 252s Autofilling 9-3...success. 252s Autofilling 9-4...success. 252s Autofilling 9-5...success. 252s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 252s Attempting automerge of 9-6...failure. 252s Attempting automerge of 9-6...failure. 252s HEAD is now at 73a5eed c⇒9 252s Conflict; suggest manual merge of 9-6 252s + grep -q Traceback autofill.out 252s + grep -q suggest manual merge of 9-6 autofill.out 252s + git-imerge diagram --commits --frontier --html=imerge1.html 252s 0 5 9 252s | | | 252s 0 - ********** - c 252s *???????.. 252s *???????.. 252s *???????.. 252s *???????.. 252s 5 - *???????.. 252s 6 - *........# 252s | 252s d 252s 252s 0 5 9 252s | | | 252s 0 - ********** - c 252s *???????.| 252s *???????.| 252s *???????.| 252s *???????.| 252s 5 - *???????.+ 252s 6 - *-------+# 252s | 252s d 252s 252s Key: 252s |,-,+ = rectangles forming current merge frontier 252s * = merge done manually 252s . = merge done automatically 252s # = conflict that is currently blocking progress 252s @ = merge was blocked but has been resolved 252s ? = no merge recorded 252s 252s + git-imerge continue --edit 252s Auto-merging conflict.txt 252s CONFLICT (content): Merge conflict in conflict.txt 252s Switched to branch 'imerge/c-d' 252s Automatic merge failed; fix conflicts and then commit the result. 252s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 252s Author: Loú User 252s Date: Thu Apr 7 22:13:23 2005 +0000 252s 252s c⇒9 252s commit f7e451a6c9656dda15641a9fbc591a602f158692 252s Author: Loú User 252s Date: Thu Apr 7 22:13:29 2005 +0000 252s 252s d⇒6 252s 252s Original first commit: 252s 252s Original second commit: 252s 252s There was a conflict merging commit 9-6, shown above. 252s Please resolve the conflict, commit the result, then type 252s 252s git-imerge continue 252s + echo merged version 252s + git add conflict.txt 252s + git-imerge continue --no-edit 252s Merge has been recorded for merge 9-6. 252s Merge is complete! 252s + git-imerge diagram --commits --frontier --html=imerge2.html 253s [imerge/c-d fac4693] imerge 'c-d': manual merge 9-6 253s 0 5 9 253s | | | 253s 0 - ********** - c 253s *???????.. 253s *???????.. 253s *???????.. 253s *???????.. 253s 5 - *???????.. 253s 6 - *........* 253s | 253s d 253s 253s 0 5 9 253s | | | 253s 0 - ********** - c 253s *???????.| 253s *???????.| 253s *???????.| 253s *???????.| 253s 5 - *???????.| 253s 6 - *--------* 253s | 253s d 253s 253s Key: 253s |,-,+ = rectangles forming current merge frontier 253s * = merge done manually 253s . = merge done automatically 253s # = conflict that is currently blocking progress 253s @ = merge was blocked but has been resolved 253s ? = no merge recorded 253s 253s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 253s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-merge 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-merge^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=rebase --branch=c-d-rebase 253s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-rebase 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-rebase^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 253s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-rebase-with-history 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-rebase-with-history^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=border --branch=c-d-border 253s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-border 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-border^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 253s Merge d into c (using imerge) 253s 253s # Please enter the commit message for your changes. Lines starting 253s # with '#' will be ignored, and an empty message aborts the commit. 253s # 253s # Date: Wed Dec 3 09:56:16 2025 +0000 253s # 253s # On branch c-d-merge 253s # Changes to be committed: 253s # modified: conflict.txt 253s # modified: d.txt 253s # 253s [c-d-merge 922791f] Merge d into c (using imerge) 253s Date: Wed Dec 3 09:56:16 2025 +0000 253s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-border-with-history 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-border-with-history^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 253s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-border-with-history2 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-border-with-history2^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge remove 254s + git checkout c 254s Switched to branch 'c' 254s + git-imerge start --goal=full --first-parent --name=c-d d 254s + tee start.out 254s Attempting to merge 1-1...success. 254s Attempting to merge 1-2...success. 254s Attempting to merge 1-3...success. 254s Attempting to merge 1-4...success. 254s Attempting to merge 1-5...success. 254s Attempting to merge 1-6...success. 254s Attempting to merge 2-1...success. 254s Attempting to merge 2-2...success. 254s Attempting to merge 2-3...success. 254s Attempting to merge 2-4...success. 254s Attempting to merge 2-5...success. 254s Attempting to merge 2-6...success. 254s Attempting to merge 3-1...success. 254s Attempting to merge 3-2...success. 254s Attempting to merge 3-3...success. 254s Attempting to merge 3-4...success. 254s Attempting to merge 3-5...success. 254s Attempting to merge 3-6...success. 254s 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...success. 254s Attempting to merge 7-1...success. 254s Attempting to merge 7-2...success. 255s Attempting to merge 7-3...success. 255s Attempting to merge 7-4...success. 255s Attempting to merge 7-5...success. 255s Attempting to merge 7-6...success. 255s Attempting to merge 8-1...success. 255s Attempting to merge 8-2...success. 255s Attempting to merge 8-3...success. 255s Attempting to merge 8-4...success. 255s Attempting to merge 8-5...success. 255s Attempting to merge 8-6...success. 255s 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 Attempting to merge 9-6...conflict. 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 73a5eedb087a0f656d730831b8def7943b40f3cf 255s Author: Loú User 255s Date: Thu Apr 7 22:13:23 2005 +0000 255s 255s c⇒9 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 9-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 9-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 9-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 b02d25d] imerge 'c-d': manual merge 9-6 255s + git-imerge continue --edit 255s Merge has been recorded for merge 9-6. 255s Merge is complete! 255s + git-imerge diagram --commits --frontier --html=imerge4.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 + git-imerge finish --branch=c-d-full 255s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 255s + local refname=c-d-full 255s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 255s + git rev-parse c-d-full^{tree} 255s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 255s + test_conflict 1-2 255s + local conflict=1-2 255s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s + DESCRIPTION=git-imerge test repository with conflict at 1-2 255s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 255s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s + local description=git-imerge test repository with conflict at 1-2 255s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 255s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s + local description=git-imerge test repository with conflict at 1-2 255s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2/.git/ 255s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s hint: Using 'master' as the name for the initial branch. This default branch name 255s hint: is subject to change. To configure the initial branch name to use in all 255s hint: of your new repositories, which will suppress this warning, call: 255s hint: 255s hint: git config --global init.defaultBranch 255s hint: 255s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 255s hint: 'development'. The just-created branch can be renamed via this command: 255s hint: 255s hint: git branch -m 255s hint: 255s hint: Disable this message with "git config set advice.defaultBranchName false" 255s + echo git-imerge test repository with conflict at 1-2 255s + printf %s\n /*.out /*.css /*.html 255s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2/.git config user.name Loú User 255s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 255s + TIME=1112911993 255s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s [master (root-commit) d70e04b] m⇒0 255s 3 files changed, 3 insertions(+) 255s create mode 100644 c.txt 255s create mode 100644 conflict.txt 255s create mode 100644 d.txt 255s [c 2120f40] c⇒1 255s 2 files changed, 2 insertions(+), 2 deletions(-) 255s [c 90cc7de] c⇒2 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c 2046ed2] c⇒3 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c 8a2cee9] c⇒4 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c ac16a05] c⇒5 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-1-2 255s + modify c.txt 0 255s + filename=c.txt 255s + text=0 255s + echo 0 255s + git add c.txt 255s + modify d.txt 0 255s + filename=d.txt 255s + text=0 255s + echo 0 255s + git add d.txt 255s + modify conflict.txt original version 255s + filename=conflict.txt 255s + text=original version 255s + echo original version 255s + git add conflict.txt 255s + commit -m m⇒0 255s + TIME=1112911994 255s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 255s + git checkout -b c master -- 255s Switched to a new branch 'c' 255s + seq 9 255s + modify c.txt 1 255s + filename=c.txt 255s + text=1 255s + echo 1 255s + git add c.txt 255s + modify conflict.txt c version 255s + filename=conflict.txt 255s + text=c version 255s + echo c version 255s + git add conflict.txt 255s + commit -m c⇒1 255s + TIME=1112911995 255s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 255s + modify c.txt 2 255s + filename=c.txt 255s + text=2 255s + echo 2 255s + git add c.txt 255s + commit -m c⇒2 255s + TIME=1112911996 255s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 255s + modify c.txt 3 255s + filename=c.txt 255s + text=3 255s + echo 3 255s + git add c.txt 255s + commit -m c⇒3 255s + TIME=1112911997 255s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 255s + modify c.txt 4 255s + filename=c.txt 255s + text=4 255s + echo 4 255s + git add c.txt 255s + commit -m c⇒4 255s + TIME=1112911998 255s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 255s + modify c.txt 5 255s + filename=c.txt 255s + text=5 255s + echo 5 255s + git add c.txt 255s + commit -m c⇒5 255s + TIME=1112911999 255s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 255s [c 30dd2ae] c⇒6 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + modify c.txt 6 255s + filename=c.txt 255s + text=6 255s + echo 6 255s + git add c.txt 255s + commit -m c⇒6 255s + TIME=1112912000 255s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 255s + modify c.txt 7 255s + filename=c.txt 255s + text=7 255s + echo 7 255s + git add c.txt 255s + commit -m c⇒7 255s + TIME=1112912001 255s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 255s [c 0883eb9] c⇒7 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + modify c.txt 8 255s + filename=c.txt 255s + text=8 255s + echo 8 255s + git add c.txt 255s [c f661c06] c⇒8 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c 243e8ed] c⇒9 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [d bd5368a] d⇒1 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [d 69efde8] d⇒2 255s 2 files changed, 2 insertions(+), 2 deletions(-) 255s [d 3169557] d⇒3 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [d 86c8052] d⇒4 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + commit -m c⇒8 255s + TIME=1112912002 255s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 255s + modify c.txt 9 255s + filename=c.txt 255s + text=9 255s + echo 9 255s + git add c.txt 255s + commit -m c⇒9 255s + TIME=1112912003 255s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 255s + git checkout -b d master -- 255s Switched to a new branch 'd' 255s + seq 6 255s + modify d.txt 1 255s + filename=d.txt 255s + text=1 255s + echo 1 255s + git add d.txt 255s + commit -m d⇒1 255s + TIME=1112912004 255s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 255s + modify d.txt 2 255s + filename=d.txt 255s + text=2 255s + echo 2 255s + git add d.txt 255s + modify conflict.txt d version 255s + filename=conflict.txt 255s + text=d version 255s + echo d version 255s + git add conflict.txt 255s + commit -m d⇒2 255s + TIME=1112912005 255s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 255s + modify d.txt 3 255s + filename=d.txt 255s + text=3 255s + echo 3 255s + git add d.txt 255s + commit -m d⇒3 255s + TIME=1112912006 255s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 255s + modify d.txt 4 255s + filename=d.txt 255s + text=4 255s + echo 4 255s + git add d.txt 255s + commit -m d⇒4 255s + TIME=1112912007 255s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 255s + modify d.txt 5 255s + filename=d.txt 255s + text=5 255s + echo 5 255s + git add d.txt 255s + commit -m d⇒5 255s + TIME=1112912008 255s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 256s [d 1700773] d⇒5 256s 1 file changed, 1 insertion(+), 1 deletion(-) 256s + modify d.txt 6 256s + filename=d.txt 256s + text=6 256s + echo 6 256s + git add d.txt 256s + commit -m d⇒6 256s + TIME=1112912009 256s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 256s [d df2e493] d⇒6 256s 1 file changed, 1 insertion(+), 1 deletion(-) 256s + git checkout c 256s Switched to branch 'c' 256s + git-imerge init --name=c-d d 256s + git-imerge list 256s * c-d 256s + git-imerge diagram --commits --frontier --html=imerge0.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 autofill 256s + tee autofill.out 256s Attempting automerge of 9-6...failure. 256s Attempting automerge of 1-1...success. 256s Attempting automerge of 1-4...failure. 256s Attempting automerge of 1-3...failure. 256s Attempting automerge of 1-2...failure. 256s Attempting automerge of 9-1...success. 256s Autofilling 1-1...success. 256s Autofilling 2-1...success. 256s Autofilling 3-1...success. 256s Autofilling 4-1...success. 256s Autofilling 5-1...success. 256s Autofilling 6-1...success. 256s Autofilling 7-1...success. 256s Autofilling 8-1...success. 256s Autofilling 9-1...success. 256s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 256s Attempting automerge of 9-6...failure. 256s Attempting automerge of 1-2...failure. 256s HEAD is now at 243e8ed c⇒9 256s Conflict; suggest manual merge of 1-2 256s + grep -q Traceback autofill.out 256s + grep -q suggest manual merge of 1-2 autofill.out 256s + git-imerge diagram --commits --frontier --html=imerge1.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 continue --edit 256s Switched to branch 'imerge/c-d' 256s Auto-merging conflict.txt 256s CONFLICT (content): Merge conflict in conflict.txt 256s Automatic merge failed; fix conflicts and then commit the result. 256s 256s Original first commit: 256s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 256s Author: Loú User 256s Date: Thu Apr 7 22:13:15 2005 +0000 256s 256s c⇒1 256s 256s Original second commit: 256s commit 69efde8f66d581a765a3909ffacb9f895f95c345 256s Author: Loú User 256s Date: Thu Apr 7 22:13:25 2005 +0000 256s 256s d⇒2 256s 256s There was a conflict merging commit 1-2, shown above. 256s Please resolve the conflict, commit the result, then type 256s 256s git-imerge continue 256s + echo merged version 256s + git add conflict.txt 256s + git-imerge continue --no-edit 257s [imerge/c-d aad4cdf] imerge 'c-d': manual merge 1-2 257s Merge has been recorded for merge 1-2. 257s Attempting automerge of 1-6...success. 257s Autofilling 1-3...success. 257s Autofilling 1-4...success. 257s Autofilling 1-5...success. 257s Autofilling 1-6...success. 257s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 257s Attempting automerge of 9-6...success. 257s Autofilling 2-6...success. 257s Autofilling 3-6...success. 257s Autofilling 4-6...success. 257s Autofilling 5-6...success. 257s Autofilling 6-6...success. 257s Autofilling 7-6...success. 257s Autofilling 8-6...success. 257s Autofilling 9-2...success. 257s Autofilling 9-3...success. 257s Autofilling 9-4...success. 257s Autofilling 9-5...success. 257s Autofilling 9-6 (first way)...success. 257s Autofilling 9-6 (second way)...success. 257s The two ways of autofilling 9-6 agree. 257s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 257s Merge is complete! 257s + git-imerge diagram --commits --frontier --html=imerge2.html 257s 0 5 9 257s | | | 257s 0 - ********** - c 257s *......... 257s **???????. 257s *.???????. 257s *.???????. 257s 5 - *.???????. 257s 6 - *......... 257s | 257s d 257s 257s 0 5 9 257s | | | 257s 0 - ********** - c 257s *........| 257s **???????| 257s *.???????| 257s *.???????| 257s 5 - *.???????| 257s 6 - *--------+ 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 + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 257s Merge d into c (using imerge) 257s 257s # Please enter the commit message for your changes. Lines starting 257s # with '#' will be ignored, and an empty message aborts the commit. 257s # 257s # Date: Wed Dec 3 09:56:21 2025 +0000 257s # 257s # On branch c-d-merge 257s # Changes to be committed: 257s # modified: conflict.txt 257s # modified: d.txt 257s # 257s [c-d-merge a0cd252] Merge d into c (using imerge) 257s Date: Wed Dec 3 09:56:21 2025 +0000 257s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + local refname=c-d-merge 257s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + git rev-parse c-d-merge^{tree} 257s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + git-imerge simplify --goal=rebase --branch=c-d-rebase 257s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + local refname=c-d-rebase 257s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + git rev-parse c-d-rebase^{tree} 257s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 258s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-rebase-with-history 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-rebase-with-history^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=border --branch=c-d-border 258s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-border 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-border^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 258s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-border-with-history 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-border-with-history^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 258s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-border-with-history2 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-border-with-history2^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge remove 258s + git checkout c 258s Switched to branch 'c' 258s + git-imerge start --goal=full --first-parent --name=c-d d 258s + tee start.out 258s Attempting to merge 1-1...success. 259s Attempting to merge 1-2...conflict. 259s Attempting to merge 2-1...success. 259s Attempting to merge 3-1...success. 259s Attempting to merge 4-1...success. 259s Attempting to merge 5-1...success. 259s Attempting to merge 6-1...success. 259s Attempting to merge 7-1...success. 259s Attempting to merge 8-1...success. 259s Attempting to merge 9-1...success. 259s Previous HEAD position was c6fb971 imerge 'c-d': automatic merge 9-1 259s Switched to branch 'imerge/c-d' 259s Auto-merging conflict.txt 259s CONFLICT (content): Merge conflict in conflict.txt 259s Automatic merge failed; fix conflicts and then commit the result. 259s 259s Original first commit: 259s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 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 69efde8f66d581a765a3909ffacb9f895f95c345 259s Author: Loú User 259s Date: Thu Apr 7 22:13:25 2005 +0000 259s 259s d⇒2 259s 259s There was a conflict merging commit 1-2, shown above. 259s Please resolve the conflict, commit the result, then type 259s 259s git-imerge continue 259s + grep -q Traceback start.out 259s + grep -q suggest manual merge of 1-2 autofill.out 259s + git-imerge diagram --commits --frontier --html=imerge3.html 259s 0 5 9 259s | | | 259s 0 - ********** - c 259s *......... 259s *#???????? 259s *????????? 259s *????????? 259s 5 - *????????? 259s 6 - *????????? 259s | 259s d 259s 259s 0 5 9 259s | | | 259s 0 - ********** - c 259s *--------+ 259s *#???????? 259s *????????? 259s *????????? 259s 5 - *????????? 259s 6 - *????????? 259s | 259s d 259s 259s Key: 259s |,-,+ = rectangles forming current merge frontier 259s * = merge done manually 259s . = merge done automatically 259s # = conflict that is currently blocking progress 259s @ = merge was blocked but has been resolved 259s ? = no merge recorded 259s 259s + echo merged version 259s + git add conflict.txt 259s + GIT_EDITOR=cat git commit 259s imerge 'c-d': manual merge 1-2 259s 259s # Conflicts: 259s # conflict.txt 259s # 259s # It looks like you may be committing a merge. 259s # If this is not correct, please run 259s # git update-ref -d MERGE_HEAD 259s # and try again. 259s 259s 259s # Please enter the commit message for your changes. Lines starting 259s # with '#' will be ignored, and an empty message aborts the commit. 259s # 259s # On branch imerge/c-d 259s # All conflicts fixed but you are still merging. 259s # 259s # Changes to be committed: 259s # modified: conflict.txt 259s # modified: d.txt 259s # 259s [imerge/c-d d15b396] imerge 'c-d': manual merge 1-2 259s + git-imerge continue --edit 259s Merge has been recorded for merge 1-2. 259s Attempting to merge 1-3...success. 259s Attempting to merge 1-4...success. 259s Attempting to merge 1-5...success. 259s Attempting to merge 1-6...success. 259s Attempting to merge 2-2...success. 259s Attempting to merge 2-3...success. 259s Attempting to merge 2-4...success. 259s Attempting to merge 2-5...success. 259s Attempting to merge 2-6...success. 259s Attempting to merge 3-2...success. 259s Attempting to merge 3-3...success. 259s Attempting to merge 3-4...success. 259s Attempting to merge 3-5...success. 259s Attempting to merge 3-6...success. 259s Attempting to merge 4-2...success. 259s Attempting to merge 4-3...success. 259s Attempting to merge 4-4...success. 259s Attempting to merge 4-5...success. 260s Attempting to merge 4-6...success. 260s Attempting to merge 5-2...success. 260s Attempting to merge 5-3...success. 260s Attempting to merge 5-4...success. 260s Attempting to merge 5-5...success. 260s Attempting to merge 5-6...success. 260s Attempting to merge 6-2...success. 260s Attempting to merge 6-3...success. 260s Attempting to merge 6-4...success. 260s Attempting to merge 6-5...success. 260s Attempting to merge 6-6...success. 260s Attempting to merge 7-2...success. 260s Attempting to merge 7-3...success. 260s Attempting to merge 7-4...success. 260s Attempting to merge 7-5...success. 260s Attempting to merge 7-6...success. 260s Attempting to merge 8-2...success. 260s Attempting to merge 8-3...success. 260s Attempting to merge 8-4...success. 260s Attempting to merge 8-5...success. 260s Attempting to merge 8-6...success. 260s Attempting to merge 9-2...success. 260s Attempting to merge 9-3...success. 260s Attempting to merge 9-4...success. 260s Attempting to merge 9-5...success. 260s Attempting to merge 9-6...success. 260s Merge is complete! 260s + git-imerge diagram --commits --frontier --html=imerge4.html 260s 0 5 9 260s | | | 260s 0 - ********** - c 260s *......... 260s **........ 260s *......... 260s *......... 260s 5 - *......... 260s 6 - *......... 260s | 260s d 260s 260s 0 5 9 260s | | | 260s 0 - ********** - c 260s *........| 260s **.......| 260s *........| 260s *........| 260s 5 - *........| 260s 6 - *--------+ 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 + git-imerge finish --branch=c-d-full 260s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + local refname=c-d-full 260s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + git rev-parse c-d-full^{tree} 260s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + test_conflict 9-5 260s + local conflict=9-5 260s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s + DESCRIPTION=git-imerge test repository with conflict at 9-5 260s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 260s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s + local description=git-imerge test repository with conflict at 9-5 260s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 260s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s + local description=git-imerge test repository with conflict at 9-5 260s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s hint: Using 'master' as the name for the initial branch. This default branch name 260s hint: is subject to change. To configure the initial branch name to use in all 260s hint: of your new repositories, which will suppress this warning, call: 260s hint: 260s hint: git config --global init.defaultBranch 260s hint: 260s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 260s hint: 'development'. The just-created branch can be renamed via this command: 260s hint: 260s hint: git branch -m 260s hint: 260s hint: Disable this message with "git config set advice.defaultBranchName false" 260s + echo git-imerge test repository with conflict at 9-5 260s + printf %s\n /*.out /*.css /*.html 260s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5/.git config user.name Loú User 260s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5/.git/ 260s [master (root-commit) d70e04b] m⇒0 260s 3 files changed, 3 insertions(+) 260s create mode 100644 c.txt 260s create mode 100644 conflict.txt 260s create mode 100644 d.txt 260s [c 89e2141] c⇒1 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s [c 7c431f2] c⇒2 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s [c f02ab24] c⇒3 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s [c ed9122f] c⇒4 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 260s + TIME=1112911993 260s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-9-5 260s + modify c.txt 0 260s + filename=c.txt 260s + text=0 260s + echo 0 260s + git add c.txt 260s + modify d.txt 0 260s + filename=d.txt 260s + text=0 260s + echo 0 260s + git add d.txt 260s + modify conflict.txt original version 260s + filename=conflict.txt 260s + text=original version 260s + echo original version 260s + git add conflict.txt 260s + commit -m m⇒0 260s + TIME=1112911994 260s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 260s + git checkout -b c master -- 260s Switched to a new branch 'c' 260s + seq 9 260s + modify c.txt 1 260s + filename=c.txt 260s + text=1 260s + echo 1 260s + git add c.txt 260s + commit -m c⇒1 260s + TIME=1112911995 260s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 260s + modify c.txt 2 260s + filename=c.txt 260s + text=2 260s + echo 2 260s + git add c.txt 260s + commit -m c⇒2 260s + TIME=1112911996 260s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 260s + modify c.txt 3 260s + filename=c.txt 260s + text=3 260s + echo 3 260s + git add c.txt 260s + commit -m c⇒3 260s + TIME=1112911997 260s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 260s + modify c.txt 4 260s + filename=c.txt 260s + text=4 260s + echo 4 260s + git add c.txt 260s + commit -m c⇒4 260s + TIME=1112911998 260s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 260s + modify c.txt 5 260s + filename=c.txt 260s + text=5 260s + echo 5 260s + git add c.txt 260s + commit -m c⇒5 260s + TIME=1112911999 260s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 260s [c 1d3bf09] c⇒5 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s + modify c.txt 6 260s + filename=c.txt 260s + text=6 260s + echo 6 260s + git add c.txt 260s [c f999ecd] c⇒6 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s + commit -m c⇒6 260s + TIME=1112912000 260s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 260s [c 7050a8a] c⇒7 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s + modify c.txt 7 260s + filename=c.txt 260s + text=7 260s + echo 7 260s + git add c.txt 260s + commit -m c⇒7 260s + TIME=1112912001 260s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 260s [c 9732e77] c⇒8 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s + modify c.txt 8 260s + filename=c.txt 260s + text=8 260s + echo 8 260s + git add c.txt 260s [c 73a5eed] c⇒9 260s 2 files changed, 2 insertions(+), 2 deletions(-) 260s [d bd5368a] d⇒1 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s [d 93e27e6] d⇒2 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s [d 133f385] d⇒3 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s [d 586472a] d⇒4 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s + commit -m c⇒8 260s + TIME=1112912002 260s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 260s + modify c.txt 9 260s + filename=c.txt 260s + text=9 260s + echo 9 260s + git add c.txt 260s + modify conflict.txt c version 260s + filename=conflict.txt 260s + text=c version 260s + echo c version 260s + git add conflict.txt 260s + commit -m c⇒9 260s + TIME=1112912003 260s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 260s + git checkout -b d master -- 260s Switched to a new branch 'd' 260s + seq 6 260s + modify d.txt 1 260s + filename=d.txt 260s + text=1 260s + echo 1 260s + git add d.txt 260s + commit -m d⇒1 260s + TIME=1112912004 260s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 260s + modify d.txt 2 260s + filename=d.txt 260s + text=2 260s + echo 2 260s + git add d.txt 260s + commit -m d⇒2 260s + TIME=1112912005 260s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 260s + modify d.txt 3 260s + filename=d.txt 260s + text=3 260s + echo 3 260s + git add d.txt 260s + commit -m d⇒3 260s + TIME=1112912006 260s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 260s + modify d.txt 4 260s + filename=d.txt 260s + text=4 260s + echo 4 260s + git add d.txt 260s + commit -m d⇒4 260s + TIME=1112912007 260s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 260s + modify d.txt 5 260s + filename=d.txt 260s + text=5 260s + echo 5 260s + git add d.txt 260s + modify conflict.txt d version 260s + filename=conflict.txt 260s + text=d version 260s + echo d version 260s + git add conflict.txt 260s + commit -m d⇒5 260s + TIME=1112912008 260s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 260s [d 0a6f956] d⇒5 260s 2 files changed, 2 insertions(+), 2 deletions(-) 260s + modify d.txt 6 260s + filename=d.txt 260s + text=6 260s + echo 6 260s + git add d.txt 260s + commit -m d⇒6 260s + TIME=1112912009 260s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 260s [d bfb30f0] d⇒6 260s 1 file changed, 1 insertion(+), 1 deletion(-) 260s + git checkout c 260s Switched to branch 'c' 260s + git-imerge init --name=c-d d 260s + git-imerge list 261s * c-d 261s + git-imerge diagram --commits --frontier --html=imerge0.html 261s 0 5 9 261s | | | 261s 0 - ********** - c 261s *????????? 261s *????????? 261s *????????? 261s *????????? 261s 5 - *????????? 261s 6 - *????????? 261s | 261s d 261s 261s 0 5 9 261s | | | 261s 0 - ********** - c 261s *????????? 261s *????????? 261s *????????? 261s *????????? 261s 5 - *????????? 261s 6 - *????????? 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 + git-imerge autofill 261s + tee autofill.out 261s Attempting automerge of 9-6...failure. 261s Attempting automerge of 1-1...success. 261s Attempting automerge of 1-4...success. 261s Attempting automerge of 1-6...success. 261s Attempting automerge of 9-6...failure. 261s Attempting automerge of 5-6...success. 261s Attempting automerge of 7-6...success. 261s Attempting automerge of 8-6...success. 261s Attempting automerge of 9-1...success. 261s Attempting automerge of 9-4...success. 261s Attempting automerge of 9-5...failure. 261s Autofilling 1-6...success. 261s Autofilling 2-6...success. 261s Autofilling 3-6...success. 261s Autofilling 4-6...success. 261s Autofilling 5-6...success. 261s Autofilling 6-6...success. 261s Autofilling 7-6...success. 261s Autofilling 8-1...success. 261s Autofilling 8-2...success. 261s Autofilling 8-3...success. 261s Autofilling 8-4...success. 261s Autofilling 8-5...success. 261s Autofilling 8-6 (first way)...success. 261s Autofilling 8-6 (second way)...success. 261s The two ways of autofilling 8-6 agree. 261s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 261s Autofilling 9-1...success. 261s Autofilling 9-2...success. 261s Autofilling 9-3...success. 261s Autofilling 9-4...success. 261s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 261s Attempting automerge of 9-6...failure. 261s Attempting automerge of 9-5...failure. 261s HEAD is now at 73a5eed c⇒9 261s Conflict; suggest manual merge of 9-5 261s + grep -q Traceback autofill.out 261s + grep -q suggest manual merge of 9-5 autofill.out 261s + git-imerge diagram --commits --frontier --html=imerge1.html 261s 0 5 9 261s | | | 261s 0 - ********** - c 261s *???????.. 261s *???????.. 261s *???????.. 261s *???????.. 261s 5 - *???????.# 261s 6 - *........? 261s | 261s d 261s 261s 0 5 9 261s | | | 261s 0 - ********** - c 261s *???????.| 261s *???????.| 261s *???????.| 261s *???????.+ 261s 5 - *???????|# 261s 6 - *-------+? 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 262s + git-imerge continue --edit 262s Switched to branch 'imerge/c-d' 262s Auto-merging conflict.txt 262s CONFLICT (content): Merge conflict in conflict.txt 262s Automatic merge failed; fix conflicts and then commit the result. 262s 262s Original first commit: 262s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 262s Author: Loú User 262s Date: Thu Apr 7 22:13:23 2005 +0000 262s 262s c⇒9 262s 262s Original second commit: 262s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 262s Author: Loú User 262s Date: Thu Apr 7 22:13:28 2005 +0000 262s 262s d⇒5 262s 262s There was a conflict merging commit 9-5, shown above. 262s Please resolve the conflict, commit the result, then type 262s 262s git-imerge continue 262s + echo merged version 262s + git add conflict.txt 262s + git-imerge continue --no-edit 262s [imerge/c-d e8d1f9d] imerge 'c-d': manual merge 9-5 262s Merge has been recorded for merge 9-5. 262s Attempting automerge of 9-6...success. 262s Autofilling 9-6...success. 262s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 262s Merge is complete! 262s + git-imerge diagram --commits --frontier --html=imerge2.html 262s 0 5 9 262s | | | 262s 0 - ********** - c 262s *???????.. 262s *???????.. 262s *???????.. 262s *???????.. 262s 5 - *???????.* 262s 6 - *......... 262s | 262s d 262s 262s 0 5 9 262s | | | 262s 0 - ********** - c 262s *???????.| 262s *???????.| 262s *???????.| 262s *???????.| 262s 5 - *???????.* 262s 6 - *--------+ 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 + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 262s Merge d into c (using imerge) 262s 262s # Please enter the commit message for your changes. Lines starting 262s # with '#' will be ignored, and an empty message aborts the commit. 262s # 262s # Date: Wed Dec 3 09:56:26 2025 +0000 262s # 262s # On branch c-d-merge 262s # Changes to be committed: 262s # modified: conflict.txt 262s # modified: d.txt 262s # 262s [c-d-merge 8657d69] Merge d into c (using imerge) 262s Date: Wed Dec 3 09:56:26 2025 +0000 262s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + local refname=c-d-merge 262s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git rev-parse c-d-merge^{tree} 262s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git-imerge simplify --goal=rebase --branch=c-d-rebase 262s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + local refname=c-d-rebase 262s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git rev-parse c-d-rebase^{tree} 262s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 262s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + local refname=c-d-rebase-with-history 262s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git rev-parse c-d-rebase-with-history^{tree} 262s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git-imerge simplify --goal=border --branch=c-d-border 263s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + local refname=c-d-border 263s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + git rev-parse c-d-border^{tree} 263s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 263s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + local refname=c-d-border-with-history 263s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + git rev-parse c-d-border-with-history^{tree} 263s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 263s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + local refname=c-d-border-with-history2 263s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + git rev-parse c-d-border-with-history2^{tree} 263s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + git-imerge remove 263s + git checkout c 263s Switched to branch 'c' 263s + git-imerge start --goal=full --first-parent --name=c-d d 263s + tee start.out 263s Attempting to merge 1-1...success. 263s Attempting to merge 1-2...success. 263s Attempting to merge 1-3...success. 263s Attempting to merge 1-4...success. 263s Attempting to merge 1-5...success. 263s Attempting to merge 1-6...success. 263s Attempting to merge 2-1...success. 263s Attempting to merge 2-2...success. 263s Attempting to merge 2-3...success. 263s Attempting to merge 2-4...success. 264s Attempting to merge 2-5...success. 264s Attempting to merge 2-6...success. 264s Attempting to merge 3-1...success. 264s Attempting to merge 3-2...success. 264s Attempting to merge 3-3...success. 264s Attempting to merge 3-4...success. 264s Attempting to merge 3-5...success. 264s Attempting to merge 3-6...success. 264s Attempting to merge 4-1...success. 264s Attempting to merge 4-2...success. 264s Attempting to merge 4-3...success. 264s Attempting to merge 4-4...success. 264s Attempting to merge 4-5...success. 264s Attempting to merge 4-6...success. 264s Attempting to merge 5-1...success. 264s Attempting to merge 5-2...success. 264s Attempting to merge 5-3...success. 264s Attempting to merge 5-4...success. 264s Attempting to merge 5-5...success. 264s Attempting to merge 5-6...success. 264s Attempting to merge 6-1...success. 264s Attempting to merge 6-2...success. 264s Attempting to merge 6-3...success. 264s Attempting to merge 6-4...success. 264s Attempting to merge 6-5...success. 264s Attempting to merge 6-6...success. 264s Attempting to merge 7-1...success. 264s Attempting to merge 7-2...success. 264s Attempting to merge 7-3...success. 264s Attempting to merge 7-4...success. 264s Attempting to merge 7-5...success. 264s Attempting to merge 7-6...success. 264s Attempting to merge 8-1...success. 264s Attempting to merge 8-2...success. 264s Attempting to merge 8-3...success. 264s Attempting to merge 8-4...success. 264s Attempting to merge 8-5...success. 264s Attempting to merge 8-6...success. 264s Attempting to merge 9-1...success. 264s Attempting to merge 9-2...success. 264s Attempting to merge 9-3...success. 264s Attempting to merge 9-4...success. 264s Attempting to merge 9-5...conflict. 264s Switched to branch 'imerge/c-d' 264s Auto-merging conflict.txt 264s CONFLICT (content): Merge conflict in conflict.txt 264s Automatic merge failed; fix conflicts and then commit the result. 264s 264s Original first commit: 264s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 264s Author: Loú User 264s Date: Thu Apr 7 22:13:23 2005 +0000 264s 264s c⇒9 264s 264s Original second commit: 264s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 264s Author: Loú User 264s Date: Thu Apr 7 22:13:28 2005 +0000 264s 264s d⇒5 264s 264s There was a conflict merging commit 9-5, shown above. 264s Please resolve the conflict, commit the result, then type 264s 264s git-imerge continue 264s + grep -q Traceback start.out 264s + grep -q suggest manual merge of 9-5 autofill.out 264s + git-imerge diagram --commits --frontier --html=imerge3.html 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *......... 265s *......... 265s *......... 265s *......... 265s 5 - *........# 265s 6 - *........? 265s | 265s d 265s 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *........| 265s *........| 265s *........| 265s *........+ 265s 5 - *.......|# 265s 6 - *-------+? 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 + echo merged version 265s + git add conflict.txt 265s + GIT_EDITOR=cat git commit 265s imerge 'c-d': manual merge 9-5 265s 265s # Conflicts: 265s # conflict.txt 265s # 265s # It looks like you may be committing a merge. 265s # If this is not correct, please run 265s # git update-ref -d MERGE_HEAD 265s # and try again. 265s 265s 265s # Please enter the commit message for your changes. Lines starting 265s # with '#' will be ignored, and an empty message aborts the commit. 265s # 265s # On branch imerge/c-d 265s # All conflicts fixed but you are still merging. 265s # 265s # Changes to be committed: 265s # modified: conflict.txt 265s # modified: d.txt 265s # 265s [imerge/c-d 96e8189] imerge 'c-d': manual merge 9-5 265s + git-imerge continue --edit 265s Merge has been recorded for merge 9-5. 265s Attempting to merge 9-6...success. 265s Merge is complete! 265s + git-imerge diagram --commits --frontier --html=imerge4.html 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *......... 265s *......... 265s *......... 265s *......... 265s 5 - *........* 265s 6 - *......... 265s | 265s d 265s 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *........| 265s *........| 265s *........| 265s *........| 265s 5 - *........* 265s 6 - *--------+ 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 + git-imerge finish --branch=c-d-full 265s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + local refname=c-d-full 265s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + git rev-parse c-d-full^{tree} 265s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + test_conflict 5-1 265s + local conflict=5-1 265s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s + DESCRIPTION=git-imerge test repository with conflict at 5-1 265s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 265s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s + local description=git-imerge test repository with conflict at 5-1 265s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 265s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s + local description=git-imerge test repository with conflict at 5-1 265s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s hint: Using 'master' as the name for the initial branch. This default branch name 265s hint: is subject to change. To configure the initial branch name to use in all 265s hint: of your new repositories, which will suppress this warning, call: 265s hint: 265s hint: git config --global init.defaultBranch 265s hint: 265s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 265s hint: 'development'. The just-created branch can be renamed via this command: 265s hint: 265s hint: git branch -m 265s hint: 265s hint: Disable this message with "git config set advice.defaultBranchName false" 265s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1/.git/ 265s + echo git-imerge test repository with conflict at 5-1 265s + printf %s\n /*.out /*.css /*.html 265s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1/.git config user.name Loú User 265s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 265s + TIME=1112911993 265s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s [master (root-commit) d70e04b] m⇒0 265s 3 files changed, 3 insertions(+) 265s create mode 100644 c.txt 265s create mode 100644 conflict.txt 265s create mode 100644 d.txt 265s [c 89e2141] c⇒1 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s [c 7c431f2] c⇒2 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s [c f02ab24] c⇒3 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-5-1 265s + modify c.txt 0 265s + filename=c.txt 265s + text=0 265s + echo 0 265s + git add c.txt 265s + modify d.txt 0 265s + filename=d.txt 265s + text=0 265s + echo 0 265s + git add d.txt 265s + modify conflict.txt original version 265s + filename=conflict.txt 265s + text=original version 265s + echo original version 265s + git add conflict.txt 265s + commit -m m⇒0 265s + TIME=1112911994 265s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 265s + git checkout -b c master -- 265s Switched to a new branch 'c' 265s + seq 9 265s + modify c.txt 1 265s + filename=c.txt 265s + text=1 265s + echo 1 265s + git add c.txt 265s + commit -m c⇒1 265s + TIME=1112911995 265s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 265s + modify c.txt 2 265s + filename=c.txt 265s + text=2 265s + echo 2 265s + git add c.txt 265s + commit -m c⇒2 265s + TIME=1112911996 265s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 265s + modify c.txt 3 265s + filename=c.txt 265s + text=3 265s + echo 3 265s + git add c.txt 265s + commit -m c⇒3 265s + TIME=1112911997 265s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 265s + modify c.txt 4 265s + filename=c.txt 265s + text=4 265s + echo 4 265s + git add c.txt 265s + commit -m c⇒4 265s + TIME=1112911998 265s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 265s [c ed9122f] c⇒4 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s + modify c.txt 5 265s + filename=c.txt 265s + text=5 265s + echo 5 265s + git add c.txt 265s + modify conflict.txt c version 265s + filename=conflict.txt 265s + text=c version 265s + echo c version 265s + git add conflict.txt 265s + commit -m c⇒5 265s + TIME=1112911999 265s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 265s [c 7e31f25] c⇒5 265s 2 files changed, 2 insertions(+), 2 deletions(-) 265s + modify c.txt 6 265s + filename=c.txt 265s + text=6 265s + echo 6 265s + git add c.txt 265s + commit -m c⇒6 265s + TIME=1112912000 265s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 265s [c df3c57a] c⇒6 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s + modify c.txt 7 265s + filename=c.txt 265s + text=7 265s + echo 7 265s + git add c.txt 265s [c ea32d81] c⇒7 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s [c 44473d6] c⇒8 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s [c d8d80cf] c⇒9 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s [d ac0427a] d⇒1 265s 2 files changed, 2 insertions(+), 2 deletions(-) 265s + commit -m c⇒7 265s + TIME=1112912001 265s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 265s + modify c.txt 8 265s + filename=c.txt 265s + text=8 265s + echo 8 265s + git add c.txt 265s + commit -m c⇒8 265s + TIME=1112912002 265s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 265s + modify c.txt 9 265s + filename=c.txt 265s + text=9 265s + echo 9 265s + git add c.txt 265s + commit -m c⇒9 265s + TIME=1112912003 265s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 265s + git checkout -b d master -- 265s Switched to a new branch 'd' 265s + seq 6 265s + modify d.txt 1 265s + filename=d.txt 265s + text=1 265s + echo 1 265s + git add d.txt 265s + modify conflict.txt d version 265s + filename=conflict.txt 265s + text=d version 265s + echo d version 265s + git add conflict.txt 265s + commit -m d⇒1 265s + TIME=1112912004 265s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 265s + modify d.txt 2 265s + filename=d.txt 265s + text=2 265s + echo 2 265s + git add d.txt 265s + commit -m d⇒2 265s + TIME=1112912005 265s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 265s + modify d.txt 3 265s + filename=d.txt 265s + text=3 265s + echo 3 265s + git add d.txt 265s [d 43c38c0] d⇒2 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s + commit -m d⇒3 265s + TIME=1112912006 265s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 265s [d 0260058] d⇒3 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s + modify d.txt 4 265s + filename=d.txt 265s + text=4 265s + echo 4 265s + git add d.txt 265s + commit -m d⇒4 265s + TIME=1112912007 265s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 265s [d 40fef44] d⇒4 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s + modify d.txt 5 265s + filename=d.txt 265s + text=5 265s + echo 5 265s + git add d.txt 265s + commit -m d⇒5 265s + TIME=1112912008 265s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 265s [d b080a65] d⇒5 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s [d 200ce5c] d⇒6 265s 1 file changed, 1 insertion(+), 1 deletion(-) 265s + modify d.txt 6 265s + filename=d.txt 265s + text=6 265s + echo 6 265s + git add d.txt 265s + commit -m d⇒6 265s + TIME=1112912009 265s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 265s + git checkout c 265s Switched to branch 'c' 265s + git-imerge init --name=c-d d 265s + git-imerge list 265s * c-d 265s + git-imerge diagram --commits --frontier --html=imerge0.html 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *????????? 265s *????????? 265s *????????? 265s *????????? 265s 5 - *????????? 265s 6 - *????????? 265s | 265s d 265s 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *????????? 265s *????????? 265s *????????? 265s *????????? 265s 5 - *????????? 265s 6 - *????????? 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 + + tee autofill.out 265s git-imerge autofill 266s Attempting automerge of 9-6...failure. 266s Attempting automerge of 1-1...success. 266s Attempting automerge of 1-4...success. 266s Attempting automerge of 1-6...success. 266s Attempting automerge of 9-6...failure. 266s Attempting automerge of 5-6...failure. 266s Attempting automerge of 3-6...success. 266s Attempting automerge of 4-6...success. 266s Attempting automerge of 5-1...failure. 266s Autofilling 1-6...success. 266s Autofilling 2-6...success. 266s Autofilling 3-6...success. 266s Autofilling 4-1...success. 266s Autofilling 4-2...success. 266s Autofilling 4-3...success. 266s Autofilling 4-4...success. 266s Autofilling 4-5...success. 266s Autofilling 4-6 (first way)...success. 266s Autofilling 4-6 (second way)...success. 266s The two ways of autofilling 4-6 agree. 266s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 266s Attempting automerge of 9-6...failure. 266s Attempting automerge of 5-1...failure. 266s HEAD is now at d8d80cf c⇒9 266s Conflict; suggest manual merge of 5-1 266s + grep -q Traceback autofill.out 266s + grep -q suggest manual merge of 5-1 autofill.out 266s + git-imerge diagram --commits --frontier --html=imerge1.html 266s 0 5 9 266s | | | 266s 0 - ********** - c 266s *???.#???? 266s *???.????? 266s *???.????? 266s *???.????? 266s 5 - *???.????? 266s 6 - *....????? 266s | 266s d 266s 266s 0 5 9 266s | | | 266s 0 - ********** - c 266s *???|#???? 266s *???|????? 266s *???|????? 266s *???|????? 266s 5 - *???|????? 266s 6 - *---+????? 266s | 266s d 266s 266s Key: 266s |,-,+ = rectangles forming current merge frontier 266s * = merge done manually 266s . = merge done automatically 266s # = conflict that is currently blocking progress 266s @ = merge was blocked but has been resolved 266s ? = no merge recorded 266s 266s + git-imerge continue --edit 266s Switched to branch 'imerge/c-d' 266s Auto-merging conflict.txt 266s CONFLICT (content): Merge conflict in conflict.txt 266s Automatic merge failed; fix conflicts and then commit the result. 266s commit 7e31f254c318decc434628f023dac0703f3d2b9e 266s Author: Loú User 266s Date: Thu Apr 7 22:13:19 2005 +0000 266s 266s c⇒5 266s 266s Original first commit: 266s 266s Original second commit: 266s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 266s Author: Loú User 266s Date: Thu Apr 7 22:13:24 2005 +0000 266s 266s d⇒1 266s 266s There was a conflict merging commit 5-1, shown above. 266s Please resolve the conflict, commit the result, then type 266s 266s git-imerge continue 266s + echo merged version 266s + git add conflict.txt 266s + git-imerge continue --no-edit 266s [imerge/c-d 9027ee4] imerge 'c-d': manual merge 5-1 266s Merge has been recorded for merge 5-1. 266s Attempting automerge of 5-6...success. 266s Autofilling 5-2...success. 266s Autofilling 5-3...success. 266s Autofilling 5-4...success. 266s Autofilling 5-5...success. 266s Autofilling 5-6...success. 266s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 266s Attempting automerge of 9-6...success. 266s Autofilling 6-6...success. 266s Autofilling 7-6...success. 266s Autofilling 8-6...success. 266s Autofilling 9-1...success. 266s Autofilling 9-2...success. 266s Autofilling 9-3...success. 266s Autofilling 9-4...success. 266s Autofilling 9-5...success. 267s Autofilling 9-6 (first way)...success. 267s Autofilling 9-6 (second way)...success. 267s The two ways of autofilling 9-6 agree. 267s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 267s Merge is complete! 267s + git-imerge diagram --commits --frontier --html=imerge2.html 267s 0 5 9 267s | | | 267s 0 - ********** - c 267s *???.*???. 267s *???..???. 267s *???..???. 267s *???..???. 267s 5 - *???..???. 267s 6 - *......... 267s | 267s d 267s 267s 0 5 9 267s | | | 267s 0 - ********** - c 267s *???.*???| 267s *???..???| 267s *???..???| 267s *???..???| 267s 5 - *???..???| 267s 6 - *--------+ 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 + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 267s Merge d into c (using imerge) 267s 267s # Please enter the commit message for your changes. Lines starting 267s # with '#' will be ignored, and an empty message aborts the commit. 267s # 267s # Date: Wed Dec 3 09:56:31 2025 +0000 267s # 267s # On branch c-d-merge 267s # Changes to be committed: 267s # modified: conflict.txt 267s # modified: d.txt 267s # 267s [c-d-merge fb30ae5] Merge d into c (using imerge) 267s Date: Wed Dec 3 09:56:31 2025 +0000 267s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + local refname=c-d-merge 267s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git rev-parse c-d-merge^{tree} 267s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git-imerge simplify --goal=rebase --branch=c-d-rebase 267s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + local refname=c-d-rebase 267s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git rev-parse c-d-rebase^{tree} 267s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 267s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + local refname=c-d-rebase-with-history 267s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git rev-parse c-d-rebase-with-history^{tree} 267s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git-imerge simplify --goal=border --branch=c-d-border 267s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + local refname=c-d-border 267s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git rev-parse c-d-border^{tree} 267s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 268s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + local refname=c-d-border-with-history 268s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + git rev-parse c-d-border-with-history^{tree} 268s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 268s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + local refname=c-d-border-with-history2 268s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + git rev-parse c-d-border-with-history2^{tree} 268s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + git-imerge remove 268s + git checkout c 268s Switched to branch 'c' 268s + git-imerge start --goal=full --first-parent --name=c-d d 268s + tee start.out 268s Attempting to merge 1-1...success. 268s Attempting to merge 1-2...success. 268s Attempting to merge 1-3...success. 268s Attempting to merge 1-4...success. 268s Attempting to merge 1-5...success. 268s Attempting to merge 1-6...success. 268s Attempting to merge 2-1...success. 268s Attempting to merge 2-2...success. 268s Attempting to merge 2-3...success. 268s Attempting to merge 2-4...success. 268s Attempting to merge 2-5...success. 268s Attempting to merge 2-6...success. 268s Attempting to merge 3-1...success. 269s Attempting to merge 3-2...success. 269s Attempting to merge 3-3...success. 269s Attempting to merge 3-4...success. 269s Attempting to merge 3-5...success. 269s Attempting to merge 3-6...success. 269s Attempting to merge 4-1...success. 269s Attempting to merge 4-2...success. 269s Attempting to merge 4-3...success. 269s Attempting to merge 4-4...success. 269s Attempting to merge 4-5...success. 269s Attempting to merge 4-6...success. 269s Attempting to merge 5-1...conflict. 269s Switched to branch 'imerge/c-d' 269s Auto-merging conflict.txt 269s CONFLICT (content): Merge conflict in conflict.txt 269s Automatic merge failed; fix conflicts and then commit the result. 269s 269s Original first commit: 269s commit 7e31f254c318decc434628f023dac0703f3d2b9e 269s Author: Loú User 269s Date: Thu Apr 7 22:13:19 2005 +0000 269s 269s c⇒5 269s 269s Original second commit: 269s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 269s Author: Loú User 269s Date: Thu Apr 7 22:13:24 2005 +0000 269s 269s d⇒1 269s 269s There was a conflict merging commit 5-1, shown above. 269s Please resolve the conflict, commit the result, then type 269s 269s git-imerge continue 269s + grep -q Traceback start.out 269s + grep -q suggest manual merge of 5-1 autofill.out 269s + git-imerge diagram --commits --frontier --html=imerge3.html 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *....#???? 269s *....????? 269s *....????? 269s *....????? 269s 5 - *....????? 269s 6 - *....????? 269s | 269s d 269s 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *...|#???? 269s *...|????? 269s *...|????? 269s *...|????? 269s 5 - *...|????? 269s 6 - *---+????? 269s | 269s d 269s 269s Key: 269s |,-,+ = rectangles forming current merge frontier 269s * = merge done manually 269s . = merge done automatically 269s # = conflict that is currently blocking progress 269s @ = merge was blocked but has been resolved 269s ? = no merge recorded 269s 269s + echo merged version 269s + git add conflict.txt 269s + GIT_EDITOR=cat git commit 269s imerge 'c-d': manual merge 5-1 269s 269s # Conflicts: 269s # conflict.txt 269s # 269s # It looks like you may be committing a merge. 269s # If this is not correct, please run 269s # git update-ref -d MERGE_HEAD 269s # and try again. 269s 269s 269s # Please enter the commit message for your changes. Lines starting 269s # with '#' will be ignored, and an empty message aborts the commit. 269s # 269s # On branch imerge/c-d 269s # All conflicts fixed but you are still merging. 269s # 269s # Changes to be committed: 269s # modified: conflict.txt 269s # modified: d.txt 269s # 269s + git-imerge continue --edit 269s [imerge/c-d eb66d34] imerge 'c-d': manual merge 5-1 269s Merge has been recorded for merge 5-1. 269s Attempting to merge 5-2...success. 269s Attempting to merge 5-3...success. 269s Attempting to merge 5-4...success. 269s Attempting to merge 5-5...success. 269s Attempting to merge 5-6...success. 269s Attempting to merge 6-1...success. 269s Attempting to merge 6-2...success. 269s Attempting to merge 6-3...success. 269s Attempting to merge 6-4...success. 269s Attempting to merge 6-5...success. 269s Attempting to merge 6-6...success. 269s Attempting to merge 7-1...success. 269s Attempting to merge 7-2...success. 269s Attempting to merge 7-3...success. 269s Attempting to merge 7-4...success. 269s Attempting to merge 7-5...success. 269s Attempting to merge 7-6...success. 269s Attempting to merge 8-1...success. 269s Attempting to merge 8-2...success. 269s Attempting to merge 8-3...success. 269s Attempting to merge 8-4...success. 269s Attempting to merge 8-5...success. 269s Attempting to merge 8-6...success. 270s Attempting to merge 9-1...success. 270s Attempting to merge 9-2...success. 270s Attempting to merge 9-3...success. 270s Attempting to merge 9-4...success. 270s Attempting to merge 9-5...success. 270s Attempting to merge 9-6...success. 270s Merge is complete! 270s + git-imerge diagram --commits --frontier --html=imerge4.html 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s *....*.... 270s *......... 270s *......... 270s *......... 270s 5 - *......... 270s 6 - *......... 270s | 270s d 270s 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s *....*...| 270s *........| 270s *........| 270s *........| 270s 5 - *........| 270s 6 - *--------+ 270s | 270s d 270s 270s Key: 270s |,-,+ = rectangles forming current merge frontier 270s * = merge done manually 270s . = merge done automatically 270s # = conflict that is currently blocking progress 270s @ = merge was blocked but has been resolved 270s ? = no merge recorded 270s 270s + git-imerge finish --branch=c-d-full 270s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + local refname=c-d-full 270s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git rev-parse c-d-full^{tree} 270s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + test_conflict 6-6 270s + local conflict=6-6 270s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s + DESCRIPTION=git-imerge test repository with conflict at 6-6 270s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 270s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s + local description=git-imerge test repository with conflict at 6-6 270s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 270s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s + local description=git-imerge test repository with conflict at 6-6 270s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6/.git/ 270s hint: Using 'master' as the name for the initial branch. This default branch name 270s hint: is subject to change. To configure the initial branch name to use in all 270s hint: of your new repositories, which will suppress this warning, call: 270s hint: 270s hint: git config --global init.defaultBranch 270s hint: 270s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 270s hint: 'development'. The just-created branch can be renamed via this command: 270s hint: 270s hint: git branch -m 270s hint: 270s hint: Disable this message with "git config set advice.defaultBranchName false" 270s + echo git-imerge test repository with conflict at 6-6 270s + printf %s\n /*.out /*.css /*.html 270s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6/.git config user.name Loú User 270s [master (root-commit) d70e04b] m⇒0 270s 3 files changed, 3 insertions(+) 270s create mode 100644 c.txt 270s create mode 100644 conflict.txt 270s create mode 100644 d.txt 270s [c 89e2141] c⇒1 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [c 7c431f2] c⇒2 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [c f02ab24] c⇒3 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [c ed9122f] c⇒4 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 270s + TIME=1112911993 270s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/conflicted-6-6 270s + modify c.txt 0 270s + filename=c.txt 270s + text=0 270s + echo 0 270s + git add c.txt 270s + modify d.txt 0 270s + filename=d.txt 270s + text=0 270s + echo 0 270s + git add d.txt 270s + modify conflict.txt original version 270s + filename=conflict.txt 270s + text=original version 270s + echo original version 270s + git add conflict.txt 270s + commit -m m⇒0 270s + TIME=1112911994 270s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 270s + git checkout -b c master -- 270s Switched to a new branch 'c' 270s + seq 9 270s + modify c.txt 1 270s + filename=c.txt 270s + text=1 270s + echo 1 270s + git add c.txt 270s + commit -m c⇒1 270s + TIME=1112911995 270s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 270s + modify c.txt 2 270s + filename=c.txt 270s + text=2 270s + echo 2 270s + git add c.txt 270s + commit -m c⇒2 270s + TIME=1112911996 270s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 270s + modify c.txt 3 270s + filename=c.txt 270s + text=3 270s + echo 3 270s + git add c.txt 270s + commit -m c⇒3 270s + TIME=1112911997 270s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 270s + modify c.txt 4 270s + filename=c.txt 270s + text=4 270s + echo 4 270s + git add c.txt 270s + commit -m c⇒4 270s + TIME=1112911998 270s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 270s + modify c.txt 5 270s + filename=c.txt 270s + text=5 270s + echo 5 270s + git add c.txt 270s + commit -m c⇒5 270s + TIME=1112911999 270s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 270s [c 1d3bf09] c⇒5 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 6 270s + filename=c.txt 270s + text=6 270s + echo 6 270s + git add c.txt 270s + modify conflict.txt c version 270s + filename=conflict.txt 270s + text=c version 270s + echo c version 270s + git add conflict.txt 270s + commit -m c⇒6 270s + TIME=1112912000 270s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 270s [c fe4fed8] c⇒6 270s 2 files changed, 2 insertions(+), 2 deletions(-) 270s + modify c.txt 7 270s + filename=c.txt 270s + text=7 270s + echo 7 270s [c ec255ea] c⇒7 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [c 7459ac3] c⇒8 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [c 70408c8] c⇒9 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [d bd5368a] d⇒1 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + git add c.txt 270s + commit -m c⇒7 270s + TIME=1112912001 270s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 270s + modify c.txt 8 270s + filename=c.txt 270s + text=8 270s + echo 8 270s + git add c.txt 270s + commit -m c⇒8 270s + TIME=1112912002 270s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 270s + modify c.txt 9 270s + filename=c.txt 270s + text=9 270s + echo 9 270s + git add c.txt 270s + commit -m c⇒9 270s + TIME=1112912003 270s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 270s + git checkout -b d master -- 270s Switched to a new branch 'd' 270s + seq 6 270s + modify d.txt 1 270s + filename=d.txt 270s + text=1 270s + echo 1 270s + git add d.txt 270s + commit -m d⇒1 270s + TIME=1112912004 270s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 270s + modify d.txt 2 270s + filename=d.txt 270s + text=2 270s + echo 2 270s + git add d.txt 270s + commit -m d⇒2 270s + TIME=1112912005 270s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 270s [d 93e27e6] d⇒2 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify d.txt 3 270s + filename=d.txt 270s + text=3 270s + echo 3 270s + git add d.txt 270s + commit -m d⇒3 270s + TIME=1112912006 270s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 270s [d 133f385] d⇒3 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify d.txt 4 270s + filename=d.txt 270s + text=4 270s + echo 4 270s + git add d.txt 270s + commit -m d⇒4 270s + TIME=1112912007 270s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 270s [d 586472a] d⇒4 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [d 9522207] d⇒5 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s [d f7e451a] d⇒6 270s 2 files changed, 2 insertions(+), 2 deletions(-) 270s + modify d.txt 5 270s + filename=d.txt 270s + text=5 270s + echo 5 270s + git add d.txt 270s + commit -m d⇒5 270s + TIME=1112912008 270s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 270s + modify d.txt 6 270s + filename=d.txt 270s + text=6 270s + echo 6 270s + git add d.txt 270s + modify conflict.txt d version 270s + filename=conflict.txt 270s + text=d version 270s + echo d version 270s + git add conflict.txt 270s + commit -m d⇒6 270s + TIME=1112912009 270s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 270s + git checkout c 270s Switched to branch 'c' 270s + git-imerge init --name=c-d d 270s + git-imerge list 270s * c-d 270s + git-imerge diagram --commits --frontier --html=imerge0.html 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s *????????? 270s *????????? 270s *????????? 270s *????????? 270s 5 - *????????? 270s 6 - *????????? 270s | 270s d 270s 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s *????????? 270s *????????? 270s *????????? 270s *????????? 270s 5 - *????????? 270s 6 - *????????? 270s | 270s d 270s 270s Key: 270s |,-,+ = rectangles forming current merge frontier 270s * = merge done manually 270s . = merge done automatically 270s # = conflict that is currently blocking progress 270s @ = merge was blocked but has been resolved 270s ? = no merge recorded 270s 270s + git-imerge autofill 270s + tee autofill.out 270s Attempting automerge of 9-6...failure. 270s Attempting automerge of 1-1...success. 270s Attempting automerge of 1-4...success. 271s Attempting automerge of 1-6...success. 271s Attempting automerge of 9-6...failure. 271s Attempting automerge of 5-6...success. 271s Attempting automerge of 7-6...failure. 271s Attempting automerge of 6-6...failure. 271s Attempting automerge of 6-1...success. 271s Attempting automerge of 6-4...success. 271s Attempting automerge of 6-5...success. 271s Attempting automerge of 9-5...success. 271s Autofilling 1-6...success. 271s Autofilling 2-6...success. 271s Autofilling 3-6...success. 271s Autofilling 4-6...success. 271s Autofilling 5-1...success. 271s Autofilling 5-2...success. 271s Autofilling 5-3...success. 271s Autofilling 5-4...success. 271s Autofilling 5-5...success. 271s Autofilling 5-6 (first way)...success. 271s Autofilling 5-6 (second way)...success. 271s The two ways of autofilling 5-6 agree. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 271s Autofilling 6-5...success. 271s Autofilling 7-5...success. 271s Autofilling 8-5...success. 271s Autofilling 9-1...success. 271s Autofilling 9-2...success. 271s Autofilling 9-3...success. 271s Autofilling 9-4...success. 271s Autofilling 9-5 (first way)...success. 271s Autofilling 9-5 (second way)...success. 271s The two ways of autofilling 9-5 agree. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 271s Attempting automerge of 9-6...failure. 271s Attempting automerge of 6-6...failure. 271s HEAD is now at 70408c8 c⇒9 271s Conflict; suggest manual merge of 6-6 271s + grep -q Traceback autofill.out 271s + grep -q suggest manual merge of 6-6 autofill.out 271s + git-imerge diagram --commits --frontier --html=imerge1.html 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s *????.???. 271s *????.???. 271s *????.???. 271s *????.???. 271s 5 - *????..... 271s 6 - *.....#??? 271s | 271s d 271s 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s *????.???| 271s *????.???| 271s *????.???| 271s *????.???| 271s 5 - *????.---+ 271s 6 - *----+#??? 271s | 271s d 271s 271s Key: 271s |,-,+ = rectangles forming current merge frontier 271s * = merge done manually 271s . = merge done automatically 271s # = conflict that is currently blocking progress 271s @ = merge was blocked but has been resolved 271s ? = no merge recorded 271s 271s + git-imerge continue --edit 271s Switched to branch 'imerge/c-d' 271s Auto-merging conflict.txt 271s CONFLICT (content): Merge conflict in conflict.txt 271s Automatic merge failed; fix conflicts and then commit the result. 271s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 271s Author: Loú User 271s Date: Thu Apr 7 22:13:20 2005 +0000 271s 271s c⇒6 271s 271s Original first commit: 271s commit f7e451a6c9656dda15641a9fbc591a602f158692 271s Author: Loú User 271s Date: Thu Apr 7 22:13:29 2005 +0000 271s 271s d⇒6 271s 271s Original second commit: 271s 271s There was a conflict merging commit 6-6, shown above. 271s Please resolve the conflict, commit the result, then type 271s 271s git-imerge continue 271s + echo merged version 271s + git add conflict.txt 271s + git-imerge continue --no-edit 271s [imerge/c-d 598c2ae] imerge 'c-d': manual merge 6-6 271s Merge has been recorded for merge 6-6. 271s Attempting automerge of 9-6...success. 271s Autofilling 7-6...success. 271s Autofilling 8-6...success. 271s Autofilling 9-6...success. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 271s Merge is complete! 271s + git-imerge diagram --commits --frontier --html=imerge2.html 272s 0 5 9 272s | | | 272s 0 - ********** - c 272s *????.???. 272s *????.???. 272s *????.???. 272s *????.???. 272s 5 - *????..... 272s 6 - *.....*... 272s | 272s d 272s 272s 0 5 9 272s | | | 272s 0 - ********** - c 272s *????.???| 272s *????.???| 272s *????.???| 272s *????.???| 272s 5 - *????....| 272s 6 - *-----*--+ 272s | 272s d 272s 272s Key: 272s |,-,+ = rectangles forming current merge frontier 272s * = merge done manually 272s . = merge done automatically 272s # = conflict that is currently blocking progress 272s @ = merge was blocked but has been resolved 272s ? = no merge recorded 272s 272s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 272s Merge d into c (using imerge) 272s 272s # Please enter the commit message for your changes. Lines starting 272s # with '#' will be ignored, and an empty message aborts the commit. 272s # 272s # Date: Wed Dec 3 09:56:36 2025 +0000 272s # 272s # On branch c-d-merge 272s # Changes to be committed: 272s # modified: conflict.txt 272s # modified: d.txt 272s # 272s [c-d-merge 36e2925] Merge d into c (using imerge) 272s Date: Wed Dec 3 09:56:36 2025 +0000 272s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + local refname=c-d-merge 272s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git rev-parse c-d-merge^{tree} 272s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git-imerge simplify --goal=rebase --branch=c-d-rebase 272s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + local refname=c-d-rebase 272s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git rev-parse c-d-rebase^{tree} 272s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 272s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + local refname=c-d-rebase-with-history 272s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git rev-parse c-d-rebase-with-history^{tree} 272s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git-imerge simplify --goal=border --branch=c-d-border 272s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + local refname=c-d-border 272s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git rev-parse c-d-border^{tree} 272s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 272s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + local refname=c-d-border-with-history 272s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git rev-parse c-d-border-with-history^{tree} 272s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 273s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + local refname=c-d-border-with-history2 273s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git rev-parse c-d-border-with-history2^{tree} 273s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git-imerge remove 273s + git checkout c 273s Switched to branch 'c' 273s + git-imerge start --goal=full --first-parent --name=c-d d 273s + tee start.out 273s Attempting to merge 1-1...success. 273s Attempting to merge 1-2...success. 273s Attempting to merge 1-3...success. 273s Attempting to merge 1-4...success. 273s Attempting to merge 1-5...success. 273s Attempting to merge 1-6...success. 273s Attempting to merge 2-1...success. 273s Attempting to merge 2-2...success. 273s Attempting to merge 2-3...success. 273s Attempting to merge 2-4...success. 273s Attempting to merge 2-5...success. 273s Attempting to merge 2-6...success. 273s Attempting to merge 3-1...success. 273s Attempting to merge 3-2...success. 273s Attempting to merge 3-3...success. 273s Attempting to merge 3-4...success. 273s Attempting to merge 3-5...success. 273s Attempting to merge 3-6...success. 273s Attempting to merge 4-1...success. 273s Attempting to merge 4-2...success. 273s Attempting to merge 4-3...success. 273s Attempting to merge 4-4...success. 273s Attempting to merge 4-5...success. 273s Attempting to merge 4-6...success. 273s Attempting to merge 5-1...success. 273s Attempting to merge 5-2...success. 274s Attempting to merge 5-3...success. 274s Attempting to merge 5-4...success. 274s Attempting to merge 5-5...success. 274s Attempting to merge 5-6...success. 274s Attempting to merge 6-1...success. 274s Attempting to merge 6-2...success. 274s Attempting to merge 6-3...success. 274s Attempting to merge 6-4...success. 274s Attempting to merge 6-5...success. 274s Attempting to merge 6-6...conflict. 274s Attempting to merge 7-1...success. 274s Attempting to merge 7-2...success. 274s Attempting to merge 7-3...success. 274s Attempting to merge 7-4...success. 274s Attempting to merge 7-5...success. 274s Attempting to merge 8-1...success. 274s Attempting to merge 8-2...success. 274s Attempting to merge 8-3...success. 274s Attempting to merge 8-4...success. 274s Attempting to merge 8-5...success. 274s Attempting to merge 9-1...success. 274s Attempting to merge 9-2...success. 274s Attempting to merge 9-3...success. 274s Attempting to merge 9-4...success. 274s Attempting to merge 9-5...success. 274s Previous HEAD position was 493ae3e imerge 'c-d': automatic merge 9-5 274s Switched to branch 'imerge/c-d' 274s Auto-merging conflict.txt 274s CONFLICT (content): Merge conflict in conflict.txt 274s Automatic merge failed; fix conflicts and then commit the result. 274s 274s Original first commit: 274s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 274s Author: Loú User 274s Date: Thu Apr 7 22:13:20 2005 +0000 274s 274s c⇒6 274s 274s Original second commit: 274s commit f7e451a6c9656dda15641a9fbc591a602f158692 274s Author: Loú User 274s Date: Thu Apr 7 22:13:29 2005 +0000 274s 274s d⇒6 274s 274s There was a conflict merging commit 6-6, shown above. 274s Please resolve the conflict, commit the result, then type 274s 274s git-imerge continue 274s + grep -q Traceback start.out 274s + grep -q suggest manual merge of 6-6 autofill.out 274s + git-imerge diagram --commits --frontier --html=imerge3.html 274s 0 5 9 274s | | | 274s 0 - ********** - c 274s *......... 274s *......... 274s *......... 274s *......... 274s 5 - *......... 274s 6 - *.....#??? 274s | 274s d 274s 274s 0 5 9 274s | | | 274s 0 - ********** - c 274s *........| 274s *........| 274s *........| 274s *........| 274s 5 - *.....---+ 274s 6 - *----+#??? 274s | 274s d 274s 274s Key: 274s |,-,+ = rectangles forming current merge frontier 274s * = merge done manually 274s . = merge done automatically 274s # = conflict that is currently blocking progress 274s @ = merge was blocked but has been resolved 274s ? = no merge recorded 274s 274s imerge 'c-d': manual merge 6-6 274s 274s # Conflicts: 274s # conflict.txt 274s # 274s # It looks like you may be committing a merge. 274s # If this is not correct, please run 274s # git update-ref -d MERGE_HEAD 274s # and try again. 274s 274s 274s # Please enter the commit message for your changes. Lines starting 274s # with '#' will be ignored, and an empty message aborts the commit. 274s # 274s # On branch imerge/c-d 274s # All conflicts fixed but you are still merging. 274s # 274s # Changes to be committed: 274s # modified: conflict.txt 274s # modified: d.txt 274s # 274s + echo merged version 274s + git add conflict.txt 274s + GIT_EDITOR=cat git commit 274s [imerge/c-d b241f59] imerge 'c-d': manual merge 6-6 274s + git-imerge continue --edit 274s Merge has been recorded for merge 6-6. 274s Attempting to merge 7-6...success. 274s Attempting to merge 8-6...success. 274s Attempting to merge 9-6...success. 274s Merge is complete! 274s + git-imerge diagram --commits --frontier --html=imerge4.html 274s 0 5 9 274s | | | 274s 0 - ********** - c 274s *......... 274s *......... 274s *......... 274s *......... 274s 5 - *......... 274s 6 - *.....*... 274s | 274s d 274s 274s 0 5 9 274s | | | 274s 0 - ********** - c 274s *........| 274s *........| 274s *........| 274s *........| 274s 5 - *........| 274s 6 - *-----*--+ 274s | 274s d 274s 274s Key: 274s |,-,+ = rectangles forming current merge frontier 274s * = merge done manually 274s . = merge done automatically 274s # = conflict that is currently blocking progress 274s @ = merge was blocked but has been resolved 274s ? = no merge recorded 274s 274s + git-imerge finish --branch=c-d-full 275s py313: commands[2] /tmp/autopkgtest.PHPuZd/build.vZB/src> /bin/sh t/test-really-conflicted 275s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + local refname=c-d-full 275s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + git rev-parse c-d-full^{tree} 275s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 275s + dirname t/test-really-conflicted 275s + cd t 275s + pwd 275s + dirname /tmp/autopkgtest.PHPuZd/build.vZB/src/t 275s + BASE=/tmp/autopkgtest.PHPuZd/build.vZB/src 275s + . /tmp/autopkgtest.PHPuZd/build.vZB/src/t/test-lib.sh 275s + GIT_IMERGE=git-imerge 275s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s + DESCRIPTION=git-imerge test repository with multiple conflicts 275s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 275s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s + local description=git-imerge test repository with multiple conflicts 275s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 275s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s + local description=git-imerge test repository with multiple conflicts 275s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted/.git/ 275s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s hint: Using 'master' as the name for the initial branch. This default branch name 275s hint: is subject to change. To configure the initial branch name to use in all 275s hint: of your new repositories, which will suppress this warning, call: 275s hint: 275s hint: git config --global init.defaultBranch 275s hint: 275s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 275s hint: 'development'. The just-created branch can be renamed via this command: 275s hint: 275s hint: git branch -m 275s hint: 275s hint: Disable this message with "git config set advice.defaultBranchName false" 275s [master (root-commit) 8e21fbd] m⇒0 275s 10 files changed, 10 insertions(+) 275s create mode 100644 c.txt 275s create mode 100644 conflict0.txt 275s create mode 100644 conflict1.txt 275s create mode 100644 conflict2.txt 275s create mode 100644 conflict3.txt 275s create mode 100644 conflict4.txt 275s create mode 100644 conflict5.txt 275s create mode 100644 conflict6.txt 275s create mode 100644 conflict7.txt 275s create mode 100644 d.txt 275s [c 4e6007a] c⇒1 275s 3 files changed, 3 insertions(+), 3 deletions(-) 275s [c c2b7c49] c⇒2 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s + echo git-imerge test repository with multiple conflicts 275s + printf %s\n /*.out /*.css /*.html 275s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted/.git config user.name Loú User 275s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted/.git config user.email luser@example.com 275s + TIME=1112911993 275s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/really-conflicted 275s + modify c.txt 0 275s + filename=c.txt 275s + text=0 275s + echo 0 275s + git add c.txt 275s + modify d.txt 0 275s + filename=d.txt 275s + text=0 275s + echo 0 275s + git add d.txt 275s + seq 0 7 275s + modify conflict0.txt original version 275s + filename=conflict0.txt 275s + text=original version 275s + echo original version 275s + git add conflict0.txt 275s + modify conflict1.txt original version 275s + filename=conflict1.txt 275s + text=original version 275s + echo original version 275s + git add conflict1.txt 275s + modify conflict2.txt original version 275s + filename=conflict2.txt 275s + text=original version 275s + echo original version 275s + git add conflict2.txt 275s + modify conflict3.txt original version 275s + filename=conflict3.txt 275s + text=original version 275s + echo original version 275s + git add conflict3.txt 275s + modify conflict4.txt original version 275s + filename=conflict4.txt 275s + text=original version 275s + echo original version 275s + git add conflict4.txt 275s + modify conflict5.txt original version 275s + filename=conflict5.txt 275s + text=original version 275s + echo original version 275s + git add conflict5.txt 275s + modify conflict6.txt original version 275s + filename=conflict6.txt 275s + text=original version 275s + echo original version 275s + git add conflict6.txt 275s + modify conflict7.txt original version 275s + filename=conflict7.txt 275s + text=original version 275s + echo original version 275s + git add conflict7.txt 275s + commit -m m⇒0 275s + TIME=1112911994 275s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 275s + git checkout -b c master -- 275s Switched to a new branch 'c' 275s + modify c.txt 1 275s + filename=c.txt 275s + text=1 275s + echo 1 275s + git add c.txt 275s + modify conflict0.txt c version 275s + filename=conflict0.txt 275s + text=c version 275s + echo c version 275s + git add conflict0.txt 275s + modify conflict4.txt c version 275s + filename=conflict4.txt 275s + text=c version 275s + echo c version 275s + git add conflict4.txt 275s + commit -m c⇒1 275s + TIME=1112911995 275s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 275s + modify c.txt 2 275s + filename=c.txt 275s + text=2 275s + echo 2 275s + git add c.txt 275s + commit -m c⇒2 275s + TIME=1112911996 275s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 275s + modify c.txt 3 275s + filename=c.txt 275s + text=3 275s + echo 3 275s + git add c.txt 275s + commit -m c⇒3 275s + TIME=1112911997 275s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 275s [c 42ad55a] c⇒3 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s + modify c.txt 4 275s + filename=c.txt 275s + text=4 275s + echo 4 275s + git add c.txt 275s + modify conflict1.txt c version 275s + filename=conflict1.txt 275s + text=c version 275s + echo c version 275s + git add conflict1.txt 275s + commit -m c⇒4 275s + TIME=1112911998 275s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 275s [c a891793] c⇒4 275s 2 files changed, 2 insertions(+), 2 deletions(-) 275s + modify c.txt 5 275s + filename=c.txt 275s + text=5 275s + echo 5 275s + git add c.txt 275s + modify conflict3.txt c version 275s + filename=conflict3.txt 275s + text=c version 275s + echo c version 275s + git add conflict3.txt 275s + modify conflict6.txt c version 275s + filename=conflict6.txt 275s + text=c version 275s + echo c version 275s + git add conflict6.txt 275s + commit -m c⇒5 275s + TIME=1112911999 275s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 275s + modify c.txt 6 275s + filename=c.txt 275s + text=6 275s + echo 6 275s + git add c.txt 275s + modify conflict5.txt c version 275s + filename=conflict5.txt 275s + text=c version 275s + echo c version 275s + git add conflict5.txt 275s + commit -m c⇒6 275s + TIME=1112912000 275s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 275s + modify c.txt 7 275s + filename=c.txt 275s + text=7 275s + echo 7 275s + git add c.txt 275s + modify conflict2.txt c version 275s + filename=conflict2.txt 275s + text=c version 275s + echo c version 275s + git add conflict2.txt 275s + commit -m c⇒7 275s + TIME=1112912001 275s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 275s + modify c.txt 8 275s + filename=c.txt 275s + text=8 275s + echo 8 275s + git add c.txt 275s + commit -m c⇒8 275s + TIME=1112912002 275s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 275s + modify c.txt 9 275s + filename=c.txt 275s + text=9 275s + echo 9 275s + git add c.txt 275s + modify conflict7.txt c version 275s + filename=conflict7.txt 275s + text=c version 275s + echo c version 275s + git add conflict7.txt 275s + commit -m c⇒9 275s + TIME=1112912003 275s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 275s + git checkout -b d master -- 275s Switched to a new branch 'd' 275s + modify d.txt 1 275s + filename=d.txt 275s + text=1 275s + echo 1 275s + git add d.txt 275s + modify conflict0.txt d version 275s + filename=conflict0.txt 275s + text=d version 275s + echo d version 275s + git add conflict0.txt 275s + modify conflict6.txt d version 275s + filename=conflict6.txt 275s + text=d version 275s + echo d version 275s + git add conflict6.txt 275s + commit -m d⇒1 275s + TIME=1112912004 275s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 275s + modify d.txt 2 275s + filename=d.txt 275s + text=2 275s + echo 2 275s + git add d.txt 275s + modify conflict1.txt d version 275s + filename=conflict1.txt 275s + text=d version 275s + echo d version 275s + git add conflict1.txt 275s + modify conflict2.txt d version 275s + filename=conflict2.txt 275s + text=d version 275s + echo d version 275s + git add conflict2.txt 275s + commit -m d⇒2 275s + TIME=1112912005 275s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 275s + modify d.txt 3 275s + filename=d.txt 275s + text=3 275s + echo 3 275s + git add d.txt 275s + commit -m d⇒3 275s + TIME=1112912006 275s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 275s + modify d.txt 4 275s + filename=d.txt 275s + text=4 275s + echo 4 275s + git add d.txt 275s + commit -m d⇒4 275s + TIME=1112912007 275s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 275s + modify d.txt 5 275s + filename=d.txt 275s + text=5 275s + echo 5 275s + git add d.txt 275s + modify conflict3.txt d version 275s + filename=conflict3.txt 275s + text=d version 275s + echo d version 275s + git add conflict3.txt 275s + commit -m d⇒5 275s + TIME=1112912008 275s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 275s + modify d.txt 6 275s + filename=d.txt 275s + text=6 275s + echo 6 275s + git add d.txt 275s + modify conflict4.txt d version 275s + filename=conflict4.txt 275s + text=d version 275s + echo d version 275s + git add conflict4.txt 275s + commit -m d⇒6 275s + TIME=1112912009 275s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 275s + modify d.txt 7 275s + filename=d.txt 275s + text=7 275s + echo 7 275s + git add d.txt 275s + modify conflict5.txt d version 275s + filename=conflict5.txt 275s + text=d version 275s + echo d version 275s + git add conflict5.txt 275s + commit -m d⇒7 275s + TIME=1112912010 275s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 275s + modify d.txt 8 275s + filename=d.txt 275s + text=8 275s + echo 8 275s + git add d.txt 275s + modify conflict7.txt d version 275s + filename=conflict7.txt 275s + text=d version 275s + echo d version 275s + git add conflict7.txt 275s + commit -m d⇒8 275s + TIME=1112912011 275s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 275s + git checkout c 275s Switched to branch 'c' 275s + git-imerge init --name=c-d d 275s + git-imerge diagram --commits --frontier 276s + conflict_count=0 276s + true 276s + git-imerge continue --no-edit 276s + tee autofill.out 276s + grep -q Traceback autofill.out 276s + git-imerge diagram --frontier 276s + grep -q There was a conflict merging autofill.out 276s + seq 0 7 276s + grep -q ==== conflict0.txt 276s + modify conflict0.txt merged version 276s + filename=conflict0.txt 276s + text=merged version 276s + echo merged version 276s + git add conflict0.txt 276s + conflict_count=1 276s + grep -q ==== conflict1.txt 276s + grep -q ==== conflict2.txt 276s + grep -q ==== conflict3.txt 276s + grep -q ==== conflict4.txt 276s + grep -q ==== conflict5.txt 276s + grep -q ==== conflict6.txt 276s + grep -q ==== conflict7.txt 276s + true 276s + git-imerge continue --no-edit 276s + tee autofill.out 276s [c c21441d] c⇒5 276s 3 files changed, 3 insertions(+), 3 deletions(-) 276s [c a797a66] c⇒6 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s [c c0e1537] c⇒7 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s [c 9f3e7c8] c⇒8 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s [c ccbfccb] c⇒9 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s [d 8c3c065] d⇒1 276s 3 files changed, 3 insertions(+), 3 deletions(-) 276s [d 820b787] d⇒2 276s 3 files changed, 3 insertions(+), 3 deletions(-) 276s [d 821c792] d⇒3 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s [d c2a1456] d⇒4 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s [d c3e3890] d⇒5 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s [d b2f5c5e] d⇒6 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s [d 892af56] d⇒7 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s [d 67099d0] d⇒8 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s 0 5 9 276s | | | 276s 0 - ********** - c 276s *????????? 276s *????????? 276s *????????? 276s *????????? 276s 5 - *????????? 276s *????????? 276s *????????? 276s 8 - *????????? 276s | 276s d 276s 276s 0 5 9 276s | | | 276s 0 - ********** - c 276s *????????? 276s *????????? 276s *????????? 276s *????????? 276s 5 - *????????? 276s *????????? 276s *????????? 276s 8 - *????????? 276s | 276s d 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 Attempting automerge of 9-8...failure. 276s Attempting automerge of 1-1...failure. 276s Switched to branch 'imerge/c-d' 276s Auto-merging conflict0.txt 276s CONFLICT (content): Merge conflict in conflict0.txt 276s Automatic merge failed; fix conflicts and then commit the result. 276s 276s Original first commit: 276s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 276s Author: Loú User 276s Date: Thu Apr 7 22:13:15 2005 +0000 276s 276s c⇒1 276s 276s Original second commit: 276s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 276s Author: Loú User 276s Date: Thu Apr 7 22:13:24 2005 +0000 276s 276s d⇒1 276s 276s There was a conflict merging commit 1-1, shown above. 276s Please resolve the conflict, commit the result, then type 276s 276s git-imerge continue 276s 0 5 9 276s | | | 276s 0 - ********** - c 276s *#???????? 276s *????????? 276s *????????? 276s *????????? 276s 5 - *????????? 276s *????????? 276s *????????? 276s 8 - *????????? 276s | 276s d 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 [imerge/c-d 8932ebe] imerge 'c-d': manual merge 1-1 276s Merge has been recorded for merge 1-1. 276s Attempting automerge of 1-8...failure. 276s Attempting automerge of 1-2...success. 276s Attempting automerge of 1-6...failure. 276s Attempting automerge of 1-4...success. 276s Attempting automerge of 1-5...success. 276s Autofilling 1-2...success. 276s Autofilling 1-3...success. 276s Autofilling 1-4...success. 276s Autofilling 1-5...success. 276s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 276s Attempting automerge of 1-8...failure. 276s Attempting automerge of 1-6...failure. 276s Attempting automerge of 9-5...failure. 276s Attempting automerge of 2-1...success. 276s Attempting automerge of 2-4...success. 276s Attempting automerge of 2-5...success. 276s Attempting automerge of 9-5...failure. 276s Attempting automerge of 6-5...failure. 276s Attempting automerge of 4-5...failure. 276s Attempting automerge of 3-5...success. 276s Attempting automerge of 4-1...success. 276s Attempting automerge of 4-3...failure. 276s Attempting automerge of 4-2...failure. 276s Attempting automerge of 9-1...failure. 276s Attempting automerge of 7-1...failure. 276s + grep -q Traceback autofill.out 276s + git-imerge diagram --frontier 276s Attempting automerge of 6-1...failure. 276s Attempting automerge of 5-1...failure. 276s Autofilling 2-5...success. 276s Autofilling 3-1...success. 276s Autofilling 3-2...success. 276s Autofilling 3-3...success. 276s Autofilling 3-4...success. 276s Autofilling 3-5 (first way)...success. 276s Autofilling 3-5 (second way)...success. 276s The two ways of autofilling 3-5 agree. 276s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 276s Autofilling 4-1...success. 276s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 276s Attempting automerge of 4-5...failure. 276s Attempting automerge of 4-2...failure. 276s Attempting automerge of 9-1...failure. 276s Attempting automerge of 5-1...failure. 276s Previous HEAD position was c21441d c⇒5 276s Switched to branch 'imerge/c-d' 276s Auto-merging conflict4.txt 276s CONFLICT (content): Merge conflict in conflict4.txt 276s Automatic merge failed; fix conflicts and then commit the result. 276s 276s Original first commit: 276s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 276s Author: Loú User 276s Date: Thu Apr 7 22:13:15 2005 +0000 276s 276s c⇒1 276s 276s Original second commit: 276s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 276s Author: Loú User 276s Date: Thu Apr 7 22:13:29 2005 +0000 276s 276s d⇒6 276s 276s There was a conflict merging commit 1-6, shown above. 276s Please resolve the conflict, commit the result, then type 276s 276s git-imerge continue 276s 0 5 9 276s | | | 276s 0 - ********** - c 276s **?.+#???? 276s *.?|#????? 276s *.?|?????? 276s *.?|?????? 276s 5 - *--+?????? 276s *#???????? 276s *????????? 276s 8 - *????????? 276s | 276s d 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 + grep -q There was a conflict merging autofill.out 276s + seq 0 7 276s + grep -q ==== conflict0.txt 276s + grep -q ==== conflict1.txt 276s + grep -q ==== conflict2.txt 276s + grep -q ==== conflict3.txt 276s + grep -q ==== conflict4.txt 276s + modify conflict4.txt merged version 276s + filename=conflict4.txt 276s + text=merged version 276s + echo merged version 276s + git add conflict4.txt 276s + conflict_count=2 276s + grep -q ==== conflict5.txt 276s + grep -q ==== conflict6.txt 276s + grep -q ==== conflict7.txt 276s + true 276s + git-imerge continue --no-edit 276s + tee autofill.out 276s [imerge/c-d 03c5469] imerge 'c-d': manual merge 1-6 276s Merge has been recorded for merge 1-6. 276s Attempting automerge of 1-8...success. 276s Autofilling 1-7...success. 276s Autofilling 1-8...success. 276s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 276s Attempting automerge of 3-8...success. 276s Autofilling 2-8...success. 276s Autofilling 3-6...success. 277s Autofilling 3-7...success. 277s Autofilling 3-8 (first way)...success. 277s Autofilling 3-8 (second way)...success. 277s The two ways of autofilling 3-8 agree. 277s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 277s Warning: you are leaving 1 commit behind, not connected to 277s any of your branches: 277s 277s cfb994f imerge 'c-d': automatic merge 3-8 277s 277s If you want to keep it by creating a new branch, this may be a good time 277s to do so with: 277s 277s git branch cfb994f 277s 277s Switched to branch 'imerge/c-d' 277s Auto-merging conflict1.txt 277s CONFLICT (content): Merge conflict in conflict1.txt 277s Automatic merge failed; fix conflicts and then commit the result. 277s 277s Original first commit: 277s commit a89179336bb40a4ca90903425239a9ef3ce659bd 277s Author: Loú User 277s Date: Thu Apr 7 22:13:18 2005 +0000 277s 277s c⇒4 277s 277s Original second commit: 277s commit 820b787e86e22612af7a061db842dc95e9f1d49f 277s Author: Loú User 277s Date: Thu Apr 7 22:13:25 2005 +0000 277s 277s d⇒2 277s 277s There was a conflict merging commit 4-2, shown above. 277s Please resolve the conflict, commit the result, then type 277s 277s git-imerge continue 277s + grep -q Traceback autofill.out 277s + git-imerge diagram --frontier 277s 0 5 9 277s | | | 277s 0 - ********** - c 277s **?.+#???? 277s *.?|#????? 277s *.?|?????? 277s *.?|?????? 277s 5 - *..|?????? 277s **?|?????? 277s *.?|?????? 277s 8 - *--+?????? 277s | 277s d 277s 277s Key: 277s |,-,+ = rectangles forming current merge frontier 277s * = merge done manually 277s . = merge done automatically 277s # = conflict that is currently blocking progress 277s @ = merge was blocked but has been resolved 277s ? = no merge recorded 277s 277s + grep -q There was a conflict merging autofill.out 277s + seq 0 7 277s + grep -q ==== conflict0.txt 277s + grep -q ==== conflict1.txt 277s + modify conflict1.txt merged version 277s + filename=conflict1.txt 277s + text=merged version 277s + echo merged version 277s + git add conflict1.txt 277s + conflict_count=3 277s + grep -q ==== conflict2.txt 277s + grep -q ==== conflict3.txt 277s + grep -q ==== conflict4.txt 277s + grep -q ==== conflict5.txt 277s + grep -q ==== conflict6.txt 277s + grep -q ==== conflict7.txt 277s + true 277s + + tee autofill.out 277s git-imerge continue --no-edit 277s [imerge/c-d 3ccab75] imerge 'c-d': manual merge 4-2 277s Merge has been recorded for merge 4-2. 277s Attempting automerge of 4-8...success. 277s Autofilling 4-3...success. 277s Autofilling 4-4...success. 277s Autofilling 4-5...success. 277s Autofilling 4-6...success. 277s Autofilling 4-7...success. 277s Autofilling 4-8...success. 277s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 277s Previous HEAD position was 5fc110e imerge 'c-d': automatic merge 4-8 277s Switched to branch 'imerge/c-d' 277s Auto-merging conflict6.txt 277s CONFLICT (content): Merge conflict in conflict6.txt 277s Automatic merge failed; fix conflicts and then commit the result. 277s 277s Original first commit: 277s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 277s Author: Loú User 277s Date: Thu Apr 7 22:13:19 2005 +0000 277s 277s c⇒5 277s 277s Original second commit: 277s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 277s Author: Loú User 277s Date: Thu Apr 7 22:13:24 2005 +0000 277s 277s d⇒1 277s 277s There was a conflict merging commit 5-1, shown above. 277s Please resolve the conflict, commit the result, then type 277s 277s git-imerge continue 277s + grep -q Traceback autofill.out 277s + git-imerge diagram --frontier 277s 0 5 9 277s | | | 277s 0 - ********** - c 277s **?.|#???? 277s *.?.*????? 277s *.?.|????? 277s *.?.|????? 277s 5 - *...|????? 277s **?.|????? 277s *.?.|????? 277s 8 - *---+????? 277s | 277s d 277s 277s Key: 277s |,-,+ = rectangles forming current merge frontier 277s * = merge done manually 277s . = merge done automatically 277s # = conflict that is currently blocking progress 277s @ = merge was blocked but has been resolved 277s ? = no merge recorded 277s 277s + grep -q There was a conflict merging autofill.out 277s + seq 0 7 277s + grep -q ==== conflict0.txt 277s + grep -q ==== conflict1.txt 277s + grep -q ==== conflict2.txt 277s + grep -q ==== conflict3.txt 277s + grep -q ==== conflict4.txt 277s + grep -q ==== conflict5.txt 277s + grep -q ==== conflict6.txt 277s + modify conflict6.txt merged version 277s + filename=conflict6.txt 277s + text=merged version 277s + echo merged version 277s + git add conflict6.txt 277s + conflict_count=4 277s + grep -q ==== conflict7.txt 277s + true 277s + git-imerge continue --no-edit 277s + tee autofill.out 277s [imerge/c-d e56a8c2] imerge 'c-d': manual merge 5-1 277s Merge has been recorded for merge 5-1. 277s Attempting automerge of 5-8...failure. 278s Attempting automerge of 5-2...success. 278s Attempting automerge of 5-6...failure. 278s Attempting automerge of 5-4...success. 278s Attempting automerge of 5-5...failure. 278s Autofilling 5-2...success. 278s Autofilling 5-3...success. 278s Autofilling 5-4...success. 278s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 278s Attempting automerge of 5-8...failure. 278s Attempting automerge of 5-5...failure. 278s Attempting automerge of 9-4...failure. 278s Attempting automerge of 6-1...success. 278s Attempting automerge of 6-3...success. 278s Attempting automerge of 6-4...success. 278s Attempting automerge of 9-4...failure. 278s Attempting automerge of 8-4...failure. 278s Attempting automerge of 7-4...failure. 278s Attempting automerge of 7-1...success. 278s Attempting automerge of 7-3...failure. 278s Attempting automerge of 7-2...failure. 278s Attempting automerge of 9-1...success. 278s Autofilling 6-1...success. 278s Autofilling 6-2...success. 278s Autofilling 6-3...success. 278s Autofilling 6-4...success. 278s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 278s Autofilling 7-1...success. 278s Autofilling 8-1...success. 278s Autofilling 9-1...success. 278s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 278s Attempting automerge of 9-4...failure. 278s Attempting automerge of 7-2...failure. 278s Previous HEAD position was 30343af imerge 'c-d': automatic merge 7-1 278s Switched to branch 'imerge/c-d' 278s Auto-merging conflict3.txt 278s CONFLICT (content): Merge conflict in conflict3.txt 278s Automatic merge failed; fix conflicts and then commit the result. 278s 278s Original first commit: 278s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 278s Author: Loú User 278s Date: Thu Apr 7 22:13:19 2005 +0000 278s 278s c⇒5 278s 278s Original second commit: 278s commit c3e3890b9e3c756c1d8f7e345184d576739be079 278s Author: Loú User 278s Date: Thu Apr 7 22:13:28 2005 +0000 278s 278s d⇒5 278s + grep -q Traceback autofill.out 278s + git-imerge diagram --frontier 278s 278s There was a conflict merging commit 5-5, shown above. 278s Please resolve the conflict, commit the result, then type 278s 278s git-imerge continue 278s 0 5 9 278s | | | 278s 0 - ********** - c 278s **?..*.--+ 278s *.?.*.|#?? 278s *.?...|??? 278s *.?..-+??? 278s 5 - *...|#???? 278s **?.|????? 278s *.?.|????? 278s 8 - *---+????? 278s | 278s d 278s 278s Key: 278s |,-,+ = rectangles forming current merge frontier 278s * = merge done manually 278s . = merge done automatically 278s # = conflict that is currently blocking progress 278s @ = merge was blocked but has been resolved 278s ? = no merge recorded 278s 278s + grep -q There was a conflict merging autofill.out 278s + seq 0 7 278s + grep -q ==== conflict0.txt 278s + grep -q ==== conflict1.txt 278s + grep -q ==== conflict2.txt 278s + grep -q ==== conflict3.txt 278s + modify conflict3.txt merged version 278s + filename=conflict3.txt 278s + text=merged version 278s + echo merged version 278s + git add conflict3.txt 278s + conflict_count=5 278s + grep -q ==== conflict4.txt 278s + grep -q ==== conflict5.txt 278s + grep -q ==== conflict6.txt 278s + grep -q ==== conflict7.txt 278s + true 278s + git-imerge continue --no-edit 278s + tee autofill.out 278s [imerge/c-d a1386c6] imerge 'c-d': manual merge 5-5 278s Merge has been recorded for merge 5-5. 278s Attempting automerge of 5-8...success. 278s Autofilling 5-6...success. 278s Autofilling 5-7...success. 278s Autofilling 5-8...success. 278s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 278s Attempting automerge of 6-8...failure. 279s Attempting automerge of 6-5...success. 279s Attempting automerge of 6-7...failure. 279s Attempting automerge of 6-6...success. 279s Autofilling 6-5...success. 279s Autofilling 6-6...success. 279s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 279s Attempting automerge of 6-8...failure. 279s Attempting automerge of 6-7...failure. 279s Switched to branch 'imerge/c-d' 279s Auto-merging conflict5.txt 279s CONFLICT (content): Merge conflict in conflict5.txt 279s Automatic merge failed; fix conflicts and then commit the result. 279s 279s Original first commit: 279s commit a797a66a0e4b89690099557280641efeac302bcf 279s Author: Loú User 279s Date: Thu Apr 7 22:13:20 2005 +0000 279s 279s c⇒6 279s 279s Original second commit: 279s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 279s Author: Loú User 279s Date: Thu Apr 7 22:13:30 2005 +0000 279s 279s d⇒7 279s 279s There was a conflict merging commit 6-7, shown above. 279s Please resolve the conflict, commit the result, then type 279s 279s git-imerge continue 279s + grep -q Traceback autofill.out 279s + git-imerge diagram --frontier 279s 0 5 9 279s | | | 279s 0 - ********** - c 279s **?..*.--+ 279s *.?.*.|#?? 279s *.?...|??? 279s *.?...|??? 279s 5 - *....*|??? 279s **?...+??? 279s *.?..|#??? 279s 8 - *----+???? 279s | 279s d 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s + grep -q There was a conflict merging autofill.out 279s + seq 0 7 279s + grep -q ==== conflict0.txt 279s + grep -q ==== conflict1.txt 279s + grep -q ==== conflict2.txt 279s + grep -q ==== conflict3.txt 279s + grep -q ==== conflict4.txt 279s + grep -q ==== conflict5.txt 279s + modify conflict5.txt merged version 279s + filename=conflict5.txt 279s + text=merged version 279s + echo merged version 279s + git add conflict5.txt 279s + conflict_count=6 279s + grep -q ==== conflict6.txt 279s + grep -q ==== conflict7.txt 279s + true 279s + git-imerge continue --no-edit 279s + tee autofill.out 279s [imerge/c-d 41e92e1] imerge 'c-d': manual merge 6-7 279s Merge has been recorded for merge 6-7. 279s Attempting automerge of 6-8...success. 279s Autofilling 6-8...success. 279s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 279s Previous HEAD position was a91ab0e imerge 'c-d': automatic merge 6-8 279s Switched to branch 'imerge/c-d' 279s Auto-merging conflict2.txt 279s CONFLICT (content): Merge conflict in conflict2.txt 279s Automatic merge failed; fix conflicts and then commit the result. 279s 279s Original first commit: 279s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 279s Author: Loú User 279s Date: Thu Apr 7 22:13:21 2005 +0000 279s 279s c⇒7 279s 279s Original second commit: 279s commit 820b787e86e22612af7a061db842dc95e9f1d49f 279s Author: Loú User 279s Date: Thu Apr 7 22:13:25 2005 +0000 279s 279s d⇒2 279s 279s There was a conflict merging commit 7-2, shown above. 279s Please resolve the conflict, commit the result, then type 279s 279s git-imerge continue 279s + grep -q Traceback autofill.out 279s + git-imerge diagram --frontier 279s 0 5 9 279s | | | 279s 0 - ********** - c 279s **?..*.--+ 279s *.?.*.|#?? 279s *.?...|??? 279s *.?...|??? 279s 5 - *....*|??? 279s **?...|??? 279s *.?...*??? 279s 8 - *-----+??? 279s | 279s d 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s + grep -q There was a conflict merging autofill.out 279s + seq 0 7 279s + grep -q ==== conflict0.txt 279s + grep -q ==== conflict1.txt 279s + grep -q ==== conflict2.txt 279s + modify conflict2.txt merged version 279s + filename=conflict2.txt 279s + text=merged version 279s + echo merged version 279s + git add conflict2.txt 279s + conflict_count=7 279s + grep -q ==== conflict3.txt 279s + grep -q ==== conflict4.txt 279s + grep -q ==== conflict5.txt 279s + grep -q ==== conflict6.txt 279s + grep -q ==== conflict7.txt 279s + true 279s + git-imerge continue --no-edit 279s + tee autofill.out 279s [imerge/c-d e54acfa] imerge 'c-d': manual merge 7-2 279s Merge has been recorded for merge 7-2. 279s Attempting automerge of 7-8...success. 279s Autofilling 7-3...success. 279s Autofilling 7-4...success. 279s Autofilling 7-5...success. 279s Autofilling 7-6...success. 279s Autofilling 7-7...success. 279s Autofilling 7-8...success. 279s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 279s Attempting automerge of 9-8...failure. 280s Attempting automerge of 8-2...success. 280s Attempting automerge of 8-6...success. 280s Attempting automerge of 8-8...success. 280s Attempting automerge of 9-8...failure. 280s Attempting automerge of 9-2...success. 280s Attempting automerge of 9-5...success. 280s Attempting automerge of 9-7...success. 280s Autofilling 8-2...success. 280s Autofilling 8-3...success. 280s Autofilling 8-4...success. 280s Autofilling 8-5...success. 280s Autofilling 8-6...success. 280s Autofilling 8-7...success. 280s Autofilling 8-8...success. 280s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 280s Autofilling 9-2...success. 280s Autofilling 9-3...success. 280s Autofilling 9-4...success. 280s Autofilling 9-5...success. 280s Autofilling 9-6...success. 280s Autofilling 9-7...success. 280s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 280s Attempting automerge of 9-8...failure. 280s Attempting automerge of 9-8...failure. 280s Switched to branch 'imerge/c-d' 280s Auto-merging conflict7.txt 280s CONFLICT (content): Merge conflict in conflict7.txt 280s Automatic merge failed; fix conflicts and then commit the result. 280s 280s Original first commit: 280s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 280s Author: Loú User 280s Date: Thu Apr 7 22:13:23 2005 +0000 280s 280s c⇒9 280s 280s Original second commit: 280s commit 67099d078100141fbe4063d46a6408200f4ff311 280s Author: Loú User 280s Date: Thu Apr 7 22:13:31 2005 +0000 280s 280s d⇒8 280s 280s There was a conflict merging commit 9-8, shown above. 280s Please resolve the conflict, commit the result, then type 280s 280s git-imerge continue 280s + grep -q Traceback autofill.out 280s + git-imerge diagram --frontier 280s 0 5 9 280s | | | 280s 0 - ********** - c 280s **?..*...| 280s *.?.*..*.| 280s *.?......| 280s *.?......| 280s 5 - *....*...| 280s **?......| 280s *.?...*..+ 280s 8 - *-------+# 280s | 280s d 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + grep -q There was a conflict merging autofill.out 280s + seq 0 7 280s + grep -q ==== conflict0.txt 280s + grep -q ==== conflict1.txt 280s + grep -q ==== conflict2.txt 280s + grep -q ==== conflict3.txt 280s + grep -q ==== conflict4.txt 280s + grep -q ==== conflict5.txt 280s + grep -q ==== conflict6.txt 280s + grep -q ==== conflict7.txt 280s + modify conflict7.txt merged version 280s + filename=conflict7.txt 280s + text=merged version 280s + echo merged version 280s + git add conflict7.txt 280s + conflict_count=8 280s + true 280s + git-imerge continue --no-edit 280s + tee autofill.out 280s [imerge/c-d 02b8939] imerge 'c-d': manual merge 9-8 280s Merge has been recorded for merge 9-8. 280s Merge is complete! 280s + grep -q Traceback autofill.out 280s + git-imerge diagram --frontier 280s 0 5 9 280s | | | 280s 0 - ********** - c 280s **?..*...| 280s *.?.*..*.| 280s *.?......| 280s *.?......| 280s 5 - *....*...| 280s **?......| 280s *.?...*..| 280s 8 - *--------* 280s | 280s d 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + grep -q There was a conflict merging autofill.out 280s + break 280s + test 8 -ne 8 280s + git-imerge diagram --commits 280s + cat 280s + diff -u - diagram.out 280s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 280s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 281s Merge d into c (using imerge) 281s 281s # Please enter the commit message for your changes. Lines starting 281s # with '#' will be ignored, and an empty message aborts the commit. 281s # 281s # Date: Wed Dec 3 09:56:44 2025 +0000 281s # 281s # On branch c-d-merge 281s # Changes to be committed: 281s # modified: conflict0.txt 281s # modified: conflict1.txt 281s # modified: conflict2.txt 281s # modified: conflict3.txt 281s # modified: conflict4.txt 281s # modified: conflict5.txt 281s # modified: conflict6.txt 281s # modified: conflict7.txt 281s # modified: d.txt 281s # 281s [c-d-merge 543dfd6] Merge d into c (using imerge) 281s Date: Wed Dec 3 09:56:44 2025 +0000 281s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + local refname=c-d-merge 281s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git rev-parse c-d-merge^{tree} 281s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git-imerge simplify --goal=rebase --branch=c-d-rebase 281s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + local refname=c-d-rebase 281s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git rev-parse c-d-rebase^{tree} 281s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 281s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + local refname=c-d-rebase-with-history 281s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git rev-parse c-d-rebase-with-history^{tree} 281s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git-imerge simplify --goal=border --branch=c-d-border 281s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + local refname=c-d-border 281s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git rev-parse c-d-border^{tree} 281s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 281s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 282s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 282s + local refname=c-d-border-with-history 282s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 282s + git rev-parse c-d-border-with-history^{tree} 282s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 282s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 282s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 282s + local refname=c-d-border-with-history2 282s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 282s + git rev-parse c-d-border-with-history2^{tree} 282s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 282s + git-imerge remove 282s py313: commands[3] /tmp/autopkgtest.PHPuZd/build.vZB/src> /bin/sh t/test-duplicated 282s + dirname t/test-duplicated 282s + cd t 282s + pwd 282s + dirname /tmp/autopkgtest.PHPuZd/build.vZB/src/t 282s + BASE=/tmp/autopkgtest.PHPuZd/build.vZB/src 282s + . /tmp/autopkgtest.PHPuZd/build.vZB/src/t/test-lib.sh 282s + GIT_IMERGE=git-imerge 282s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 282s + DESCRIPTION=git-imerge test repository with duplicate commits 282s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated git-imerge test repository with duplicate commits 282s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 282s + local description=git-imerge test repository with duplicate commits 282s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated git-imerge test repository with duplicate commits 282s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 282s + local description=git-imerge test repository with duplicate commits 282s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 282s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 282s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 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 hint: 282s hint: Disable this message with "git config set advice.defaultBranchName false" 282s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated/.git/ 282s + echo git-imerge test repository with duplicate commits 282s + printf %s\n /*.out /*.css /*.html 282s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated/.git config user.name Loú User 282s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated/.git config user.email luser@example.com 282s + TIME=1112911993 282s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 282s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/duplicated 282s + modify a.txt 0 282s + filename=a.txt 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 + 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 + seq 3 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 + 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 + seq 4 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 b 282s + TIME=1112911998 282s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 282s [b 62a5c56] a⇒1 on branch b 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 b 282s + TIME=1112911999 282s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 282s [b f846281] a⇒2 on branch b 282s 1 file changed, 1 insertion(+), 1 deletion(-) 282s [b a4b2c2b] a⇒3 on branch b 282s 1 file changed, 1 insertion(+), 1 deletion(-) 282s [b 5b24553] a⇒4 on branch b 282s 1 file changed, 1 insertion(+), 1 deletion(-) 282s + modify a.txt 3 282s + filename=a.txt 282s + text=3 282s + echo 3 282s + git add a.txt 282s + commit -m a⇒3 on branch b 282s + TIME=1112912000 282s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 282s + modify a.txt 4 282s + filename=a.txt 282s + text=4 282s + echo 4 282s + git add a.txt 282s + commit -m a⇒4 on branch b 282s + TIME=1112912001 282s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 282s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 282s + git checkout a 282s Switched to branch 'a' 282s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 282s Attempting automerge of 3-4...failure. 282s Attempting automerge of 1-1...success. 282s Attempting automerge of 1-3...failure. 282s Attempting automerge of 1-2...failure. 282s Attempting automerge of 3-1...failure. 282s Attempting automerge of 2-1...failure. 282s Autofilling 1-1...success. 282s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 282s Attempting automerge of 1-4...success. 282s Autofilling 1-2...success. 282s Autofilling 1-3...success. 282s Autofilling 1-4...success. 282s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 282s Attempting automerge of 3-4...failure. 282s Attempting automerge of 2-1...success. 282s Attempting automerge of 2-3...failure. 282s Attempting automerge of 2-2...success. 282s Attempting automerge of 3-2...failure. 282s Attempting automerge of 3-1...success. 282s Autofilling 2-1...success. 282s Autofilling 2-2...success. 282s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 282s Autofilling 3-1...success. 282s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 282s Attempting automerge of 2-4...success. 282s Autofilling 2-3...success. 282s Autofilling 2-4...success. 282s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 283s Attempting automerge of 3-4...failure. 283s Attempting automerge of 3-2...success. 283s Attempting automerge of 3-4...failure. 283s Attempting automerge of 3-3...success. 283s Autofilling 3-2...success. 283s Autofilling 3-3...success. 283s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 283s Attempting automerge of 3-4...success. 283s Autofilling 3-4...success. 283s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 283s Merge is complete! 283s + git-imerge diagram --commits --frontier --html=imerge5.html 283s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 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 Merge b into a (using imerge) 283s 283s # Please enter the commit message for your changes. Lines starting 283s # with '#' will be ignored, and an empty message aborts the commit. 283s # 283s # Date: Wed Dec 3 09:56:47 2025 +0000 283s # 283s # On branch a-b-merge 283s # Changes to be committed: 283s # modified: a.txt 283s # 283s [a-b-merge 4700105] Merge b into a (using imerge) 283s Date: Wed Dec 3 09:56:47 2025 +0000 283s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + local refname=a-b-merge 283s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git rev-parse a-b-merge^{tree} 283s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git-imerge simplify --goal=rebase --branch=a-b-rebase 283s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + local refname=a-b-rebase 283s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git rev-parse a-b-rebase^{tree} 283s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 283s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + local refname=a-b-rebase-with-history 283s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git rev-parse a-b-rebase-with-history^{tree} 283s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git-imerge simplify --goal=border --branch=a-b-border 283s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + local refname=a-b-border 283s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git rev-parse a-b-border^{tree} 283s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 283s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 284s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 284s + local refname=a-b-border-with-history 284s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 284s + git rev-parse a-b-border-with-history^{tree} 284s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 284s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 284s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 284s + local refname=a-b-border-with-history2 284s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 284s + git rev-parse a-b-border-with-history2^{tree} 284s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 284s + git checkout a 284s Switched to branch 'a' 284s + git-imerge start --goal=full --name=a-b b 284s Attempting to merge 1-1...success. 284s Attempting to merge 1-2...success. 284s Attempting to merge 1-3...success. 284s Attempting to merge 1-4...success. 284s Attempting to merge 2-1...success. 284s Attempting to merge 2-2...success. 284s Attempting to merge 2-3...success. 284s Attempting to merge 2-4...success. 284s Attempting to merge 3-1...success. 284s Attempting to merge 3-2...success. 284s Attempting to merge 3-3...success. 284s Attempting to merge 3-4...success. 284s Merge is complete! 284s + git-imerge list 284s * a-b 284s + git-imerge diagram --commits --frontier --html=imerge6.html 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 + git-imerge finish --branch=a-b-full 285s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 285s + local refname=a-b-full 285s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 285s + git rev-parse a-b-full^{tree} 285s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 285s py313: commands[4] /tmp/autopkgtest.PHPuZd/build.vZB/src> /bin/sh t/test-flip-flop 285s + dirname t/test-flip-flop 285s + cd t 285s + pwd 285s + dirname /tmp/autopkgtest.PHPuZd/build.vZB/src/t 285s + BASE=/tmp/autopkgtest.PHPuZd/build.vZB/src 285s + . /tmp/autopkgtest.PHPuZd/build.vZB/src/t/test-lib.sh 285s + GIT_IMERGE=git-imerge 285s + flip_flop_test 1 285s + local n=1 285s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 285s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 285s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s + local description=git-imerge test repository with a commit and its revert at n=1 285s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 285s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s + local description=git-imerge test repository with a commit and its revert at n=1 285s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1/.git/ 285s [master (root-commit) a733afa] m⇒0 285s 1 file changed, 1 insertion(+) 285s create mode 100644 a.txt 285s [a 2f1f75a] a⇒1 on branch a 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s hint: Using 'master' as the name for the initial branch. This default branch name 285s hint: is subject to change. To configure the initial branch name to use in all 285s hint: of your new repositories, which will suppress this warning, call: 285s hint: 285s hint: git config --global init.defaultBranch 285s hint: 285s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 285s hint: 'development'. The just-created branch can be renamed via this command: 285s hint: 285s hint: git branch -m 285s hint: 285s hint: Disable this message with "git config set advice.defaultBranchName false" 285s + echo git-imerge test repository with a commit and its revert at n=1 285s + printf %s\n /*.out /*.css /*.html 285s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1/.git config user.name Loú User 285s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 285s + TIME=1112911993 285s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-1 285s + modify a.txt 0 285s + filename=a.txt 285s + text=0 285s + echo 0 285s + git add a.txt 285s + commit -m m⇒0 285s + TIME=1112911994 285s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 285s + git checkout -b a -- 285s Switched to a new branch 'a' 285s + modify a.txt 1 285s + filename=a.txt 285s + text=1 285s + echo 1 285s + git add a.txt 285s + commit -m a⇒1 on branch a 285s + TIME=1112911995 285s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 285s + modify a.txt 2 285s + filename=a.txt 285s + text=2 285s + echo 2 285s + git add a.txt 285s + commit -m a⇒2 on branch a 285s + TIME=1112911996 285s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 285s [a 4700669] a⇒2 on branch a 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s + modify a.txt 3 285s + filename=a.txt 285s + text=3 285s + echo 3 285s + git add a.txt 285s + commit -m a⇒3 on branch a 285s + TIME=1112911997 285s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 285s [a 621c381] a⇒3 on branch a 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s + git checkout -b b master -- 285s Switched to a new branch 'b' 285s + modify b.txt 1 285s + filename=b.txt 285s + text=1 285s + echo 1 285s + git add b.txt 285s + msg=b⇒1 285s + test 1 = 1 285s + modify a.txt X 285s + filename=a.txt 285s + text=X 285s [b 044a3fa] b⇒1 and a⇒X on branch b 285s 2 files changed, 2 insertions(+), 1 deletion(-) 285s create mode 100644 b.txt 285s [b 7851975] b⇒2 and a⇒0 on branch b 285s 2 files changed, 2 insertions(+), 2 deletions(-) 285s [b 6fe24f0] b⇒3 on branch b 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s [b 2dc5eb7] b⇒4 on branch b 285s 1 file changed, 1 insertion(+), 1 deletion(-) 285s + echo X 285s + git add a.txt 285s + msg=b⇒1 and a⇒X 285s + test 1 = 2 285s + commit -m b⇒1 and a⇒X on branch b 285s + TIME=1112911998 285s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 285s + modify b.txt 2 285s + filename=b.txt 285s + text=2 285s + echo 2 285s + git add b.txt 285s + msg=b⇒2 285s + test 2 = 1 285s + test 2 = 2 285s + modify a.txt 0 285s + filename=a.txt 285s + text=0 285s + echo 0 285s + git add a.txt 285s + msg=b⇒2 and a⇒0 285s + commit -m b⇒2 and a⇒0 on branch b 285s + TIME=1112911999 285s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 285s + modify b.txt 3 285s + filename=b.txt 285s + text=3 285s + echo 3 285s + git add b.txt 285s + msg=b⇒3 285s + test 3 = 1 285s + test 3 = 2 285s + commit -m b⇒3 on branch b 285s + TIME=1112912000 285s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 285s + modify b.txt 4 285s + filename=b.txt 285s + text=4 285s + echo 4 285s + git add b.txt 285s + msg=b⇒4 285s + test 4 = 1 285s + test 4 = 2 285s + commit -m b⇒4 on branch b 285s + TIME=1112912001 285s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 285s + test_merge b-into-a-1 a b 1-1 1-2 285s + local name=b-into-a-1 285s + local dst=a 285s + local src=b 285s + local conflict1=1-1 285s + local conflict2=1-2 285s + git checkout a 285s Switched to branch 'a' 285s + git-imerge merge --branch=b-into-a-1 b 285s + tee imerge-b-into-a-1-1.out 285s Attempting automerge of 3-4...success. 285s Autofilling 1-4...success. 285s Autofilling 2-4...success. 285s Autofilling 3-1...unexpected conflict. Backtracking... 285s Autofilling 1-4...success. 285s Autofilling 2-1...unexpected conflict. Backtracking... 285s Autofilling 1-1...unexpected conflict. Backtracking... 285s Switched to branch 'imerge/b' 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 2f1f75a7b49864d699f9e222c1d78078cfe01587 285s Author: Loú User 285s Date: Thu Apr 7 22:13:15 2005 +0000 285s 285s a⇒1 on branch a 285s 285s Original second commit: 285s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 285s Author: Loú User 285s Date: Thu Apr 7 22:13:18 2005 +0000 285s 285s b⇒1 and a⇒X on branch b 285s 285s There was a conflict merging commit 1-1, shown above. 285s Please resolve the conflict, commit the result, then type 285s 285s git-imerge continue 285s + 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 + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 285s + echo 1 285s + git add a.txt 285s + git-imerge continue --no-edit 285s + tee imerge-b-into-a-1-2.out 285s [imerge/b 4e4648b] imerge 'b': manual merge 1-1 285s Merge has been recorded for merge 1-1. 285s Attempting automerge of 1-4...failure. 285s Attempting automerge of 1-2...failure. 285s Attempting automerge of 3-1...success. 285s Autofilling 2-1...success. 285s Autofilling 3-1...success. 285s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 285s Previous HEAD position was f456e25 imerge 'b': automatic merge 3-1 285s Switched to branch 'imerge/b' 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 2f1f75a7b49864d699f9e222c1d78078cfe01587 285s Author: Loú User 285s Date: Thu Apr 7 22:13:15 2005 +0000 285s 285s a⇒1 on branch a 285s 285s Original second commit: 285s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 285s Author: Loú User 285s Date: Thu Apr 7 22:13:19 2005 +0000 285s 285s b⇒2 and a⇒0 on branch b 285s 285s There was a conflict merging commit 1-2, shown above. 285s Please resolve the conflict, commit the result, then type 285s 285s git-imerge continue 285s + 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 + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 285s + echo 1 285s + git add a.txt 285s + git-imerge continue --no-edit 285s + tee imerge-b-into-a-1-3.out 286s [imerge/b e3304be] imerge 'b': manual merge 1-2 286s Merge has been recorded for merge 1-2. 286s Attempting automerge of 1-4...success. 286s Autofilling 1-3...success. 286s Autofilling 1-4...success. 286s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 286s Attempting automerge of 3-4...success. 286s Autofilling 2-4...success. 286s Autofilling 3-2...success. 286s Autofilling 3-3...success. 286s Autofilling 3-4 (first way)...success. 286s Autofilling 3-4 (second way)...success. 286s The two ways of autofilling 3-4 agree. 286s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 286s Merge is complete! 286s + grep -q Merge is complete imerge-b-into-a-1-3.out 286s + git-imerge diagram --commits --frontier 286s 0 3 286s | | 286s 0 - **** - a 286s **.. 286s **?. 286s *.?. 286s 4 - *... 286s | 286s b 286s 286s 0 3 286s | | 286s 0 - **** - a 286s **.| 286s **?| 286s *.?| 286s 4 - *--+ 286s | 286s b 286s 286s Key: 286s |,-,+ = rectangles forming current merge frontier 286s * = merge done manually 286s . = merge done automatically 286s # = conflict that is currently blocking progress 286s @ = merge was blocked but has been resolved 286s ? = no merge recorded 286s 286s + GIT_EDITOR=cat git-imerge finish 286s Merge b into a (using imerge) 286s 286s # Please enter the commit message for your changes. Lines starting 286s # with '#' will be ignored, and an empty message aborts the commit. 286s # 286s # Date: Wed Dec 3 09:56:50 2025 +0000 286s # 286s # On branch b-into-a-1 286s # Changes to be committed: 286s # new file: b.txt 286s # 286s [b-into-a-1 f605e63] Merge b into a (using imerge) 286s Date: Wed Dec 3 09:56:50 2025 +0000 286s + test_merge a-into-b-1 b a 1-1 2-1 286s + local name=a-into-b-1 286s + local dst=b 286s + local src=a 286s + local conflict1=1-1 286s + local conflict2=2-1 286s + git checkout b 286s Switched to branch 'b' 286s + git-imerge merge --branch=a-into-b-1 a 286s + tee imerge-a-into-b-1-1.out 286s Attempting automerge of 4-3...success. 286s Autofilling 1-3...unexpected conflict. Backtracking... 286s Autofilling 1-2...unexpected conflict. Backtracking... 286s Autofilling 1-1...unexpected conflict. Backtracking... 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 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 286s Author: Loú User 286s Date: Thu Apr 7 22:13:18 2005 +0000 286s 286s b⇒1 and a⇒X 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 1-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 1-1 imerge-a-into-b-1-1.out 286s + echo 1 286s + git add a.txt 286s + git-imerge continue --no-edit 286s + tee imerge-a-into-b-1-2.out 286s [imerge/a ed51fd8] imerge 'a': manual merge 1-1 286s Merge has been recorded for merge 1-1. 286s Attempting automerge of 1-3...success. 286s Autofilling 1-2...success. 286s Autofilling 1-3...success. 286s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 286s Attempting automerge of 4-3...failure. 286s Attempting automerge of 2-1...failure. 286s Switched to branch 'imerge/a' 287s Auto-merging a.txt 287s CONFLICT (content): Merge conflict in a.txt 287s Automatic merge failed; fix conflicts and then commit the result. 287s 287s Original first commit: 287s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 287s Author: Loú User 287s Date: Thu Apr 7 22:13:19 2005 +0000 287s 287s b⇒2 and a⇒0 on branch b 287s 287s Original second commit: 287s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 287s Author: Loú User 287s Date: Thu Apr 7 22:13:15 2005 +0000 287s 287s a⇒1 on branch a 287s 287s There was a conflict merging commit 2-1, shown above. 287s Please resolve the conflict, commit the result, then type 287s 287s git-imerge continue 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 + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 287s + echo 1 287s + git add a.txt 287s + git-imerge continue --no-edit 287s + tee imerge-a-into-b-1-3.out 287s [imerge/a 1ad4fc9] imerge 'a': manual merge 2-1 287s Merge has been recorded for merge 2-1. 287s Attempting automerge of 2-3...success. 287s Autofilling 2-2...success. 287s Autofilling 2-3...success. 287s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 287s Attempting automerge of 4-3...success. 287s Autofilling 3-3...success. 287s Autofilling 4-1...success. 287s Autofilling 4-2...success. 287s Autofilling 4-3 (first way)...success. 287s Autofilling 4-3 (second way)...success. 287s The two ways of autofilling 4-3 agree. 287s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 287s Merge is complete! 287s + grep -q Merge is complete imerge-a-into-b-1-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 Dec 3 09:56:51 2025 +0000 287s # 287s # On branch a-into-b-1 287s # Changes to be committed: 287s # modified: a.txt 287s # 287s [a-into-b-1 e3a71db] Merge a into b (using imerge) 287s Date: Wed Dec 3 09:56:51 2025 +0000 287s + flip_flop_test 2 287s + local n=2 287s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 287s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 287s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 287s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 287s + local description=git-imerge test repository with a commit and its revert at n=2 287s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 287s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 287s + local description=git-imerge test repository with a commit and its revert at n=2 287s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 287s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 287s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 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 hint: 287s hint: Disable this message with "git config set advice.defaultBranchName false" 287s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2/.git/ 287s + echo git-imerge test repository with a commit and its revert at n=2 287s + printf %s\n /*.out /*.css /*.html 287s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2/.git config user.name Loú User 287s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 287s + TIME=1112911993 287s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 287s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-2 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 [a 2f1f75a] a⇒1 on branch a 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s + git checkout -b a -- 287s [a 4700669] a⇒2 on branch a 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s [a 621c381] a⇒3 on branch a 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s [b 1f7d097] b⇒1 on branch b 287s 1 file changed, 1 insertion(+) 287s create mode 100644 b.txt 287s [b 48df77d] b⇒2 and a⇒X on branch b 287s 2 files changed, 2 insertions(+), 2 deletions(-) 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 + 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 + 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 + 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 = 2 287s + test 1 = 3 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 + 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 = 2 287s + modify a.txt X 287s + filename=a.txt 287s + text=X 287s + echo X 287s + git add a.txt 287s + msg=b⇒2 and a⇒X 287s + test 2 = 3 287s + commit -m b⇒2 and a⇒X on branch b 287s + TIME=1112911999 287s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 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 = 2 287s + test 3 = 3 287s + modify a.txt 0 287s + filename=a.txt 287s + text=0 287s + echo 0 287s + git add a.txt 287s + msg=b⇒3 and a⇒0 287s + commit -m b⇒3 and a⇒0 on branch b 287s + TIME=1112912000 287s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 287s [b f3ef019] b⇒3 and a⇒0 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 = 2 287s + test 4 = 3 287s + commit -m b⇒4 on branch b 287s + TIME=1112912001 287s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 287s [b 69d0c21] b⇒4 on branch b 287s 1 file changed, 1 insertion(+), 1 deletion(-) 287s + test_merge b-into-a-2 a b 1-2 1-3 287s + local name=b-into-a-2 287s + local dst=a 287s + local src=b 287s + local conflict1=1-2 287s + local conflict2=1-3 287s + git checkout a 287s Switched to branch 'a' 287s + git-imerge merge --branch=b-into-a-2 b 287s + tee imerge-b-into-a-2-1.out 287s Attempting automerge of 3-4...success. 287s Autofilling 1-4...success. 287s Autofilling 2-4...success. 287s Autofilling 3-1...success. 287s Autofilling 3-2...unexpected conflict. Backtracking... 287s Autofilling 1-4...success. 287s Autofilling 2-1...success. 287s Autofilling 2-2...unexpected conflict. Backtracking... 287s Autofilling 1-1...success. 288s Autofilling 1-2...unexpected conflict. Backtracking... 288s Autofilling 1-1...success. 288s Autofilling 2-1...success. 288s Autofilling 3-1...success. 288s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 288s Attempting automerge of 3-4...success. 288s Autofilling 1-4...success. 288s Autofilling 2-4...success. 288s Autofilling 3-2...unexpected conflict. Backtracking... 288s Autofilling 1-4...success. 288s Autofilling 2-2...unexpected conflict. Backtracking... 288s Autofilling 1-2...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 48df77d20a6d16fe330e32ba17d5472d3868a622 288s Author: Loú User 288s Date: Thu Apr 7 22:13:19 2005 +0000 288s 288s b⇒2 and a⇒X on branch b 288s 288s There was a conflict merging commit 1-2, shown above. 288s Please resolve the conflict, commit the result, then type 288s 288s git-imerge continue 288s + git-imerge diagram --commits --frontier 288s 0 3 288s | | 288s 0 - **** - a 288s *... 288s *#?? 288s *??? 288s 4 - *??? 288s | 288s b 288s 288s 0 3 288s | | 288s 0 - **** - a 288s *--+ 288s *#?? 288s *??? 288s 4 - *??? 288s | 288s b 288s 288s Key: 288s |,-,+ = rectangles forming current merge frontier 288s * = merge done manually 288s . = merge done automatically 288s # = conflict that is currently blocking progress 288s @ = merge was blocked but has been resolved 288s ? = no merge recorded 288s 288s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 288s + echo 1 288s + git add a.txt 288s + git-imerge continue --no-edit 288s + tee imerge-b-into-a-2-2.out 288s [imerge/b 1718af7] imerge 'b': manual merge 1-2 288s Merge has been recorded for merge 1-2. 288s Attempting automerge of 1-4...failure. 288s Attempting automerge of 1-3...failure. 288s Attempting automerge of 3-2...success. 288s Autofilling 2-2...success. 288s Autofilling 3-2...success. 288s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 288s Previous HEAD position was 98c00c7 imerge 'b': automatic merge 3-2 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 f3ef01986be02ef5e40589b283c0385471ecca7d 288s Author: Loú User 288s Date: Thu Apr 7 22:13:20 2005 +0000 288s 288s b⇒3 and a⇒0 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 288s 0 3 288s | | 288s 0 - **** - a 288s *... 288s **.. 288s *#?? 288s 4 - *??? 288s | 288s b 288s 288s 0 3 288s | | 288s 0 - **** - a 288s *..| 288s **-+ 288s *#?? 288s 4 - *??? 288s | 288s b 288s 288s Key: 288s |,-,+ = rectangles forming current merge frontier 288s * = merge done manually 288s . = merge done automatically 288s # = conflict that is currently blocking progress 288s @ = merge was blocked but has been resolved 288s ? = no merge recorded 288s 288s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 288s + echo 1 288s + git add a.txt 288s + git-imerge continue --no-edit 288s + tee imerge-b-into-a-2-3.out 288s [imerge/b e5afb75] imerge 'b': manual merge 1-3 288s Merge has been recorded for merge 1-3. 288s Attempting automerge of 1-4...success. 288s Autofilling 1-4...success. 288s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 288s Attempting automerge of 3-4...success. 288s Autofilling 2-4...success. 288s Autofilling 3-3...success. 288s Autofilling 3-4 (first way)...success. 288s Autofilling 3-4 (second way)...success. 288s The two ways of autofilling 3-4 agree. 288s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 288s Merge is complete! 288s + grep -q Merge is complete imerge-b-into-a-2-3.out 288s + git-imerge diagram --commits --frontier 288s 0 3 288s | | 288s 0 - **** - a 288s *... 288s **.. 288s **?. 288s 4 - *... 288s | 288s b 288s 288s 0 3 288s | | 288s 0 - **** - a 288s *..| 288s **.| 288s **?| 288s 4 - *--+ 288s | 288s b 288s 288s Key: 288s |,-,+ = rectangles forming current merge frontier 288s * = merge done manually 288s . = merge done automatically 288s # = conflict that is currently blocking progress 288s @ = merge was blocked but has been resolved 288s ? = no merge recorded 288s 288s + GIT_EDITOR=cat git-imerge finish 289s Merge b into a (using imerge) 289s 289s # Please enter the commit message for your changes. Lines starting 289s # with '#' will be ignored, and an empty message aborts the commit. 289s # 289s # Date: Wed Dec 3 09:56:53 2025 +0000 289s # 289s # On branch b-into-a-2 289s # Changes to be committed: 289s # new file: b.txt 289s # 289s [b-into-a-2 5cfae48] Merge b into a (using imerge) 289s Date: Wed Dec 3 09:56:53 2025 +0000 289s + test_merge a-into-b-2 b a 2-1 3-1 289s + local name=a-into-b-2 289s + local dst=b 289s + local src=a 289s + local conflict1=2-1 289s + local conflict2=3-1 289s + git checkout b 289s Switched to branch 'b' 289s + git-imerge merge --branch=a-into-b-2 a 289s + tee imerge-a-into-b-2-1.out 289s Attempting automerge of 4-3...success. 289s Autofilling 1-3...success. 289s Autofilling 2-3...unexpected conflict. Backtracking... 289s Autofilling 1-1...success. 289s Autofilling 1-2...success. 289s Autofilling 1-3...success. 289s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 289s Autofilling 2-2...unexpected conflict. Backtracking... 289s Autofilling 2-1...unexpected conflict. Backtracking... 289s Switched to branch 'imerge/a' 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 48df77d20a6d16fe330e32ba17d5472d3868a622 289s Author: Loú User 289s Date: Thu Apr 7 22:13:19 2005 +0000 289s 289s b⇒2 and a⇒X on branch b 289s 289s Original second 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 There was a conflict merging commit 2-1, 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 4 289s | | 289s 0 - ***** - b 289s *.#?? 289s *.??? 289s 3 - *.??? 289s | 289s a 289s 289s 0 4 289s | | 289s 0 - ***** - b 289s *|#?? 289s *|??? 289s 3 - *+??? 289s | 289s a 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 2-1 imerge-a-into-b-2-1.out 289s + echo 1 289s + git add a.txt 289s + git-imerge continue --no-edit 289s + tee imerge-a-into-b-2-2.out 289s [imerge/a 598c734] imerge 'a': manual merge 2-1 289s Merge has been recorded for merge 2-1. 289s Attempting automerge of 2-3...success. 289s Autofilling 2-2...success. 289s Autofilling 2-3...success. 289s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 289s Attempting automerge of 4-3...failure. 289s Attempting automerge of 3-1...failure. 289s Switched to branch 'imerge/a' 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 f3ef01986be02ef5e40589b283c0385471ecca7d 289s Author: Loú User 289s Date: Thu Apr 7 22:13:20 2005 +0000 289s 289s b⇒3 and a⇒0 on branch b 289s 289s Original second 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 There was a conflict merging commit 3-1, 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 4 289s | | 289s 0 - ***** - b 289s *.*#? 289s *..?? 289s 3 - *..?? 289s | 289s a 289s 289s 0 4 289s | | 289s 0 - ***** - b 289s *.*#? 289s *.|?? 289s 3 - *-+?? 289s | 289s a 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 3-1 imerge-a-into-b-2-2.out 289s + echo 1 289s + git add a.txt 289s + git-imerge continue --no-edit 289s + tee imerge-a-into-b-2-3.out 289s [imerge/a c104ce3] imerge 'a': manual merge 3-1 289s Merge has been recorded for merge 3-1. 289s Attempting automerge of 3-3...success. 289s Autofilling 3-2...success. 289s Autofilling 3-3...success. 289s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 289s Attempting automerge of 4-3...success. 289s Autofilling 4-1...success. 290s Autofilling 4-2...success. 290s Autofilling 4-3...success. 290s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 290s Merge is complete! 290s + grep -q Merge is complete imerge-a-into-b-2-3.out 290s + git-imerge diagram --commits --frontier 290s 0 4 290s | | 290s 0 - ***** - b 290s *.**. 290s *.... 290s 3 - *.... 290s | 290s a 290s 290s 0 4 290s | | 290s 0 - ***** - b 290s *.**| 290s *...| 290s 3 - *---+ 290s | 290s a 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 a into b (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 Dec 3 09:56:54 2025 +0000 290s # 290s # On branch a-into-b-2 290s # Changes to be committed: 290s # modified: a.txt 290s # 290s [a-into-b-2 1d48cbb] Merge a into b (using imerge) 290s Date: Wed Dec 3 09:56:54 2025 +0000 290s + flip_flop_test 3 290s + local n=3 290s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 290s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 290s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s + local description=git-imerge test repository with a commit and its revert at n=3 290s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 290s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s + local description=git-imerge test repository with a commit and its revert at n=3 290s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s hint: Using 'master' as the name for the initial branch. This default branch name 290s hint: is subject to change. To configure the initial branch name to use in all 290s hint: of your new repositories, which will suppress this warning, call: 290s hint: 290s hint: git config --global init.defaultBranch 290s hint: 290s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 290s hint: 'development'. The just-created branch can be renamed via this command: 290s hint: 290s hint: git branch -m 290s hint: 290s hint: Disable this message with "git config set advice.defaultBranchName false" 290s + echo git-imerge test repository with a commit and its revert at n=3 290s + printf %s\n /*.out /*.css /*.html 290s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3/.git config user.name Loú User 290s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3/.git/ 290s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 290s + TIME=1112911993 290s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s + cd /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/flip-flop-3 290s + modify a.txt 0 290s + filename=a.txt 290s + text=0 290s + echo 0 290s + git add a.txt 290s + commit -m m⇒0 290s + TIME=1112911994 290s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 290s [master (root-commit) a733afa] m⇒0 290s 1 file changed, 1 insertion(+) 290s create mode 100644 a.txt 290s + git checkout -b a -- 290s [a 2f1f75a] a⇒1 on branch a 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s [a 4700669] a⇒2 on branch a 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s [a 621c381] a⇒3 on branch a 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s Switched to a new branch 'a' 290s + modify a.txt 1 290s + filename=a.txt 290s + text=1 290s + echo 1 290s + git add a.txt 290s + commit -m a⇒1 on branch a 290s + TIME=1112911995 290s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 290s + modify a.txt 2 290s + filename=a.txt 290s + text=2 290s + echo 2 290s + git add a.txt 290s + commit -m a⇒2 on branch a 290s + TIME=1112911996 290s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 290s + modify a.txt 3 290s + filename=a.txt 290s + text=3 290s + echo 3 290s + git add a.txt 290s + commit -m a⇒3 on branch a 290s + TIME=1112911997 290s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 290s + git checkout -b b master -- 290s Switched to a new branch 'b' 290s + modify b.txt 1 290s + filename=b.txt 290s + text=1 290s + echo 1 290s + git add b.txt 290s + msg=b⇒1 290s + test 1 = 3 290s + test 1 = 4 290s + commit -m b⇒1 on branch b 290s + TIME=1112911998 290s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 290s + modify b.txt 2 290s + filename=b.txt 290s + text=2 290s [b 1f7d097] b⇒1 on branch b 290s 1 file changed, 1 insertion(+) 290s create mode 100644 b.txt 290s + echo 2 290s + git add b.txt 290s + msg=b⇒2 290s + test 2 = 3 290s + test 2 = 4 290s + commit -m b⇒2 on branch b 290s + TIME=1112911999 290s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 290s [b ce671e9] b⇒2 on branch b 290s 1 file changed, 1 insertion(+), 1 deletion(-) 290s + modify b.txt 3 290s + filename=b.txt 290s + text=3 290s + echo 3 290s + git add b.txt 290s + msg=b⇒3 290s + test 3 = 3 290s + modify a.txt X 290s + filename=a.txt 290s + text=X 290s + echo X 290s + git add a.txt 290s + msg=b⇒3 and a⇒X 290s + test 3 = 4 290s + commit -m b⇒3 and a⇒X on branch b 290s + TIME=1112912000 290s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 290s + modify b.txt 4 290s + filename=b.txt 290s + text=4 290s [b d40495e] b⇒3 and a⇒X on branch b 290s 2 files changed, 2 insertions(+), 2 deletions(-) 290s + echo 4 290s + git add b.txt 290s + msg=b⇒4 290s + test 4 = 3 290s + test 4 = 4 290s + modify a.txt 0 290s + filename=a.txt 290s + text=0 290s + echo 0 290s + git add a.txt 290s + msg=b⇒4 and a⇒0 290s + commit -m b⇒4 and a⇒0 on branch b 290s + TIME=1112912001 290s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 290s [b eb736f2] b⇒4 and a⇒0 on branch b 290s 2 files changed, 2 insertions(+), 2 deletions(-) 290s + test_merge b-into-a-3 a b 1-3 1-4 290s + local name=b-into-a-3 290s + local dst=a 290s + local src=b 290s + local conflict1=1-3 290s + local conflict2=1-4 290s + git checkout a 290s Switched to branch 'a' 290s + git-imerge merge --branch=b-into-a-3 b 290s + tee imerge-b-into-a-3-1.out 290s Attempting automerge of 3-4...success. 290s Autofilling 1-4...success. 290s Autofilling 2-4...success. 290s Autofilling 3-1...success. 290s Autofilling 3-2...success. 290s Autofilling 3-3...unexpected conflict. Backtracking... 290s Autofilling 1-4...success. 290s Autofilling 2-1...success. 290s Autofilling 2-2...success. 290s Autofilling 2-3...unexpected conflict. Backtracking... 290s Autofilling 1-1...success. 290s Autofilling 1-2...success. 290s Autofilling 1-3...unexpected conflict. Backtracking... 290s Autofilling 1-2...success. 290s Autofilling 2-2...success. 290s Autofilling 3-1...success. 290s Autofilling 3-2 (first way)...success. 290s Autofilling 3-2 (second way)...success. 290s The two ways of autofilling 3-2 agree. 290s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 290s Attempting automerge of 3-4...success. 290s Autofilling 1-4...success. 290s Autofilling 2-4...success. 290s Autofilling 3-3...unexpected conflict. Backtracking... 290s Autofilling 1-4...success. 291s Autofilling 2-3...unexpected conflict. Backtracking... 291s Autofilling 1-3...unexpected conflict. Backtracking... 291s Switched to branch 'imerge/b' 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 2f1f75a7b49864d699f9e222c1d78078cfe01587 291s Author: Loú User 291s Date: Thu Apr 7 22:13:15 2005 +0000 291s 291s a⇒1 on branch a 291s 291s Original second commit: 291s + git-imerge diagram --commits --frontier 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 There was a conflict merging commit 1-3, shown above. 291s Please resolve the conflict, commit the result, then type 291s 291s git-imerge continue 291s 0 3 291s | | 291s 0 - **** - a 291s *??. 291s *... 291s *#?? 291s 4 - *??? 291s | 291s b 291s 291s 0 3 291s | | 291s 0 - **** - a 291s *??| 291s *--+ 291s *#?? 291s 4 - *??? 291s | 291s b 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 1-3 imerge-b-into-a-3-1.out 291s + echo 1 291s + git add a.txt 291s + git-imerge continue --no-edit 291s + tee imerge-b-into-a-3-2.out 291s [imerge/b 8abc944] imerge 'b': manual merge 1-3 291s Merge has been recorded for merge 1-3. 291s Attempting automerge of 1-4...failure. 291s Attempting automerge of 1-4...failure. 291s Attempting automerge of 3-3...success. 291s Autofilling 2-3...success. 291s Autofilling 3-3...success. 291s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 291s Previous HEAD position was 242f2bc imerge 'b': automatic merge 3-3 291s Switched to branch 'imerge/b' 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 2f1f75a7b49864d699f9e222c1d78078cfe01587 291s Author: Loú User 291s Date: Thu Apr 7 22:13:15 2005 +0000 291s 291s a⇒1 on branch a 291s 291s Original second commit: 291s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 291s Author: Loú User 291s Date: Thu Apr 7 22:13:21 2005 +0000 291s 291s b⇒4 and a⇒0 on branch b 291s 291s There was a conflict merging commit 1-4, 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 3 291s | | 291s 0 - **** - a 291s *??. 291s *... 291s **.. 291s 4 - *#?? 291s | 291s b 291s 291s 0 3 291s | | 291s 0 - **** - a 291s *??| 291s *..| 291s **-+ 291s 4 - *#?? 291s | 291s b 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 1-4 imerge-b-into-a-3-2.out 291s + echo 1 291s + git add a.txt 291s + git-imerge continue --no-edit 291s + tee imerge-b-into-a-3-3.out 291s [imerge/b 3124b61] imerge 'b': manual merge 1-4 291s Merge has been recorded for merge 1-4. 291s Attempting automerge of 3-4...success. 291s Autofilling 2-4...success. 291s Autofilling 3-4...success. 291s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 291s Merge is complete! 291s + grep -q Merge is complete imerge-b-into-a-3-3.out 291s + git-imerge diagram --commits --frontier 291s 0 3 291s | | 291s 0 - **** - a 291s *??. 291s *... 291s **.. 291s 4 - **.. 291s | 291s b 291s 291s 0 3 291s | | 291s 0 - **** - a 291s *??| 291s *..| 291s **.| 291s 4 - **-+ 291s | 291s b 291s 291s Key: 291s |,-,+ = rectangles forming current merge frontier 291s * = merge done manually 291s . = merge done automatically 291s # = conflict that is currently blocking progress 291s @ = merge was blocked but has been resolved 291s ? = no merge recorded 291s 291s + GIT_EDITOR=cat git-imerge finish 291s Merge b into a (using imerge) 291s 291s # Please enter the commit message for your changes. Lines starting 291s # with '#' will be ignored, and an empty message aborts the commit. 291s # 291s # Date: Wed Dec 3 09:56:55 2025 +0000 291s # 291s # On branch b-into-a-3 291s # Changes to be committed: 291s # new file: b.txt 291s # 291s [b-into-a-3 501dd66] Merge b into a (using imerge) 291s Date: Wed Dec 3 09:56:55 2025 +0000 291s + test_merge a-into-b-3 b a 3-1 4-1 291s + local name=a-into-b-3 291s + local dst=b 291s + local src=a 291s + local conflict1=3-1 291s + local conflict2=4-1 291s + git checkout b 291s Switched to branch 'b' 291s + git-imerge merge --branch=a-into-b-3 a 291s + tee imerge-a-into-b-3-1.out 292s Attempting automerge of 4-3...success. 292s Autofilling 1-3...success. 292s Autofilling 2-3...success. 292s Autofilling 3-3...unexpected conflict. Backtracking... 292s Autofilling 1-3...success. 292s Autofilling 2-1...success. 292s Autofilling 2-2...success. 292s Autofilling 2-3 (first way)...success. 292s Autofilling 2-3 (second way)...success. 292s The two ways of autofilling 2-3 agree. 292s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 292s Autofilling 3-2...unexpected conflict. Backtracking... 292s + git-imerge diagram --commits --frontier 292s Autofilling 3-1...unexpected conflict. Backtracking... 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 d40495ed379f376841e517047f90b663e8c7c7e1 292s Author: Loú User 292s Date: Thu Apr 7 22:13:20 2005 +0000 292s 292s b⇒3 and a⇒X 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 3-1, shown above. 292s Please resolve the conflict, commit the result, then type 292s 292s git-imerge continue 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 [imerge/a 24cec72] imerge 'a': manual merge 3-1 292s 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 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 [imerge/a d6794f4] 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 There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 292s + echo 1 292s + git add a.txt 292s + git-imerge continue --no-edit 292s + tee imerge-a-into-b-3-2.out 292s + git-imerge diagram --commits --frontier 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 + git-imerge continue --no-edit 292s + tee imerge-a-into-b-3-3.out 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 292s + 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 Dec 3 09:56:57 2025 +0000 293s # 293s # On branch a-into-b-3 293s # Changes to be committed: 293s # modified: a.txt 293s # 293s [a-into-b-3 86b0bc6] Merge a into b (using imerge) 293s Date: Wed Dec 3 09:56:57 2025 +0000 293s py313: commands[5] /tmp/autopkgtest.PHPuZd/build.vZB/src> /bin/sh t/test-drop 293s + dirname t/test-drop 293s + cd t 293s + pwd 293s + dirname /tmp/autopkgtest.PHPuZd/build.vZB/src/t 293s + BASE=/tmp/autopkgtest.PHPuZd/build.vZB/src 293s + . /tmp/autopkgtest.PHPuZd/build.vZB/src/t/test-lib.sh 293s + GIT_IMERGE=git-imerge 293s + TMP=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop 293s + DESCRIPTION=git-imerge drop test repository 293s + init_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop git-imerge drop test repository 293s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop 293s + local description=git-imerge drop test repository 293s + delete_test_repo /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop git-imerge drop test repository 293s + local path=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop 293s + local description=git-imerge drop test repository 293s + test -d /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop 293s + mkdir -p /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop 293s + git init /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop 293s Initialized empty Git repository in /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop/.git/ 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 hint: 293s hint: Disable this message with "git config set advice.defaultBranchName false" 293s [master (root-commit) a733afa] m⇒0 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a.txt 293s + echo git-imerge drop test repository 293s + printf %s\n /*.out /*.css /*.html 293s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop/.git config user.name Loú User 293s + git --git-dir=/tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop/.git config user.email luser@example.com 293s + TIME=1112911993 293s + ln -s /tmp/autopkgtest.PHPuZd/build.vZB/src/imerge.css /tmp/autopkgtest.PHPuZd/build.vZB/src/t/tmp/drop 293s + cd /tmp/autopkgtest.PHPuZd/build.vZB/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 389a4ba] a1⇒1 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a1.txt 293s [master 4785218] a2⇒2 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a2.txt 293s [master 34bdde3] a3⇒3 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a3.txt 293s [master c793a5a] a4⇒4 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a4.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 + 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 + 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 + 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 + 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 + git checkout -b dropped master 293s [master 9d6aec5] a6⇒6 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a6.txt 293s Switched to a new branch 'dropped' 293s + git-imerge drop HEAD~5..HEAD~3 293s [detached HEAD 46f8732] Revert "a3⇒3" 293s Date: Wed Dec 3 09:56:57 2025 +0000 293s 1 file changed, 1 deletion(-) 293s delete mode 100644 a3.txt 293s [detached HEAD 0b742dd] Revert "a2⇒2" 293s Date: Wed Dec 3 09:56:57 2025 +0000 293s 1 file changed, 1 deletion(-) 293s delete mode 100644 a2.txt 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 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='0b742dd8adfe1d12d44b6f3f44b3b7fe9ccef752', goal='drop')[0:4,0:3]. 293s Merge is complete! 293s + git-imerge diagram --commits --frontier --html=imerge-drop.html 293s 0 3 293s | | 293s 0 - **** - dropped 293s *??. 293s 2 - *... 293s | 293s 0b742dd8adfe1d12d44b6f3f44b3b7fe9ccef752 293s 293s 0 3 293s | | 293s 0 - **** - dropped 293s *??| 293s 2 - *--+ 293s | 293s 0b742dd8adfe1d12d44b6f3f44b3b7fe9ccef752 293s 293s Key: 293s |,-,+ = rectangles forming current merge frontier 293s * = merge done manually 293s . = merge done automatically 293s # = conflict that is currently blocking progress 293s @ = merge was blocked but has been resolved 293s ? = no merge recorded 293s 293s + git-imerge finish 293s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 293s + local refname=dropped 293s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 293s + git rev-parse dropped^{tree} 293s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 293s + git checkout -b reverted master 293s Switched to a new branch 'reverted' 293s + 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 [detached HEAD 44618a3] Revert "a3⇒3" 294s Date: Wed Dec 3 09:56:58 2025 +0000 294s 1 file changed, 1 deletion(-) 294s delete mode 100644 a3.txt 294s HEAD is now at 34bdde3 a3⇒3 294s [detached HEAD a93e2c8] Revert "a2⇒2" 294s Date: Wed Dec 3 09:56:58 2025 +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='a93e2c8cc5c9de8f2fd378c91f849161b92c1dc5', goal='revert')[0:4,0:3]. 294s Merge is complete! 294s + git-imerge diagram --commits --frontier --html=imerge-revert.html 294s 0 3 294s | | 294s 0 - **** - reverted 294s *??. 294s 2 - *... 294s | 294s a93e2c8cc5c9de8f2fd378c91f849161b92c1dc5 294s 294s 0 3 294s | | 294s 0 - **** - reverted 294s *??| 294s 2 - *--+ 294s | 294s a93e2c8cc5c9de8f2fd378c91f849161b92c1dc5 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 reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 294s + local refname=reverted 294s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 294s + git rev-parse reverted^{tree} 294s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 294s py313: OK (65.71=setup[0.20]+cmd[3.21,42.89,7.28,2.76,7.99,1.37] seconds) 294s congratulations :) (65.82 seconds) 294s autopkgtest [09:56:58]: test pybuild-autopkgtest: -----------------------] 299s autopkgtest [09:57:03]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 299s pybuild-autopkgtest PASS 304s autopkgtest [09:57:08]: @@@@@@@@@@@@@@@@@@@@ summary 304s pybuild-autopkgtest PASS