0s autopkgtest [23:15:45]: starting date and time: 2025-12-03 23:15:45+0000 0s autopkgtest [23:15:45]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [23:15:45]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.k316hk_c/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --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 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest-cpu2-ram4-disk20-amd64 --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@sto01-4.secgroup --name adt-resolute-amd64-git-imerge-20251203-231545-juju-7f2275-prod-proposed-migration-environment-15-5f1eaa44-f2e2-4de9-b567-2952fb5ead52 --image adt/ubuntu-resolute-amd64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-autopkgtest-workers-amd64 -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 3s Creating nova instance adt-resolute-amd64-git-imerge-20251203-231545-juju-7f2275-prod-proposed-migration-environment-15-5f1eaa44-f2e2-4de9-b567-2952fb5ead52 from image adt/ubuntu-resolute-amd64-server-20251203.img (UUID c6e78f39-c16c-48bb-9815-0096f6be052e)... 39s autopkgtest [23:16:24]: testbed dpkg architecture: amd64 39s autopkgtest [23:16:24]: testbed apt version: 3.1.12 39s autopkgtest [23:16:24]: @@@@@@@@@@@@@@@@@@@@ test bed setup 39s autopkgtest [23:16:24]: testbed release detected to be: None 40s autopkgtest [23:16:25]: updating testbed package index (apt update) 40s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 40s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 40s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 40s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 40s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [155 kB] 40s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [23.1 kB] 41s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [931 kB] 41s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main i386 Packages [163 kB] 41s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 Packages [220 kB] 42s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 c-n-f Metadata [6432 B] 42s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 c-n-f Metadata [120 B] 42s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 Packages [757 kB] 42s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/universe i386 Packages [345 kB] 42s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 c-n-f Metadata [23.6 kB] 42s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 Packages [9636 B] 42s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse i386 Packages [4040 B] 42s Get:17 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 c-n-f Metadata [748 B] 43s Fetched 2762 kB in 2s (1142 kB/s) 43s Reading package lists... 44s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 44s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 44s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 44s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 45s Reading package lists... 45s Reading package lists... 45s Building dependency tree... 45s Reading state information... 45s Calculating upgrade... 45s The following packages will be upgraded: 45s libpython3-stdlib python3 python3-gdbm python3-minimal 45s 4 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 45s Need to get 72.9 kB of archives. 45s After this operation, 2048 B of additional disk space will be used. 45s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 python3-minimal amd64 3.13.9-2 [28.1 kB] 45s Get:2 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 python3 amd64 3.13.9-2 [23.0 kB] 45s Get:3 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 libpython3-stdlib amd64 3.13.9-2 [10.8 kB] 45s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 python3-gdbm amd64 3.13.9-2 [11.0 kB] 45s dpkg-preconfigure: unable to re-open stdin: No such file or directory 45s Fetched 72.9 kB in 0s (3706 kB/s) 45s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 83538 files and directories currently installed.) 45s Preparing to unpack .../python3-minimal_3.13.9-2_amd64.deb ... 46s Unpacking python3-minimal (3.13.9-2) over (3.13.7-1) ... 46s Setting up python3-minimal (3.13.9-2) ... 46s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 83538 files and directories currently installed.) 46s Preparing to unpack .../python3_3.13.9-2_amd64.deb ... 46s running python pre-rtupdate hooks for python3.13... 46s Unpacking python3 (3.13.9-2) over (3.13.7-1) ... 46s Preparing to unpack .../libpython3-stdlib_3.13.9-2_amd64.deb ... 46s Unpacking libpython3-stdlib:amd64 (3.13.9-2) over (3.13.7-1) ... 46s Preparing to unpack .../python3-gdbm_3.13.9-2_amd64.deb ... 46s Unpacking python3-gdbm (3.13.9-2) over (3.13.9-1) ... 46s Setting up python3-gdbm (3.13.9-2) ... 46s Setting up libpython3-stdlib:amd64 (3.13.9-2) ... 46s Setting up python3 (3.13.9-2) ... 46s running python rtupdate hooks for python3.13... 46s running python post-rtupdate hooks for python3.13... 46s Processing triggers for man-db (2.13.1-1) ... 46s autopkgtest [23:16:31]: upgrading testbed (apt dist-upgrade and autopurge) 46s Reading package lists... 47s Building dependency tree... 47s Reading state information... 47s Calculating upgrade... 47s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 47s Reading package lists... 47s Building dependency tree... 47s Reading state information... 47s Solving dependencies... 47s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 49s autopkgtest [23:16:34]: testbed running kernel: Linux 6.17.0-6-generic #6-Ubuntu SMP PREEMPT_DYNAMIC Tue Oct 7 13:34:17 UTC 2025 49s autopkgtest [23:16:34]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 50s Get:1 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (dsc) [1896 B] 50s Get:2 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 50s Get:3 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (diff) [3144 B] 50s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 50s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 50s gpgv: Can't check signature: No public key 50s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 50s autopkgtest [23:16:35]: testing package git-imerge version 1.2.0-5 51s autopkgtest [23:16:36]: build not needed 51s autopkgtest [23:16:36]: test pybuild-autopkgtest: preparing testbed 51s Reading package lists... 51s Building dependency tree... 51s Reading state information... 51s Solving dependencies... 51s The following NEW packages will be installed: 51s autoconf automake autopoint autotools-dev build-essential cpp cpp-15 51s cpp-15-x86-64-linux-gnu cpp-x86-64-linux-gnu debhelper debugedit 51s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-15 51s g++-15-x86-64-linux-gnu g++-x86-64-linux-gnu gcc gcc-15 51s gcc-15-x86-64-linux-gnu gcc-x86-64-linux-gnu gettext git git-imerge git-man 51s intltool-debian libarchive-zip-perl libasan8 libcc1-0 libdebhelper-perl 51s liberror-perl libfile-stripnondeterminism-perl libgcc-15-dev libgomp1 51s libhwasan0 libisl23 libitm1 libjs-jquery libjs-sphinxdoc libjs-underscore 51s liblsan0 libmpc3 libpkgconf3 libquadmath0 libstdc++-15-dev libtool libtsan2 51s libubsan1 m4 pkg-config pkgconf pkgconf-bin po-debconf 51s pybuild-plugin-autopkgtest python3-cachetools python3-colorama 51s python3-distlib python3-filelock python3-pip-whl python3-platformdirs 51s python3-pluggy python3-pyproject-api python3-setuptools-whl 51s python3-virtualenv python3-wheel tox 51s 0 upgraded, 68 newly installed, 0 to remove and 0 not upgraded. 51s Need to get 84.3 MB of archives. 51s After this operation, 290 MB of additional disk space will be used. 51s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 m4 amd64 1.4.20-2 [217 kB] 51s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 autoconf all 2.72-3.1ubuntu1 [384 kB] 51s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 autotools-dev all 20240727.1 [43.4 kB] 51s Get:4 http://ftpmaster.internal/ubuntu resolute/main amd64 automake all 1:1.18.1-3 [582 kB] 51s Get:5 http://ftpmaster.internal/ubuntu resolute/main amd64 autopoint all 0.23.2-1 [620 kB] 51s Get:6 http://ftpmaster.internal/ubuntu resolute/main amd64 libisl23 amd64 0.27-1 [685 kB] 52s Get:7 http://ftpmaster.internal/ubuntu resolute/main amd64 libmpc3 amd64 1.3.1-2 [54.8 kB] 52s Get:8 http://ftpmaster.internal/ubuntu resolute/main amd64 cpp-15-x86-64-linux-gnu amd64 15.2.0-9ubuntu1 [12.9 MB] 52s Get:9 http://ftpmaster.internal/ubuntu resolute/main amd64 cpp-15 amd64 15.2.0-9ubuntu1 [1030 B] 52s Get:10 http://ftpmaster.internal/ubuntu resolute/main amd64 cpp-x86-64-linux-gnu amd64 4:15.2.0-4ubuntu1 [5746 B] 52s Get:11 http://ftpmaster.internal/ubuntu resolute/main amd64 cpp amd64 4:15.2.0-4ubuntu1 [22.4 kB] 52s Get:12 http://ftpmaster.internal/ubuntu resolute/main amd64 libcc1-0 amd64 15.2.0-9ubuntu1 [47.4 kB] 52s Get:13 http://ftpmaster.internal/ubuntu resolute/main amd64 libgomp1 amd64 15.2.0-9ubuntu1 [151 kB] 52s Get:14 http://ftpmaster.internal/ubuntu resolute/main amd64 libitm1 amd64 15.2.0-9ubuntu1 [29.6 kB] 52s Get:15 http://ftpmaster.internal/ubuntu resolute/main amd64 libasan8 amd64 15.2.0-9ubuntu1 [3071 kB] 52s Get:16 http://ftpmaster.internal/ubuntu resolute/main amd64 liblsan0 amd64 15.2.0-9ubuntu1 [1360 kB] 52s Get:17 http://ftpmaster.internal/ubuntu resolute/main amd64 libtsan2 amd64 15.2.0-9ubuntu1 [2757 kB] 52s Get:18 http://ftpmaster.internal/ubuntu resolute/main amd64 libubsan1 amd64 15.2.0-9ubuntu1 [1210 kB] 52s Get:19 http://ftpmaster.internal/ubuntu resolute/main amd64 libhwasan0 amd64 15.2.0-9ubuntu1 [1685 kB] 52s Get:20 http://ftpmaster.internal/ubuntu resolute/main amd64 libquadmath0 amd64 15.2.0-9ubuntu1 [153 kB] 52s Get:21 http://ftpmaster.internal/ubuntu resolute/main amd64 libgcc-15-dev amd64 15.2.0-9ubuntu1 [2863 kB] 52s Get:22 http://ftpmaster.internal/ubuntu resolute/main amd64 gcc-15-x86-64-linux-gnu amd64 15.2.0-9ubuntu1 [25.4 MB] 53s Get:23 http://ftpmaster.internal/ubuntu resolute/main amd64 gcc-15 amd64 15.2.0-9ubuntu1 [527 kB] 53s Get:24 http://ftpmaster.internal/ubuntu resolute/main amd64 gcc-x86-64-linux-gnu amd64 4:15.2.0-4ubuntu1 [1208 B] 53s Get:25 http://ftpmaster.internal/ubuntu resolute/main amd64 gcc amd64 4:15.2.0-4ubuntu1 [5024 B] 53s Get:26 http://ftpmaster.internal/ubuntu resolute/main amd64 libstdc++-15-dev amd64 15.2.0-9ubuntu1 [2574 kB] 53s Get:27 http://ftpmaster.internal/ubuntu resolute/main amd64 g++-15-x86-64-linux-gnu amd64 15.2.0-9ubuntu1 [14.4 MB] 53s Get:28 http://ftpmaster.internal/ubuntu resolute/main amd64 g++-15 amd64 15.2.0-9ubuntu1 [24.3 kB] 53s Get:29 http://ftpmaster.internal/ubuntu resolute/main amd64 g++-x86-64-linux-gnu amd64 4:15.2.0-4ubuntu1 [966 B] 53s Get:30 http://ftpmaster.internal/ubuntu resolute/main amd64 g++ amd64 4:15.2.0-4ubuntu1 [1100 B] 53s Get:31 http://ftpmaster.internal/ubuntu resolute/main amd64 build-essential amd64 12.12ubuntu2 [5256 B] 53s Get:32 http://ftpmaster.internal/ubuntu resolute/main amd64 libdebhelper-perl all 13.24.2ubuntu1 [95.7 kB] 53s Get:33 http://ftpmaster.internal/ubuntu resolute/main amd64 libtool all 2.5.4-7 [169 kB] 53s Get:34 http://ftpmaster.internal/ubuntu resolute/main amd64 dh-autoreconf all 21 [12.5 kB] 53s Get:35 http://ftpmaster.internal/ubuntu resolute/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 53s Get:36 http://ftpmaster.internal/ubuntu resolute/main amd64 libfile-stripnondeterminism-perl all 1.15.0-1 [20.5 kB] 53s Get:37 http://ftpmaster.internal/ubuntu resolute/main amd64 dh-strip-nondeterminism all 1.15.0-1 [5090 B] 53s Get:38 http://ftpmaster.internal/ubuntu resolute/main amd64 debugedit amd64 1:5.2-3 [49.9 kB] 53s Get:39 http://ftpmaster.internal/ubuntu resolute/main amd64 dwz amd64 0.16-2 [115 kB] 53s Get:40 http://ftpmaster.internal/ubuntu resolute/main amd64 gettext amd64 0.23.2-1 [1019 kB] 53s Get:41 http://ftpmaster.internal/ubuntu resolute/main amd64 intltool-debian all 0.35.0+20060710.6build1 [24.1 kB] 53s Get:42 http://ftpmaster.internal/ubuntu resolute/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 53s Get:43 http://ftpmaster.internal/ubuntu resolute/main amd64 debhelper all 13.24.2ubuntu1 [896 kB] 53s Get:44 http://ftpmaster.internal/ubuntu resolute/universe amd64 dh-python all 6.20251029 [120 kB] 53s Get:45 http://ftpmaster.internal/ubuntu resolute/main amd64 liberror-perl all 0.17030-1 [23.5 kB] 53s Get:46 http://ftpmaster.internal/ubuntu resolute/main amd64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 53s Get:47 http://ftpmaster.internal/ubuntu resolute/main amd64 git amd64 1:2.51.0-1ubuntu1 [4414 kB] 53s Get:48 http://ftpmaster.internal/ubuntu resolute/universe amd64 git-imerge all 1.2.0-5 [49.5 kB] 53s Get:49 http://ftpmaster.internal/ubuntu resolute/main amd64 libjs-jquery all 3.7.1+dfsg+~3.5.33-1build1 [321 kB] 53s Get:50 http://ftpmaster.internal/ubuntu resolute/main amd64 libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 53s Get:51 http://ftpmaster.internal/ubuntu resolute/main amd64 libjs-sphinxdoc all 8.2.3-1ubuntu2 [28.0 kB] 53s Get:52 http://ftpmaster.internal/ubuntu resolute/main amd64 libpkgconf3 amd64 1.8.1-4build1 [32.8 kB] 53s Get:53 http://ftpmaster.internal/ubuntu resolute/main amd64 pkgconf-bin amd64 1.8.1-4build1 [21.7 kB] 53s Get:54 http://ftpmaster.internal/ubuntu resolute/main amd64 pkgconf amd64 1.8.1-4build1 [16.8 kB] 53s Get:55 http://ftpmaster.internal/ubuntu resolute/main amd64 pkg-config amd64 1.8.1-4build1 [7494 B] 53s Get:56 http://ftpmaster.internal/ubuntu resolute/universe amd64 pybuild-plugin-autopkgtest all 6.20251029 [1746 B] 53s Get:57 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-cachetools all 5.3.3-1 [10.3 kB] 53s Get:58 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-colorama all 0.4.6-4 [32.1 kB] 53s Get:59 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-distlib all 0.4.0-1 [267 kB] 53s Get:60 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-filelock all 3.18.0-1 [13.0 kB] 53s Get:61 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-pip-whl all 25.1.1+dfsg-1ubuntu2 [1430 kB] 53s Get:62 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-platformdirs all 4.4.0-1 [16.9 kB] 53s Get:63 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-pluggy all 1.6.0-1 [21.0 kB] 53s Get:64 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-pyproject-api all 1.9.1-1 [52.9 kB] 53s Get:65 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-setuptools-whl all 78.1.1-0.1 [1174 kB] 53s Get:66 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-virtualenv all 20.35.4+ds-1 [76.1 kB] 53s Get:67 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-wheel all 0.46.1-2 [22.1 kB] 53s Get:68 http://ftpmaster.internal/ubuntu resolute/universe amd64 tox all 4.25.0-1 [323 kB] 53s Fetched 84.3 MB in 2s (42.4 MB/s) 53s Selecting previously unselected package m4. 53s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 83538 files and directories currently installed.) 53s Preparing to unpack .../00-m4_1.4.20-2_amd64.deb ... 53s Unpacking m4 (1.4.20-2) ... 54s Selecting previously unselected package autoconf. 54s Preparing to unpack .../01-autoconf_2.72-3.1ubuntu1_all.deb ... 54s Unpacking autoconf (2.72-3.1ubuntu1) ... 54s Selecting previously unselected package autotools-dev. 54s Preparing to unpack .../02-autotools-dev_20240727.1_all.deb ... 54s Unpacking autotools-dev (20240727.1) ... 54s Selecting previously unselected package automake. 54s Preparing to unpack .../03-automake_1%3a1.18.1-3_all.deb ... 54s Unpacking automake (1:1.18.1-3) ... 54s Selecting previously unselected package autopoint. 54s Preparing to unpack .../04-autopoint_0.23.2-1_all.deb ... 54s Unpacking autopoint (0.23.2-1) ... 54s Selecting previously unselected package libisl23:amd64. 54s Preparing to unpack .../05-libisl23_0.27-1_amd64.deb ... 54s Unpacking libisl23:amd64 (0.27-1) ... 54s Selecting previously unselected package libmpc3:amd64. 54s Preparing to unpack .../06-libmpc3_1.3.1-2_amd64.deb ... 54s Unpacking libmpc3:amd64 (1.3.1-2) ... 54s Selecting previously unselected package cpp-15-x86-64-linux-gnu. 54s Preparing to unpack .../07-cpp-15-x86-64-linux-gnu_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking cpp-15-x86-64-linux-gnu (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package cpp-15. 54s Preparing to unpack .../08-cpp-15_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking cpp-15 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package cpp-x86-64-linux-gnu. 54s Preparing to unpack .../09-cpp-x86-64-linux-gnu_4%3a15.2.0-4ubuntu1_amd64.deb ... 54s Unpacking cpp-x86-64-linux-gnu (4:15.2.0-4ubuntu1) ... 54s Selecting previously unselected package cpp. 54s Preparing to unpack .../10-cpp_4%3a15.2.0-4ubuntu1_amd64.deb ... 54s Unpacking cpp (4:15.2.0-4ubuntu1) ... 54s Selecting previously unselected package libcc1-0:amd64. 54s Preparing to unpack .../11-libcc1-0_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libcc1-0:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libgomp1:amd64. 54s Preparing to unpack .../12-libgomp1_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libgomp1:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libitm1:amd64. 54s Preparing to unpack .../13-libitm1_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libitm1:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libasan8:amd64. 54s Preparing to unpack .../14-libasan8_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libasan8:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package liblsan0:amd64. 54s Preparing to unpack .../15-liblsan0_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking liblsan0:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libtsan2:amd64. 54s Preparing to unpack .../16-libtsan2_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libtsan2:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libubsan1:amd64. 54s Preparing to unpack .../17-libubsan1_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libubsan1:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libhwasan0:amd64. 54s Preparing to unpack .../18-libhwasan0_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libhwasan0:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libquadmath0:amd64. 54s Preparing to unpack .../19-libquadmath0_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libquadmath0:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package libgcc-15-dev:amd64. 54s Preparing to unpack .../20-libgcc-15-dev_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libgcc-15-dev:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package gcc-15-x86-64-linux-gnu. 54s Preparing to unpack .../21-gcc-15-x86-64-linux-gnu_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking gcc-15-x86-64-linux-gnu (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package gcc-15. 54s Preparing to unpack .../22-gcc-15_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking gcc-15 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package gcc-x86-64-linux-gnu. 54s Preparing to unpack .../23-gcc-x86-64-linux-gnu_4%3a15.2.0-4ubuntu1_amd64.deb ... 54s Unpacking gcc-x86-64-linux-gnu (4:15.2.0-4ubuntu1) ... 54s Selecting previously unselected package gcc. 54s Preparing to unpack .../24-gcc_4%3a15.2.0-4ubuntu1_amd64.deb ... 54s Unpacking gcc (4:15.2.0-4ubuntu1) ... 54s Selecting previously unselected package libstdc++-15-dev:amd64. 54s Preparing to unpack .../25-libstdc++-15-dev_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking libstdc++-15-dev:amd64 (15.2.0-9ubuntu1) ... 54s Selecting previously unselected package g++-15-x86-64-linux-gnu. 54s Preparing to unpack .../26-g++-15-x86-64-linux-gnu_15.2.0-9ubuntu1_amd64.deb ... 54s Unpacking g++-15-x86-64-linux-gnu (15.2.0-9ubuntu1) ... 55s Selecting previously unselected package g++-15. 55s Preparing to unpack .../27-g++-15_15.2.0-9ubuntu1_amd64.deb ... 55s Unpacking g++-15 (15.2.0-9ubuntu1) ... 55s Selecting previously unselected package g++-x86-64-linux-gnu. 55s Preparing to unpack .../28-g++-x86-64-linux-gnu_4%3a15.2.0-4ubuntu1_amd64.deb ... 55s Unpacking g++-x86-64-linux-gnu (4:15.2.0-4ubuntu1) ... 55s Selecting previously unselected package g++. 55s Preparing to unpack .../29-g++_4%3a15.2.0-4ubuntu1_amd64.deb ... 55s Unpacking g++ (4:15.2.0-4ubuntu1) ... 55s Selecting previously unselected package build-essential. 55s Preparing to unpack .../30-build-essential_12.12ubuntu2_amd64.deb ... 55s Unpacking build-essential (12.12ubuntu2) ... 55s Selecting previously unselected package libdebhelper-perl. 55s Preparing to unpack .../31-libdebhelper-perl_13.24.2ubuntu1_all.deb ... 55s Unpacking libdebhelper-perl (13.24.2ubuntu1) ... 55s Selecting previously unselected package libtool. 55s Preparing to unpack .../32-libtool_2.5.4-7_all.deb ... 55s Unpacking libtool (2.5.4-7) ... 55s Selecting previously unselected package dh-autoreconf. 55s Preparing to unpack .../33-dh-autoreconf_21_all.deb ... 55s Unpacking dh-autoreconf (21) ... 55s Selecting previously unselected package libarchive-zip-perl. 55s Preparing to unpack .../34-libarchive-zip-perl_1.68-1_all.deb ... 55s Unpacking libarchive-zip-perl (1.68-1) ... 55s Selecting previously unselected package libfile-stripnondeterminism-perl. 55s Preparing to unpack .../35-libfile-stripnondeterminism-perl_1.15.0-1_all.deb ... 55s Unpacking libfile-stripnondeterminism-perl (1.15.0-1) ... 55s Selecting previously unselected package dh-strip-nondeterminism. 55s Preparing to unpack .../36-dh-strip-nondeterminism_1.15.0-1_all.deb ... 55s Unpacking dh-strip-nondeterminism (1.15.0-1) ... 55s Selecting previously unselected package debugedit. 55s Preparing to unpack .../37-debugedit_1%3a5.2-3_amd64.deb ... 55s Unpacking debugedit (1:5.2-3) ... 55s Selecting previously unselected package dwz. 55s Preparing to unpack .../38-dwz_0.16-2_amd64.deb ... 55s Unpacking dwz (0.16-2) ... 55s Selecting previously unselected package gettext. 55s Preparing to unpack .../39-gettext_0.23.2-1_amd64.deb ... 55s Unpacking gettext (0.23.2-1) ... 55s Selecting previously unselected package intltool-debian. 55s Preparing to unpack .../40-intltool-debian_0.35.0+20060710.6build1_all.deb ... 55s Unpacking intltool-debian (0.35.0+20060710.6build1) ... 55s Selecting previously unselected package po-debconf. 55s Preparing to unpack .../41-po-debconf_1.0.21+nmu1_all.deb ... 55s Unpacking po-debconf (1.0.21+nmu1) ... 55s Selecting previously unselected package debhelper. 55s Preparing to unpack .../42-debhelper_13.24.2ubuntu1_all.deb ... 55s Unpacking debhelper (13.24.2ubuntu1) ... 55s Selecting previously unselected package dh-python. 55s Preparing to unpack .../43-dh-python_6.20251029_all.deb ... 55s Unpacking dh-python (6.20251029) ... 55s Selecting previously unselected package liberror-perl. 55s Preparing to unpack .../44-liberror-perl_0.17030-1_all.deb ... 55s Unpacking liberror-perl (0.17030-1) ... 55s Selecting previously unselected package git-man. 55s Preparing to unpack .../45-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 55s Unpacking git-man (1:2.51.0-1ubuntu1) ... 55s Selecting previously unselected package git. 55s Preparing to unpack .../46-git_1%3a2.51.0-1ubuntu1_amd64.deb ... 55s Unpacking git (1:2.51.0-1ubuntu1) ... 55s Selecting previously unselected package git-imerge. 55s Preparing to unpack .../47-git-imerge_1.2.0-5_all.deb ... 55s Unpacking git-imerge (1.2.0-5) ... 55s Selecting previously unselected package libjs-jquery. 55s Preparing to unpack .../48-libjs-jquery_3.7.1+dfsg+~3.5.33-1build1_all.deb ... 55s Unpacking libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 55s Selecting previously unselected package libjs-underscore. 55s Preparing to unpack .../49-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 55s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 55s Selecting previously unselected package libjs-sphinxdoc. 55s Preparing to unpack .../50-libjs-sphinxdoc_8.2.3-1ubuntu2_all.deb ... 55s Unpacking libjs-sphinxdoc (8.2.3-1ubuntu2) ... 55s Selecting previously unselected package libpkgconf3:amd64. 55s Preparing to unpack .../51-libpkgconf3_1.8.1-4build1_amd64.deb ... 55s Unpacking libpkgconf3:amd64 (1.8.1-4build1) ... 55s Selecting previously unselected package pkgconf-bin. 55s Preparing to unpack .../52-pkgconf-bin_1.8.1-4build1_amd64.deb ... 55s Unpacking pkgconf-bin (1.8.1-4build1) ... 55s Selecting previously unselected package pkgconf:amd64. 55s Preparing to unpack .../53-pkgconf_1.8.1-4build1_amd64.deb ... 55s Unpacking pkgconf:amd64 (1.8.1-4build1) ... 55s Selecting previously unselected package pkg-config:amd64. 55s Preparing to unpack .../54-pkg-config_1.8.1-4build1_amd64.deb ... 55s Unpacking pkg-config:amd64 (1.8.1-4build1) ... 55s Selecting previously unselected package pybuild-plugin-autopkgtest. 55s Preparing to unpack .../55-pybuild-plugin-autopkgtest_6.20251029_all.deb ... 55s Unpacking pybuild-plugin-autopkgtest (6.20251029) ... 55s Selecting previously unselected package python3-cachetools. 55s Preparing to unpack .../56-python3-cachetools_5.3.3-1_all.deb ... 55s Unpacking python3-cachetools (5.3.3-1) ... 55s Selecting previously unselected package python3-colorama. 55s Preparing to unpack .../57-python3-colorama_0.4.6-4_all.deb ... 55s Unpacking python3-colorama (0.4.6-4) ... 55s Selecting previously unselected package python3-distlib. 55s Preparing to unpack .../58-python3-distlib_0.4.0-1_all.deb ... 55s Unpacking python3-distlib (0.4.0-1) ... 55s Selecting previously unselected package python3-filelock. 55s Preparing to unpack .../59-python3-filelock_3.18.0-1_all.deb ... 55s Unpacking python3-filelock (3.18.0-1) ... 55s Selecting previously unselected package python3-pip-whl. 55s Preparing to unpack .../60-python3-pip-whl_25.1.1+dfsg-1ubuntu2_all.deb ... 55s Unpacking python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 55s Selecting previously unselected package python3-platformdirs. 55s Preparing to unpack .../61-python3-platformdirs_4.4.0-1_all.deb ... 55s Unpacking python3-platformdirs (4.4.0-1) ... 55s Selecting previously unselected package python3-pluggy. 55s Preparing to unpack .../62-python3-pluggy_1.6.0-1_all.deb ... 55s Unpacking python3-pluggy (1.6.0-1) ... 55s Selecting previously unselected package python3-pyproject-api. 55s Preparing to unpack .../63-python3-pyproject-api_1.9.1-1_all.deb ... 55s Unpacking python3-pyproject-api (1.9.1-1) ... 55s Selecting previously unselected package python3-setuptools-whl. 55s Preparing to unpack .../64-python3-setuptools-whl_78.1.1-0.1_all.deb ... 55s Unpacking python3-setuptools-whl (78.1.1-0.1) ... 55s Selecting previously unselected package python3-virtualenv. 55s Preparing to unpack .../65-python3-virtualenv_20.35.4+ds-1_all.deb ... 55s Unpacking python3-virtualenv (20.35.4+ds-1) ... 55s Selecting previously unselected package python3-wheel. 55s Preparing to unpack .../66-python3-wheel_0.46.1-2_all.deb ... 55s Unpacking python3-wheel (0.46.1-2) ... 55s Selecting previously unselected package tox. 55s Preparing to unpack .../67-tox_4.25.0-1_all.deb ... 55s Unpacking tox (4.25.0-1) ... 55s Setting up dh-python (6.20251029) ... 55s Setting up python3-setuptools-whl (78.1.1-0.1) ... 55s Setting up python3-filelock (3.18.0-1) ... 55s Setting up python3-cachetools (5.3.3-1) ... 55s Setting up python3-colorama (0.4.6-4) ... 56s Setting up python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 56s Setting up libarchive-zip-perl (1.68-1) ... 56s Setting up libdebhelper-perl (13.24.2ubuntu1) ... 56s Setting up m4 (1.4.20-2) ... 56s Setting up python3-distlib (0.4.0-1) ... 56s Setting up libgomp1:amd64 (15.2.0-9ubuntu1) ... 56s Setting up python3-wheel (0.46.1-2) ... 56s Setting up python3-platformdirs (4.4.0-1) ... 56s Setting up liberror-perl (0.17030-1) ... 56s Setting up autotools-dev (20240727.1) ... 56s Setting up libpkgconf3:amd64 (1.8.1-4build1) ... 56s Setting up libquadmath0:amd64 (15.2.0-9ubuntu1) ... 56s Setting up libmpc3:amd64 (1.3.1-2) ... 56s Setting up autopoint (0.23.2-1) ... 56s Setting up pkgconf-bin (1.8.1-4build1) ... 56s Setting up autoconf (2.72-3.1ubuntu1) ... 56s Setting up python3-pluggy (1.6.0-1) ... 56s Setting up libubsan1:amd64 (15.2.0-9ubuntu1) ... 56s Setting up dwz (0.16-2) ... 56s Setting up libhwasan0:amd64 (15.2.0-9ubuntu1) ... 56s Setting up libasan8:amd64 (15.2.0-9ubuntu1) ... 56s Setting up debugedit (1:5.2-3) ... 56s Setting up git-man (1:2.51.0-1ubuntu1) ... 56s Setting up libtsan2:amd64 (15.2.0-9ubuntu1) ... 56s Setting up libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 56s Setting up libisl23:amd64 (0.27-1) ... 56s Setting up libcc1-0:amd64 (15.2.0-9ubuntu1) ... 56s Setting up liblsan0:amd64 (15.2.0-9ubuntu1) ... 56s Setting up libitm1:amd64 (15.2.0-9ubuntu1) ... 56s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 56s Setting up automake (1:1.18.1-3) ... 56s update-alternatives: using /usr/bin/automake-1.18 to provide /usr/bin/automake (automake) in auto mode 56s Setting up libfile-stripnondeterminism-perl (1.15.0-1) ... 56s Setting up gettext (0.23.2-1) ... 56s Setting up libgcc-15-dev:amd64 (15.2.0-9ubuntu1) ... 56s Setting up python3-virtualenv (20.35.4+ds-1) ... 56s Setting up cpp-15-x86-64-linux-gnu (15.2.0-9ubuntu1) ... 56s Setting up pkgconf:amd64 (1.8.1-4build1) ... 56s Setting up intltool-debian (0.35.0+20060710.6build1) ... 56s Setting up gcc-15-x86-64-linux-gnu (15.2.0-9ubuntu1) ... 56s Setting up libstdc++-15-dev:amd64 (15.2.0-9ubuntu1) ... 56s Setting up pkg-config:amd64 (1.8.1-4build1) ... 56s Setting up git (1:2.51.0-1ubuntu1) ... 56s Setting up libjs-sphinxdoc (8.2.3-1ubuntu2) ... 56s Setting up dh-strip-nondeterminism (1.15.0-1) ... 56s Setting up cpp-15 (15.2.0-9ubuntu1) ... 56s Setting up cpp-x86-64-linux-gnu (4:15.2.0-4ubuntu1) ... 56s Setting up g++-15-x86-64-linux-gnu (15.2.0-9ubuntu1) ... 56s Setting up gcc-x86-64-linux-gnu (4:15.2.0-4ubuntu1) ... 56s Setting up po-debconf (1.0.21+nmu1) ... 56s Setting up python3-pyproject-api (1.9.1-1) ... 56s Setting up git-imerge (1.2.0-5) ... 56s Setting up gcc-15 (15.2.0-9ubuntu1) ... 56s Setting up cpp (4:15.2.0-4ubuntu1) ... 56s Setting up g++-x86-64-linux-gnu (4:15.2.0-4ubuntu1) ... 56s Setting up g++-15 (15.2.0-9ubuntu1) ... 56s Setting up tox (4.25.0-1) ... 56s Setting up libtool (2.5.4-7) ... 56s Setting up gcc (4:15.2.0-4ubuntu1) ... 56s Setting up dh-autoreconf (21) ... 56s Setting up g++ (4:15.2.0-4ubuntu1) ... 56s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 56s Setting up build-essential (12.12ubuntu2) ... 56s Setting up debhelper (13.24.2ubuntu1) ... 56s Setting up pybuild-plugin-autopkgtest (6.20251029) ... 56s Processing triggers for install-info (7.2-5) ... 56s Processing triggers for libc-bin (2.42-2ubuntu2) ... 56s Processing triggers for man-db (2.13.1-1) ... 58s autopkgtest [23:16:43]: test pybuild-autopkgtest: pybuild-autopkgtest 58s autopkgtest [23:16:43]: test pybuild-autopkgtest: [----------------------- 58s pybuild-autopkgtest 58s I: pybuild base:317: cd /tmp/autopkgtest.ZvitK4/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.ZvitK4/build.No0/src/tox.ini --sitepackages -e py313 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 59s py313: skip building and installing the package 59s py313: commands[0] /tmp/autopkgtest.ZvitK4/build.No0/src> /bin/sh t/test-unconflicted 59s + dirname t/test-unconflicted 59s + cd t 59s + pwd 59s + dirname /tmp/autopkgtest.ZvitK4/build.No0/src/t 59s + BASE=/tmp/autopkgtest.ZvitK4/build.No0/src 59s + . /tmp/autopkgtest.ZvitK4/build.No0/src/t/test-lib.sh 59s + GIT_IMERGE=git-imerge 59s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s + DESCRIPTION=git-imerge test repository without conflicts 59s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted git-imerge test repository without conflicts 59s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s + local description=git-imerge test repository without conflicts 59s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted git-imerge test repository without conflicts 59s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s + local description=git-imerge test repository without conflicts 59s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s hint: Using 'master' as the name for the initial branch. This default branch name 59s hint: is subject to change. To configure the initial branch name to use in all 59s hint: of your new repositories, which will suppress this warning, call: 59s hint: 59s hint: git config --global init.defaultBranch 59s hint: 59s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 59s hint: 'development'. The just-created branch can be renamed via this command: 59s hint: 59s hint: git branch -m 59s hint: 59s hint: Disable this message with "git config set advice.defaultBranchName false" 59s + echo git-imerge test repository without conflicts 59s + printf %s\n /*.out /*.css /*.html 59s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted/.git config user.name Loú User 59s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted/.git config user.email luser@example.com 59s + TIME=1112911993 59s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted 59s + modify a.txt 0 59s + filename=a.txt 59s + text=0 59s + echo 0 59s + git add a.txt 59s + modify b.txt 0 59s + filename=b.txt 59s + text=0 59s + echo 0 59s + git add b.txt 59s + commit -m m⇒0 59s + TIME=1112911994 59s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 59s + git checkout -b a -- 59s Switched to a new branch 'a' 59s + seq 8 59s + modify a.txt 1 59s + filename=a.txt 59s + text=1 59s + echo 1 59s + git add a.txt 59s + commit -m a⇒1 59s + TIME=1112911995 59s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 59s + modify a.txt 2 59s + filename=a.txt 59s + text=2 59s + echo 2 59s + git add a.txt 59s + commit -m a⇒2 59s + TIME=1112911996 59s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 59s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/unconflicted/.git/ 59s [master (root-commit) 780ddf5] m⇒0 59s 2 files changed, 2 insertions(+) 59s create mode 100644 a.txt 59s create mode 100644 b.txt 59s [a b862e30] a⇒1 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s [a dcbe282] a⇒2 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s [a ecd8647] a⇒3 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s [a 1634bab] a⇒4 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s [a 909ce12] a⇒5 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s + modify a.txt 3 59s + filename=a.txt 59s + text=3 59s + echo 3 59s + git add a.txt 59s + commit -m a⇒3 59s + TIME=1112911997 59s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 59s + modify a.txt 4 59s + filename=a.txt 59s + text=4 59s + echo 4 59s + git add a.txt 59s + commit -m a⇒4 59s + TIME=1112911998 59s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 59s + modify a.txt 5 59s + filename=a.txt 59s + text=5 59s + echo 5 59s + git add a.txt 59s + commit -m a⇒5 59s + TIME=1112911999 59s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 59s + modify a.txt 6 59s + filename=a.txt 59s + text=6 59s + echo 6 59s + git add a.txt 59s + commit -m a⇒6 59s + TIME=1112912000 59s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 59s + modify a.txt 7 59s + filename=a.txt 59s + text=7 59s [a f6520bf] a⇒6 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s + echo 7 59s + git add a.txt 59s + commit -m a⇒7 59s + TIME=1112912001 59s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 59s + modify a.txt 8 59s + filename=a.txt 59s + text=8 59s + echo 8 59s + git add a.txt 59s [a 6797186] a⇒7 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s + commit -m a⇒8 59s + TIME=1112912002 59s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 59s [a 49643dd] a⇒8 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s + git checkout -b b master -- 59s Switched to a new branch 'b' 59s + seq 5 59s + modify b.txt 1 59s + filename=b.txt 59s + text=1 59s + echo 1 59s + git add b.txt 59s + commit -m b⇒1 59s + TIME=1112912003 59s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 59s + modify b.txt 2 59s + filename=b.txt 59s + text=2 59s + echo 2 59s + git add b.txt 59s [b d43305b] b⇒1 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s + commit -m b⇒2 59s + TIME=1112912004 59s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 59s [b 853ee68] b⇒2 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s [b 03a2455] b⇒3 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s [b 484ea85] b⇒4 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s [b e22cd97] b⇒5 59s 1 file changed, 1 insertion(+), 1 deletion(-) 59s + modify b.txt 3 59s + filename=b.txt 59s + text=3 59s + echo 3 59s + git add b.txt 59s + commit -m b⇒3 59s + TIME=1112912005 59s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 59s + modify b.txt 4 59s + filename=b.txt 59s + text=4 59s + echo 4 59s + git add b.txt 59s + commit -m b⇒4 59s + TIME=1112912006 59s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 59s + modify b.txt 5 59s + filename=b.txt 59s + text=5 59s + echo 5 59s + git add b.txt 59s + commit -m b⇒5 59s + TIME=1112912007 59s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 59s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git checkout a 59s Switched to branch 'a' 59s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 59s Attempting automerge of 8-5...success. 59s Autofilling 1-5...success. 59s Autofilling 2-5...success. 59s Autofilling 3-5...success. 59s Autofilling 4-5...success. 59s Autofilling 5-5...success. 59s Autofilling 6-5...success. 59s Autofilling 7-5...success. 59s Autofilling 8-1...success. 59s Autofilling 8-2...success. 59s Autofilling 8-3...success. 59s Autofilling 8-4...success. 59s Autofilling 8-5 (first way)...success. 59s Autofilling 8-5 (second way)...success. 59s The two ways of autofilling 8-5 agree. 59s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 59s Merge is complete! 59s + git-imerge list 59s * a-b 59s + git-imerge diagram --commits --frontier --html=imerge3.html 59s 0 5 8 59s | | | 59s 0 - ********* - a 59s *???????. 59s *???????. 59s *???????. 59s *???????. 59s 5 - *........ 59s | 59s b 59s 59s 0 5 8 59s | | | 59s 0 - ********* - a 59s *???????| 59s *???????| 59s *???????| 59s *???????| 59s 5 - *-------+ 59s | 59s b 59s 59s Key: 59s |,-,+ = rectangles forming current merge frontier 59s * = merge done manually 59s . = merge done automatically 59s # = conflict that is currently blocking progress 59s @ = merge was blocked but has been resolved 59s ? = no merge recorded 59s 59s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 59s Merge b into a (using imerge) 59s 59s # Please enter the commit message for your changes. Lines starting 59s # with '#' will be ignored, and an empty message aborts the commit. 59s # 59s # Date: Wed Dec 3 23:16:44 2025 +0000 59s # 59s # On branch a-b-merge 59s # Changes to be committed: 59s # modified: b.txt 59s # 59s [a-b-merge 9852182] Merge b into a (using imerge) 59s Date: Wed Dec 3 23:16:44 2025 +0000 59s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + local refname=a-b-merge 59s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git rev-parse a-b-merge^{tree} 59s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git-imerge simplify --goal=rebase --branch=a-b-rebase 59s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + local refname=a-b-rebase 59s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git rev-parse a-b-rebase^{tree} 59s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 59s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + local refname=a-b-rebase-with-history 59s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git rev-parse a-b-rebase-with-history^{tree} 59s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git-imerge simplify --goal=border --branch=a-b-border 59s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + local refname=a-b-border 59s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git rev-parse a-b-border^{tree} 59s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 59s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + local refname=a-b-border-with-history 59s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git rev-parse a-b-border-with-history^{tree} 59s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 59s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + local refname=a-b-border-with-history2 59s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git rev-parse a-b-border-with-history2^{tree} 59s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 59s + git-imerge remove 59s + git checkout a 59s Switched to branch 'a' 59s + git-imerge start --goal=full --name=a-b b 60s Attempting to merge 1-1...success. 60s Attempting to merge 1-2...success. 60s Attempting to merge 1-3...success. 60s Attempting to merge 1-4...success. 60s Attempting to merge 1-5...success. 60s Attempting to merge 2-1...success. 60s Attempting to merge 2-2...success. 60s Attempting to merge 2-3...success. 60s Attempting to merge 2-4...success. 60s Attempting to merge 2-5...success. 60s Attempting to merge 3-1...success. 60s Attempting to merge 3-2...success. 60s Attempting to merge 3-3...success. 60s Attempting to merge 3-4...success. 60s Attempting to merge 3-5...success. 60s Attempting to merge 4-1...success. 60s Attempting to merge 4-2...success. 60s Attempting to merge 4-3...success. 60s Attempting to merge 4-4...success. 60s Attempting to merge 4-5...success. 60s Attempting to merge 5-1...success. 60s Attempting to merge 5-2...success. 60s Attempting to merge 5-3...success. 60s Attempting to merge 5-4...success. 60s Attempting to merge 5-5...success. 60s Attempting to merge 6-1...success. 60s Attempting to merge 6-2...success. 60s Attempting to merge 6-3...success. 60s Attempting to merge 6-4...success. 60s Attempting to merge 6-5...success. 60s Attempting to merge 7-1...success. 60s Attempting to merge 7-2...success. 60s Attempting to merge 7-3...success. 60s Attempting to merge 7-4...success. 60s Attempting to merge 7-5...success. 60s Attempting to merge 8-1...success. 60s Attempting to merge 8-2...success. 60s Attempting to merge 8-3...success. 60s Attempting to merge 8-4...success. 60s Attempting to merge 8-5...success. 60s Merge is complete! 60s + git-imerge list 60s * a-b 60s + git-imerge diagram --commits --frontier --html=imerge4.html 60s 0 5 8 60s | | | 60s 0 - ********* - a 60s *........ 60s *........ 60s *........ 60s *........ 60s 5 - *........ 60s | 60s b 60s 60s 0 5 8 60s | | | 60s 0 - ********* - a 60s *.......| 60s *.......| 60s *.......| 60s *.......| 60s 5 - *-------+ 60s | 60s b 60s 60s Key: 60s |,-,+ = rectangles forming current merge frontier 60s * = merge done manually 60s . = merge done automatically 60s # = conflict that is currently blocking progress 60s @ = merge was blocked but has been resolved 60s ? = no merge recorded 60s 60s + git-imerge finish --branch=a-b-full 60s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 60s + local refname=a-b-full 60s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 60s + git rev-parse a-b-full^{tree} 60s py313: commands[1] /tmp/autopkgtest.ZvitK4/build.No0/src> /bin/sh t/test-conflicted 60s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 60s + dirname t/test-conflicted 60s + cd t 60s + pwd 60s + dirname /tmp/autopkgtest.ZvitK4/build.No0/src/t 60s + BASE=/tmp/autopkgtest.ZvitK4/build.No0/src 60s + . /tmp/autopkgtest.ZvitK4/build.No0/src/t/test-lib.sh 60s + GIT_IMERGE=git-imerge 60s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 60s + test_conflict 4-3 60s + local conflict=4-3 60s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s + DESCRIPTION=git-imerge test repository with conflict at 4-3 60s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 60s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s + local description=git-imerge test repository with conflict at 4-3 60s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 60s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s + local description=git-imerge test repository with conflict at 4-3 60s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s hint: Using 'master' as the name for the initial branch. This default branch name 60s hint: is subject to change. To configure the initial branch name to use in all 60s hint: of your new repositories, which will suppress this warning, call: 60s hint: 60s hint: git config --global init.defaultBranch 60s hint: 60s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 60s hint: 'development'. The just-created branch can be renamed via this command: 60s hint: 60s hint: git branch -m 60s hint: 60s hint: Disable this message with "git config set advice.defaultBranchName false" 60s + echo git-imerge test repository with conflict at 4-3 60s + printf %s\n /*.out /*.css /*.html 60s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3/.git config user.name Loú User 60s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3/.git/ 60s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 60s + TIME=1112911993 60s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-4-3 60s + modify c.txt 0 60s + filename=c.txt 60s + text=0 60s + echo 0 60s + git add c.txt 60s + modify d.txt 0 60s + filename=d.txt 60s + text=0 60s + echo 0 60s + git add d.txt 60s + modify conflict.txt original version 60s + filename=conflict.txt 60s + text=original version 60s + echo original version 60s + git add conflict.txt 60s + commit -m m⇒0 60s + TIME=1112911994 60s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 60s + git checkout -b c master -- 60s [master (root-commit) d70e04b] m⇒0 60s 3 files changed, 3 insertions(+) 60s create mode 100644 c.txt 60s create mode 100644 conflict.txt 60s create mode 100644 d.txt 60s Switched to a new branch 'c' 60s + seq 9 60s + modify c.txt 1 60s + filename=c.txt 60s + text=1 60s + echo 1 60s + git add c.txt 60s + commit -m c⇒1 60s + TIME=1112911995 60s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 60s + modify c.txt 2 60s + filename=c.txt 60s + text=2 60s + echo 2 60s + git add c.txt 60s [c 89e2141] c⇒1 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + commit -m c⇒2 60s + TIME=1112911996 60s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 60s + modify c.txt 3 60s + filename=c.txt 60s + text=3 60s [c 7c431f2] c⇒2 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + echo 3 60s + git add c.txt 60s + commit -m c⇒3 60s + TIME=1112911997 60s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 60s [c f02ab24] c⇒3 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + modify c.txt 4 60s + filename=c.txt 60s + text=4 60s + echo 4 60s + git add c.txt 60s + modify conflict.txt c version 60s + filename=conflict.txt 60s + text=c version 60s + echo c version 60s + git add conflict.txt 60s + commit -m c⇒4 60s + TIME=1112911998 60s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 60s [c 3c091de] c⇒4 60s 2 files changed, 2 insertions(+), 2 deletions(-) 60s + modify c.txt 5 60s + filename=c.txt 60s + text=5 60s + echo 5 60s + git add c.txt 60s + commit -m c⇒5 60s + TIME=1112911999 60s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 60s [c a0ac37a] c⇒5 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + modify c.txt 6 60s + filename=c.txt 60s + text=6 60s + echo 6 60s + git add c.txt 60s + commit -m c⇒6 60s + TIME=1112912000 60s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 60s [c ed9fdfa] c⇒6 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + modify c.txt 7 60s + filename=c.txt 60s + text=7 60s + echo 7 60s + git add c.txt 60s + commit -m c⇒7 60s + TIME=1112912001 60s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 60s + modify c.txt 8 60s + filename=c.txt 60s + text=8 60s + echo 8 60s + git add c.txt 60s [c 1da7bf5] c⇒7 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + commit -m c⇒8 60s + TIME=1112912002 60s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 60s [c d8de99f] c⇒8 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + modify c.txt 9 60s + filename=c.txt 60s + text=9 60s + echo 9 60s + git add c.txt 60s + commit -m c⇒9 60s + TIME=1112912003 60s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 60s [c 9cde605] c⇒9 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + git checkout -b d master -- 60s Switched to a new branch 'd' 60s + seq 6 60s + modify d.txt 1 60s + filename=d.txt 60s + text=1 60s + echo 1 60s + git add d.txt 60s + commit -m d⇒1 60s + TIME=1112912004 60s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 60s + modify d.txt 2 60s + filename=d.txt 60s + text=2 60s + echo 2 60s + git add d.txt 60s [d bd5368a] d⇒1 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + commit -m d⇒2 60s + TIME=1112912005 60s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 60s + modify d.txt 3 60s + filename=d.txt 60s + text=3 60s + echo 3 60s [d 93e27e6] d⇒2 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + git add d.txt 60s + modify conflict.txt d version 60s + filename=conflict.txt 60s + text=d version 60s + echo d version 60s + git add conflict.txt 60s + commit -m d⇒3 60s + TIME=1112912006 60s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 60s [d 2bb1a7e] d⇒3 60s 2 files changed, 2 insertions(+), 2 deletions(-) 60s + modify d.txt 4 60s + filename=d.txt 60s + text=4 60s + echo 4 60s + git add d.txt 60s + commit -m d⇒4 60s + TIME=1112912007 60s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 60s [d 81f9c80] d⇒4 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + modify d.txt 5 60s + filename=d.txt 60s + text=5 60s + echo 5 60s + git add d.txt 60s + commit -m d⇒5 60s + TIME=1112912008 60s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 60s + modify d.txt 6 60s + filename=d.txt 60s + text=6 60s + echo 6 60s + git add d.txt 60s [d 3690dde] d⇒5 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + commit -m d⇒6 60s + TIME=1112912009 60s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 60s [d 8085853] d⇒6 60s 1 file changed, 1 insertion(+), 1 deletion(-) 60s + git checkout c 60s Switched to branch 'c' 60s + git-imerge init --name=c-d d 60s + git-imerge list 60s * c-d 60s + git-imerge diagram --commits --frontier --html=imerge0.html 60s 0 5 9 60s | | | 60s 0 - ********** - c 60s *????????? 60s *????????? 60s *????????? 60s *????????? 60s 5 - *????????? 60s 6 - *????????? 60s | 60s d 60s 60s 0 5 9 60s | | | 60s 0 - ********** - c 60s *????????? 60s *????????? 60s *????????? 60s *????????? 60s 5 - *????????? 60s 6 - *????????? 60s | 60s d 60s 60s Key: 60s |,-,+ = rectangles forming current merge frontier 60s * = merge done manually 60s . = merge done automatically 60s # = conflict that is currently blocking progress 60s @ = merge was blocked but has been resolved 60s ? = no merge recorded 60s 60s + git-imerge autofill 60s + tee autofill.out 60s Attempting automerge of 9-6...failure. 60s Attempting automerge of 1-1...success. 60s Attempting automerge of 1-4...success. 60s Attempting automerge of 1-6...success. 60s Attempting automerge of 9-6...failure. 60s Attempting automerge of 5-6...failure. 60s Attempting automerge of 3-6...success. 60s Attempting automerge of 4-6...failure. 60s Attempting automerge of 4-1...success. 60s Attempting automerge of 4-4...failure. 60s Attempting automerge of 4-3...failure. 60s Attempting automerge of 4-2...success. 60s Attempting automerge of 9-2...success. 60s Autofilling 1-6...success. 60s Autofilling 2-6...success. 60s Autofilling 3-1...success. 60s Autofilling 3-2...success. 60s Autofilling 3-3...success. 60s Autofilling 3-4...success. 60s Autofilling 3-5...success. 60s Autofilling 3-6 (first way)...success. 60s Autofilling 3-6 (second way)...success. 60s The two ways of autofilling 3-6 agree. 60s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 60s Autofilling 4-2...success. 60s Autofilling 5-2...success. 60s Autofilling 6-2...success. 60s Autofilling 7-2...success. 60s Autofilling 8-2...success. 60s Autofilling 9-1...success. 60s Autofilling 9-2 (first way)...success. 60s Autofilling 9-2 (second way)...success. 60s The two ways of autofilling 9-2 agree. 60s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 60s Attempting automerge of 9-6...failure. 60s Attempting automerge of 4-3...failure. 60s HEAD is now at 9cde605 c⇒9 60s Conflict; suggest manual merge of 4-3 60s + grep -q Traceback autofill.out 60s + grep -q suggest manual merge of 4-3 autofill.out 60s + git-imerge diagram --commits --frontier --html=imerge1.html 61s 0 5 9 61s | | | 61s 0 - ********** - c 61s *??.?????. 61s *??....... 61s *??.#????? 61s *??.?????? 61s 5 - *??.?????? 61s 6 - *...?????? 61s | 61s d 61s 61s 0 5 9 61s | | | 61s 0 - ********** - c 61s *??.?????| 61s *??.-----+ 61s *??|#????? 61s *??|?????? 61s 5 - *??|?????? 61s 6 - *--+?????? 61s | 61s d 61s 61s Key: 61s |,-,+ = rectangles forming current merge frontier 61s * = merge done manually 61s . = merge done automatically 61s # = conflict that is currently blocking progress 61s @ = merge was blocked but has been resolved 61s ? = no merge recorded 61s 61s + git-imerge continue --edit 61s Switched to branch 'imerge/c-d' 61s Auto-merging conflict.txt 61s CONFLICT (content): Merge conflict in conflict.txt 61s Automatic merge failed; fix conflicts and then commit the result. 61s 61s Original first commit: 61s commit 3c091ded129a5edf9061360bab867edade996c93 61s Author: Loú User 61s Date: Thu Apr 7 22:13:18 2005 +0000 61s 61s c⇒4 61s 61s Original second commit: 61s 61s There was a conflict merging commit 4-3, shown above. 61s Please resolve the conflict, commit the result, then type 61s 61s git-imerge continue 61s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 61s Author: Loú User 61s Date: Thu Apr 7 22:13:26 2005 +0000 61s 61s d⇒3 61s + echo merged version 61s + git add conflict.txt 61s + git-imerge continue --no-edit 61s [imerge/c-d ca9eecc] imerge 'c-d': manual merge 4-3 61s Merge has been recorded for merge 4-3. 61s Attempting automerge of 4-6...success. 61s Autofilling 4-4...success. 61s Autofilling 4-5...success. 61s Autofilling 4-6...success. 61s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 61s Attempting automerge of 9-6...success. 61s Autofilling 5-6...success. 61s Autofilling 6-6...success. 61s Autofilling 7-6...success. 61s Autofilling 8-6...success. 61s Autofilling 9-3...success. 61s Autofilling 9-4...success. 61s Autofilling 9-5...success. 61s Autofilling 9-6 (first way)...success. 61s Autofilling 9-6 (second way)...success. 61s The two ways of autofilling 9-6 agree. 61s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 61s Merge is complete! 61s + git-imerge diagram --commits --frontier --html=imerge2.html 61s 0 5 9 61s | | | 61s 0 - ********** - c 61s *??.?????. 61s *??....... 61s *??.*????. 61s *??..????. 61s 5 - *??..????. 61s 6 - *......... 61s | 61s d 61s 61s 0 5 9 61s | | | 61s 0 - ********** - c 61s *??.?????| 61s *??......| 61s *??.*????| 61s *??..????| 61s 5 - *??..????| 61s 6 - *--------+ 61s | 61s d 61s 61s Key: 61s |,-,+ = rectangles forming current merge frontier 61s * = merge done manually 61s . = merge done automatically 61s # = conflict that is currently blocking progress 61s @ = merge was blocked but has been resolved 61s ? = no merge recorded 61s 61s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 61s Merge d into c (using imerge) 61s 61s # Please enter the commit message for your changes. Lines starting 61s # with '#' will be ignored, and an empty message aborts the commit. 61s # 61s # Date: Wed Dec 3 23:16:46 2025 +0000 61s # 61s # On branch c-d-merge 61s # Changes to be committed: 61s # modified: conflict.txt 61s # modified: d.txt 61s # 61s [c-d-merge b234147] Merge d into c (using imerge) 61s Date: Wed Dec 3 23:16:46 2025 +0000 61s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + local refname=c-d-merge 61s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git rev-parse c-d-merge^{tree} 61s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git-imerge simplify --goal=rebase --branch=c-d-rebase 61s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + local refname=c-d-rebase 61s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git rev-parse c-d-rebase^{tree} 61s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 61s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + local refname=c-d-rebase-with-history 61s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git rev-parse c-d-rebase-with-history^{tree} 61s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git-imerge simplify --goal=border --branch=c-d-border 61s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + local refname=c-d-border 61s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git rev-parse c-d-border^{tree} 61s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 61s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + local refname=c-d-border-with-history 61s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git rev-parse c-d-border-with-history^{tree} 61s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 61s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + local refname=c-d-border-with-history2 61s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git rev-parse c-d-border-with-history2^{tree} 61s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 61s + git-imerge remove 61s + git checkout c 61s Switched to branch 'c' 61s + + tee start.out 61s git-imerge start --goal=full --first-parent --name=c-d d 61s Attempting to merge 1-1...success. 61s Attempting to merge 1-2...success. 61s Attempting to merge 1-3...success. 61s Attempting to merge 1-4...success. 61s Attempting to merge 1-5...success. 61s Attempting to merge 1-6...success. 61s Attempting to merge 2-1...success. 62s Attempting to merge 2-2...success. 62s Attempting to merge 2-3...success. 62s Attempting to merge 2-4...success. 62s Attempting to merge 2-5...success. 62s Attempting to merge 2-6...success. 62s Attempting to merge 3-1...success. 62s Attempting to merge 3-2...success. 62s Attempting to merge 3-3...success. 62s Attempting to merge 3-4...success. 62s Attempting to merge 3-5...success. 62s Attempting to merge 3-6...success. 62s Attempting to merge 4-1...success. 62s Attempting to merge 4-2...success. 62s Attempting to merge 4-3...conflict. 62s Attempting to merge 5-1...success. 62s Attempting to merge 5-2...success. 62s Attempting to merge 6-1...success. 62s Attempting to merge 6-2...success. 62s Attempting to merge 7-1...success. 62s Attempting to merge 7-2...success. 62s Attempting to merge 8-1...success. 62s Attempting to merge 8-2...success. 62s Attempting to merge 9-1...success. 62s Attempting to merge 9-2...success. 62s Previous HEAD position was 6280dd1 imerge 'c-d': automatic merge 9-2 62s Switched to branch 'imerge/c-d' 62s Auto-merging conflict.txt 62s CONFLICT (content): Merge conflict in conflict.txt 62s Automatic merge failed; fix conflicts and then commit the result. 62s 62s Original first commit: 62s commit 3c091ded129a5edf9061360bab867edade996c93 62s Author: Loú User 62s Date: Thu Apr 7 22:13:18 2005 +0000 62s 62s c⇒4 62s 62s Original second commit: 62s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 62s Author: Loú User 62s Date: Thu Apr 7 22:13:26 2005 +0000 62s 62s d⇒3 62s 62s There was a conflict merging commit 4-3, shown above. 62s Please resolve the conflict, commit the result, then type 62s 62s git-imerge continue 62s + grep -q Traceback start.out 62s + grep -q suggest manual merge of 4-3 autofill.out 62s + git-imerge diagram --commits --frontier --html=imerge3.html 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *......... 62s *......... 62s *...#????? 62s *...?????? 62s 5 - *...?????? 62s 6 - *...?????? 62s | 62s d 62s 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *........| 62s *...-----+ 62s *..|#????? 62s *..|?????? 62s 5 - *..|?????? 62s 6 - *--+?????? 62s | 62s d 62s 62s Key: 62s |,-,+ = rectangles forming current merge frontier 62s * = merge done manually 62s . = merge done automatically 62s # = conflict that is currently blocking progress 62s @ = merge was blocked but has been resolved 62s ? = no merge recorded 62s 62s + echo merged version 62s + git add conflict.txt 62s + GIT_EDITOR=cat git commit 62s imerge 'c-d': manual merge 4-3 62s 62s # Conflicts: 62s # conflict.txt 62s # 62s # It looks like you may be committing a merge. 62s # If this is not correct, please run 62s # git update-ref -d MERGE_HEAD 62s # and try again. 62s 62s 62s # Please enter the commit message for your changes. Lines starting 62s # with '#' will be ignored, and an empty message aborts the commit. 62s # 62s # On branch imerge/c-d 62s # All conflicts fixed but you are still merging. 62s # 62s # Changes to be committed: 62s # modified: conflict.txt 62s # modified: d.txt 62s # 62s [imerge/c-d b59990a] imerge 'c-d': manual merge 4-3 62s + git-imerge continue --edit 62s Merge has been recorded for merge 4-3. 62s Attempting to merge 4-4...success. 62s Attempting to merge 4-5...success. 62s Attempting to merge 4-6...success. 62s Attempting to merge 5-3...success. 62s Attempting to merge 5-4...success. 62s Attempting to merge 5-5...success. 62s Attempting to merge 5-6...success. 62s Attempting to merge 6-3...success. 62s Attempting to merge 6-4...success. 62s Attempting to merge 6-5...success. 62s Attempting to merge 6-6...success. 62s Attempting to merge 7-3...success. 62s Attempting to merge 7-4...success. 62s Attempting to merge 7-5...success. 62s Attempting to merge 7-6...success. 62s Attempting to merge 8-3...success. 62s Attempting to merge 8-4...success. 62s Attempting to merge 8-5...success. 62s Attempting to merge 8-6...success. 62s Attempting to merge 9-3...success. 62s Attempting to merge 9-4...success. 62s Attempting to merge 9-5...success. 62s Attempting to merge 9-6...success. 62s Merge is complete! 62s + git-imerge diagram --commits --frontier --html=imerge4.html 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *......... 62s *......... 62s *...*..... 62s *......... 62s 5 - *......... 62s 6 - *......... 62s | 62s d 62s 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *........| 62s *........| 62s *...*....| 62s *........| 62s 5 - *........| 62s 6 - *--------+ 62s | 62s d 62s 62s Key: 62s |,-,+ = rectangles forming current merge frontier 62s * = merge done manually 62s . = merge done automatically 62s # = conflict that is currently blocking progress 62s @ = merge was blocked but has been resolved 62s ? = no merge recorded 62s 62s + git-imerge finish --branch=c-d-full 62s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 62s + local refname=c-d-full 62s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 62s + git rev-parse c-d-full^{tree} 62s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 62s + test_conflict 1-1 62s + local conflict=1-1 62s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s + DESCRIPTION=git-imerge test repository with conflict at 1-1 62s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 62s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s + local description=git-imerge test repository with conflict at 1-1 62s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 62s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s + local description=git-imerge test repository with conflict at 1-1 62s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s hint: Using 'master' as the name for the initial branch. This default branch name 62s hint: is subject to change. To configure the initial branch name to use in all 62s hint: of your new repositories, which will suppress this warning, call: 62s hint: 62s hint: git config --global init.defaultBranch 62s hint: 62s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 62s hint: 'development'. The just-created branch can be renamed via this command: 62s hint: 62s hint: git branch -m 62s hint: 62s hint: Disable this message with "git config set advice.defaultBranchName false" 62s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1/.git/ 62s + echo git-imerge test repository with conflict at 1-1 62s + printf %s\n /*.out /*.css /*.html 62s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1/.git config user.name Loú User 62s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 62s + TIME=1112911993 62s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-1 62s + modify c.txt 0 62s + filename=c.txt 62s + text=0 62s + echo 0 62s + git add c.txt 62s + modify d.txt 0 62s + filename=d.txt 62s + text=0 62s + echo 0 62s + git add d.txt 62s + modify conflict.txt original version 62s + filename=conflict.txt 62s + text=original version 62s + echo original version 62s + git add conflict.txt 62s + commit -m m⇒0 62s + TIME=1112911994 62s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 62s + git checkout -b c master -- 62s [master (root-commit) d70e04b] m⇒0 62s 3 files changed, 3 insertions(+) 62s create mode 100644 c.txt 62s create mode 100644 conflict.txt 62s create mode 100644 d.txt 62s Switched to a new branch 'c' 62s + seq 9 62s + modify c.txt 1 62s + filename=c.txt 62s + text=1 62s + echo 1 62s + git add c.txt 62s + modify conflict.txt c version 62s + filename=conflict.txt 62s + text=c version 62s + echo c version 62s + git add conflict.txt 62s + commit -m c⇒1 62s + TIME=1112911995 62s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 62s [c 2120f40] c⇒1 62s 2 files changed, 2 insertions(+), 2 deletions(-) 62s + modify c.txt 2 62s + filename=c.txt 62s + text=2 62s + echo 2 62s + git add c.txt 62s + commit -m c⇒2 62s + TIME=1112911996 62s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 62s [c 90cc7de] c⇒2 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify c.txt 3 62s + filename=c.txt 62s + text=3 62s + echo 3 62s + git add c.txt 62s + commit -m c⇒3 62s + TIME=1112911997 62s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 62s [c 2046ed2] c⇒3 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify c.txt 4 62s + filename=c.txt 62s + text=4 62s + echo 4 62s + git add c.txt 62s + commit -m c⇒4 62s + TIME=1112911998 62s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 62s [c 8a2cee9] c⇒4 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify c.txt 5 62s + filename=c.txt 62s + text=5 62s + echo 5 62s + git add c.txt 62s + commit -m c⇒5 62s + TIME=1112911999 62s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 62s [c ac16a05] c⇒5 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify c.txt 6 62s + filename=c.txt 62s + text=6 62s + echo 6 62s + git add c.txt 62s + commit -m c⇒6 62s + TIME=1112912000 62s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 62s [c 30dd2ae] c⇒6 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify c.txt 7 62s + filename=c.txt 62s + text=7 62s + echo 7 62s + git add c.txt 62s + commit -m c⇒7 62s + TIME=1112912001 62s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 62s [c 0883eb9] c⇒7 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify c.txt 8 62s + filename=c.txt 62s + text=8 62s + echo 8 62s + git add c.txt 62s + commit -m c⇒8 62s + TIME=1112912002 62s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 62s [c f661c06] c⇒8 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify c.txt 9 62s + filename=c.txt 62s + text=9 62s + echo 9 62s + git add c.txt 62s + commit -m c⇒9 62s + TIME=1112912003 62s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 62s + git checkout -b d master -- 62s [c 243e8ed] c⇒9 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s Switched to a new branch 'd' 62s + seq 6 62s + modify d.txt 1 62s + filename=d.txt 62s + text=1 62s + echo 1 62s + git add d.txt 62s + modify conflict.txt d version 62s + filename=conflict.txt 62s + text=d version 62s + echo d version 62s + git add conflict.txt 62s + commit -m d⇒1 62s + TIME=1112912004 62s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 62s [d ac0427a] d⇒1 62s 2 files changed, 2 insertions(+), 2 deletions(-) 62s + modify d.txt 2 62s + filename=d.txt 62s + text=2 62s + echo 2 62s + git add d.txt 62s + commit -m d⇒2 62s + TIME=1112912005 62s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 62s [d 43c38c0] d⇒2 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify d.txt 3 62s + filename=d.txt 62s + text=3 62s + echo 3 62s + git add d.txt 62s + commit -m d⇒3 62s + TIME=1112912006 62s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 62s [d 0260058] d⇒3 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify d.txt 4 62s + filename=d.txt 62s + text=4 62s + echo 4 62s + git add d.txt 62s + commit -m d⇒4 62s + TIME=1112912007 62s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 62s [d 40fef44] d⇒4 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify d.txt 5 62s + filename=d.txt 62s + text=5 62s + echo 5 62s + git add d.txt 62s + commit -m d⇒5 62s + TIME=1112912008 62s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 62s [d b080a65] d⇒5 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + modify d.txt 6 62s + filename=d.txt 62s + text=6 62s + echo 6 62s + git add d.txt 62s + commit -m d⇒6 62s + TIME=1112912009 62s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 62s [d 200ce5c] d⇒6 62s 1 file changed, 1 insertion(+), 1 deletion(-) 62s + git checkout c 62s Switched to branch 'c' 62s + git-imerge init --name=c-d d 62s + git-imerge list 62s * c-d 62s + git-imerge diagram --commits --frontier --html=imerge0.html 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *????????? 62s *????????? 62s *????????? 62s *????????? 62s 5 - *????????? 62s 6 - *????????? 62s | 62s d 62s 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *????????? 62s *????????? 62s *????????? 62s *????????? 62s 5 - *????????? 62s 6 - *????????? 62s | 62s d 62s 62s Key: 62s |,-,+ = rectangles forming current merge frontier 62s * = merge done manually 62s . = merge done automatically 62s # = conflict that is currently blocking progress 62s @ = merge was blocked but has been resolved 62s ? = no merge recorded 62s 62s + git-imerge autofill 62s + tee autofill.out 62s Attempting automerge of 9-6...failure. 62s Attempting automerge of 1-1...failure. 62s HEAD is now at 243e8ed c⇒9 62s No progress was possible; suggest manual merge of 1-1 62s + grep -q Traceback autofill.out 62s + grep -q suggest manual merge of 1-1 autofill.out 62s + git-imerge diagram --commits --frontier --html=imerge1.html 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *#???????? 62s *????????? 62s *????????? 62s *????????? 62s 5 - *????????? 62s 6 - *????????? 62s | 62s d 62s 62s 0 5 9 62s | | | 62s 0 - ********** - c 62s *#???????? 62s *????????? 62s *????????? 62s *????????? 62s 5 - *????????? 62s 6 - *????????? 62s | 62s d 62s 62s Key: 62s |,-,+ = rectangles forming current merge frontier 62s * = merge done manually 62s . = merge done automatically 62s # = conflict that is currently blocking progress 62s @ = merge was blocked but has been resolved 62s ? = no merge recorded 62s 62s + git-imerge continue --edit 63s Switched to branch 'imerge/c-d' 63s Auto-merging conflict.txt 63s CONFLICT (content): Merge conflict in conflict.txt 63s Automatic merge failed; fix conflicts and then commit the result. 63s 63s Original first commit: 63s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 63s Author: Loú User 63s Date: Thu Apr 7 22:13:15 2005 +0000 63s 63s c⇒1 63s 63s Original second commit: 63s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 63s Author: Loú User 63s Date: Thu Apr 7 22:13:24 2005 +0000 63s 63s d⇒1 63s 63s There was a conflict merging commit 1-1, shown above. 63s Please resolve the conflict, commit the result, then type 63s 63s git-imerge continue 63s + echo merged version 63s + git add conflict.txt 63s + git-imerge continue --no-edit 63s [imerge/c-d 0816b43] imerge 'c-d': manual merge 1-1 63s Merge has been recorded for merge 1-1. 63s Attempting automerge of 1-6...success. 63s Autofilling 1-2...success. 63s Autofilling 1-3...success. 63s Autofilling 1-4...success. 63s Autofilling 1-5...success. 63s Autofilling 1-6...success. 63s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 63s Attempting automerge of 9-6...success. 63s Autofilling 2-6...success. 63s Autofilling 3-6...success. 63s Autofilling 4-6...success. 63s Autofilling 5-6...success. 63s Autofilling 6-6...success. 63s Autofilling 7-6...success. 63s Autofilling 8-6...success. 63s Autofilling 9-1...success. 63s Autofilling 9-2...success. 63s Autofilling 9-3...success. 63s Autofilling 9-4...success. 63s Autofilling 9-5...success. 63s Autofilling 9-6 (first way)...success. 63s Autofilling 9-6 (second way)...success. 63s The two ways of autofilling 9-6 agree. 63s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 63s Merge is complete! 63s + git-imerge diagram --commits --frontier --html=imerge2.html 63s 0 5 9 63s | | | 63s 0 - ********** - c 63s **???????. 63s *.???????. 63s *.???????. 63s *.???????. 63s 5 - *.???????. 63s 6 - *......... 63s | 63s d 63s 63s 0 5 9 63s | | | 63s 0 - ********** - c 63s **???????| 63s *.???????| 63s *.???????| 63s *.???????| 63s 5 - *.???????| 63s 6 - *--------+ 63s | 63s d 63s 63s Key: 63s |,-,+ = rectangles forming current merge frontier 63s * = merge done manually 63s . = merge done automatically 63s # = conflict that is currently blocking progress 63s @ = merge was blocked but has been resolved 63s ? = no merge recorded 63s 63s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 63s Merge d into c (using imerge) 63s 63s # Please enter the commit message for your changes. Lines starting 63s # with '#' will be ignored, and an empty message aborts the commit. 63s # 63s # Date: Wed Dec 3 23:16:48 2025 +0000 63s # 63s # On branch c-d-merge 63s # Changes to be committed: 63s # modified: conflict.txt 63s # modified: d.txt 63s # 63s [c-d-merge 3cf85a3] Merge d into c (using imerge) 63s Date: Wed Dec 3 23:16:48 2025 +0000 63s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + local refname=c-d-merge 63s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git rev-parse c-d-merge^{tree} 63s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git-imerge simplify --goal=rebase --branch=c-d-rebase 63s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + local refname=c-d-rebase 63s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git rev-parse c-d-rebase^{tree} 63s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 63s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + local refname=c-d-rebase-with-history 63s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git rev-parse c-d-rebase-with-history^{tree} 63s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git-imerge simplify --goal=border --branch=c-d-border 63s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + local refname=c-d-border 63s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git rev-parse c-d-border^{tree} 63s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 63s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + local refname=c-d-border-with-history 63s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git rev-parse c-d-border-with-history^{tree} 63s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 63s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + local refname=c-d-border-with-history2 63s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git rev-parse c-d-border-with-history2^{tree} 63s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 63s + git-imerge remove 63s + git checkout c 63s Switched to branch 'c' 63s + + tee start.out 63s git-imerge start --goal=full --first-parent --name=c-d d 63s Attempting to merge 1-1...conflict. 63s Switched to branch 'imerge/c-d' 63s Auto-merging conflict.txt 63s CONFLICT (content): Merge conflict in conflict.txt 63s Automatic merge failed; fix conflicts and then commit the result. 63s 63s Original first commit: 63s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 63s Author: Loú User 63s Date: Thu Apr 7 22:13:15 2005 +0000 63s 63s c⇒1 63s 63s Original second commit: 63s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 63s Author: Loú User 63s Date: Thu Apr 7 22:13:24 2005 +0000 63s 63s d⇒1 63s 63s There was a conflict merging commit 1-1, shown above. 63s Please resolve the conflict, commit the result, then type 63s 63s git-imerge continue 63s + grep -q Traceback start.out 63s + grep -q suggest manual merge of 1-1 autofill.out 63s + git-imerge diagram --commits --frontier --html=imerge3.html 64s 0 5 9 64s | | | 64s 0 - ********** - c 64s *#???????? 64s *????????? 64s *????????? 64s *????????? 64s 5 - *????????? 64s 6 - *????????? 64s | 64s d 64s 64s 0 5 9 64s | | | 64s 0 - ********** - c 64s *#???????? 64s *????????? 64s *????????? 64s *????????? 64s 5 - *????????? 64s 6 - *????????? 64s | 64s d 64s 64s Key: 64s |,-,+ = rectangles forming current merge frontier 64s * = merge done manually 64s . = merge done automatically 64s # = conflict that is currently blocking progress 64s @ = merge was blocked but has been resolved 64s ? = no merge recorded 64s 64s + echo merged version 64s + git add conflict.txt 64s + GIT_EDITOR=cat git commit 64s imerge 'c-d': manual merge 1-1 64s 64s # Conflicts: 64s # conflict.txt 64s # 64s # It looks like you may be committing a merge. 64s # If this is not correct, please run 64s # git update-ref -d MERGE_HEAD 64s # and try again. 64s 64s 64s # Please enter the commit message for your changes. Lines starting 64s # with '#' will be ignored, and an empty message aborts the commit. 64s # 64s # On branch imerge/c-d 64s # All conflicts fixed but you are still merging. 64s # 64s # Changes to be committed: 64s # modified: conflict.txt 64s # modified: d.txt 64s # 64s [imerge/c-d b134817] imerge 'c-d': manual merge 1-1 64s + git-imerge continue --edit 64s Merge has been recorded for merge 1-1. 64s Attempting to merge 1-2...success. 64s Attempting to merge 1-3...success. 64s Attempting to merge 1-4...success. 64s Attempting to merge 1-5...success. 64s Attempting to merge 1-6...success. 64s Attempting to merge 2-1...success. 64s Attempting to merge 2-2...success. 64s Attempting to merge 2-3...success. 64s Attempting to merge 2-4...success. 64s Attempting to merge 2-5...success. 64s Attempting to merge 2-6...success. 64s Attempting to merge 3-1...success. 64s Attempting to merge 3-2...success. 64s Attempting to merge 3-3...success. 64s Attempting to merge 3-4...success. 64s Attempting to merge 3-5...success. 64s Attempting to merge 3-6...success. 64s Attempting to merge 4-1...success. 64s Attempting to merge 4-2...success. 64s Attempting to merge 4-3...success. 64s Attempting to merge 4-4...success. 64s Attempting to merge 4-5...success. 64s Attempting to merge 4-6...success. 64s Attempting to merge 5-1...success. 64s Attempting to merge 5-2...success. 64s Attempting to merge 5-3...success. 64s Attempting to merge 5-4...success. 64s Attempting to merge 5-5...success. 64s Attempting to merge 5-6...success. 64s Attempting to merge 6-1...success. 64s Attempting to merge 6-2...success. 64s Attempting to merge 6-3...success. 64s Attempting to merge 6-4...success. 64s Attempting to merge 6-5...success. 64s Attempting to merge 6-6...success. 64s Attempting to merge 7-1...success. 64s Attempting to merge 7-2...success. 64s Attempting to merge 7-3...success. 64s Attempting to merge 7-4...success. 64s Attempting to merge 7-5...success. 64s Attempting to merge 7-6...success. 64s Attempting to merge 8-1...success. 64s Attempting to merge 8-2...success. 64s Attempting to merge 8-3...success. 64s Attempting to merge 8-4...success. 64s Attempting to merge 8-5...success. 64s Attempting to merge 8-6...success. 64s Attempting to merge 9-1...success. 64s Attempting to merge 9-2...success. 64s Attempting to merge 9-3...success. 64s Attempting to merge 9-4...success. 64s Attempting to merge 9-5...success. 64s Attempting to merge 9-6...success. 64s Merge is complete! 64s + git-imerge diagram --commits --frontier --html=imerge4.html 64s 0 5 9 64s | | | 64s 0 - ********** - c 64s **........ 64s *......... 64s *......... 64s *......... 64s 5 - *......... 64s 6 - *......... 64s | 64s d 64s 64s 0 5 9 64s | | | 64s 0 - ********** - c 64s **.......| 64s *........| 64s *........| 64s *........| 64s 5 - *........| 64s 6 - *--------+ 64s | 64s d 64s 64s Key: 64s |,-,+ = rectangles forming current merge frontier 64s * = merge done manually 64s . = merge done automatically 64s # = conflict that is currently blocking progress 64s @ = merge was blocked but has been resolved 64s ? = no merge recorded 64s 64s + git-imerge finish --branch=c-d-full 64s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 64s + local refname=c-d-full 64s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 64s + git rev-parse c-d-full^{tree} 64s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 64s + test_conflict 9-1 64s + local conflict=9-1 64s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s + DESCRIPTION=git-imerge test repository with conflict at 9-1 64s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 64s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s + local description=git-imerge test repository with conflict at 9-1 64s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 64s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s + local description=git-imerge test repository with conflict at 9-1 64s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s hint: Using 'master' as the name for the initial branch. This default branch name 64s hint: is subject to change. To configure the initial branch name to use in all 64s hint: of your new repositories, which will suppress this warning, call: 64s hint: 64s hint: git config --global init.defaultBranch 64s hint: 64s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 64s hint: 'development'. The just-created branch can be renamed via this command: 64s hint: 64s hint: git branch -m 64s hint: 64s hint: Disable this message with "git config set advice.defaultBranchName false" 64s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1/.git/ 64s + echo git-imerge test repository with conflict at 9-1 64s + printf %s\n /*.out /*.css /*.html 64s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1/.git config user.name Loú User 64s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 64s + TIME=1112911993 64s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-1 64s + modify c.txt 0 64s + filename=c.txt 64s + text=0 64s + echo 0 64s + git add c.txt 64s + modify d.txt 0 64s + filename=d.txt 64s + text=0 64s + echo 0 64s + git add d.txt 64s + modify conflict.txt original version 64s + filename=conflict.txt 64s + text=original version 64s + echo original version 64s + git add conflict.txt 64s + commit -m m⇒0 64s + TIME=1112911994 64s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 64s [master (root-commit) d70e04b] m⇒0 64s 3 files changed, 3 insertions(+) 64s create mode 100644 c.txt 64s create mode 100644 conflict.txt 64s create mode 100644 d.txt 64s + git checkout -b c master -- 64s Switched to a new branch 'c' 64s + seq 9 64s + modify c.txt 1 64s + filename=c.txt 64s + text=1 64s + echo 1 64s + git add c.txt 64s + commit -m c⇒1 64s + TIME=1112911995 64s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 64s [c 89e2141] c⇒1 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify c.txt 2 64s + filename=c.txt 64s + text=2 64s + echo 2 64s + git add c.txt 64s + commit -m c⇒2 64s + TIME=1112911996 64s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 64s + modify c.txt 3 64s + filename=c.txt 64s + text=3 64s [c 7c431f2] c⇒2 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + echo 3 64s + git add c.txt 64s + commit -m c⇒3 64s + TIME=1112911997 64s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 64s [c f02ab24] c⇒3 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify c.txt 4 64s + filename=c.txt 64s + text=4 64s + echo 4 64s + git add c.txt 64s + commit -m c⇒4 64s + TIME=1112911998 64s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 64s + modify c.txt 5 64s + filename=c.txt 64s + text=5 64s + echo 5 64s + git add c.txt 64s [c ed9122f] c⇒4 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + commit -m c⇒5 64s + TIME=1112911999 64s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 64s [c 1d3bf09] c⇒5 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify c.txt 6 64s + filename=c.txt 64s + text=6 64s + echo 6 64s + git add c.txt 64s + commit -m c⇒6 64s + TIME=1112912000 64s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 64s [c f999ecd] c⇒6 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify c.txt 7 64s + filename=c.txt 64s + text=7 64s + echo 7 64s + git add c.txt 64s + commit -m c⇒7 64s + TIME=1112912001 64s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 64s [c 7050a8a] c⇒7 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify c.txt 8 64s + filename=c.txt 64s + text=8 64s + echo 8 64s + git add c.txt 64s + commit -m c⇒8 64s + TIME=1112912002 64s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 64s [c 9732e77] c⇒8 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify c.txt 9 64s + filename=c.txt 64s + text=9 64s + echo 9 64s + git add c.txt 64s + modify conflict.txt c version 64s + filename=conflict.txt 64s + text=c version 64s + echo c version 64s + git add conflict.txt 64s + commit -m c⇒9 64s + TIME=1112912003 64s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 64s [c 73a5eed] c⇒9 64s 2 files changed, 2 insertions(+), 2 deletions(-) 64s + git checkout -b d master -- 64s Switched to a new branch 'd' 64s + seq 6 64s + modify d.txt 1 64s + filename=d.txt 64s + text=1 64s + echo 1 64s + git add d.txt 64s + modify conflict.txt d version 64s + filename=conflict.txt 64s + text=d version 64s + echo d version 64s + git add conflict.txt 64s + commit -m d⇒1 64s + TIME=1112912004 64s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 64s [d ac0427a] d⇒1 64s 2 files changed, 2 insertions(+), 2 deletions(-) 64s + modify d.txt 2 64s + filename=d.txt 64s + text=2 64s + echo 2 64s + git add d.txt 64s + commit -m d⇒2 64s + TIME=1112912005 64s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 64s + modify d.txt 3 64s + filename=d.txt 64s + text=3 64s + echo 3 64s + git add d.txt 64s [d 43c38c0] d⇒2 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + commit -m d⇒3 64s + TIME=1112912006 64s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 64s [d 0260058] d⇒3 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify d.txt 4 64s + filename=d.txt 64s + text=4 64s + echo 4 64s + git add d.txt 64s + commit -m d⇒4 64s + TIME=1112912007 64s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 64s + modify d.txt 5 64s + filename=d.txt 64s + text=5 64s + echo 5 64s + git add d.txt 64s [d 40fef44] d⇒4 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + commit -m d⇒5 64s + TIME=1112912008 64s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 64s [d b080a65] d⇒5 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s + modify d.txt 6 64s + filename=d.txt 64s + text=6 64s + echo 6 64s + git add d.txt 64s + commit -m d⇒6 64s + TIME=1112912009 64s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 64s + git checkout c 64s [d 200ce5c] d⇒6 64s 1 file changed, 1 insertion(+), 1 deletion(-) 64s Switched to branch 'c' 64s + git-imerge init --name=c-d d 64s + git-imerge list 64s * c-d 64s + git-imerge diagram --commits --frontier --html=imerge0.html 64s 0 5 9 64s | | | 64s 0 - ********** - c 64s *????????? 64s *????????? 64s *????????? 64s *????????? 64s 5 - *????????? 64s 6 - *????????? 64s | 64s d 64s 64s 0 5 9 64s | | | 64s 0 - ********** - c 64s *????????? 64s *????????? 64s *????????? 64s *????????? 64s 5 - *????????? 64s 6 - *????????? 64s | 64s d 64s 64s Key: 64s |,-,+ = rectangles forming current merge frontier 64s * = merge done manually 64s . = merge done automatically 64s # = conflict that is currently blocking progress 64s @ = merge was blocked but has been resolved 64s ? = no merge recorded 64s 64s + git-imerge autofill 64s + tee autofill.out 64s Attempting automerge of 9-6...failure. 64s Attempting automerge of 1-1...success. 64s Attempting automerge of 1-4...success. 64s Attempting automerge of 1-6...success. 64s Attempting automerge of 9-6...failure. 64s Attempting automerge of 5-6...success. 64s Attempting automerge of 7-6...success. 64s Attempting automerge of 8-6...success. 64s Attempting automerge of 9-1...failure. 64s Autofilling 1-6...success. 64s Autofilling 2-6...success. 64s Autofilling 3-6...success. 64s Autofilling 4-6...success. 65s Autofilling 5-6...success. 65s Autofilling 6-6...success. 65s Autofilling 7-6...success. 65s Autofilling 8-1...success. 65s Autofilling 8-2...success. 65s Autofilling 8-3...success. 65s Autofilling 8-4...success. 65s Autofilling 8-5...success. 65s Autofilling 8-6 (first way)...success. 65s Autofilling 8-6 (second way)...success. 65s The two ways of autofilling 8-6 agree. 65s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 65s Attempting automerge of 9-6...failure. 65s Attempting automerge of 9-1...failure. 65s HEAD is now at 73a5eed c⇒9 65s Conflict; suggest manual merge of 9-1 65s + grep -q Traceback autofill.out 65s + grep -q suggest manual merge of 9-1 autofill.out 65s + git-imerge diagram --commits --frontier --html=imerge1.html 65s 0 5 9 65s | | | 65s 0 - ********** - c 65s *???????.# 65s *???????.? 65s *???????.? 65s *???????.? 65s 5 - *???????.? 65s 6 - *........? 65s | 65s d 65s 65s 0 5 9 65s | | | 65s 0 - ********** - c 65s *???????|# 65s *???????|? 65s *???????|? 65s *???????|? 65s 5 - *???????|? 65s 6 - *-------+? 65s | 65s d 65s 65s Key: 65s |,-,+ = rectangles forming current merge frontier 65s * = merge done manually 65s . = merge done automatically 65s # = conflict that is currently blocking progress 65s @ = merge was blocked but has been resolved 65s ? = no merge recorded 65s 65s + git-imerge continue --edit 65s Switched to branch 'imerge/c-d' 65s Auto-merging conflict.txt 65s CONFLICT (content): Merge conflict in conflict.txt 65s Automatic merge failed; fix conflicts and then commit the result. 65s 65s Original first commit: 65s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 65s Author: Loú User 65s Date: Thu Apr 7 22:13:23 2005 +0000 65s 65s c⇒9 65s 65s Original second commit: 65s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 65s Author: Loú User 65s Date: Thu Apr 7 22:13:24 2005 +0000 65s 65s d⇒1 65s 65s There was a conflict merging commit 9-1, shown above. 65s Please resolve the conflict, commit the result, then type 65s 65s git-imerge continue 65s + echo merged version 65s + git add conflict.txt 65s + git-imerge continue --no-edit 65s [imerge/c-d f1dfd86] imerge 'c-d': manual merge 9-1 65s Merge has been recorded for merge 9-1. 65s Attempting automerge of 9-6...success. 65s Autofilling 9-2...success. 65s Autofilling 9-3...success. 65s Autofilling 9-4...success. 65s Autofilling 9-5...success. 65s Autofilling 9-6...success. 65s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 65s Merge is complete! 65s + git-imerge diagram --commits --frontier --html=imerge2.html 65s 0 5 9 65s | | | 65s 0 - ********** - c 65s *???????.* 65s *???????.. 65s *???????.. 65s *???????.. 65s 5 - *???????.. 65s 6 - *......... 65s | 65s d 65s 65s 0 5 9 65s | | | 65s 0 - ********** - c 65s *???????.* 65s *???????.| 65s *???????.| 65s *???????.| 65s 5 - *???????.| 65s 6 - *--------+ 65s | 65s d 65s 65s Key: 65s |,-,+ = rectangles forming current merge frontier 65s * = merge done manually 65s . = merge done automatically 65s # = conflict that is currently blocking progress 65s @ = merge was blocked but has been resolved 65s ? = no merge recorded 65s 65s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 65s Merge d into c (using imerge) 65s 65s # Please enter the commit message for your changes. Lines starting 65s # with '#' will be ignored, and an empty message aborts the commit. 65s # 65s # Date: Wed Dec 3 23:16:50 2025 +0000 65s # 65s # On branch c-d-merge 65s # Changes to be committed: 65s # modified: conflict.txt 65s # modified: d.txt 65s # 65s [c-d-merge 09db21d] Merge d into c (using imerge) 65s Date: Wed Dec 3 23:16:50 2025 +0000 65s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + local refname=c-d-merge 65s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git rev-parse c-d-merge^{tree} 65s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git-imerge simplify --goal=rebase --branch=c-d-rebase 65s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + local refname=c-d-rebase 65s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git rev-parse c-d-rebase^{tree} 65s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 65s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + local refname=c-d-rebase-with-history 65s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git rev-parse c-d-rebase-with-history^{tree} 65s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git-imerge simplify --goal=border --branch=c-d-border 65s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + local refname=c-d-border 65s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git rev-parse c-d-border^{tree} 65s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 65s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + local refname=c-d-border-with-history 65s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git rev-parse c-d-border-with-history^{tree} 65s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 65s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + local refname=c-d-border-with-history2 65s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git rev-parse c-d-border-with-history2^{tree} 65s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 65s + git-imerge remove 65s + git checkout c 65s Switched to branch 'c' 65s + git-imerge start --goal=full --first-parent --name=c-d d 65s + tee start.out 65s Attempting to merge 1-1...success. 65s Attempting to merge 1-2...success. 66s Attempting to merge 1-3...success. 66s Attempting to merge 1-4...success. 66s Attempting to merge 1-5...success. 66s Attempting to merge 1-6...success. 66s Attempting to merge 2-1...success. 66s Attempting to merge 2-2...success. 66s Attempting to merge 2-3...success. 66s Attempting to merge 2-4...success. 66s Attempting to merge 2-5...success. 66s Attempting to merge 2-6...success. 66s Attempting to merge 3-1...success. 66s Attempting to merge 3-2...success. 66s Attempting to merge 3-3...success. 66s Attempting to merge 3-4...success. 66s Attempting to merge 3-5...success. 66s Attempting to merge 3-6...success. 66s Attempting to merge 4-1...success. 66s Attempting to merge 4-2...success. 66s Attempting to merge 4-3...success. 66s Attempting to merge 4-4...success. 66s Attempting to merge 4-5...success. 66s Attempting to merge 4-6...success. 66s Attempting to merge 5-1...success. 66s Attempting to merge 5-2...success. 66s Attempting to merge 5-3...success. 66s Attempting to merge 5-4...success. 66s Attempting to merge 5-5...success. 66s Attempting to merge 5-6...success. 66s Attempting to merge 6-1...success. 66s Attempting to merge 6-2...success. 66s Attempting to merge 6-3...success. 66s Attempting to merge 6-4...success. 66s Attempting to merge 6-5...success. 66s Attempting to merge 6-6...success. 66s Attempting to merge 7-1...success. 66s Attempting to merge 7-2...success. 66s Attempting to merge 7-3...success. 66s Attempting to merge 7-4...success. 66s Attempting to merge 7-5...success. 66s Attempting to merge 7-6...success. 66s Attempting to merge 8-1...success. 66s Attempting to merge 8-2...success. 66s Attempting to merge 8-3...success. 66s Attempting to merge 8-4...success. 66s Attempting to merge 8-5...success. 66s Attempting to merge 8-6...success. 66s Attempting to merge 9-1...conflict. 66s Switched to branch 'imerge/c-d' 66s Auto-merging conflict.txt 66s CONFLICT (content): Merge conflict in conflict.txt 66s Automatic merge failed; fix conflicts and then commit the result. 66s 66s Original first commit: 66s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 66s Author: Loú User 66s Date: Thu Apr 7 22:13:23 2005 +0000 66s 66s c⇒9 66s 66s Original second commit: 66s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 66s Author: Loú User 66s Date: Thu Apr 7 22:13:24 2005 +0000 66s 66s d⇒1 66s 66s There was a conflict merging commit 9-1, shown above. 66s Please resolve the conflict, commit the result, then type 66s 66s git-imerge continue 66s + grep -q Traceback start.out 66s + grep -q suggest manual merge of 9-1 autofill.out 66s + git-imerge diagram --commits --frontier --html=imerge3.html 66s 0 5 9 66s | | | 66s 0 - ********** - c 66s *........# 66s *........? 66s *........? 66s *........? 66s 5 - *........? 66s 6 - *........? 66s | 66s d 66s 66s 0 5 9 66s | | | 66s 0 - ********** - c 66s *.......|# 66s *.......|? 66s *.......|? 66s *.......|? 66s 5 - *.......|? 66s 6 - *-------+? 66s | 66s d 66s 66s Key: 66s |,-,+ = rectangles forming current merge frontier 66s * = merge done manually 66s . = merge done automatically 66s # = conflict that is currently blocking progress 66s @ = merge was blocked but has been resolved 66s ? = no merge recorded 66s 66s + echo merged version 66s + git add conflict.txt 66s + GIT_EDITOR=cat git commit 66s imerge 'c-d': manual merge 9-1 66s 66s # Conflicts: 66s # conflict.txt 66s # 66s # It looks like you may be committing a merge. 66s # If this is not correct, please run 66s # git update-ref -d MERGE_HEAD 66s # and try again. 66s 66s 66s # Please enter the commit message for your changes. Lines starting 66s # with '#' will be ignored, and an empty message aborts the commit. 66s # 66s # On branch imerge/c-d 66s # All conflicts fixed but you are still merging. 66s # 66s # Changes to be committed: 66s # modified: conflict.txt 66s # modified: d.txt 66s # 66s [imerge/c-d cd07029] imerge 'c-d': manual merge 9-1 66s + git-imerge continue --edit 66s Merge has been recorded for merge 9-1. 66s Attempting to merge 9-2...success. 66s Attempting to merge 9-3...success. 66s Attempting to merge 9-4...success. 66s Attempting to merge 9-5...success. 66s Attempting to merge 9-6...success. 66s Merge is complete! 66s + git-imerge diagram --commits --frontier --html=imerge4.html 66s 0 5 9 66s | | | 66s 0 - ********** - c 66s *........* 66s *......... 66s *......... 66s *......... 66s 5 - *......... 66s 6 - *......... 66s | 66s d 66s 66s 0 5 9 66s | | | 66s 0 - ********** - c 66s *........* 66s *........| 66s *........| 66s *........| 66s 5 - *........| 66s 6 - *--------+ 66s | 66s d 66s 66s Key: 66s |,-,+ = rectangles forming current merge frontier 66s * = merge done manually 66s . = merge done automatically 66s # = conflict that is currently blocking progress 66s @ = merge was blocked but has been resolved 66s ? = no merge recorded 66s 66s + git-imerge finish --branch=c-d-full 66s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 66s + local refname=c-d-full 66s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 66s + git rev-parse c-d-full^{tree} 66s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 66s + test_conflict 1-6 66s + local conflict=1-6 66s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s + DESCRIPTION=git-imerge test repository with conflict at 1-6 66s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 66s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s + local description=git-imerge test repository with conflict at 1-6 66s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 66s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s + local description=git-imerge test repository with conflict at 1-6 66s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s hint: Using 'master' as the name for the initial branch. This default branch name 66s hint: is subject to change. To configure the initial branch name to use in all 66s hint: of your new repositories, which will suppress this warning, call: 66s hint: 66s hint: git config --global init.defaultBranch 66s hint: 66s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 66s hint: 'development'. The just-created branch can be renamed via this command: 66s hint: 66s hint: git branch -m 66s hint: 66s hint: Disable this message with "git config set advice.defaultBranchName false" 66s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6/.git/ 66s + echo git-imerge test repository with conflict at 1-6 66s + printf %s\n /*.out /*.css /*.html 66s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6/.git config user.name Loú User 66s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 66s + TIME=1112911993 66s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-6 66s + modify c.txt 0 66s + filename=c.txt 66s + text=0 66s + echo 0 66s + git add c.txt 66s + modify d.txt 0 66s + filename=d.txt 66s + text=0 66s + echo 0 66s + git add d.txt 66s + modify conflict.txt original version 66s + filename=conflict.txt 66s + text=original version 66s + echo original version 66s + git add conflict.txt 66s + commit -m m⇒0 66s + TIME=1112911994 66s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 66s [master (root-commit) d70e04b] m⇒0 66s 3 files changed, 3 insertions(+) 66s create mode 100644 c.txt 66s create mode 100644 conflict.txt 66s create mode 100644 d.txt 66s + git checkout -b c master -- 66s Switched to a new branch 'c' 66s + seq 9 66s + modify c.txt 1 66s + filename=c.txt 66s + text=1 66s + echo 1 66s + git add c.txt 66s + modify conflict.txt c version 66s + filename=conflict.txt 66s + text=c version 66s + echo c version 66s + git add conflict.txt 66s + commit -m c⇒1 66s + TIME=1112911995 66s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 66s [c 2120f40] c⇒1 66s 2 files changed, 2 insertions(+), 2 deletions(-) 66s + modify c.txt 2 66s + filename=c.txt 66s + text=2 66s + echo 2 66s + git add c.txt 66s + commit -m c⇒2 66s + TIME=1112911996 66s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 66s [c 90cc7de] c⇒2 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify c.txt 3 66s + filename=c.txt 66s + text=3 66s + echo 3 66s + git add c.txt 66s + commit -m c⇒3 66s + TIME=1112911997 66s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 66s [c 2046ed2] c⇒3 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify c.txt 4 66s + filename=c.txt 66s + text=4 66s + echo 4 66s + git add c.txt 66s + commit -m c⇒4 66s + TIME=1112911998 66s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 66s [c 8a2cee9] c⇒4 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify c.txt 5 66s + filename=c.txt 66s + text=5 66s + echo 5 66s + git add c.txt 66s + commit -m c⇒5 66s + TIME=1112911999 66s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 66s [c ac16a05] c⇒5 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify c.txt 6 66s + filename=c.txt 66s + text=6 66s + echo 6 66s + git add c.txt 66s + commit -m c⇒6 66s + TIME=1112912000 66s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 66s [c 30dd2ae] c⇒6 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify c.txt 7 66s + filename=c.txt 66s + text=7 66s + echo 7 66s + git add c.txt 66s + commit -m c⇒7 66s + TIME=1112912001 66s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 66s [c 0883eb9] c⇒7 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify c.txt 8 66s + filename=c.txt 66s + text=8 66s + echo 8 66s + git add c.txt 66s + commit -m c⇒8 66s + TIME=1112912002 66s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 66s [c f661c06] c⇒8 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify c.txt 9 66s + filename=c.txt 66s + text=9 66s + echo 9 66s + git add c.txt 66s + commit -m c⇒9 66s + TIME=1112912003 66s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 66s [c 243e8ed] c⇒9 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + git checkout -b d master -- 66s Switched to a new branch 'd' 66s + seq 6 66s + modify d.txt 1 66s + filename=d.txt 66s + text=1 66s + echo 1 66s + git add d.txt 66s + commit -m d⇒1 66s + TIME=1112912004 66s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 66s [d bd5368a] d⇒1 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify d.txt 2 66s + filename=d.txt 66s + text=2 66s + echo 2 66s + git add d.txt 66s + commit -m d⇒2 66s + TIME=1112912005 66s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 66s [d 93e27e6] d⇒2 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify d.txt 3 66s + filename=d.txt 66s + text=3 66s + echo 3 66s + git add d.txt 66s + commit -m d⇒3 66s + TIME=1112912006 66s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 66s [d 133f385] d⇒3 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify d.txt 4 66s + filename=d.txt 66s + text=4 66s + echo 4 66s + git add d.txt 66s + commit -m d⇒4 66s + TIME=1112912007 66s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 66s [d 586472a] d⇒4 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify d.txt 5 66s + filename=d.txt 66s + text=5 66s + echo 5 66s + git add d.txt 66s + commit -m d⇒5 66s + TIME=1112912008 66s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 66s [d 9522207] d⇒5 66s 1 file changed, 1 insertion(+), 1 deletion(-) 66s + modify d.txt 6 66s + filename=d.txt 66s + text=6 66s + echo 6 66s + git add d.txt 66s + modify conflict.txt d version 66s + filename=conflict.txt 66s + text=d version 66s + echo d version 66s + git add conflict.txt 66s + commit -m d⇒6 66s + TIME=1112912009 66s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 66s [d f7e451a] d⇒6 66s 2 files changed, 2 insertions(+), 2 deletions(-) 66s + git checkout c 66s Switched to branch 'c' 66s + git-imerge init --name=c-d d 66s + git-imerge list 66s * c-d 66s + git-imerge diagram --commits --frontier --html=imerge0.html 66s 0 5 9 66s | | | 66s 0 - ********** - c 66s *????????? 66s *????????? 66s *????????? 66s *????????? 66s 5 - *????????? 66s 6 - *????????? 66s | 66s d 66s 66s 0 5 9 66s | | | 66s 0 - ********** - c 66s *????????? 66s *????????? 66s *????????? 66s *????????? 66s 5 - *????????? 66s 6 - *????????? 66s | 66s d 66s 66s Key: 66s |,-,+ = rectangles forming current merge frontier 66s * = merge done manually 66s . = merge done automatically 66s # = conflict that is currently blocking progress 66s @ = merge was blocked but has been resolved 66s ? = no merge recorded 66s 66s + git-imerge autofill 66s + tee autofill.out 66s Attempting automerge of 9-6...failure. 66s Attempting automerge of 1-1...success. 66s Attempting automerge of 1-4...success. 66s Attempting automerge of 1-6...failure. 66s Attempting automerge of 1-5...success. 66s Attempting automerge of 9-5...success. 66s Autofilling 1-5...success. 66s Autofilling 2-5...success. 66s Autofilling 3-5...success. 66s Autofilling 4-5...success. 67s Autofilling 5-5...success. 67s Autofilling 6-5...success. 67s Autofilling 7-5...success. 67s Autofilling 8-5...success. 67s Autofilling 9-1...success. 67s Autofilling 9-2...success. 67s Autofilling 9-3...success. 67s Autofilling 9-4...success. 67s Autofilling 9-5 (first way)...success. 67s Autofilling 9-5 (second way)...success. 67s The two ways of autofilling 9-5 agree. 67s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 67s Attempting automerge of 9-6...failure. 67s Attempting automerge of 1-6...failure. 67s HEAD is now at 243e8ed c⇒9 67s Conflict; suggest manual merge of 1-6 67s + grep -q Traceback autofill.out 67s + grep -q suggest manual merge of 1-6 autofill.out 67s + git-imerge diagram --commits --frontier --html=imerge1.html 67s 0 5 9 67s | | | 67s 0 - ********** - c 67s *????????. 67s *????????. 67s *????????. 67s *????????. 67s 5 - *......... 67s 6 - *#???????? 67s | 67s d 67s 67s 0 5 9 67s | | | 67s 0 - ********** - c 67s *????????| 67s *????????| 67s *????????| 67s *????????| 67s 5 - *--------+ 67s 6 - *#???????? 67s | 67s d 67s 67s Key: 67s |,-,+ = rectangles forming current merge frontier 67s * = merge done manually 67s . = merge done automatically 67s # = conflict that is currently blocking progress 67s @ = merge was blocked but has been resolved 67s ? = no merge recorded 67s 67s + git-imerge continue --edit 67s Switched to branch 'imerge/c-d' 67s Auto-merging conflict.txt 67s CONFLICT (content): Merge conflict in conflict.txt 67s Automatic merge failed; fix conflicts and then commit the result. 67s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 67s Author: Loú User 67s Date: Thu Apr 7 22:13:15 2005 +0000 67s 67s c⇒1 67s 67s Original first commit: 67s 67s Original second commit: 67s commit f7e451a6c9656dda15641a9fbc591a602f158692 67s Author: Loú User 67s Date: Thu Apr 7 22:13:29 2005 +0000 67s 67s d⇒6 67s 67s There was a conflict merging commit 1-6, shown above. 67s Please resolve the conflict, commit the result, then type 67s 67s git-imerge continue 67s + echo merged version 67s + git add conflict.txt 67s + git-imerge continue --no-edit 67s [imerge/c-d 042580f] imerge 'c-d': manual merge 1-6 67s Merge has been recorded for merge 1-6. 67s Attempting automerge of 9-6...success. 67s Autofilling 2-6...success. 67s Autofilling 3-6...success. 67s Autofilling 4-6...success. 67s Autofilling 5-6...success. 67s Autofilling 6-6...success. 67s Autofilling 7-6...success. 67s Autofilling 8-6...success. 67s Autofilling 9-6...success. 67s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 67s Merge is complete! 67s + git-imerge diagram --commits --frontier --html=imerge2.html 67s 0 5 9 67s | | | 67s 0 - ********** - c 67s *????????. 67s *????????. 67s *????????. 67s *????????. 67s 5 - *......... 67s 6 - **........ 67s | 67s d 67s 67s 0 5 9 67s | | | 67s 0 - ********** - c 67s *????????| 67s *????????| 67s *????????| 67s *????????| 67s 5 - *........| 67s 6 - **-------+ 67s | 67s d 67s 67s Key: 67s |,-,+ = rectangles forming current merge frontier 67s * = merge done manually 67s . = merge done automatically 67s # = conflict that is currently blocking progress 67s @ = merge was blocked but has been resolved 67s ? = no merge recorded 67s 67s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 67s Merge d into c (using imerge) 67s 67s # Please enter the commit message for your changes. Lines starting 67s # with '#' will be ignored, and an empty message aborts the commit. 67s # 67s # Date: Wed Dec 3 23:16:52 2025 +0000 67s # 67s # On branch c-d-merge 67s # Changes to be committed: 67s # modified: conflict.txt 67s # modified: d.txt 67s # 67s [c-d-merge 068095b] Merge d into c (using imerge) 67s Date: Wed Dec 3 23:16:52 2025 +0000 67s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + local refname=c-d-merge 67s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git rev-parse c-d-merge^{tree} 67s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git-imerge simplify --goal=rebase --branch=c-d-rebase 67s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + local refname=c-d-rebase 67s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git rev-parse c-d-rebase^{tree} 67s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 67s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + local refname=c-d-rebase-with-history 67s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git rev-parse c-d-rebase-with-history^{tree} 67s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git-imerge simplify --goal=border --branch=c-d-border 67s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + local refname=c-d-border 67s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git rev-parse c-d-border^{tree} 67s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 67s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + local refname=c-d-border-with-history 67s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git rev-parse c-d-border-with-history^{tree} 67s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 67s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + local refname=c-d-border-with-history2 67s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git rev-parse c-d-border-with-history2^{tree} 67s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 67s + git-imerge remove 67s + git checkout c 67s Switched to branch 'c' 67s + git-imerge start --goal=full --first-parent --name=c-d d 67s + tee start.out 68s Attempting to merge 1-1...success. 68s Attempting to merge 1-2...success. 68s Attempting to merge 1-3...success. 68s Attempting to merge 1-4...success. 68s Attempting to merge 1-5...success. 68s Attempting to merge 1-6...conflict. 68s Attempting to merge 2-1...success. 68s Attempting to merge 2-2...success. 68s Attempting to merge 2-3...success. 68s Attempting to merge 2-4...success. 68s Attempting to merge 2-5...success. 68s Attempting to merge 3-1...success. 68s Attempting to merge 3-2...success. 68s Attempting to merge 3-3...success. 68s Attempting to merge 3-4...success. 68s Attempting to merge 3-5...success. 68s Attempting to merge 4-1...success. 68s Attempting to merge 4-2...success. 68s Attempting to merge 4-3...success. 68s Attempting to merge 4-4...success. 68s Attempting to merge 4-5...success. 68s Attempting to merge 5-1...success. 68s Attempting to merge 5-2...success. 68s Attempting to merge 5-3...success. 68s Attempting to merge 5-4...success. 68s Attempting to merge 5-5...success. 68s Attempting to merge 6-1...success. 68s Attempting to merge 6-2...success. 68s Attempting to merge 6-3...success. 68s Attempting to merge 6-4...success. 68s Attempting to merge 6-5...success. 68s Attempting to merge 7-1...success. 68s Attempting to merge 7-2...success. 68s Attempting to merge 7-3...success. 68s Attempting to merge 7-4...success. 68s Attempting to merge 7-5...success. 68s Attempting to merge 8-1...success. 68s Attempting to merge 8-2...success. 68s Attempting to merge 8-3...success. 68s Attempting to merge 8-4...success. 68s Attempting to merge 8-5...success. 68s Attempting to merge 9-1...success. 68s Attempting to merge 9-2...success. 68s Attempting to merge 9-3...success. 68s Attempting to merge 9-4...success. 68s Attempting to merge 9-5...success. 68s Previous HEAD position was 99443bc imerge 'c-d': automatic merge 9-5 68s Switched to branch 'imerge/c-d' 68s Auto-merging conflict.txt 68s CONFLICT (content): Merge conflict in conflict.txt 68s Automatic merge failed; fix conflicts and then commit the result. 68s 68s Original first commit: 68s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 68s Author: Loú User 68s Date: Thu Apr 7 22:13:15 2005 +0000 68s 68s c⇒1 68s 68s Original second commit: 68s commit f7e451a6c9656dda15641a9fbc591a602f158692 68s Author: Loú User 68s Date: Thu Apr 7 22:13:29 2005 +0000 68s 68s d⇒6 68s 68s There was a conflict merging commit 1-6, shown above. 68s Please resolve the conflict, commit the result, then type 68s 68s git-imerge continue 68s + grep -q Traceback start.out 68s + grep -q suggest manual merge of 1-6 autofill.out 68s + git-imerge diagram --commits --frontier --html=imerge3.html 68s 0 5 9 68s | | | 68s 0 - ********** - c 68s *......... 68s *......... 68s *......... 68s *......... 68s 5 - *......... 68s 6 - *#???????? 68s | 68s d 68s 68s 0 5 9 68s | | | 68s 0 - ********** - c 68s *........| 68s *........| 68s *........| 68s *........| 68s 5 - *--------+ 68s 6 - *#???????? 68s | 68s d 68s 68s Key: 68s |,-,+ = rectangles forming current merge frontier 68s * = merge done manually 68s . = merge done automatically 68s # = conflict that is currently blocking progress 68s @ = merge was blocked but has been resolved 68s ? = no merge recorded 68s 68s + echo merged version 68s + git add conflict.txt 68s + GIT_EDITOR=cat git commit 68s imerge 'c-d': manual merge 1-6 68s 68s # Conflicts: 68s # conflict.txt 68s # 68s # It looks like you may be committing a merge. 68s # If this is not correct, please run 68s # git update-ref -d MERGE_HEAD 68s # and try again. 68s 68s 68s # Please enter the commit message for your changes. Lines starting 68s # with '#' will be ignored, and an empty message aborts the commit. 68s # 68s # On branch imerge/c-d 68s # All conflicts fixed but you are still merging. 68s # 68s # Changes to be committed: 68s # modified: conflict.txt 68s # modified: d.txt 68s # 68s + git-imerge continue --edit 68s [imerge/c-d 4fe6683] imerge 'c-d': manual merge 1-6 68s Merge has been recorded for merge 1-6. 68s Attempting to merge 2-6...success. 68s Attempting to merge 3-6...success. 68s Attempting to merge 4-6...success. 68s Attempting to merge 5-6...success. 68s Attempting to merge 6-6...success. 68s Attempting to merge 7-6...success. 68s Attempting to merge 8-6...success. 68s Attempting to merge 9-6...success. 68s Merge is complete! 68s + git-imerge diagram --commits --frontier --html=imerge4.html 68s 0 5 9 68s | | | 68s 0 - ********** - c 68s *......... 68s *......... 68s *......... 68s *......... 68s 5 - *......... 68s 6 - **........ 68s | 68s d 68s 68s 0 5 9 68s | | | 68s 0 - ********** - c 68s *........| 68s *........| 68s *........| 68s *........| 68s 5 - *........| 68s 6 - **-------+ 68s | 68s d 68s 68s Key: 68s |,-,+ = rectangles forming current merge frontier 68s * = merge done manually 68s . = merge done automatically 68s # = conflict that is currently blocking progress 68s @ = merge was blocked but has been resolved 68s ? = no merge recorded 68s 68s + git-imerge finish --branch=c-d-full 68s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 68s + local refname=c-d-full 68s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 68s + git rev-parse c-d-full^{tree} 68s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 68s + test_conflict 9-6 68s + local conflict=9-6 68s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s + DESCRIPTION=git-imerge test repository with conflict at 9-6 68s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 68s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s + local description=git-imerge test repository with conflict at 9-6 68s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 68s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s + local description=git-imerge test repository with conflict at 9-6 68s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s hint: Using 'master' as the name for the initial branch. This default branch name 68s hint: is subject to change. To configure the initial branch name to use in all 68s hint: of your new repositories, which will suppress this warning, call: 68s hint: 68s hint: git config --global init.defaultBranch 68s hint: 68s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 68s hint: 'development'. The just-created branch can be renamed via this command: 68s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6/.git/ 68s hint: 68s hint: git branch -m 68s hint: 68s hint: Disable this message with "git config set advice.defaultBranchName false" 68s + echo git-imerge test repository with conflict at 9-6 68s + printf %s\n /*.out /*.css /*.html 68s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6/.git config user.name Loú User 68s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 68s + TIME=1112911993 68s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-6 68s + modify c.txt 0 68s + filename=c.txt 68s + text=0 68s + echo 0 68s + git add c.txt 68s + modify d.txt 0 68s + filename=d.txt 68s + text=0 68s + echo 0 68s + git add d.txt 68s + modify conflict.txt original version 68s + filename=conflict.txt 68s + text=original version 68s + echo original version 68s + git add conflict.txt 68s + commit -m m⇒0 68s + TIME=1112911994 68s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 68s [master (root-commit) d70e04b] m⇒0 68s 3 files changed, 3 insertions(+) 68s create mode 100644 c.txt 68s create mode 100644 conflict.txt 68s create mode 100644 d.txt 68s + git checkout -b c master -- 68s Switched to a new branch 'c' 68s + seq 9 68s + modify c.txt 1 68s + filename=c.txt 68s + text=1 68s + echo 1 68s + git add c.txt 68s + commit -m c⇒1 68s + TIME=1112911995 68s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 68s [c 89e2141] c⇒1 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 2 68s + filename=c.txt 68s + text=2 68s + echo 2 68s + git add c.txt 68s + commit -m c⇒2 68s + TIME=1112911996 68s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 68s [c 7c431f2] c⇒2 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 3 68s + filename=c.txt 68s + text=3 68s + echo 3 68s + git add c.txt 68s + commit -m c⇒3 68s + TIME=1112911997 68s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 68s [c f02ab24] c⇒3 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 4 68s + filename=c.txt 68s + text=4 68s + echo 4 68s + git add c.txt 68s + commit -m c⇒4 68s + TIME=1112911998 68s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 68s [c ed9122f] c⇒4 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 5 68s + filename=c.txt 68s + text=5 68s + echo 5 68s + git add c.txt 68s + commit -m c⇒5 68s + TIME=1112911999 68s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 68s [c 1d3bf09] c⇒5 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 6 68s + filename=c.txt 68s + text=6 68s + echo 6 68s + git add c.txt 68s + commit -m c⇒6 68s + TIME=1112912000 68s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 68s [c f999ecd] c⇒6 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 7 68s + filename=c.txt 68s + text=7 68s + echo 7 68s + git add c.txt 68s + commit -m c⇒7 68s + TIME=1112912001 68s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 68s [c 7050a8a] c⇒7 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 8 68s + filename=c.txt 68s + text=8 68s + echo 8 68s + git add c.txt 68s + commit -m c⇒8 68s + TIME=1112912002 68s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 68s [c 9732e77] c⇒8 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify c.txt 9 68s + filename=c.txt 68s + text=9 68s + echo 9 68s + git add c.txt 68s + modify conflict.txt c version 68s + filename=conflict.txt 68s + text=c version 68s + echo c version 68s + git add conflict.txt 68s + commit -m c⇒9 68s + TIME=1112912003 68s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 68s [c 73a5eed] c⇒9 68s 2 files changed, 2 insertions(+), 2 deletions(-) 68s + git checkout -b d master -- 68s Switched to a new branch 'd' 68s + seq 6 68s + modify d.txt 1 68s + filename=d.txt 68s + text=1 68s + echo 1 68s + git add d.txt 68s + commit -m d⇒1 68s + TIME=1112912004 68s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 68s [d bd5368a] d⇒1 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify d.txt 2 68s + filename=d.txt 68s + text=2 68s + echo 2 68s + git add d.txt 68s + commit -m d⇒2 68s + TIME=1112912005 68s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 68s [d 93e27e6] d⇒2 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify d.txt 3 68s + filename=d.txt 68s + text=3 68s + echo 3 68s + git add d.txt 68s + commit -m d⇒3 68s + TIME=1112912006 68s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 68s [d 133f385] d⇒3 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify d.txt 4 68s + filename=d.txt 68s + text=4 68s + echo 4 68s + git add d.txt 68s + commit -m d⇒4 68s + TIME=1112912007 68s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 68s [d 586472a] d⇒4 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify d.txt 5 68s + filename=d.txt 68s + text=5 68s + echo 5 68s + git add d.txt 68s + commit -m d⇒5 68s + TIME=1112912008 68s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 68s [d 9522207] d⇒5 68s 1 file changed, 1 insertion(+), 1 deletion(-) 68s + modify d.txt 6 68s + filename=d.txt 68s + text=6 68s + echo 6 68s + git add d.txt 68s + modify conflict.txt d version 68s + filename=conflict.txt 68s + text=d version 68s + echo d version 68s + git add conflict.txt 68s + commit -m d⇒6 68s + TIME=1112912009 68s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 68s [d f7e451a] d⇒6 68s 2 files changed, 2 insertions(+), 2 deletions(-) 68s + git checkout c 68s Switched to branch 'c' 68s + git-imerge init --name=c-d d 68s + git-imerge list 68s * c-d 68s + git-imerge diagram --commits --frontier --html=imerge0.html 68s 0 5 9 68s | | | 68s 0 - ********** - c 68s *????????? 68s *????????? 68s *????????? 68s *????????? 68s 5 - *????????? 68s 6 - *????????? 68s | 68s d 68s 68s 0 5 9 68s | | | 68s 0 - ********** - c 68s *????????? 68s *????????? 68s *????????? 68s *????????? 68s 5 - *????????? 68s 6 - *????????? 68s | 68s d 68s 68s Key: 68s |,-,+ = rectangles forming current merge frontier 68s * = merge done manually 68s . = merge done automatically 68s # = conflict that is currently blocking progress 68s @ = merge was blocked but has been resolved 68s ? = no merge recorded 68s 68s + git-imerge autofill 68s + tee autofill.out 68s Attempting automerge of 9-6...failure. 69s Attempting automerge of 1-1...success. 69s Attempting automerge of 1-4...success. 69s Attempting automerge of 1-6...success. 69s Attempting automerge of 9-6...failure. 69s Attempting automerge of 5-6...success. 69s Attempting automerge of 7-6...success. 69s Attempting automerge of 8-6...success. 69s Attempting automerge of 9-1...success. 69s Attempting automerge of 9-4...success. 69s Attempting automerge of 9-5...success. 69s Autofilling 1-6...success. 69s Autofilling 2-6...success. 69s Autofilling 3-6...success. 69s Autofilling 4-6...success. 69s Autofilling 5-6...success. 69s Autofilling 6-6...success. 69s Autofilling 7-6...success. 69s Autofilling 8-1...success. 69s Autofilling 8-2...success. 69s Autofilling 8-3...success. 69s Autofilling 8-4...success. 69s Autofilling 8-5...success. 69s Autofilling 8-6 (first way)...success. 69s Autofilling 8-6 (second way)...success. 69s The two ways of autofilling 8-6 agree. 69s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 69s Autofilling 9-1...success. 69s Autofilling 9-2...success. 69s Autofilling 9-3...success. 69s Autofilling 9-4...success. 69s Autofilling 9-5...success. 69s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 69s Attempting automerge of 9-6...failure. 69s Attempting automerge of 9-6...failure. 69s HEAD is now at 73a5eed c⇒9 69s Conflict; suggest manual merge of 9-6 69s + grep -q Traceback autofill.out 69s + grep -q suggest manual merge of 9-6 autofill.out 69s + git-imerge diagram --commits --frontier --html=imerge1.html 69s 0 5 9 69s | | | 69s 0 - ********** - c 69s *???????.. 69s *???????.. 69s *???????.. 69s *???????.. 69s 5 - *???????.. 69s 6 - *........# 69s | 69s d 69s 69s 0 5 9 69s | | | 69s 0 - ********** - c 69s *???????.| 69s *???????.| 69s *???????.| 69s *???????.| 69s 5 - *???????.+ 69s 6 - *-------+# 69s | 69s d 69s 69s Key: 69s |,-,+ = rectangles forming current merge frontier 69s * = merge done manually 69s . = merge done automatically 69s # = conflict that is currently blocking progress 69s @ = merge was blocked but has been resolved 69s ? = no merge recorded 69s 69s + git-imerge continue --edit 69s Switched to branch 'imerge/c-d' 69s 69s Original first commit: 69s Auto-merging conflict.txt 69s CONFLICT (content): Merge conflict in conflict.txt 69s Automatic merge failed; fix conflicts and then commit the result. 69s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 69s Author: Loú User 69s Date: Thu Apr 7 22:13:23 2005 +0000 69s 69s c⇒9 69s 69s Original second commit: 69s 69s There was a conflict merging commit 9-6, shown above. 69s Please resolve the conflict, commit the result, then type 69s 69s git-imerge continue 69s commit f7e451a6c9656dda15641a9fbc591a602f158692 69s Author: Loú User 69s Date: Thu Apr 7 22:13:29 2005 +0000 69s 69s d⇒6 69s + echo merged version 69s + git add conflict.txt 69s + git-imerge continue --no-edit 69s [imerge/c-d 36f4acd] imerge 'c-d': manual merge 9-6 69s Merge has been recorded for merge 9-6. 69s Merge is complete! 69s + git-imerge diagram --commits --frontier --html=imerge2.html 69s 0 5 9 69s | | | 69s 0 - ********** - c 69s *???????.. 69s *???????.. 69s *???????.. 69s *???????.. 69s 5 - *???????.. 69s 6 - *........* 69s | 69s d 69s 69s 0 5 9 69s | | | 69s 0 - ********** - c 69s *???????.| 69s *???????.| 69s *???????.| 69s *???????.| 69s 5 - *???????.| 69s 6 - *--------* 69s | 69s d 69s 69s Key: 69s |,-,+ = rectangles forming current merge frontier 69s * = merge done manually 69s . = merge done automatically 69s # = conflict that is currently blocking progress 69s @ = merge was blocked but has been resolved 69s ? = no merge recorded 69s 69s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 69s Merge d into c (using imerge) 69s 69s # Please enter the commit message for your changes. Lines starting 69s # with '#' will be ignored, and an empty message aborts the commit. 69s # 69s # Date: Wed Dec 3 23:16:54 2025 +0000 69s # 69s # On branch c-d-merge 69s # Changes to be committed: 69s # modified: conflict.txt 69s # modified: d.txt 69s # 69s [c-d-merge c01569e] Merge d into c (using imerge) 69s Date: Wed Dec 3 23:16:54 2025 +0000 69s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + local refname=c-d-merge 69s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git rev-parse c-d-merge^{tree} 69s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git-imerge simplify --goal=rebase --branch=c-d-rebase 69s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + local refname=c-d-rebase 69s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git rev-parse c-d-rebase^{tree} 69s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 69s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + local refname=c-d-rebase-with-history 69s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git rev-parse c-d-rebase-with-history^{tree} 69s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git-imerge simplify --goal=border --branch=c-d-border 69s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + local refname=c-d-border 69s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git rev-parse c-d-border^{tree} 69s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 69s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + local refname=c-d-border-with-history 69s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git rev-parse c-d-border-with-history^{tree} 69s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 69s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + local refname=c-d-border-with-history2 69s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git rev-parse c-d-border-with-history2^{tree} 69s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 69s + git-imerge remove 70s + git checkout c 70s Switched to branch 'c' 70s + + tee start.out 70s git-imerge start --goal=full --first-parent --name=c-d d 70s Attempting to merge 1-1...success. 70s Attempting to merge 1-2...success. 70s Attempting to merge 1-3...success. 70s Attempting to merge 1-4...success. 70s Attempting to merge 1-5...success. 70s Attempting to merge 1-6...success. 70s Attempting to merge 2-1...success. 70s Attempting to merge 2-2...success. 70s Attempting to merge 2-3...success. 70s Attempting to merge 2-4...success. 70s Attempting to merge 2-5...success. 70s Attempting to merge 2-6...success. 70s Attempting to merge 3-1...success. 70s Attempting to merge 3-2...success. 70s Attempting to merge 3-3...success. 70s Attempting to merge 3-4...success. 70s Attempting to merge 3-5...success. 70s Attempting to merge 3-6...success. 70s Attempting to merge 4-1...success. 70s Attempting to merge 4-2...success. 70s Attempting to merge 4-3...success. 70s Attempting to merge 4-4...success. 70s Attempting to merge 4-5...success. 70s Attempting to merge 4-6...success. 70s Attempting to merge 5-1...success. 70s Attempting to merge 5-2...success. 70s Attempting to merge 5-3...success. 70s Attempting to merge 5-4...success. 70s Attempting to merge 5-5...success. 70s Attempting to merge 5-6...success. 70s Attempting to merge 6-1...success. 70s Attempting to merge 6-2...success. 70s Attempting to merge 6-3...success. 70s Attempting to merge 6-4...success. 70s Attempting to merge 6-5...success. 70s Attempting to merge 6-6...success. 70s Attempting to merge 7-1...success. 70s Attempting to merge 7-2...success. 70s Attempting to merge 7-3...success. 70s Attempting to merge 7-4...success. 70s Attempting to merge 7-5...success. 70s Attempting to merge 7-6...success. 70s Attempting to merge 8-1...success. 70s Attempting to merge 8-2...success. 70s Attempting to merge 8-3...success. 70s Attempting to merge 8-4...success. 70s Attempting to merge 8-5...success. 70s Attempting to merge 8-6...success. 70s Attempting to merge 9-1...success. 70s Attempting to merge 9-2...success. 70s Attempting to merge 9-3...success. 70s Attempting to merge 9-4...success. 70s Attempting to merge 9-5...success. 70s Attempting to merge 9-6...conflict. 70s Switched to branch 'imerge/c-d' 70s Auto-merging conflict.txt 70s CONFLICT (content): Merge conflict in conflict.txt 70s Automatic merge failed; fix conflicts and then commit the result. 70s 70s Original first commit: 70s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 70s Author: Loú User 70s Date: Thu Apr 7 22:13:23 2005 +0000 70s 70s c⇒9 70s 70s Original second commit: 70s commit f7e451a6c9656dda15641a9fbc591a602f158692 70s Author: Loú User 70s Date: Thu Apr 7 22:13:29 2005 +0000 70s 70s d⇒6 70s 70s There was a conflict merging commit 9-6, shown above. 70s Please resolve the conflict, commit the result, then type 70s 70s git-imerge continue 70s + grep -q Traceback start.out 70s + grep -q suggest manual merge of 9-6 autofill.out 70s + git-imerge diagram --commits --frontier --html=imerge3.html 70s 0 5 9 70s | | | 70s 0 - ********** - c 70s *......... 70s *......... 70s *......... 70s *......... 70s 5 - *......... 70s 6 - *........# 70s | 70s d 70s 70s 0 5 9 70s | | | 70s 0 - ********** - c 70s *........| 70s *........| 70s *........| 70s *........| 70s 5 - *........+ 70s 6 - *-------+# 70s | 70s d 70s 70s Key: 70s |,-,+ = rectangles forming current merge frontier 70s * = merge done manually 70s . = merge done automatically 70s # = conflict that is currently blocking progress 70s @ = merge was blocked but has been resolved 70s ? = no merge recorded 70s 70s + echo merged version 70s + git add conflict.txt 70s + GIT_EDITOR=cat git commit 70s imerge 'c-d': manual merge 9-6 70s 70s # Conflicts: 70s # conflict.txt 70s # 70s # It looks like you may be committing a merge. 70s # If this is not correct, please run 70s # git update-ref -d MERGE_HEAD 70s # and try again. 70s 70s 70s # Please enter the commit message for your changes. Lines starting 70s # with '#' will be ignored, and an empty message aborts the commit. 70s # 70s # On branch imerge/c-d 70s # All conflicts fixed but you are still merging. 70s # 70s # Changes to be committed: 70s # modified: conflict.txt 70s # modified: d.txt 70s # 70s [imerge/c-d f4b1a29] imerge 'c-d': manual merge 9-6 70s + git-imerge continue --edit 70s Merge has been recorded for merge 9-6. 70s Merge is complete! 70s + git-imerge diagram --commits --frontier --html=imerge4.html 70s 0 5 9 70s | | | 70s 0 - ********** - c 70s *......... 70s *......... 70s *......... 70s *......... 70s 5 - *......... 70s 6 - *........* 70s | 70s d 70s 70s 0 5 9 70s | | | 70s 0 - ********** - c 70s *........| 70s *........| 70s *........| 70s *........| 70s 5 - *........| 70s 6 - *--------* 70s | 70s d 70s 70s Key: 70s |,-,+ = rectangles forming current merge frontier 70s * = merge done manually 70s . = merge done automatically 70s # = conflict that is currently blocking progress 70s @ = merge was blocked but has been resolved 70s ? = no merge recorded 70s 70s + git-imerge finish --branch=c-d-full 70s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 70s + local refname=c-d-full 70s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 70s + git rev-parse c-d-full^{tree} 70s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 70s + test_conflict 1-2 70s + local conflict=1-2 70s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s + DESCRIPTION=git-imerge test repository with conflict at 1-2 70s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 70s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s + local description=git-imerge test repository with conflict at 1-2 70s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 70s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s + local description=git-imerge test repository with conflict at 1-2 70s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s hint: Using 'master' as the name for the initial branch. This default branch name 70s hint: is subject to change. To configure the initial branch name to use in all 70s hint: of your new repositories, which will suppress this warning, call: 70s hint: 70s hint: git config --global init.defaultBranch 70s hint: 70s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 70s hint: 'development'. The just-created branch can be renamed via this command: 70s hint: 70s hint: git branch -m 70s hint: 70s hint: Disable this message with "git config set advice.defaultBranchName false" 70s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2/.git/ 70s + echo git-imerge test repository with conflict at 1-2 70s + printf %s\n /*.out /*.css /*.html 70s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2/.git config user.name Loú User 70s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 70s + TIME=1112911993 70s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-1-2 70s + modify c.txt 0 70s + filename=c.txt 70s + text=0 70s + echo 0 70s + git add c.txt 70s + modify d.txt 0 70s + filename=d.txt 70s + text=0 70s + echo 0 70s + git add d.txt 70s + modify conflict.txt original version 70s + filename=conflict.txt 70s + text=original version 70s + echo original version 70s + git add conflict.txt 70s + commit -m m⇒0 70s + TIME=1112911994 70s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 70s + git checkout -b c master -- 70s Switched to a new branch 'c' 70s [master (root-commit) d70e04b] m⇒0 70s 3 files changed, 3 insertions(+) 70s create mode 100644 c.txt 70s create mode 100644 conflict.txt 70s create mode 100644 d.txt 70s + seq 9 70s + modify c.txt 1 70s + filename=c.txt 70s + text=1 70s + echo 1 70s + git add c.txt 70s + modify conflict.txt c version 70s + filename=conflict.txt 70s + text=c version 70s + echo c version 70s + git add conflict.txt 70s + commit -m c⇒1 70s + TIME=1112911995 70s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 70s [c 2120f40] c⇒1 70s 2 files changed, 2 insertions(+), 2 deletions(-) 70s + modify c.txt 2 70s + filename=c.txt 70s + text=2 70s + echo 2 70s + git add c.txt 70s + commit -m c⇒2 70s + TIME=1112911996 70s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 70s [c 90cc7de] c⇒2 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + modify c.txt 3 70s + filename=c.txt 70s + text=3 70s + echo 3 70s + git add c.txt 70s + commit -m c⇒3 70s + TIME=1112911997 70s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 70s [c 2046ed2] c⇒3 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + modify c.txt 4 70s + filename=c.txt 70s + text=4 70s + echo 4 70s + git add c.txt 70s + commit -m c⇒4 70s + TIME=1112911998 70s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 70s + modify c.txt 5 70s + filename=c.txt 70s + text=5 70s + echo 5 70s + git add c.txt 70s [c 8a2cee9] c⇒4 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + commit -m c⇒5 70s + TIME=1112911999 70s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 70s + modify c.txt 6 70s + filename=c.txt 70s + text=6 70s + echo 6 70s + git add c.txt 70s [c ac16a05] c⇒5 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + commit -m c⇒6 70s + TIME=1112912000 70s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 70s + modify c.txt 7 70s + filename=c.txt 70s + text=7 70s + echo 7 70s + git add c.txt 70s [c 30dd2ae] c⇒6 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + commit -m c⇒7 70s + TIME=1112912001 70s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 70s [c 0883eb9] c⇒7 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + modify c.txt 8 70s + filename=c.txt 70s + text=8 70s + echo 8 70s + git add c.txt 70s + commit -m c⇒8 70s + TIME=1112912002 70s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 70s + modify c.txt 9 70s + filename=c.txt 70s + text=9 70s + echo 9 70s + git add c.txt 70s [c f661c06] c⇒8 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + commit -m c⇒9 70s + TIME=1112912003 70s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 70s [c 243e8ed] c⇒9 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + git checkout -b d master -- 70s Switched to a new branch 'd' 70s + seq 6 70s + modify d.txt 1 70s + filename=d.txt 70s + text=1 70s + echo 1 70s + git add d.txt 70s + commit -m d⇒1 70s + TIME=1112912004 70s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 70s + modify d.txt 2 70s + filename=d.txt 70s + text=2 70s + echo 2 70s + git add d.txt 70s [d bd5368a] d⇒1 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + modify conflict.txt d version 70s + filename=conflict.txt 70s + text=d version 70s + echo d version 70s + git add conflict.txt 70s + commit -m d⇒2 70s + TIME=1112912005 70s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 70s + modify d.txt 3 70s + filename=d.txt 70s + text=3 70s + echo 3 70s + git add d.txt 70s [d 69efde8] d⇒2 70s 2 files changed, 2 insertions(+), 2 deletions(-) 70s + commit -m d⇒3 70s + TIME=1112912006 70s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 70s + modify d.txt 4 70s + filename=d.txt 70s + text=4 70s + echo 4 70s + git add d.txt 70s [d 3169557] d⇒3 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + commit -m d⇒4 70s + TIME=1112912007 70s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 70s + modify d.txt 5 70s + filename=d.txt 70s + text=5 70s [d 86c8052] d⇒4 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + echo 5 70s + git add d.txt 70s + commit -m d⇒5 70s + TIME=1112912008 70s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 70s [d 1700773] d⇒5 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + modify d.txt 6 70s + filename=d.txt 70s + text=6 70s + echo 6 70s + git add d.txt 70s + commit -m d⇒6 70s + TIME=1112912009 70s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 70s [d df2e493] d⇒6 70s 1 file changed, 1 insertion(+), 1 deletion(-) 70s + git checkout c 70s Switched to branch 'c' 70s + git-imerge init --name=c-d d 70s + git-imerge list 71s * c-d 71s + git-imerge diagram --commits --frontier --html=imerge0.html 71s 0 5 9 71s | | | 71s 0 - ********** - c 71s *????????? 71s *????????? 71s *????????? 71s *????????? 71s 5 - *????????? 71s 6 - *????????? 71s | 71s d 71s 71s 0 5 9 71s | | | 71s 0 - ********** - c 71s *????????? 71s *????????? 71s *????????? 71s *????????? 71s 5 - *????????? 71s 6 - *????????? 71s | 71s d 71s 71s Key: 71s |,-,+ = rectangles forming current merge frontier 71s * = merge done manually 71s . = merge done automatically 71s # = conflict that is currently blocking progress 71s @ = merge was blocked but has been resolved 71s ? = no merge recorded 71s 71s + git-imerge autofill 71s + tee autofill.out 71s Attempting automerge of 9-6...failure. 71s Attempting automerge of 1-1...success. 71s Attempting automerge of 1-4...failure. 71s Attempting automerge of 1-3...failure. 71s Attempting automerge of 1-2...failure. 71s Attempting automerge of 9-1...success. 71s Autofilling 1-1...success. 71s Autofilling 2-1...success. 71s Autofilling 3-1...success. 71s Autofilling 4-1...success. 71s Autofilling 5-1...success. 71s Autofilling 6-1...success. 71s Autofilling 7-1...success. 71s Autofilling 8-1...success. 71s Autofilling 9-1...success. 71s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 71s Attempting automerge of 9-6...failure. 71s Attempting automerge of 1-2...failure. 71s HEAD is now at 243e8ed c⇒9 71s Conflict; suggest manual merge of 1-2 71s + grep -q Traceback autofill.out 71s + grep -q suggest manual merge of 1-2 autofill.out 71s + git-imerge diagram --commits --frontier --html=imerge1.html 71s 0 5 9 71s | | | 71s 0 - ********** - c 71s *......... 71s *#???????? 71s *????????? 71s *????????? 71s 5 - *????????? 71s 6 - *????????? 71s | 71s d 71s 71s 0 5 9 71s | | | 71s 0 - ********** - c 71s *--------+ 71s *#???????? 71s *????????? 71s *????????? 71s 5 - *????????? 71s 6 - *????????? 71s | 71s d 71s 71s Key: 71s |,-,+ = rectangles forming current merge frontier 71s * = merge done manually 71s . = merge done automatically 71s # = conflict that is currently blocking progress 71s @ = merge was blocked but has been resolved 71s ? = no merge recorded 71s 71s + git-imerge continue --edit 71s Switched to branch 'imerge/c-d' 71s Auto-merging conflict.txt 71s CONFLICT (content): Merge conflict in conflict.txt 71s 71s Original first commit: 71s Automatic merge failed; fix conflicts and then commit the result. 71s 71s Original second commit: 71s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 71s Author: Loú User 71s Date: Thu Apr 7 22:13:15 2005 +0000 71s 71s c⇒1 71s commit 69efde8f66d581a765a3909ffacb9f895f95c345 71s Author: Loú User 71s Date: Thu Apr 7 22:13:25 2005 +0000 71s 71s d⇒2 71s 71s There was a conflict merging commit 1-2, shown above. 71s Please resolve the conflict, commit the result, then type 71s 71s git-imerge continue 71s + echo merged version 71s + git add conflict.txt 71s + git-imerge continue --no-edit 71s [imerge/c-d 2defedd] imerge 'c-d': manual merge 1-2 71s Merge has been recorded for merge 1-2. 71s Attempting automerge of 1-6...success. 71s Autofilling 1-3...success. 71s Autofilling 1-4...success. 71s Autofilling 1-5...success. 71s Autofilling 1-6...success. 71s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 71s Attempting automerge of 9-6...success. 71s Autofilling 2-6...success. 71s Autofilling 3-6...success. 71s Autofilling 4-6...success. 71s Autofilling 5-6...success. 71s Autofilling 6-6...success. 71s Autofilling 7-6...success. 71s Autofilling 8-6...success. 71s Autofilling 9-2...success. 71s Autofilling 9-3...success. 71s Autofilling 9-4...success. 71s Autofilling 9-5...success. 71s Autofilling 9-6 (first way)...success. 71s Autofilling 9-6 (second way)...success. 71s The two ways of autofilling 9-6 agree. 71s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 71s Merge is complete! 71s + git-imerge diagram --commits --frontier --html=imerge2.html 71s 0 5 9 71s | | | 71s 0 - ********** - c 71s *......... 71s **???????. 71s *.???????. 71s *.???????. 71s 5 - *.???????. 71s 6 - *......... 71s | 71s d 71s 71s 0 5 9 71s | | | 71s 0 - ********** - c 71s *........| 71s **???????| 71s *.???????| 71s *.???????| 71s 5 - *.???????| 71s 6 - *--------+ 71s | 71s d 71s 71s Key: 71s |,-,+ = rectangles forming current merge frontier 71s * = merge done manually 71s . = merge done automatically 71s # = conflict that is currently blocking progress 71s @ = merge was blocked but has been resolved 71s ? = no merge recorded 71s 71s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 71s Merge d into c (using imerge) 71s 71s # Please enter the commit message for your changes. Lines starting 71s # with '#' will be ignored, and an empty message aborts the commit. 71s # 71s # Date: Wed Dec 3 23:16:56 2025 +0000 71s # 71s # On branch c-d-merge 71s # Changes to be committed: 71s # modified: conflict.txt 71s # modified: d.txt 71s # 71s [c-d-merge 6642939] Merge d into c (using imerge) 71s Date: Wed Dec 3 23:16:56 2025 +0000 71s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + local refname=c-d-merge 71s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git rev-parse c-d-merge^{tree} 71s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git-imerge simplify --goal=rebase --branch=c-d-rebase 71s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + local refname=c-d-rebase 71s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git rev-parse c-d-rebase^{tree} 71s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 71s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + local refname=c-d-rebase-with-history 71s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git rev-parse c-d-rebase-with-history^{tree} 71s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git-imerge simplify --goal=border --branch=c-d-border 71s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + local refname=c-d-border 71s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git rev-parse c-d-border^{tree} 71s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 71s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 72s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 72s + local refname=c-d-border-with-history 72s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 72s + git rev-parse c-d-border-with-history^{tree} 72s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 72s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 72s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 72s + local refname=c-d-border-with-history2 72s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 72s + git rev-parse c-d-border-with-history2^{tree} 72s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 72s + git-imerge remove 72s + git checkout c 72s Switched to branch 'c' 72s + git-imerge start --goal=full --first-parent --name=c-d d 72s + tee start.out 72s Attempting to merge 1-1...success. 72s Attempting to merge 1-2...conflict. 72s Attempting to merge 2-1...success. 72s Attempting to merge 3-1...success. 72s Attempting to merge 4-1...success. 72s Attempting to merge 5-1...success. 72s Attempting to merge 6-1...success. 72s Attempting to merge 7-1...success. 72s Attempting to merge 8-1...success. 72s Attempting to merge 9-1...success. 72s Previous HEAD position was 4f42ae4 imerge 'c-d': automatic merge 9-1 72s Switched to branch 'imerge/c-d' 72s Auto-merging conflict.txt 72s CONFLICT (content): Merge conflict in conflict.txt 72s Automatic merge failed; fix conflicts and then commit the result. 72s 72s Original first commit: 72s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 72s Author: Loú User 72s Date: Thu Apr 7 22:13:15 2005 +0000 72s 72s c⇒1 72s 72s Original second commit: 72s commit 69efde8f66d581a765a3909ffacb9f895f95c345 72s Author: Loú User 72s Date: Thu Apr 7 22:13:25 2005 +0000 72s 72s d⇒2 72s 72s There was a conflict merging commit 1-2, shown above. 72s Please resolve the conflict, commit the result, then type 72s 72s git-imerge continue 72s + grep -q Traceback start.out 72s + grep -q suggest manual merge of 1-2 autofill.out 72s + git-imerge diagram --commits --frontier --html=imerge3.html 72s 0 5 9 72s | | | 72s 0 - ********** - c 72s *......... 72s *#???????? 72s *????????? 72s *????????? 72s 5 - *????????? 72s 6 - *????????? 72s | 72s d 72s 72s 0 5 9 72s | | | 72s 0 - ********** - c 72s *--------+ 72s *#???????? 72s *????????? 72s *????????? 72s 5 - *????????? 72s 6 - *????????? 72s | 72s d 72s 72s Key: 72s |,-,+ = rectangles forming current merge frontier 72s * = merge done manually 72s . = merge done automatically 72s # = conflict that is currently blocking progress 72s @ = merge was blocked but has been resolved 72s ? = no merge recorded 72s 72s + echo merged version 72s + git add conflict.txt 72s + GIT_EDITOR=cat git commit 72s imerge 'c-d': manual merge 1-2 72s 72s # Conflicts: 72s # conflict.txt 72s # 72s # It looks like you may be committing a merge. 72s # If this is not correct, please run 72s # git update-ref -d MERGE_HEAD 72s # and try again. 72s 72s 72s # Please enter the commit message for your changes. Lines starting 72s # with '#' will be ignored, and an empty message aborts the commit. 72s # 72s # On branch imerge/c-d 72s # All conflicts fixed but you are still merging. 72s # 72s # Changes to be committed: 72s # modified: conflict.txt 72s # modified: d.txt 72s # 72s [imerge/c-d 2d5ab4b] imerge 'c-d': manual merge 1-2 72s + git-imerge continue --edit 72s Merge has been recorded for merge 1-2. 72s Attempting to merge 1-3...success. 72s Attempting to merge 1-4...success. 72s Attempting to merge 1-5...success. 72s Attempting to merge 1-6...success. 72s Attempting to merge 2-2...success. 72s Attempting to merge 2-3...success. 72s Attempting to merge 2-4...success. 72s Attempting to merge 2-5...success. 72s Attempting to merge 2-6...success. 72s Attempting to merge 3-2...success. 72s Attempting to merge 3-3...success. 72s Attempting to merge 3-4...success. 72s Attempting to merge 3-5...success. 72s Attempting to merge 3-6...success. 72s Attempting to merge 4-2...success. 72s Attempting to merge 4-3...success. 72s Attempting to merge 4-4...success. 72s Attempting to merge 4-5...success. 72s Attempting to merge 4-6...success. 72s Attempting to merge 5-2...success. 72s Attempting to merge 5-3...success. 72s Attempting to merge 5-4...success. 72s Attempting to merge 5-5...success. 72s Attempting to merge 5-6...success. 72s Attempting to merge 6-2...success. 72s Attempting to merge 6-3...success. 72s Attempting to merge 6-4...success. 72s Attempting to merge 6-5...success. 72s Attempting to merge 6-6...success. 72s Attempting to merge 7-2...success. 72s Attempting to merge 7-3...success. 72s Attempting to merge 7-4...success. 72s Attempting to merge 7-5...success. 72s Attempting to merge 7-6...success. 72s Attempting to merge 8-2...success. 72s Attempting to merge 8-3...success. 72s Attempting to merge 8-4...success. 72s Attempting to merge 8-5...success. 72s Attempting to merge 8-6...success. 72s Attempting to merge 9-2...success. 72s Attempting to merge 9-3...success. 72s Attempting to merge 9-4...success. 72s Attempting to merge 9-5...success. 72s Attempting to merge 9-6...success. 72s Merge is complete! 72s + git-imerge diagram --commits --frontier --html=imerge4.html 72s 0 5 9 72s | | | 72s 0 - ********** - c 72s *......... 72s **........ 72s *......... 72s *......... 72s 5 - *......... 72s 6 - *......... 72s | 72s d 72s 72s 0 5 9 72s | | | 72s 0 - ********** - c 72s *........| 72s **.......| 72s *........| 72s *........| 72s 5 - *........| 72s 6 - *--------+ 72s | 72s d 72s 72s Key: 72s |,-,+ = rectangles forming current merge frontier 72s * = merge done manually 72s . = merge done automatically 72s # = conflict that is currently blocking progress 72s @ = merge was blocked but has been resolved 72s ? = no merge recorded 72s 72s + git-imerge finish --branch=c-d-full 73s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + local refname=c-d-full 73s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + git rev-parse c-d-full^{tree} 73s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + test_conflict 9-5 73s + local conflict=9-5 73s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s + DESCRIPTION=git-imerge test repository with conflict at 9-5 73s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 73s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s + local description=git-imerge test repository with conflict at 9-5 73s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 73s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s + local description=git-imerge test repository with conflict at 9-5 73s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s hint: Using 'master' as the name for the initial branch. This default branch name 73s hint: is subject to change. To configure the initial branch name to use in all 73s hint: of your new repositories, which will suppress this warning, call: 73s hint: 73s hint: git config --global init.defaultBranch 73s hint: 73s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 73s hint: 'development'. The just-created branch can be renamed via this command: 73s hint: 73s hint: git branch -m 73s hint: 73s hint: Disable this message with "git config set advice.defaultBranchName false" 73s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5/.git/ 73s + echo git-imerge test repository with conflict at 9-5 73s + printf %s\n /*.out /*.css /*.html 73s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5/.git config user.name Loú User 73s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 73s + TIME=1112911993 73s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-9-5 73s + modify c.txt 0 73s + filename=c.txt 73s + text=0 73s + echo 0 73s + git add c.txt 73s + modify d.txt 0 73s + filename=d.txt 73s + text=0 73s + echo 0 73s + git add d.txt 73s + modify conflict.txt original version 73s + filename=conflict.txt 73s + text=original version 73s + echo original version 73s + git add conflict.txt 73s + commit -m m⇒0 73s + TIME=1112911994 73s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 73s [master (root-commit) d70e04b] m⇒0 73s 3 files changed, 3 insertions(+) 73s create mode 100644 c.txt 73s create mode 100644 conflict.txt 73s create mode 100644 d.txt 73s + git checkout -b c master -- 73s Switched to a new branch 'c' 73s + seq 9 73s + modify c.txt 1 73s + filename=c.txt 73s + text=1 73s + echo 1 73s + git add c.txt 73s + commit -m c⇒1 73s + TIME=1112911995 73s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 73s [c 89e2141] c⇒1 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify c.txt 2 73s + filename=c.txt 73s + text=2 73s + echo 2 73s + git add c.txt 73s + commit -m c⇒2 73s + TIME=1112911996 73s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 73s + modify c.txt 3 73s + filename=c.txt 73s + text=3 73s + echo 3 73s + git add c.txt 73s [c 7c431f2] c⇒2 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + commit -m c⇒3 73s + TIME=1112911997 73s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 73s [c f02ab24] c⇒3 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify c.txt 4 73s + filename=c.txt 73s + text=4 73s + echo 4 73s + git add c.txt 73s + commit -m c⇒4 73s + TIME=1112911998 73s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 73s [c ed9122f] c⇒4 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify c.txt 5 73s + filename=c.txt 73s + text=5 73s + echo 5 73s + git add c.txt 73s + commit -m c⇒5 73s + TIME=1112911999 73s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 73s [c 1d3bf09] c⇒5 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify c.txt 6 73s + filename=c.txt 73s + text=6 73s + echo 6 73s + git add c.txt 73s + commit -m c⇒6 73s + TIME=1112912000 73s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 73s [c f999ecd] c⇒6 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify c.txt 7 73s + filename=c.txt 73s + text=7 73s + echo 7 73s + git add c.txt 73s + commit -m c⇒7 73s + TIME=1112912001 73s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 73s [c 7050a8a] c⇒7 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify c.txt 8 73s + filename=c.txt 73s + text=8 73s + echo 8 73s + git add c.txt 73s + commit -m c⇒8 73s + TIME=1112912002 73s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 73s [c 9732e77] c⇒8 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify c.txt 9 73s + filename=c.txt 73s + text=9 73s + echo 9 73s + git add c.txt 73s + modify conflict.txt c version 73s + filename=conflict.txt 73s + text=c version 73s + echo c version 73s + git add conflict.txt 73s + commit -m c⇒9 73s + TIME=1112912003 73s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 73s [c 73a5eed] c⇒9 73s 2 files changed, 2 insertions(+), 2 deletions(-) 73s + git checkout -b d master -- 73s Switched to a new branch 'd' 73s + seq 6 73s + modify d.txt 1 73s + filename=d.txt 73s + text=1 73s + echo 1 73s + git add d.txt 73s + commit -m d⇒1 73s + TIME=1112912004 73s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 73s + modify d.txt 2 73s + filename=d.txt 73s + text=2 73s + echo 2 73s + git add d.txt 73s [d bd5368a] d⇒1 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + commit -m d⇒2 73s + TIME=1112912005 73s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 73s [d 93e27e6] d⇒2 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify d.txt 3 73s + filename=d.txt 73s + text=3 73s + echo 3 73s + git add d.txt 73s + commit -m d⇒3 73s + TIME=1112912006 73s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 73s [d 133f385] d⇒3 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify d.txt 4 73s + filename=d.txt 73s + text=4 73s + echo 4 73s + git add d.txt 73s + commit -m d⇒4 73s + TIME=1112912007 73s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 73s [d 586472a] d⇒4 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + modify d.txt 5 73s + filename=d.txt 73s + text=5 73s + echo 5 73s + git add d.txt 73s + modify conflict.txt d version 73s + filename=conflict.txt 73s + text=d version 73s + echo d version 73s + git add conflict.txt 73s + commit -m d⇒5 73s + TIME=1112912008 73s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 73s + modify d.txt 6 73s + filename=d.txt 73s + text=6 73s + echo 6 73s + git add d.txt 73s [d 0a6f956] d⇒5 73s 2 files changed, 2 insertions(+), 2 deletions(-) 73s + commit -m d⇒6 73s + TIME=1112912009 73s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 73s [d bfb30f0] d⇒6 73s 1 file changed, 1 insertion(+), 1 deletion(-) 73s + git checkout c 73s Switched to branch 'c' 73s + git-imerge init --name=c-d d 73s + git-imerge list 73s * c-d 73s + git-imerge diagram --commits --frontier --html=imerge0.html 73s 0 5 9 73s | | | 73s 0 - ********** - c 73s *????????? 73s *????????? 73s *????????? 73s *????????? 73s 5 - *????????? 73s 6 - *????????? 73s | 73s d 73s 73s 0 5 9 73s | | | 73s 0 - ********** - c 73s *????????? 73s *????????? 73s *????????? 73s *????????? 73s 5 - *????????? 73s 6 - *????????? 73s | 73s d 73s 73s Key: 73s |,-,+ = rectangles forming current merge frontier 73s * = merge done manually 73s . = merge done automatically 73s # = conflict that is currently blocking progress 73s @ = merge was blocked but has been resolved 73s ? = no merge recorded 73s 73s + git-imerge autofill 73s + tee autofill.out 73s Attempting automerge of 9-6...failure. 73s Attempting automerge of 1-1...success. 73s Attempting automerge of 1-4...success. 73s Attempting automerge of 1-6...success. 73s Attempting automerge of 9-6...failure. 73s Attempting automerge of 5-6...success. 73s Attempting automerge of 7-6...success. 73s Attempting automerge of 8-6...success. 73s Attempting automerge of 9-1...success. 73s Attempting automerge of 9-4...success. 73s Attempting automerge of 9-5...failure. 73s Autofilling 1-6...success. 73s Autofilling 2-6...success. 73s Autofilling 3-6...success. 73s Autofilling 4-6...success. 73s Autofilling 5-6...success. 73s Autofilling 6-6...success. 73s Autofilling 7-6...success. 73s Autofilling 8-1...success. 73s Autofilling 8-2...success. 73s Autofilling 8-3...success. 73s Autofilling 8-4...success. 73s Autofilling 8-5...success. 73s Autofilling 8-6 (first way)...success. 73s Autofilling 8-6 (second way)...success. 73s The two ways of autofilling 8-6 agree. 73s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 73s Autofilling 9-1...success. 73s Autofilling 9-2...success. 73s Autofilling 9-3...success. 73s Autofilling 9-4...success. 73s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 73s Attempting automerge of 9-6...failure. 73s Attempting automerge of 9-5...failure. 73s HEAD is now at 73a5eed c⇒9 73s Conflict; suggest manual merge of 9-5 73s + grep -q Traceback autofill.out 73s + grep -q suggest manual merge of 9-5 autofill.out 73s + git-imerge diagram --commits --frontier --html=imerge1.html 73s 0 5 9 73s | | | 73s 0 - ********** - c 73s *???????.. 73s *???????.. 73s *???????.. 73s *???????.. 73s 5 - *???????.# 73s 6 - *........? 73s | 73s d 73s 73s 0 5 9 73s | | | 73s 0 - ********** - c 73s *???????.| 73s *???????.| 73s *???????.| 73s *???????.+ 73s 5 - *???????|# 73s 6 - *-------+? 73s | 73s d 73s 73s Key: 73s |,-,+ = rectangles forming current merge frontier 73s * = merge done manually 73s . = merge done automatically 73s # = conflict that is currently blocking progress 73s @ = merge was blocked but has been resolved 73s ? = no merge recorded 73s 73s + git-imerge continue --edit 73s Switched to branch 'imerge/c-d' 73s Auto-merging conflict.txt 73s CONFLICT (content): Merge conflict in conflict.txt 73s Automatic merge failed; fix conflicts and then commit the result. 73s 73s Original first commit: 73s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 73s Author: Loú User 73s Date: Thu Apr 7 22:13:23 2005 +0000 73s 73s c⇒9 73s 73s Original second commit: 73s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 73s Author: Loú User 73s Date: Thu Apr 7 22:13:28 2005 +0000 73s 73s d⇒5 73s 73s There was a conflict merging commit 9-5, shown above. 73s Please resolve the conflict, commit the result, then type 73s 73s git-imerge continue 73s + echo merged version 73s + git add conflict.txt 73s + git-imerge continue --no-edit 73s [imerge/c-d a5fa63e] imerge 'c-d': manual merge 9-5 73s Merge has been recorded for merge 9-5. 73s Attempting automerge of 9-6...success. 73s Autofilling 9-6...success. 73s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 73s Merge is complete! 73s + git-imerge diagram --commits --frontier --html=imerge2.html 73s 0 5 9 73s | | | 73s 0 - ********** - c 73s *???????.. 73s *???????.. 73s *???????.. 73s *???????.. 73s 5 - *???????.* 73s 6 - *......... 73s | 73s d 73s 73s 0 5 9 73s | | | 73s 0 - ********** - c 73s *???????.| 73s *???????.| 73s *???????.| 73s *???????.| 73s 5 - *???????.* 73s 6 - *--------+ 73s | 73s d 73s 73s Key: 73s |,-,+ = rectangles forming current merge frontier 73s * = merge done manually 73s . = merge done automatically 73s # = conflict that is currently blocking progress 73s @ = merge was blocked but has been resolved 73s ? = no merge recorded 73s 73s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 73s Merge d into c (using imerge) 73s 73s # Please enter the commit message for your changes. Lines starting 73s # with '#' will be ignored, and an empty message aborts the commit. 73s # 73s # Date: Wed Dec 3 23:16:58 2025 +0000 73s # 73s # On branch c-d-merge 73s # Changes to be committed: 73s # modified: conflict.txt 73s # modified: d.txt 73s # 73s [c-d-merge bf8e8b6] Merge d into c (using imerge) 73s Date: Wed Dec 3 23:16:58 2025 +0000 73s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + local refname=c-d-merge 73s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + git rev-parse c-d-merge^{tree} 73s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + git-imerge simplify --goal=rebase --branch=c-d-rebase 73s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + local refname=c-d-rebase 73s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + git rev-parse c-d-rebase^{tree} 73s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 73s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + local refname=c-d-rebase-with-history 73s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + git rev-parse c-d-rebase-with-history^{tree} 73s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 73s + git-imerge simplify --goal=border --branch=c-d-border 74s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + local refname=c-d-border 74s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + git rev-parse c-d-border^{tree} 74s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 74s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + local refname=c-d-border-with-history 74s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + git rev-parse c-d-border-with-history^{tree} 74s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 74s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + local refname=c-d-border-with-history2 74s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + git rev-parse c-d-border-with-history2^{tree} 74s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 74s + git-imerge remove 74s + git checkout c 74s Switched to branch 'c' 74s + git-imerge start --goal=full --first-parent --name=c-d d 74s + tee start.out 74s Attempting to merge 1-1...success. 74s Attempting to merge 1-2...success. 74s Attempting to merge 1-3...success. 74s Attempting to merge 1-4...success. 74s Attempting to merge 1-5...success. 74s Attempting to merge 1-6...success. 74s Attempting to merge 2-1...success. 74s Attempting to merge 2-2...success. 74s Attempting to merge 2-3...success. 74s Attempting to merge 2-4...success. 74s Attempting to merge 2-5...success. 74s Attempting to merge 2-6...success. 74s Attempting to merge 3-1...success. 74s Attempting to merge 3-2...success. 74s Attempting to merge 3-3...success. 74s Attempting to merge 3-4...success. 74s Attempting to merge 3-5...success. 74s Attempting to merge 3-6...success. 74s Attempting to merge 4-1...success. 74s Attempting to merge 4-2...success. 74s Attempting to merge 4-3...success. 74s Attempting to merge 4-4...success. 74s Attempting to merge 4-5...success. 74s Attempting to merge 4-6...success. 74s Attempting to merge 5-1...success. 74s Attempting to merge 5-2...success. 74s Attempting to merge 5-3...success. 74s Attempting to merge 5-4...success. 74s Attempting to merge 5-5...success. 74s Attempting to merge 5-6...success. 74s Attempting to merge 6-1...success. 74s Attempting to merge 6-2...success. 74s Attempting to merge 6-3...success. 74s Attempting to merge 6-4...success. 74s Attempting to merge 6-5...success. 74s Attempting to merge 6-6...success. 74s Attempting to merge 7-1...success. 74s Attempting to merge 7-2...success. 74s Attempting to merge 7-3...success. 74s Attempting to merge 7-4...success. 74s Attempting to merge 7-5...success. 74s Attempting to merge 7-6...success. 74s Attempting to merge 8-1...success. 74s Attempting to merge 8-2...success. 74s Attempting to merge 8-3...success. 74s Attempting to merge 8-4...success. 74s Attempting to merge 8-5...success. 74s Attempting to merge 8-6...success. 74s Attempting to merge 9-1...success. 74s Attempting to merge 9-2...success. 74s Attempting to merge 9-3...success. 74s Attempting to merge 9-4...success. 74s Attempting to merge 9-5...conflict. 74s Switched to branch 'imerge/c-d' 74s Auto-merging conflict.txt 74s CONFLICT (content): Merge conflict in conflict.txt 74s Automatic merge failed; fix conflicts and then commit the result. 74s 74s Original first commit: 74s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 74s Author: Loú User 74s Date: Thu Apr 7 22:13:23 2005 +0000 74s 74s c⇒9 74s 74s Original second commit: 74s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 74s Author: Loú User 74s Date: Thu Apr 7 22:13:28 2005 +0000 74s 74s d⇒5 74s 74s There was a conflict merging commit 9-5, shown above. 74s Please resolve the conflict, commit the result, then type 74s 74s git-imerge continue 74s + grep -q Traceback start.out 74s + grep -q suggest manual merge of 9-5 autofill.out 74s + git-imerge diagram --commits --frontier --html=imerge3.html 74s 0 5 9 74s | | | 74s 0 - ********** - c 74s *......... 74s *......... 74s *......... 74s *......... 74s 5 - *........# 74s 6 - *........? 74s | 74s d 74s 74s 0 5 9 74s | | | 74s 0 - ********** - c 74s *........| 74s *........| 74s *........| 74s *........+ 74s 5 - *.......|# 74s 6 - *-------+? 74s | 74s d 74s 74s Key: 74s |,-,+ = rectangles forming current merge frontier 74s * = merge done manually 74s . = merge done automatically 74s # = conflict that is currently blocking progress 74s @ = merge was blocked but has been resolved 74s ? = no merge recorded 74s 74s + echo merged version 74s + git add conflict.txt 74s + GIT_EDITOR=cat git commit 74s imerge 'c-d': manual merge 9-5 74s 74s # Conflicts: 74s # conflict.txt 74s # 74s # It looks like you may be committing a merge. 74s # If this is not correct, please run 74s # git update-ref -d MERGE_HEAD 74s # and try again. 74s 74s 74s # Please enter the commit message for your changes. Lines starting 74s # with '#' will be ignored, and an empty message aborts the commit. 74s # 74s # On branch imerge/c-d 74s # All conflicts fixed but you are still merging. 74s # 74s # Changes to be committed: 74s # modified: conflict.txt 74s # modified: d.txt 74s # 74s + git-imerge continue --edit 74s [imerge/c-d 9c40848] imerge 'c-d': manual merge 9-5 74s Merge has been recorded for merge 9-5. 74s Attempting to merge 9-6...success. 74s Merge is complete! 74s + git-imerge diagram --commits --frontier --html=imerge4.html 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *......... 75s *......... 75s *......... 75s *......... 75s 5 - *........* 75s 6 - *......... 75s | 75s d 75s 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *........| 75s *........| 75s *........| 75s *........| 75s 5 - *........* 75s 6 - *--------+ 75s | 75s d 75s 75s Key: 75s |,-,+ = rectangles forming current merge frontier 75s * = merge done manually 75s . = merge done automatically 75s # = conflict that is currently blocking progress 75s @ = merge was blocked but has been resolved 75s ? = no merge recorded 75s 75s + git-imerge finish --branch=c-d-full 75s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 75s + local refname=c-d-full 75s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 75s + git rev-parse c-d-full^{tree} 75s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 75s + test_conflict 5-1 75s + local conflict=5-1 75s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s + DESCRIPTION=git-imerge test repository with conflict at 5-1 75s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 75s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s + local description=git-imerge test repository with conflict at 5-1 75s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 75s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s + local description=git-imerge test repository with conflict at 5-1 75s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1/.git/ 75s hint: Using 'master' as the name for the initial branch. This default branch name 75s hint: is subject to change. To configure the initial branch name to use in all 75s hint: of your new repositories, which will suppress this warning, call: 75s hint: 75s hint: git config --global init.defaultBranch 75s hint: 75s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 75s hint: 'development'. The just-created branch can be renamed via this command: 75s hint: 75s hint: git branch -m 75s hint: 75s hint: Disable this message with "git config set advice.defaultBranchName false" 75s + echo git-imerge test repository with conflict at 5-1 75s + printf %s\n /*.out /*.css /*.html 75s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1/.git config user.name Loú User 75s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 75s + TIME=1112911993 75s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-5-1 75s + modify c.txt 0 75s + filename=c.txt 75s + text=0 75s + echo 0 75s + git add c.txt 75s + modify d.txt 0 75s + filename=d.txt 75s + text=0 75s + echo 0 75s + git add d.txt 75s + modify conflict.txt original version 75s + filename=conflict.txt 75s + text=original version 75s + echo original version 75s + git add conflict.txt 75s + commit -m m⇒0 75s + TIME=1112911994 75s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 75s [master (root-commit) d70e04b] m⇒0 75s 3 files changed, 3 insertions(+) 75s create mode 100644 c.txt 75s create mode 100644 conflict.txt 75s create mode 100644 d.txt 75s + git checkout -b c master -- 75s Switched to a new branch 'c' 75s + seq 9 75s + modify c.txt 1 75s + filename=c.txt 75s + text=1 75s + echo 1 75s + git add c.txt 75s + commit -m c⇒1 75s + TIME=1112911995 75s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 75s [c 89e2141] c⇒1 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify c.txt 2 75s + filename=c.txt 75s + text=2 75s + echo 2 75s + git add c.txt 75s + commit -m c⇒2 75s + TIME=1112911996 75s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 75s [c 7c431f2] c⇒2 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify c.txt 3 75s + filename=c.txt 75s + text=3 75s + echo 3 75s + git add c.txt 75s + commit -m c⇒3 75s + TIME=1112911997 75s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 75s [c f02ab24] c⇒3 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify c.txt 4 75s + filename=c.txt 75s + text=4 75s + echo 4 75s + git add c.txt 75s + commit -m c⇒4 75s + TIME=1112911998 75s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 75s [c ed9122f] c⇒4 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify c.txt 5 75s + filename=c.txt 75s + text=5 75s + echo 5 75s + git add c.txt 75s + modify conflict.txt c version 75s + filename=conflict.txt 75s + text=c version 75s + echo c version 75s + git add conflict.txt 75s + commit -m c⇒5 75s + TIME=1112911999 75s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 75s [c 7e31f25] c⇒5 75s 2 files changed, 2 insertions(+), 2 deletions(-) 75s + modify c.txt 6 75s + filename=c.txt 75s + text=6 75s + echo 6 75s + git add c.txt 75s + commit -m c⇒6 75s + TIME=1112912000 75s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 75s [c df3c57a] c⇒6 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify c.txt 7 75s + filename=c.txt 75s + text=7 75s + echo 7 75s + git add c.txt 75s + commit -m c⇒7 75s + TIME=1112912001 75s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 75s [c ea32d81] c⇒7 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify c.txt 8 75s + filename=c.txt 75s + text=8 75s + echo 8 75s + git add c.txt 75s + commit -m c⇒8 75s + TIME=1112912002 75s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 75s [c 44473d6] c⇒8 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify c.txt 9 75s + filename=c.txt 75s + text=9 75s + echo 9 75s + git add c.txt 75s + commit -m c⇒9 75s + TIME=1112912003 75s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 75s [c d8d80cf] c⇒9 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + git checkout -b d master -- 75s Switched to a new branch 'd' 75s + seq 6 75s + modify d.txt 1 75s + filename=d.txt 75s + text=1 75s + echo 1 75s + git add d.txt 75s + modify conflict.txt d version 75s + filename=conflict.txt 75s + text=d version 75s + echo d version 75s + git add conflict.txt 75s + commit -m d⇒1 75s + TIME=1112912004 75s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 75s [d ac0427a] d⇒1 75s 2 files changed, 2 insertions(+), 2 deletions(-) 75s + modify d.txt 2 75s + filename=d.txt 75s + text=2 75s + echo 2 75s + git add d.txt 75s + commit -m d⇒2 75s + TIME=1112912005 75s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 75s [d 43c38c0] d⇒2 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify d.txt 3 75s + filename=d.txt 75s + text=3 75s + echo 3 75s + git add d.txt 75s + commit -m d⇒3 75s + TIME=1112912006 75s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 75s [d 0260058] d⇒3 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify d.txt 4 75s + filename=d.txt 75s + text=4 75s + echo 4 75s + git add d.txt 75s + commit -m d⇒4 75s + TIME=1112912007 75s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 75s [d 40fef44] d⇒4 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify d.txt 5 75s + filename=d.txt 75s + text=5 75s + echo 5 75s + git add d.txt 75s + commit -m d⇒5 75s + TIME=1112912008 75s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 75s [d b080a65] d⇒5 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + modify d.txt 6 75s + filename=d.txt 75s + text=6 75s + echo 6 75s + git add d.txt 75s + commit -m d⇒6 75s + TIME=1112912009 75s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 75s [d 200ce5c] d⇒6 75s 1 file changed, 1 insertion(+), 1 deletion(-) 75s + git checkout c 75s Switched to branch 'c' 75s + git-imerge init --name=c-d d 75s + git-imerge list 75s * c-d 75s + git-imerge diagram --commits --frontier --html=imerge0.html 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *????????? 75s *????????? 75s *????????? 75s *????????? 75s 5 - *????????? 75s 6 - *????????? 75s | 75s d 75s 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *????????? 75s *????????? 75s *????????? 75s *????????? 75s 5 - *????????? 75s 6 - *????????? 75s | 75s d 75s 75s Key: 75s |,-,+ = rectangles forming current merge frontier 75s * = merge done manually 75s . = merge done automatically 75s # = conflict that is currently blocking progress 75s @ = merge was blocked but has been resolved 75s ? = no merge recorded 75s 75s + git-imerge autofill 75s + tee autofill.out 75s Attempting automerge of 9-6...failure. 75s Attempting automerge of 1-1...success. 75s Attempting automerge of 1-4...success. 75s Attempting automerge of 1-6...success. 75s Attempting automerge of 9-6...failure. 75s Attempting automerge of 5-6...failure. 75s Attempting automerge of 3-6...success. 75s Attempting automerge of 4-6...success. 75s Attempting automerge of 5-1...failure. 75s Autofilling 1-6...success. 75s Autofilling 2-6...success. 75s Autofilling 3-6...success. 75s Autofilling 4-1...success. 75s Autofilling 4-2...success. 75s Autofilling 4-3...success. 75s Autofilling 4-4...success. 75s Autofilling 4-5...success. 75s Autofilling 4-6 (first way)...success. 75s Autofilling 4-6 (second way)...success. 75s The two ways of autofilling 4-6 agree. 75s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 75s Attempting automerge of 9-6...failure. 75s Attempting automerge of 5-1...failure. 75s HEAD is now at d8d80cf c⇒9 75s Conflict; suggest manual merge of 5-1 75s + grep -q Traceback autofill.out 75s + grep -q suggest manual merge of 5-1 autofill.out 75s + git-imerge diagram --commits --frontier --html=imerge1.html 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *???.#???? 75s *???.????? 75s *???.????? 75s *???.????? 75s 5 - *???.????? 75s 6 - *....????? 75s | 75s d 75s 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *???|#???? 75s *???|????? 75s *???|????? 75s *???|????? 75s 5 - *???|????? 75s 6 - *---+????? 75s | 75s d 75s 75s Key: 75s |,-,+ = rectangles forming current merge frontier 75s * = merge done manually 75s . = merge done automatically 75s # = conflict that is currently blocking progress 75s @ = merge was blocked but has been resolved 75s ? = no merge recorded 75s 75s + git-imerge continue --edit 75s Switched to branch 'imerge/c-d' 75s Auto-merging conflict.txt 75s CONFLICT (content): Merge conflict in conflict.txt 75s Automatic merge failed; fix conflicts and then commit the result. 75s commit 7e31f254c318decc434628f023dac0703f3d2b9e 75s Author: Loú User 75s Date: Thu Apr 7 22:13:19 2005 +0000 75s 75s c⇒5 75s 75s Original first commit: 75s 75s Original second commit: 75s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 75s Author: Loú User 75s Date: Thu Apr 7 22:13:24 2005 +0000 75s 75s d⇒1 75s 75s There was a conflict merging commit 5-1, shown above. 75s Please resolve the conflict, commit the result, then type 75s 75s git-imerge continue 75s + echo merged version 75s + git add conflict.txt 75s + git-imerge continue --no-edit 75s [imerge/c-d a5d43ac] imerge 'c-d': manual merge 5-1 75s Merge has been recorded for merge 5-1. 75s Attempting automerge of 5-6...success. 75s Autofilling 5-2...success. 75s Autofilling 5-3...success. 75s Autofilling 5-4...success. 75s Autofilling 5-5...success. 75s Autofilling 5-6...success. 75s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 75s Attempting automerge of 9-6...success. 75s Autofilling 6-6...success. 75s Autofilling 7-6...success. 75s Autofilling 8-6...success. 75s Autofilling 9-1...success. 75s Autofilling 9-2...success. 75s Autofilling 9-3...success. 75s Autofilling 9-4...success. 75s Autofilling 9-5...success. 75s Autofilling 9-6 (first way)...success. 75s Autofilling 9-6 (second way)...success. 75s The two ways of autofilling 9-6 agree. 75s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 75s Merge is complete! 75s + git-imerge diagram --commits --frontier --html=imerge2.html 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *???.*???. 75s *???..???. 75s *???..???. 75s *???..???. 75s 5 - *???..???. 75s 6 - *......... 75s | 75s d 75s 75s 0 5 9 75s | | | 75s 0 - ********** - c 75s *???.*???| 75s *???..???| 75s *???..???| 75s *???..???| 75s 5 - *???..???| 75s 6 - *--------+ 75s | 75s d 75s 75s Key: 75s |,-,+ = rectangles forming current merge frontier 75s * = merge done manually 75s . = merge done automatically 75s # = conflict that is currently blocking progress 75s @ = merge was blocked but has been resolved 75s ? = no merge recorded 75s 75s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 75s Merge d into c (using imerge) 75s 75s # Please enter the commit message for your changes. Lines starting 75s # with '#' will be ignored, and an empty message aborts the commit. 75s # 75s # Date: Wed Dec 3 23:17:00 2025 +0000 75s # 75s # On branch c-d-merge 75s # Changes to be committed: 75s # modified: conflict.txt 75s # modified: d.txt 75s # 75s [c-d-merge 021333f] Merge d into c (using imerge) 75s Date: Wed Dec 3 23:17:00 2025 +0000 75s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 75s + local refname=c-d-merge 75s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 75s + git rev-parse c-d-merge^{tree} 75s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 75s + git-imerge simplify --goal=rebase --branch=c-d-rebase 76s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + local refname=c-d-rebase 76s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git rev-parse c-d-rebase^{tree} 76s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 76s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + local refname=c-d-rebase-with-history 76s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git rev-parse c-d-rebase-with-history^{tree} 76s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git-imerge simplify --goal=border --branch=c-d-border 76s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + local refname=c-d-border 76s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git rev-parse c-d-border^{tree} 76s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 76s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + local refname=c-d-border-with-history 76s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git rev-parse c-d-border-with-history^{tree} 76s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 76s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + local refname=c-d-border-with-history2 76s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git rev-parse c-d-border-with-history2^{tree} 76s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 76s + git-imerge remove 76s + git checkout c 76s Switched to branch 'c' 76s + git-imerge start --goal=full --first-parent --name=c-d d 76s + tee start.out 76s Attempting to merge 1-1...success. 76s Attempting to merge 1-2...success. 76s Attempting to merge 1-3...success. 76s Attempting to merge 1-4...success. 76s Attempting to merge 1-5...success. 76s Attempting to merge 1-6...success. 76s Attempting to merge 2-1...success. 76s Attempting to merge 2-2...success. 76s Attempting to merge 2-3...success. 76s Attempting to merge 2-4...success. 76s Attempting to merge 2-5...success. 76s Attempting to merge 2-6...success. 76s Attempting to merge 3-1...success. 76s Attempting to merge 3-2...success. 76s Attempting to merge 3-3...success. 76s Attempting to merge 3-4...success. 76s Attempting to merge 3-5...success. 76s Attempting to merge 3-6...success. 76s Attempting to merge 4-1...success. 76s Attempting to merge 4-2...success. 76s Attempting to merge 4-3...success. 76s Attempting to merge 4-4...success. 76s Attempting to merge 4-5...success. 76s Attempting to merge 4-6...success. 76s Attempting to merge 5-1...conflict. 76s Switched to branch 'imerge/c-d' 76s Auto-merging conflict.txt 76s CONFLICT (content): Merge conflict in conflict.txt 76s Automatic merge failed; fix conflicts and then commit the result. 76s 76s Original first commit: 76s commit 7e31f254c318decc434628f023dac0703f3d2b9e 76s Author: Loú User 76s Date: Thu Apr 7 22:13:19 2005 +0000 76s 76s c⇒5 76s 76s Original second commit: 76s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 76s Author: Loú User 76s Date: Thu Apr 7 22:13:24 2005 +0000 76s 76s d⇒1 76s 76s There was a conflict merging commit 5-1, shown above. 76s Please resolve the conflict, commit the result, then type 76s 76s git-imerge continue 76s + grep -q Traceback start.out 76s + grep -q suggest manual merge of 5-1 autofill.out 76s + git-imerge diagram --commits --frontier --html=imerge3.html 76s 0 5 9 76s | | | 76s 0 - ********** - c 76s *....#???? 76s *....????? 76s *....????? 76s *....????? 76s 5 - *....????? 76s 6 - *....????? 76s | 76s d 76s 76s 0 5 9 76s | | | 76s 0 - ********** - c 76s *...|#???? 76s *...|????? 76s *...|????? 76s *...|????? 76s 5 - *...|????? 76s 6 - *---+????? 76s | 76s d 76s 76s Key: 76s |,-,+ = rectangles forming current merge frontier 76s * = merge done manually 76s . = merge done automatically 76s # = conflict that is currently blocking progress 76s @ = merge was blocked but has been resolved 76s ? = no merge recorded 76s 76s + echo merged version 76s + git add conflict.txt 76s + GIT_EDITOR=cat git commit 76s imerge 'c-d': manual merge 5-1 76s 76s # Conflicts: 76s # conflict.txt 76s # 76s # It looks like you may be committing a merge. 76s # If this is not correct, please run 76s # git update-ref -d MERGE_HEAD 76s # and try again. 76s 76s 76s # Please enter the commit message for your changes. Lines starting 76s # with '#' will be ignored, and an empty message aborts the commit. 76s # 76s # On branch imerge/c-d 76s # All conflicts fixed but you are still merging. 76s # 76s # Changes to be committed: 76s # modified: conflict.txt 76s # modified: d.txt 76s # 76s [imerge/c-d 2d06dab] imerge 'c-d': manual merge 5-1 76s + git-imerge continue --edit 76s Merge has been recorded for merge 5-1. 76s Attempting to merge 5-2...success. 76s Attempting to merge 5-3...success. 76s Attempting to merge 5-4...success. 76s Attempting to merge 5-5...success. 76s Attempting to merge 5-6...success. 76s Attempting to merge 6-1...success. 76s Attempting to merge 6-2...success. 76s Attempting to merge 6-3...success. 76s Attempting to merge 6-4...success. 76s Attempting to merge 6-5...success. 76s Attempting to merge 6-6...success. 76s Attempting to merge 7-1...success. 76s Attempting to merge 7-2...success. 76s Attempting to merge 7-3...success. 76s Attempting to merge 7-4...success. 77s Attempting to merge 7-5...success. 77s Attempting to merge 7-6...success. 77s Attempting to merge 8-1...success. 77s Attempting to merge 8-2...success. 77s Attempting to merge 8-3...success. 77s Attempting to merge 8-4...success. 77s Attempting to merge 8-5...success. 77s Attempting to merge 8-6...success. 77s Attempting to merge 9-1...success. 77s Attempting to merge 9-2...success. 77s Attempting to merge 9-3...success. 77s Attempting to merge 9-4...success. 77s Attempting to merge 9-5...success. 77s Attempting to merge 9-6...success. 77s Merge is complete! 77s + git-imerge diagram --commits --frontier --html=imerge4.html 77s 0 5 9 77s | | | 77s 0 - ********** - c 77s *....*.... 77s *......... 77s *......... 77s *......... 77s 5 - *......... 77s 6 - *......... 77s | 77s d 77s 77s 0 5 9 77s | | | 77s 0 - ********** - c 77s *....*...| 77s *........| 77s *........| 77s *........| 77s 5 - *........| 77s 6 - *--------+ 77s | 77s d 77s 77s Key: 77s |,-,+ = rectangles forming current merge frontier 77s * = merge done manually 77s . = merge done automatically 77s # = conflict that is currently blocking progress 77s @ = merge was blocked but has been resolved 77s ? = no merge recorded 77s 77s + git-imerge finish --branch=c-d-full 77s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 77s + local refname=c-d-full 77s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 77s + git rev-parse c-d-full^{tree} 77s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 77s + test_conflict 6-6 77s + local conflict=6-6 77s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s + DESCRIPTION=git-imerge test repository with conflict at 6-6 77s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 77s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s + local description=git-imerge test repository with conflict at 6-6 77s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 77s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s + local description=git-imerge test repository with conflict at 6-6 77s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6/.git/ 77s hint: Using 'master' as the name for the initial branch. This default branch name 77s hint: is subject to change. To configure the initial branch name to use in all 77s hint: of your new repositories, which will suppress this warning, call: 77s hint: 77s hint: git config --global init.defaultBranch 77s hint: 77s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 77s hint: 'development'. The just-created branch can be renamed via this command: 77s hint: 77s hint: git branch -m 77s hint: 77s hint: Disable this message with "git config set advice.defaultBranchName false" 77s + echo git-imerge test repository with conflict at 6-6 77s + printf %s\n /*.out /*.css /*.html 77s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6/.git config user.name Loú User 77s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 77s + TIME=1112911993 77s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/conflicted-6-6 77s + modify c.txt 0 77s + filename=c.txt 77s + text=0 77s + echo 0 77s + git add c.txt 77s + modify d.txt 0 77s + filename=d.txt 77s + text=0 77s + echo 0 77s + git add d.txt 77s + modify conflict.txt original version 77s + filename=conflict.txt 77s + text=original version 77s + echo original version 77s + git add conflict.txt 77s + commit -m m⇒0 77s + TIME=1112911994 77s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 77s [master (root-commit) d70e04b] m⇒0 77s 3 files changed, 3 insertions(+) 77s create mode 100644 c.txt 77s create mode 100644 conflict.txt 77s create mode 100644 d.txt 77s + git checkout -b c master -- 77s Switched to a new branch 'c' 77s + seq 9 77s + modify c.txt 1 77s + filename=c.txt 77s + text=1 77s + echo 1 77s + git add c.txt 77s + commit -m c⇒1 77s + TIME=1112911995 77s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 77s [c 89e2141] c⇒1 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify c.txt 2 77s + filename=c.txt 77s + text=2 77s + echo 2 77s + git add c.txt 77s + commit -m c⇒2 77s + TIME=1112911996 77s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 77s [c 7c431f2] c⇒2 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify c.txt 3 77s + filename=c.txt 77s + text=3 77s + echo 3 77s + git add c.txt 77s + commit -m c⇒3 77s + TIME=1112911997 77s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 77s [c f02ab24] c⇒3 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify c.txt 4 77s + filename=c.txt 77s + text=4 77s + echo 4 77s + git add c.txt 77s + commit -m c⇒4 77s + TIME=1112911998 77s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 77s [c ed9122f] c⇒4 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify c.txt 5 77s + filename=c.txt 77s + text=5 77s + echo 5 77s + git add c.txt 77s + commit -m c⇒5 77s + TIME=1112911999 77s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 77s + modify c.txt 6 77s + filename=c.txt 77s + text=6 77s + echo 6 77s + git add c.txt 77s [c 1d3bf09] c⇒5 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify conflict.txt c version 77s + filename=conflict.txt 77s + text=c version 77s + echo c version 77s + git add conflict.txt 77s + commit -m c⇒6 77s + TIME=1112912000 77s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 77s [c fe4fed8] c⇒6 77s 2 files changed, 2 insertions(+), 2 deletions(-) 77s + modify c.txt 7 77s + filename=c.txt 77s + text=7 77s + echo 7 77s + git add c.txt 77s + commit -m c⇒7 77s + TIME=1112912001 77s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 77s [c ec255ea] c⇒7 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify c.txt 8 77s + filename=c.txt 77s + text=8 77s + echo 8 77s + git add c.txt 77s + commit -m c⇒8 77s + TIME=1112912002 77s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 77s [c 7459ac3] c⇒8 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify c.txt 9 77s + filename=c.txt 77s + text=9 77s + echo 9 77s + git add c.txt 77s + commit -m c⇒9 77s + TIME=1112912003 77s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 77s [c 70408c8] c⇒9 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + git checkout -b d master -- 77s Switched to a new branch 'd' 77s + seq 6 77s + modify d.txt 1 77s + filename=d.txt 77s + text=1 77s + echo 1 77s + git add d.txt 77s + commit -m d⇒1 77s + TIME=1112912004 77s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 77s [d bd5368a] d⇒1 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify d.txt 2 77s + filename=d.txt 77s + text=2 77s + echo 2 77s + git add d.txt 77s + commit -m d⇒2 77s + TIME=1112912005 77s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 77s [d 93e27e6] d⇒2 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify d.txt 3 77s + filename=d.txt 77s + text=3 77s + echo 3 77s + git add d.txt 77s + commit -m d⇒3 77s + TIME=1112912006 77s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 77s [d 133f385] d⇒3 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify d.txt 4 77s + filename=d.txt 77s + text=4 77s + echo 4 77s + git add d.txt 77s + commit -m d⇒4 77s + TIME=1112912007 77s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 77s [d 586472a] d⇒4 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify d.txt 5 77s + filename=d.txt 77s + text=5 77s + echo 5 77s + git add d.txt 77s + commit -m d⇒5 77s + TIME=1112912008 77s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 77s + modify d.txt 6 77s + filename=d.txt 77s + text=6 77s + echo 6 77s + git add d.txt 77s [d 9522207] d⇒5 77s 1 file changed, 1 insertion(+), 1 deletion(-) 77s + modify conflict.txt d version 77s + filename=conflict.txt 77s + text=d version 77s + echo d version 77s + git add conflict.txt 77s + commit -m d⇒6 77s + TIME=1112912009 77s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 77s [d f7e451a] d⇒6 77s 2 files changed, 2 insertions(+), 2 deletions(-) 77s + git checkout c 77s Switched to branch 'c' 77s + git-imerge init --name=c-d d 77s + git-imerge list 77s * c-d 77s + git-imerge diagram --commits --frontier --html=imerge0.html 77s 0 5 9 77s | | | 77s 0 - ********** - c 77s *????????? 77s *????????? 77s *????????? 77s *????????? 77s 5 - *????????? 77s 6 - *????????? 77s | 77s d 77s 77s 0 5 9 77s | | | 77s 0 - ********** - c 77s *????????? 77s *????????? 77s *????????? 77s *????????? 77s 5 - *????????? 77s 6 - *????????? 77s | 77s d 77s 77s Key: 77s |,-,+ = rectangles forming current merge frontier 77s * = merge done manually 77s . = merge done automatically 77s # = conflict that is currently blocking progress 77s @ = merge was blocked but has been resolved 77s ? = no merge recorded 77s 77s + git-imerge autofill 77s + tee autofill.out 77s Attempting automerge of 9-6...failure. 77s Attempting automerge of 1-1...success. 77s Attempting automerge of 1-4...success. 77s Attempting automerge of 1-6...success. 77s Attempting automerge of 9-6...failure. 77s Attempting automerge of 5-6...success. 77s Attempting automerge of 7-6...failure. 77s Attempting automerge of 6-6...failure. 77s Attempting automerge of 6-1...success. 77s Attempting automerge of 6-4...success. 77s Attempting automerge of 6-5...success. 77s Attempting automerge of 9-5...success. 77s Autofilling 1-6...success. 77s Autofilling 2-6...success. 77s Autofilling 3-6...success. 77s Autofilling 4-6...success. 77s Autofilling 5-1...success. 77s Autofilling 5-2...success. 77s Autofilling 5-3...success. 77s Autofilling 5-4...success. 77s Autofilling 5-5...success. 77s Autofilling 5-6 (first way)...success. 77s Autofilling 5-6 (second way)...success. 77s The two ways of autofilling 5-6 agree. 77s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 77s Autofilling 6-5...success. 77s Autofilling 7-5...success. 77s Autofilling 8-5...success. 77s Autofilling 9-1...success. 77s Autofilling 9-2...success. 77s Autofilling 9-3...success. 77s Autofilling 9-4...success. 77s Autofilling 9-5 (first way)...success. 77s Autofilling 9-5 (second way)...success. 77s The two ways of autofilling 9-5 agree. 77s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 77s Attempting automerge of 9-6...failure. 77s Attempting automerge of 6-6...failure. 77s HEAD is now at 70408c8 c⇒9 77s Conflict; suggest manual merge of 6-6 77s + grep -q Traceback autofill.out 77s + grep -q suggest manual merge of 6-6 autofill.out 77s + git-imerge diagram --commits --frontier --html=imerge1.html 77s 0 5 9 77s | | | 77s 0 - ********** - c 77s *????.???. 77s *????.???. 77s *????.???. 77s *????.???. 77s 5 - *????..... 77s 6 - *.....#??? 77s | 77s d 77s 77s 0 5 9 77s | | | 77s 0 - ********** - c 77s *????.???| 77s *????.???| 77s *????.???| 77s *????.???| 77s 5 - *????.---+ 77s 6 - *----+#??? 77s | 77s d 77s 77s Key: 77s |,-,+ = rectangles forming current merge frontier 77s * = merge done manually 77s . = merge done automatically 77s # = conflict that is currently blocking progress 77s @ = merge was blocked but has been resolved 77s ? = no merge recorded 77s 77s + git-imerge continue --edit 77s Switched to branch 'imerge/c-d' 77s 77s Original first commit: 77s Auto-merging conflict.txt 77s CONFLICT (content): Merge conflict in conflict.txt 77s Automatic merge failed; fix conflicts and then commit the result. 77s 77s Original second commit: 77s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 77s Author: Loú User 77s Date: Thu Apr 7 22:13:20 2005 +0000 77s 77s c⇒6 77s commit f7e451a6c9656dda15641a9fbc591a602f158692 77s Author: Loú User 77s Date: Thu Apr 7 22:13:29 2005 +0000 77s 77s d⇒6 77s 77s There was a conflict merging commit 6-6, shown above. 77s Please resolve the conflict, commit the result, then type 77s 77s git-imerge continue 77s + echo merged version 77s + git add conflict.txt 77s + git-imerge continue --no-edit 77s [imerge/c-d 68ea5ea] imerge 'c-d': manual merge 6-6 77s Merge has been recorded for merge 6-6. 77s Attempting automerge of 9-6...success. 77s Autofilling 7-6...success. 77s Autofilling 8-6...success. 77s Autofilling 9-6...success. 77s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 77s Merge is complete! 77s + git-imerge diagram --commits --frontier --html=imerge2.html 78s 0 5 9 78s | | | 78s 0 - ********** - c 78s *????.???. 78s *????.???. 78s *????.???. 78s *????.???. 78s 5 - *????..... 78s 6 - *.....*... 78s | 78s d 78s 78s 0 5 9 78s | | | 78s 0 - ********** - c 78s *????.???| 78s *????.???| 78s *????.???| 78s *????.???| 78s 5 - *????....| 78s 6 - *-----*--+ 78s | 78s d 78s 78s Key: 78s |,-,+ = rectangles forming current merge frontier 78s * = merge done manually 78s . = merge done automatically 78s # = conflict that is currently blocking progress 78s @ = merge was blocked but has been resolved 78s ? = no merge recorded 78s 78s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 78s Merge d into c (using imerge) 78s 78s # Please enter the commit message for your changes. Lines starting 78s # with '#' will be ignored, and an empty message aborts the commit. 78s # 78s # Date: Wed Dec 3 23:17:03 2025 +0000 78s # 78s # On branch c-d-merge 78s # Changes to be committed: 78s # modified: conflict.txt 78s # modified: d.txt 78s # 78s [c-d-merge d1ace38] Merge d into c (using imerge) 78s Date: Wed Dec 3 23:17:03 2025 +0000 78s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + local refname=c-d-merge 78s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git rev-parse c-d-merge^{tree} 78s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git-imerge simplify --goal=rebase --branch=c-d-rebase 78s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + local refname=c-d-rebase 78s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git rev-parse c-d-rebase^{tree} 78s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 78s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + local refname=c-d-rebase-with-history 78s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git rev-parse c-d-rebase-with-history^{tree} 78s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git-imerge simplify --goal=border --branch=c-d-border 78s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + local refname=c-d-border 78s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git rev-parse c-d-border^{tree} 78s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 78s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + local refname=c-d-border-with-history 78s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git rev-parse c-d-border-with-history^{tree} 78s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 78s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + local refname=c-d-border-with-history2 78s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git rev-parse c-d-border-with-history2^{tree} 78s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 78s + git-imerge remove 78s + git checkout c 78s Switched to branch 'c' 78s + + tee start.out 78s git-imerge start --goal=full --first-parent --name=c-d d 78s Attempting to merge 1-1...success. 78s Attempting to merge 1-2...success. 78s Attempting to merge 1-3...success. 78s Attempting to merge 1-4...success. 78s Attempting to merge 1-5...success. 78s Attempting to merge 1-6...success. 78s Attempting to merge 2-1...success. 78s Attempting to merge 2-2...success. 78s Attempting to merge 2-3...success. 78s Attempting to merge 2-4...success. 78s Attempting to merge 2-5...success. 78s Attempting to merge 2-6...success. 78s Attempting to merge 3-1...success. 78s Attempting to merge 3-2...success. 78s Attempting to merge 3-3...success. 78s Attempting to merge 3-4...success. 78s Attempting to merge 3-5...success. 78s Attempting to merge 3-6...success. 78s Attempting to merge 4-1...success. 78s Attempting to merge 4-2...success. 78s Attempting to merge 4-3...success. 78s Attempting to merge 4-4...success. 78s Attempting to merge 4-5...success. 78s Attempting to merge 4-6...success. 78s Attempting to merge 5-1...success. 78s Attempting to merge 5-2...success. 78s Attempting to merge 5-3...success. 78s Attempting to merge 5-4...success. 78s Attempting to merge 5-5...success. 78s Attempting to merge 5-6...success. 78s Attempting to merge 6-1...success. 78s Attempting to merge 6-2...success. 78s Attempting to merge 6-3...success. 78s Attempting to merge 6-4...success. 78s Attempting to merge 6-5...success. 79s Attempting to merge 6-6...conflict. 79s Attempting to merge 7-1...success. 79s Attempting to merge 7-2...success. 79s Attempting to merge 7-3...success. 79s Attempting to merge 7-4...success. 79s Attempting to merge 7-5...success. 79s Attempting to merge 8-1...success. 79s Attempting to merge 8-2...success. 79s Attempting to merge 8-3...success. 79s Attempting to merge 8-4...success. 79s Attempting to merge 8-5...success. 79s Attempting to merge 9-1...success. 79s Attempting to merge 9-2...success. 79s Attempting to merge 9-3...success. 79s Attempting to merge 9-4...success. 79s Attempting to merge 9-5...success. 79s Previous HEAD position was 66221ae imerge 'c-d': automatic merge 9-5 79s Switched to branch 'imerge/c-d' 79s Auto-merging conflict.txt 79s CONFLICT (content): Merge conflict in conflict.txt 79s Automatic merge failed; fix conflicts and then commit the result. 79s 79s Original first commit: 79s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 79s Author: Loú User 79s Date: Thu Apr 7 22:13:20 2005 +0000 79s 79s c⇒6 79s 79s Original second commit: 79s commit f7e451a6c9656dda15641a9fbc591a602f158692 79s Author: Loú User 79s Date: Thu Apr 7 22:13:29 2005 +0000 79s 79s d⇒6 79s 79s There was a conflict merging commit 6-6, shown above. 79s Please resolve the conflict, commit the result, then type 79s 79s git-imerge continue 79s + grep -q Traceback start.out 79s + grep -q suggest manual merge of 6-6 autofill.out 79s + git-imerge diagram --commits --frontier --html=imerge3.html 79s 0 5 9 79s | | | 79s 0 - ********** - c 79s *......... 79s *......... 79s *......... 79s *......... 79s 5 - *......... 79s 6 - *.....#??? 79s | 79s d 79s 79s 0 5 9 79s | | | 79s 0 - ********** - c 79s *........| 79s *........| 79s *........| 79s *........| 79s 5 - *.....---+ 79s 6 - *----+#??? 79s | 79s d 79s 79s Key: 79s |,-,+ = rectangles forming current merge frontier 79s * = merge done manually 79s . = merge done automatically 79s # = conflict that is currently blocking progress 79s @ = merge was blocked but has been resolved 79s ? = no merge recorded 79s 79s + echo merged version 79s + git add conflict.txt 79s + GIT_EDITOR=cat git commit 79s imerge 'c-d': manual merge 6-6 79s 79s # Conflicts: 79s # conflict.txt 79s # 79s # It looks like you may be committing a merge. 79s # If this is not correct, please run 79s # git update-ref -d MERGE_HEAD 79s # and try again. 79s 79s 79s # Please enter the commit message for your changes. Lines starting 79s # with '#' will be ignored, and an empty message aborts the commit. 79s # 79s # On branch imerge/c-d 79s # All conflicts fixed but you are still merging. 79s # 79s # Changes to be committed: 79s # modified: conflict.txt 79s # modified: d.txt 79s # 79s + git-imerge continue --edit 79s [imerge/c-d 01229e3] imerge 'c-d': manual merge 6-6 79s Merge has been recorded for merge 6-6. 79s Attempting to merge 7-6...success. 79s Attempting to merge 8-6...success. 79s Attempting to merge 9-6...success. 79s Merge is complete! 79s + git-imerge diagram --commits --frontier --html=imerge4.html 79s 0 5 9 79s | | | 79s 0 - ********** - c 79s *......... 79s *......... 79s *......... 79s *......... 79s 5 - *......... 79s 6 - *.....*... 79s | 79s d 79s 79s 0 5 9 79s | | | 79s 0 - ********** - c 79s *........| 79s *........| 79s *........| 79s *........| 79s 5 - *........| 79s 6 - *-----*--+ 79s | 79s d 79s 79s Key: 79s |,-,+ = rectangles forming current merge frontier 79s * = merge done manually 79s . = merge done automatically 79s # = conflict that is currently blocking progress 79s @ = merge was blocked but has been resolved 79s ? = no merge recorded 79s 79s + git-imerge finish --branch=c-d-full 79s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 79s + local refname=c-d-full 79s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 79s + git rev-parse c-d-full^{tree} 79s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 79s py313: commands[2] /tmp/autopkgtest.ZvitK4/build.No0/src> /bin/sh t/test-really-conflicted 79s + dirname t/test-really-conflicted 79s + cd t 79s + pwd 79s + dirname /tmp/autopkgtest.ZvitK4/build.No0/src/t 79s + BASE=/tmp/autopkgtest.ZvitK4/build.No0/src 79s + . /tmp/autopkgtest.ZvitK4/build.No0/src/t/test-lib.sh 79s + GIT_IMERGE=git-imerge 79s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s + DESCRIPTION=git-imerge test repository with multiple conflicts 79s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 79s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s + local description=git-imerge test repository with multiple conflicts 79s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 79s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s + local description=git-imerge test repository with multiple conflicts 79s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s hint: Using 'master' as the name for the initial branch. This default branch name 79s hint: is subject to change. To configure the initial branch name to use in all 79s hint: of your new repositories, which will suppress this warning, call: 79s hint: 79s hint: git config --global init.defaultBranch 79s hint: 79s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 79s hint: 'development'. The just-created branch can be renamed via this command: 79s hint: 79s hint: git branch -m 79s hint: 79s hint: Disable this message with "git config set advice.defaultBranchName false" 79s + echo git-imerge test repository with multiple conflicts 79s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted/.git/ 79s + printf %s\n /*.out /*.css /*.html 79s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted/.git config user.name Loú User 79s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted/.git config user.email luser@example.com 79s + TIME=1112911993 79s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/really-conflicted 79s + modify c.txt 0 79s + filename=c.txt 79s + text=0 79s + echo 0 79s + git add c.txt 79s + modify d.txt 0 79s + filename=d.txt 79s + text=0 79s + echo 0 79s + git add d.txt 79s + seq 0 7 79s + modify conflict0.txt original version 79s + filename=conflict0.txt 79s + text=original version 79s + echo original version 79s + git add conflict0.txt 79s + modify conflict1.txt original version 79s + filename=conflict1.txt 79s + text=original version 79s + echo original version 79s + git add conflict1.txt 79s + modify conflict2.txt original version 79s + filename=conflict2.txt 79s + text=original version 79s + echo original version 79s + git add conflict2.txt 79s + modify conflict3.txt original version 79s + filename=conflict3.txt 79s + text=original version 79s + echo original version 79s + git add conflict3.txt 79s + modify conflict4.txt original version 79s + filename=conflict4.txt 79s + text=original version 79s + echo original version 79s + git add conflict4.txt 79s + modify conflict5.txt original version 79s + filename=conflict5.txt 79s + text=original version 79s + echo original version 79s + git add conflict5.txt 79s + modify conflict6.txt original version 79s + filename=conflict6.txt 79s + text=original version 79s + echo original version 79s + git add conflict6.txt 79s + modify conflict7.txt original version 79s + filename=conflict7.txt 79s + text=original version 79s + echo original version 79s + git add conflict7.txt 79s + commit -m m⇒0 79s + TIME=1112911994 79s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 79s [master (root-commit) 8e21fbd] m⇒0 79s 10 files changed, 10 insertions(+) 79s create mode 100644 c.txt 79s create mode 100644 conflict0.txt 79s create mode 100644 conflict1.txt 79s create mode 100644 conflict2.txt 79s create mode 100644 conflict3.txt 79s create mode 100644 conflict4.txt 79s create mode 100644 conflict5.txt 79s create mode 100644 conflict6.txt 79s create mode 100644 conflict7.txt 79s create mode 100644 d.txt 79s + git checkout -b c master -- 79s Switched to a new branch 'c' 79s + modify c.txt 1 79s + filename=c.txt 79s + text=1 79s + echo 1 79s + git add c.txt 79s + modify conflict0.txt c version 79s + filename=conflict0.txt 79s + text=c version 79s + echo c version 79s + git add conflict0.txt 79s + modify conflict4.txt c version 79s + filename=conflict4.txt 79s + text=c version 79s + echo c version 79s + git add conflict4.txt 79s + commit -m c⇒1 79s + TIME=1112911995 79s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 79s [c 4e6007a] c⇒1 79s 3 files changed, 3 insertions(+), 3 deletions(-) 79s + modify c.txt 2 79s + filename=c.txt 79s + text=2 79s + echo 2 79s + git add c.txt 79s + commit -m c⇒2 79s + TIME=1112911996 79s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 79s [c c2b7c49] c⇒2 79s 1 file changed, 1 insertion(+), 1 deletion(-) 79s + modify c.txt 3 79s + filename=c.txt 79s + text=3 79s + echo 3 79s + git add c.txt 79s + commit -m c⇒3 79s + TIME=1112911997 79s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 79s [c 42ad55a] c⇒3 79s 1 file changed, 1 insertion(+), 1 deletion(-) 79s + modify c.txt 4 79s + filename=c.txt 79s + text=4 79s + echo 4 79s + git add c.txt 79s + modify conflict1.txt c version 79s + filename=conflict1.txt 79s + text=c version 79s + echo c version 79s + git add conflict1.txt 79s + commit -m c⇒4 79s + TIME=1112911998 79s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 79s [c a891793] c⇒4 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + modify c.txt 5 79s + filename=c.txt 79s + text=5 79s + echo 5 79s + git add c.txt 79s + modify conflict3.txt c version 79s + filename=conflict3.txt 79s + text=c version 79s + echo c version 79s + git add conflict3.txt 79s + modify conflict6.txt c version 79s + filename=conflict6.txt 79s + text=c version 79s + echo c version 79s + git add conflict6.txt 79s + commit -m c⇒5 79s + TIME=1112911999 79s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 79s [c c21441d] c⇒5 79s 3 files changed, 3 insertions(+), 3 deletions(-) 79s + modify c.txt 6 79s + filename=c.txt 79s + text=6 79s + echo 6 79s + git add c.txt 79s + modify conflict5.txt c version 79s + filename=conflict5.txt 79s + text=c version 79s + echo c version 79s + git add conflict5.txt 79s + commit -m c⇒6 79s + TIME=1112912000 79s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 79s [c a797a66] c⇒6 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + modify c.txt 7 79s + filename=c.txt 79s + text=7 79s + echo 7 79s + git add c.txt 79s + modify conflict2.txt c version 79s + filename=conflict2.txt 79s + text=c version 79s + echo c version 79s + git add conflict2.txt 79s + commit -m c⇒7 79s + TIME=1112912001 79s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 79s [c c0e1537] c⇒7 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + modify c.txt 8 79s + filename=c.txt 79s + text=8 79s + echo 8 79s + git add c.txt 79s + commit -m c⇒8 79s + TIME=1112912002 79s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 79s [c 9f3e7c8] c⇒8 79s 1 file changed, 1 insertion(+), 1 deletion(-) 79s + modify c.txt 9 79s + filename=c.txt 79s + text=9 79s + echo 9 79s + git add c.txt 79s + modify conflict7.txt c version 79s + filename=conflict7.txt 79s + text=c version 79s + echo c version 79s + git add conflict7.txt 79s + commit -m c⇒9 79s + TIME=1112912003 79s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 79s [c ccbfccb] c⇒9 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + git checkout -b d master -- 79s Switched to a new branch 'd' 79s + modify d.txt 1 79s + filename=d.txt 79s + text=1 79s + echo 1 79s + git add d.txt 79s + modify conflict0.txt d version 79s + filename=conflict0.txt 79s + text=d version 79s + echo d version 79s + git add conflict0.txt 79s + modify conflict6.txt d version 79s + filename=conflict6.txt 79s + text=d version 79s + echo d version 79s + git add conflict6.txt 79s + commit -m d⇒1 79s + TIME=1112912004 79s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 79s [d 8c3c065] d⇒1 79s 3 files changed, 3 insertions(+), 3 deletions(-) 79s + modify d.txt 2 79s + filename=d.txt 79s + text=2 79s + echo 2 79s + git add d.txt 79s + modify conflict1.txt d version 79s + filename=conflict1.txt 79s + text=d version 79s + echo d version 79s + git add conflict1.txt 79s + modify conflict2.txt d version 79s + filename=conflict2.txt 79s + text=d version 79s + echo d version 79s + git add conflict2.txt 79s + commit -m d⇒2 79s + TIME=1112912005 79s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 79s [d 820b787] d⇒2 79s 3 files changed, 3 insertions(+), 3 deletions(-) 79s + modify d.txt 3 79s + filename=d.txt 79s + text=3 79s + echo 3 79s + git add d.txt 79s + commit -m d⇒3 79s + TIME=1112912006 79s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 79s [d 821c792] d⇒3 79s 1 file changed, 1 insertion(+), 1 deletion(-) 79s + modify d.txt 4 79s + filename=d.txt 79s + text=4 79s + echo 4 79s + git add d.txt 79s + commit -m d⇒4 79s + TIME=1112912007 79s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 79s [d c2a1456] d⇒4 79s 1 file changed, 1 insertion(+), 1 deletion(-) 79s + modify d.txt 5 79s + filename=d.txt 79s + text=5 79s + echo 5 79s + git add d.txt 79s + modify conflict3.txt d version 79s + filename=conflict3.txt 79s + text=d version 79s + echo d version 79s + git add conflict3.txt 79s + commit -m d⇒5 79s + TIME=1112912008 79s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 79s [d c3e3890] d⇒5 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + modify d.txt 6 79s + filename=d.txt 79s + text=6 79s + echo 6 79s + git add d.txt 79s + modify conflict4.txt d version 79s + filename=conflict4.txt 79s + text=d version 79s + echo d version 79s + git add conflict4.txt 79s + commit -m d⇒6 79s + TIME=1112912009 79s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 79s [d b2f5c5e] d⇒6 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + modify d.txt 7 79s + filename=d.txt 79s + text=7 79s + echo 7 79s + git add d.txt 79s + modify conflict5.txt d version 79s + filename=conflict5.txt 79s + text=d version 79s + echo d version 79s + git add conflict5.txt 79s + commit -m d⇒7 79s + TIME=1112912010 79s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 79s [d 892af56] d⇒7 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + modify d.txt 8 79s + filename=d.txt 79s + text=8 79s + echo 8 79s + git add d.txt 79s + modify conflict7.txt d version 79s + filename=conflict7.txt 79s + text=d version 79s + echo d version 79s + git add conflict7.txt 79s + commit -m d⇒8 79s + TIME=1112912011 79s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 79s [d 67099d0] d⇒8 79s 2 files changed, 2 insertions(+), 2 deletions(-) 79s + git checkout c 79s Switched to branch 'c' 79s + git-imerge init --name=c-d d 79s + git-imerge diagram --commits --frontier 79s 0 5 9 79s | | | 79s 0 - ********** - c 79s *????????? 79s *????????? 79s *????????? 79s *????????? 79s 5 - *????????? 79s *????????? 79s *????????? 79s 8 - *????????? 79s | 79s d 79s 79s 0 5 9 79s | | | 79s 0 - ********** - c 79s *????????? 79s *????????? 79s *????????? 79s *????????? 79s 5 - *????????? 79s *????????? 79s *????????? 79s 8 - *????????? 79s | 79s d 79s 79s Key: 79s |,-,+ = rectangles forming current merge frontier 79s * = merge done manually 79s . = merge done automatically 79s # = conflict that is currently blocking progress 79s @ = merge was blocked but has been resolved 79s ? = no merge recorded 79s 79s + conflict_count=0 79s + true 79s + git-imerge continue --no-edit 79s + tee autofill.out 79s Attempting automerge of 9-8...failure. 79s Attempting automerge of 1-1...failure. 79s Switched to branch 'imerge/c-d' 79s Auto-merging conflict0.txt 79s CONFLICT (content): Merge conflict in conflict0.txt 79s Automatic merge failed; fix conflicts and then commit the result. 79s 79s Original first commit: 79s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 79s Author: Loú User 79s Date: Thu Apr 7 22:13:15 2005 +0000 79s 79s c⇒1 79s 79s Original second commit: 79s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 79s Author: Loú User 79s Date: Thu Apr 7 22:13:24 2005 +0000 79s 79s d⇒1 79s 79s There was a conflict merging commit 1-1, shown above. 79s Please resolve the conflict, commit the result, then type 79s 79s git-imerge continue 79s + grep -q Traceback autofill.out 79s + git-imerge diagram --frontier 79s 0 5 9 79s | | | 79s 0 - ********** - c 79s *#???????? 79s *????????? 79s *????????? 79s *????????? 79s 5 - *????????? 79s *????????? 79s *????????? 79s 8 - *????????? 79s | 79s d 79s 79s Key: 79s |,-,+ = rectangles forming current merge frontier 79s * = merge done manually 79s . = merge done automatically 79s # = conflict that is currently blocking progress 79s @ = merge was blocked but has been resolved 79s ? = no merge recorded 79s 79s + grep -q There was a conflict merging autofill.out 79s + seq 0 7 79s + grep -q ==== conflict0.txt 79s + modify conflict0.txt merged version 79s + filename=conflict0.txt 79s + text=merged version 79s + echo merged version 79s + git add conflict0.txt 79s + conflict_count=1 79s + grep -q ==== conflict1.txt 79s + grep -q ==== conflict2.txt 79s + grep -q ==== conflict3.txt 79s + grep -q ==== conflict4.txt 79s + grep -q ==== conflict5.txt 79s + grep -q ==== conflict6.txt 79s + grep -q ==== conflict7.txt 79s + true 79s + git-imerge continue --no-edit 79s + tee autofill.out 79s [imerge/c-d 3d9988f] imerge 'c-d': manual merge 1-1 79s Merge has been recorded for merge 1-1. 79s Attempting automerge of 1-8...failure. 79s Attempting automerge of 1-2...success. 79s Attempting automerge of 1-6...failure. 79s Attempting automerge of 1-4...success. 79s Attempting automerge of 1-5...success. 79s Autofilling 1-2...success. 79s Autofilling 1-3...success. 79s Autofilling 1-4...success. 79s Autofilling 1-5...success. 79s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 79s Attempting automerge of 1-8...failure. 79s Attempting automerge of 1-6...failure. 79s Attempting automerge of 9-5...failure. 79s Attempting automerge of 2-1...success. 79s Attempting automerge of 2-4...success. 79s Attempting automerge of 2-5...success. 79s Attempting automerge of 9-5...failure. 79s Attempting automerge of 6-5...failure. 79s Attempting automerge of 4-5...failure. 79s Attempting automerge of 3-5...success. 79s Attempting automerge of 4-1...success. 79s Attempting automerge of 4-3...failure. 79s Attempting automerge of 4-2...failure. 80s Attempting automerge of 9-1...failure. 80s Attempting automerge of 7-1...failure. 80s Attempting automerge of 6-1...failure. 80s Attempting automerge of 5-1...failure. 80s Autofilling 2-5...success. 80s Autofilling 3-1...success. 80s Autofilling 3-2...success. 80s Autofilling 3-3...success. 80s Autofilling 3-4...success. 80s Autofilling 3-5 (first way)...success. 80s Autofilling 3-5 (second way)...success. 80s The two ways of autofilling 3-5 agree. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 80s Autofilling 4-1...success. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 80s Attempting automerge of 4-5...failure. 80s Attempting automerge of 4-2...failure. 80s Attempting automerge of 9-1...failure. 80s Attempting automerge of 5-1...failure. 80s Previous HEAD position was c21441d c⇒5 80s Switched to branch 'imerge/c-d' 80s Auto-merging conflict4.txt 80s CONFLICT (content): Merge conflict in conflict4.txt 80s Automatic merge failed; fix conflicts and then commit the result. 80s 80s Original first commit: 80s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 80s Author: Loú User 80s Date: Thu Apr 7 22:13:15 2005 +0000 80s 80s c⇒1 80s 80s Original second commit: 80s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 80s Author: Loú User 80s Date: Thu Apr 7 22:13:29 2005 +0000 80s 80s d⇒6 80s 80s There was a conflict merging commit 1-6, shown above. 80s Please resolve the conflict, commit the result, then type 80s 80s git-imerge continue 80s + grep -q Traceback autofill.out 80s + git-imerge diagram --frontier 80s 0 5 9 80s | | | 80s 0 - ********** - c 80s **?.+#???? 80s *.?|#????? 80s *.?|?????? 80s *.?|?????? 80s 5 - *--+?????? 80s *#???????? 80s *????????? 80s 8 - *????????? 80s | 80s d 80s 80s Key: 80s |,-,+ = rectangles forming current merge frontier 80s * = merge done manually 80s . = merge done automatically 80s # = conflict that is currently blocking progress 80s @ = merge was blocked but has been resolved 80s ? = no merge recorded 80s 80s + grep -q There was a conflict merging autofill.out 80s + seq 0 7 80s + grep -q ==== conflict0.txt 80s + grep -q ==== conflict1.txt 80s + grep -q ==== conflict2.txt 80s + grep -q ==== conflict3.txt 80s + grep -q ==== conflict4.txt 80s + modify conflict4.txt merged version 80s + filename=conflict4.txt 80s + text=merged version 80s + echo merged version 80s + git add conflict4.txt 80s + conflict_count=2 80s + grep -q ==== conflict5.txt 80s + grep -q ==== conflict6.txt 80s + grep -q ==== conflict7.txt 80s + true 80s + git-imerge continue --no-edit 80s + tee autofill.out 80s [imerge/c-d e7e42b2] imerge 'c-d': manual merge 1-6 80s Merge has been recorded for merge 1-6. 80s Attempting automerge of 1-8...success. 80s Autofilling 1-7...success. 80s Autofilling 1-8...success. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 80s Attempting automerge of 3-8...success. 80s Autofilling 2-8...success. 80s Autofilling 3-6...success. 80s Autofilling 3-7...success. 80s Autofilling 3-8 (first way)...success. 80s Autofilling 3-8 (second way)...success. 80s The two ways of autofilling 3-8 agree. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 80s Warning: you are leaving 1 commit behind, not connected to 80s any of your branches: 80s 80s 436581e imerge 'c-d': automatic merge 3-8 80s 80s If you want to keep it by creating a new branch, this may be a good time 80s to do so with: 80s 80s git branch 436581e 80s 80s Switched to branch 'imerge/c-d' 80s Auto-merging conflict1.txt 80s CONFLICT (content): Merge conflict in conflict1.txt 80s Automatic merge failed; fix conflicts and then commit the result. 80s 80s Original first commit: 80s commit a89179336bb40a4ca90903425239a9ef3ce659bd 80s Author: Loú User 80s Date: Thu Apr 7 22:13:18 2005 +0000 80s 80s c⇒4 80s 80s Original second commit: 80s commit 820b787e86e22612af7a061db842dc95e9f1d49f 80s Author: Loú User 80s Date: Thu Apr 7 22:13:25 2005 +0000 80s 80s d⇒2 80s 80s There was a conflict merging commit 4-2, shown above. 80s Please resolve the conflict, commit the result, then type 80s 80s git-imerge continue 80s + grep -q Traceback autofill.out 80s + git-imerge diagram --frontier 80s 0 5 9 80s | | | 80s 0 - ********** - c 80s **?.+#???? 80s *.?|#????? 80s *.?|?????? 80s *.?|?????? 80s 5 - *..|?????? 80s **?|?????? 80s *.?|?????? 80s 8 - *--+?????? 80s | 80s d 80s 80s Key: 80s |,-,+ = rectangles forming current merge frontier 80s * = merge done manually 80s . = merge done automatically 80s # = conflict that is currently blocking progress 80s @ = merge was blocked but has been resolved 80s ? = no merge recorded 80s 80s + grep -q There was a conflict merging autofill.out 80s + seq 0 7 80s + grep -q ==== conflict0.txt 80s + grep -q ==== conflict1.txt 80s + modify conflict1.txt merged version 80s + filename=conflict1.txt 80s + text=merged version 80s + echo merged version 80s + git add conflict1.txt 80s + conflict_count=3 80s + grep -q ==== conflict2.txt 80s + grep -q ==== conflict3.txt 80s + grep -q ==== conflict4.txt 80s + grep -q ==== conflict5.txt 80s + grep -q ==== conflict6.txt 80s + grep -q ==== conflict7.txt 80s + true 80s + git-imerge continue --no-edit 80s + tee autofill.out 80s [imerge/c-d 61daeae] imerge 'c-d': manual merge 4-2 80s Merge has been recorded for merge 4-2. 80s Attempting automerge of 4-8...success. 80s Autofilling 4-3...success. 80s Autofilling 4-4...success. 80s Autofilling 4-5...success. 80s Autofilling 4-6...success. 80s Autofilling 4-7...success. 80s Autofilling 4-8...success. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 80s Previous HEAD position was 8d683f4 imerge 'c-d': automatic merge 4-8 80s Switched to branch 'imerge/c-d' 80s Auto-merging conflict6.txt 80s CONFLICT (content): Merge conflict in conflict6.txt 80s Automatic merge failed; fix conflicts and then commit the result. 80s 80s Original first commit: 80s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 80s Author: Loú User 80s Date: Thu Apr 7 22:13:19 2005 +0000 80s 80s c⇒5 80s 80s Original second commit: 80s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 80s Author: Loú User 80s Date: Thu Apr 7 22:13:24 2005 +0000 80s 80s d⇒1 80s 80s There was a conflict merging commit 5-1, shown above. 80s Please resolve the conflict, commit the result, then type 80s 80s git-imerge continue 80s + grep -q Traceback autofill.out 80s + git-imerge diagram --frontier 80s 0 5 9 80s | | | 80s 0 - ********** - c 80s **?.|#???? 80s *.?.*????? 80s *.?.|????? 80s *.?.|????? 80s 5 - *...|????? 80s **?.|????? 80s *.?.|????? 80s 8 - *---+????? 80s | 80s d 80s 80s Key: 80s |,-,+ = rectangles forming current merge frontier 80s * = merge done manually 80s . = merge done automatically 80s # = conflict that is currently blocking progress 80s @ = merge was blocked but has been resolved 80s ? = no merge recorded 80s 80s + grep -q There was a conflict merging autofill.out 80s + seq 0 7 80s + grep -q ==== conflict0.txt 80s + grep -q ==== conflict1.txt 80s + grep -q ==== conflict2.txt 80s + grep -q ==== conflict3.txt 80s + grep -q ==== conflict4.txt 80s + grep -q ==== conflict5.txt 80s + grep -q ==== conflict6.txt 80s + modify conflict6.txt merged version 80s + filename=conflict6.txt 80s + text=merged version 80s + echo merged version 80s + git add conflict6.txt 80s + conflict_count=4 80s + grep -q ==== conflict7.txt 80s + true 80s + git-imerge continue --no-edit 80s + tee autofill.out 80s [imerge/c-d 11d4f7b] imerge 'c-d': manual merge 5-1 80s Merge has been recorded for merge 5-1. 80s Attempting automerge of 5-8...failure. 80s Attempting automerge of 5-2...success. 80s Attempting automerge of 5-6...failure. 80s Attempting automerge of 5-4...success. 80s Attempting automerge of 5-5...failure. 80s Autofilling 5-2...success. 80s Autofilling 5-3...success. 80s Autofilling 5-4...success. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 80s Attempting automerge of 5-8...failure. 80s Attempting automerge of 5-5...failure. 80s Attempting automerge of 9-4...failure. 80s Attempting automerge of 6-1...success. 80s Attempting automerge of 6-3...success. 80s Attempting automerge of 6-4...success. 80s Attempting automerge of 9-4...failure. 80s Attempting automerge of 8-4...failure. 80s Attempting automerge of 7-4...failure. 80s Attempting automerge of 7-1...success. 80s Attempting automerge of 7-3...failure. 80s Attempting automerge of 7-2...failure. 80s Attempting automerge of 9-1...success. 80s Autofilling 6-1...success. 80s Autofilling 6-2...success. 80s Autofilling 6-3...success. 80s Autofilling 6-4...success. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 80s Autofilling 7-1...success. 80s Autofilling 8-1...success. 80s Autofilling 9-1...success. 80s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 80s Attempting automerge of 9-4...failure. 80s Attempting automerge of 7-2...failure. 80s Previous HEAD position was 385fde7 imerge 'c-d': automatic merge 7-1 80s Switched to branch 'imerge/c-d' 80s Auto-merging conflict3.txt 80s CONFLICT (content): Merge conflict in conflict3.txt 80s Automatic merge failed; fix conflicts and then commit the result. 80s 80s Original first commit: 80s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 80s Author: Loú User 80s Date: Thu Apr 7 22:13:19 2005 +0000 80s 80s c⇒5 80s 80s Original second commit: 80s commit c3e3890b9e3c756c1d8f7e345184d576739be079 80s Author: Loú User 80s Date: Thu Apr 7 22:13:28 2005 +0000 80s 80s d⇒5 80s 80s There was a conflict merging commit 5-5, shown above. 80s Please resolve the conflict, commit the result, then type 80s 80s git-imerge continue 80s + grep -q Traceback autofill.out 80s + git-imerge diagram --frontier 80s 0 5 9 80s | | | 80s 0 - ********** - c 80s **?..*.--+ 80s *.?.*.|#?? 80s *.?...|??? 80s *.?..-+??? 80s 5 - *...|#???? 80s **?.|????? 80s *.?.|????? 80s 8 - *---+????? 80s | 80s d 80s 80s Key: 80s |,-,+ = rectangles forming current merge frontier 80s * = merge done manually 80s . = merge done automatically 80s # = conflict that is currently blocking progress 80s @ = merge was blocked but has been resolved 80s ? = no merge recorded 80s 80s + grep -q There was a conflict merging autofill.out 80s + seq 0 7 80s + grep -q ==== conflict0.txt 80s + grep -q ==== conflict1.txt 80s + grep -q ==== conflict2.txt 80s + grep -q ==== conflict3.txt 80s + modify conflict3.txt merged version 80s + filename=conflict3.txt 80s + text=merged version 80s + echo merged version 80s + git add conflict3.txt 80s + conflict_count=5 80s + grep -q ==== conflict4.txt 80s + grep -q ==== conflict5.txt 80s + grep -q ==== conflict6.txt 80s + grep -q ==== conflict7.txt 80s + true 80s + git-imerge continue --no-edit 80s + tee autofill.out 80s [imerge/c-d db7fe41] imerge 'c-d': manual merge 5-5 80s Merge has been recorded for merge 5-5. 81s Attempting automerge of 5-8...success. 81s Autofilling 5-6...success. 81s Autofilling 5-7...success. 81s Autofilling 5-8...success. 81s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 81s Attempting automerge of 6-8...failure. 81s Attempting automerge of 6-5...success. 81s Attempting automerge of 6-7...failure. 81s Attempting automerge of 6-6...success. 81s Autofilling 6-5...success. 81s Autofilling 6-6...success. 81s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 81s Attempting automerge of 6-8...failure. 81s Attempting automerge of 6-7...failure. 81s Switched to branch 'imerge/c-d' 81s Auto-merging conflict5.txt 81s CONFLICT (content): Merge conflict in conflict5.txt 81s Automatic merge failed; fix conflicts and then commit the result. 81s 81s Original first commit: 81s commit a797a66a0e4b89690099557280641efeac302bcf 81s Author: Loú User 81s Date: Thu Apr 7 22:13:20 2005 +0000 81s 81s c⇒6 81s 81s Original second commit: 81s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 81s Author: Loú User 81s Date: Thu Apr 7 22:13:30 2005 +0000 81s 81s d⇒7 81s 81s There was a conflict merging commit 6-7, shown above. 81s Please resolve the conflict, commit the result, then type 81s 81s git-imerge continue 81s + grep -q Traceback autofill.out 81s + git-imerge diagram --frontier 81s 0 5 9 81s | | | 81s 0 - ********** - c 81s **?..*.--+ 81s *.?.*.|#?? 81s *.?...|??? 81s *.?...|??? 81s 5 - *....*|??? 81s **?...+??? 81s *.?..|#??? 81s 8 - *----+???? 81s | 81s d 81s 81s Key: 81s |,-,+ = rectangles forming current merge frontier 81s * = merge done manually 81s . = merge done automatically 81s # = conflict that is currently blocking progress 81s @ = merge was blocked but has been resolved 81s ? = no merge recorded 81s 81s + grep -q There was a conflict merging autofill.out 81s + seq 0 7 81s + grep -q ==== conflict0.txt 81s + grep -q ==== conflict1.txt 81s + grep -q ==== conflict2.txt 81s + grep -q ==== conflict3.txt 81s + grep -q ==== conflict4.txt 81s + grep -q ==== conflict5.txt 81s + modify conflict5.txt merged version 81s + filename=conflict5.txt 81s + text=merged version 81s + echo merged version 81s + git add conflict5.txt 81s + conflict_count=6 81s + grep -q ==== conflict6.txt 81s + grep -q ==== conflict7.txt 81s + true 81s + git-imerge continue --no-edit 81s + tee autofill.out 81s [imerge/c-d c7d6216] imerge 'c-d': manual merge 6-7 81s Merge has been recorded for merge 6-7. 81s Attempting automerge of 6-8...success. 81s Autofilling 6-8...success. 81s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 81s Previous HEAD position was 09469b9 imerge 'c-d': automatic merge 6-8 81s Switched to branch 'imerge/c-d' 81s Auto-merging conflict2.txt 81s CONFLICT (content): Merge conflict in conflict2.txt 81s Automatic merge failed; fix conflicts and then commit the result. 81s 81s Original first commit: 81s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 81s Author: Loú User 81s Date: Thu Apr 7 22:13:21 2005 +0000 81s 81s c⇒7 81s 81s Original second commit: 81s commit 820b787e86e22612af7a061db842dc95e9f1d49f 81s Author: Loú User 81s Date: Thu Apr 7 22:13:25 2005 +0000 81s 81s d⇒2 81s 81s There was a conflict merging commit 7-2, shown above. 81s Please resolve the conflict, commit the result, then type 81s 81s git-imerge continue 81s + grep -q Traceback autofill.out 81s + git-imerge diagram --frontier 81s 0 5 9 81s | | | 81s 0 - ********** - c 81s **?..*.--+ 81s *.?.*.|#?? 81s *.?...|??? 81s *.?...|??? 81s 5 - *....*|??? 81s **?...|??? 81s *.?...*??? 81s 8 - *-----+??? 81s | 81s d 81s 81s Key: 81s |,-,+ = rectangles forming current merge frontier 81s * = merge done manually 81s . = merge done automatically 81s # = conflict that is currently blocking progress 81s @ = merge was blocked but has been resolved 81s ? = no merge recorded 81s 81s + grep -q There was a conflict merging autofill.out 81s + seq 0 7 81s + grep -q ==== conflict0.txt 81s + grep -q ==== conflict1.txt 81s + grep -q ==== conflict2.txt 81s + modify conflict2.txt merged version 81s + filename=conflict2.txt 81s + text=merged version 81s + echo merged version 81s + git add conflict2.txt 81s + conflict_count=7 81s + grep -q ==== conflict3.txt 81s + grep -q ==== conflict4.txt 81s + grep -q ==== conflict5.txt 81s + grep -q ==== conflict6.txt 81s + grep -q ==== conflict7.txt 81s + true 81s + git-imerge continue --no-edit 81s + tee autofill.out 81s [imerge/c-d 7ce7548] imerge 'c-d': manual merge 7-2 81s Merge has been recorded for merge 7-2. 81s Attempting automerge of 7-8...success. 81s Autofilling 7-3...success. 81s Autofilling 7-4...success. 81s Autofilling 7-5...success. 81s Autofilling 7-6...success. 81s Autofilling 7-7...success. 81s Autofilling 7-8...success. 81s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 81s Attempting automerge of 9-8...failure. 81s Attempting automerge of 8-2...success. 81s Attempting automerge of 8-6...success. 81s Attempting automerge of 8-8...success. 81s Attempting automerge of 9-8...failure. 81s Attempting automerge of 9-2...success. 81s Attempting automerge of 9-5...success. 81s Attempting automerge of 9-7...success. 81s Autofilling 8-2...success. 81s Autofilling 8-3...success. 81s Autofilling 8-4...success. 81s Autofilling 8-5...success. 81s Autofilling 8-6...success. 81s Autofilling 8-7...success. 81s Autofilling 8-8...success. 81s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 81s Autofilling 9-2...success. 81s Autofilling 9-3...success. 81s Autofilling 9-4...success. 81s Autofilling 9-5...success. 81s Autofilling 9-6...success. 81s Autofilling 9-7...success. 81s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 81s Attempting automerge of 9-8...failure. 81s Attempting automerge of 9-8...failure. 81s Switched to branch 'imerge/c-d' 81s Auto-merging conflict7.txt 81s CONFLICT (content): Merge conflict in conflict7.txt 81s Automatic merge failed; fix conflicts and then commit the result. 81s 81s Original first commit: 81s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 81s Author: Loú User 81s Date: Thu Apr 7 22:13:23 2005 +0000 81s 81s c⇒9 81s 81s Original second commit: 81s commit 67099d078100141fbe4063d46a6408200f4ff311 81s Author: Loú User 81s Date: Thu Apr 7 22:13:31 2005 +0000 81s 81s d⇒8 81s 81s There was a conflict merging commit 9-8, shown above. 81s Please resolve the conflict, commit the result, then type 81s 81s git-imerge continue 81s + grep -q Traceback autofill.out 81s + git-imerge diagram --frontier 81s 0 5 9 81s | | | 81s 0 - ********** - c 81s **?..*...| 81s *.?.*..*.| 81s *.?......| 81s *.?......| 81s 5 - *....*...| 81s **?......| 81s *.?...*..+ 81s 8 - *-------+# 81s | 81s d 81s 81s Key: 81s |,-,+ = rectangles forming current merge frontier 81s * = merge done manually 81s . = merge done automatically 81s # = conflict that is currently blocking progress 81s @ = merge was blocked but has been resolved 81s ? = no merge recorded 81s 81s + grep -q There was a conflict merging autofill.out 81s + seq 0 7 81s + grep -q ==== conflict0.txt 81s + grep -q ==== conflict1.txt 81s + grep -q ==== conflict2.txt 81s + grep -q ==== conflict3.txt 81s + grep -q ==== conflict4.txt 81s + grep -q ==== conflict5.txt 81s + grep -q ==== conflict6.txt 81s + grep -q ==== conflict7.txt 81s + modify conflict7.txt merged version 81s + filename=conflict7.txt 81s + text=merged version 81s + echo merged version 81s + git add conflict7.txt 81s + conflict_count=8 81s + true 81s + git-imerge continue --no-edit 81s + tee autofill.out 81s [imerge/c-d e383881] imerge 'c-d': manual merge 9-8 81s Merge has been recorded for merge 9-8. 81s Merge is complete! 81s + grep -q Traceback autofill.out 81s + git-imerge diagram --frontier 81s 0 5 9 81s | | | 81s 0 - ********** - c 81s **?..*...| 81s *.?.*..*.| 81s *.?......| 81s *.?......| 81s 5 - *....*...| 81s **?......| 81s *.?...*..| 81s 8 - *--------* 81s | 81s d 81s 81s Key: 81s |,-,+ = rectangles forming current merge frontier 81s * = merge done manually 81s . = merge done automatically 81s # = conflict that is currently blocking progress 81s @ = merge was blocked but has been resolved 81s ? = no merge recorded 81s 81s + grep -q There was a conflict merging autofill.out 81s + break 81s + test 8 -ne 8 81s + git-imerge diagram --commits 81s + cat 81s + diff -u - diagram.out 81s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 81s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 81s Merge d into c (using imerge) 81s 81s # Please enter the commit message for your changes. Lines starting 81s # with '#' will be ignored, and an empty message aborts the commit. 81s # 81s # Date: Wed Dec 3 23:17:06 2025 +0000 81s # 81s # On branch c-d-merge 81s # Changes to be committed: 81s # modified: conflict0.txt 81s # modified: conflict1.txt 81s # modified: conflict2.txt 81s # modified: conflict3.txt 81s # modified: conflict4.txt 81s # modified: conflict5.txt 81s # modified: conflict6.txt 81s # modified: conflict7.txt 81s # modified: d.txt 81s # 81s [c-d-merge 290d7ae] Merge d into c (using imerge) 81s Date: Wed Dec 3 23:17:06 2025 +0000 81s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 81s + local refname=c-d-merge 81s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 81s + git rev-parse c-d-merge^{tree} 81s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 81s + git-imerge simplify --goal=rebase --branch=c-d-rebase 82s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + local refname=c-d-rebase 82s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git rev-parse c-d-rebase^{tree} 82s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 82s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + local refname=c-d-rebase-with-history 82s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git rev-parse c-d-rebase-with-history^{tree} 82s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git-imerge simplify --goal=border --branch=c-d-border 82s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + local refname=c-d-border 82s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git rev-parse c-d-border^{tree} 82s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 82s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + local refname=c-d-border-with-history 82s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git rev-parse c-d-border-with-history^{tree} 82s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 82s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + local refname=c-d-border-with-history2 82s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git rev-parse c-d-border-with-history2^{tree} 82s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 82s + git-imerge remove 82s py313: commands[3] /tmp/autopkgtest.ZvitK4/build.No0/src> /bin/sh t/test-duplicated 82s + dirname t/test-duplicated 82s + cd t 82s + pwd 82s + dirname /tmp/autopkgtest.ZvitK4/build.No0/src/t 82s + BASE=/tmp/autopkgtest.ZvitK4/build.No0/src 82s + . /tmp/autopkgtest.ZvitK4/build.No0/src/t/test-lib.sh 82s + GIT_IMERGE=git-imerge 82s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s + DESCRIPTION=git-imerge test repository with duplicate commits 82s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated git-imerge test repository with duplicate commits 82s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s + local description=git-imerge test repository with duplicate commits 82s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated git-imerge test repository with duplicate commits 82s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s + local description=git-imerge test repository with duplicate commits 82s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s hint: Using 'master' as the name for the initial branch. This default branch name 82s hint: is subject to change. To configure the initial branch name to use in all 82s hint: of your new repositories, which will suppress this warning, call: 82s hint: 82s hint: git config --global init.defaultBranch 82s hint: 82s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 82s hint: 'development'. The just-created branch can be renamed via this command: 82s hint: 82s hint: git branch -m 82s hint: 82s hint: Disable this message with "git config set advice.defaultBranchName false" 82s + echo git-imerge test repository with duplicate commits 82s + printf %s\n /*.out /*.css /*.html 82s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated/.git config user.name Loú User 82s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated/.git/ 82s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated/.git config user.email luser@example.com 82s + TIME=1112911993 82s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/duplicated 82s + modify a.txt 0 82s + filename=a.txt 82s + text=0 82s + echo 0 82s + git add a.txt 82s + commit -m m⇒0 82s + TIME=1112911994 82s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 82s + git checkout -b a -- 82s [master (root-commit) a733afa] m⇒0 82s 1 file changed, 1 insertion(+) 82s create mode 100644 a.txt 82s Switched to a new branch 'a' 82s + seq 3 82s + modify a.txt 1 82s + filename=a.txt 82s + text=1 82s + echo 1 82s + git add a.txt 82s + commit -m a⇒1 on branch a 82s + TIME=1112911995 82s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 82s [a 2f1f75a] a⇒1 on branch a 82s 1 file changed, 1 insertion(+), 1 deletion(-) 82s + modify a.txt 2 82s + filename=a.txt 82s + text=2 82s + echo 2 82s + git add a.txt 82s + commit -m a⇒2 on branch a 82s + TIME=1112911996 82s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 82s [a 4700669] a⇒2 on branch a 82s 1 file changed, 1 insertion(+), 1 deletion(-) 82s + modify a.txt 3 82s + filename=a.txt 82s + text=3 82s + echo 3 82s + git add a.txt 82s + commit -m a⇒3 on branch a 82s + TIME=1112911997 82s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 82s + git checkout -b b master -- 82s Switched to a new branch 'b' 82s [a 621c381] a⇒3 on branch a 82s 1 file changed, 1 insertion(+), 1 deletion(-) 82s + seq 4 82s + modify a.txt 1 82s + filename=a.txt 82s + text=1 82s + echo 1 82s + git add a.txt 82s + commit -m a⇒1 on branch b 82s + TIME=1112911998 82s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 82s [b 62a5c56] a⇒1 on branch b 82s 1 file changed, 1 insertion(+), 1 deletion(-) 82s + modify a.txt 2 82s + filename=a.txt 82s + text=2 82s + echo 2 82s + git add a.txt 82s + commit -m a⇒2 on branch b 82s + TIME=1112911999 82s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 82s [b f846281] a⇒2 on branch b 82s 1 file changed, 1 insertion(+), 1 deletion(-) 82s + modify a.txt 3 82s + filename=a.txt 82s + text=3 82s + echo 3 82s + git add a.txt 82s + commit -m a⇒3 on branch b 82s + TIME=1112912000 82s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 82s [b a4b2c2b] a⇒3 on branch b 82s 1 file changed, 1 insertion(+), 1 deletion(-) 82s + modify a.txt 4 82s + filename=a.txt 82s + text=4 82s + echo 4 82s + git add a.txt 82s + commit -m a⇒4 on branch b 82s + TIME=1112912001 82s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 82s [b 5b24553] a⇒4 on branch b 82s 1 file changed, 1 insertion(+), 1 deletion(-) 82s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 82s + git checkout a 82s Switched to branch 'a' 82s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 82s Attempting automerge of 3-4...failure. 82s Attempting automerge of 1-1...success. 82s Attempting automerge of 1-3...failure. 82s Attempting automerge of 1-2...failure. 82s Attempting automerge of 3-1...failure. 82s Attempting automerge of 2-1...failure. 82s Autofilling 1-1...success. 82s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 82s Attempting automerge of 1-4...success. 82s Autofilling 1-2...success. 82s Autofilling 1-3...success. 82s Autofilling 1-4...success. 82s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 82s Attempting automerge of 3-4...failure. 82s Attempting automerge of 2-1...success. 82s Attempting automerge of 2-3...failure. 82s Attempting automerge of 2-2...success. 82s Attempting automerge of 3-2...failure. 82s Attempting automerge of 3-1...success. 82s Autofilling 2-1...success. 82s Autofilling 2-2...success. 82s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 82s Autofilling 3-1...success. 82s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 82s Attempting automerge of 2-4...success. 82s Autofilling 2-3...success. 82s Autofilling 2-4...success. 82s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 82s Attempting automerge of 3-4...failure. 82s Attempting automerge of 3-2...success. 82s Attempting automerge of 3-4...failure. 82s Attempting automerge of 3-3...success. 82s Autofilling 3-2...success. 82s Autofilling 3-3...success. 82s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 82s Attempting automerge of 3-4...success. 82s Autofilling 3-4...success. 82s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 82s Merge is complete! 82s + git-imerge diagram --commits --frontier --html=imerge5.html 82s 0 3 82s | | 82s 0 - **** - a 82s *... 82s *... 82s *... 82s 4 - *... 82s | 82s b 82s 82s 0 3 82s | | 82s 0 - **** - a 82s *..| 82s *..| 82s *..| 82s 4 - *--+ 82s | 82s b 82s 82s Key: 82s |,-,+ = rectangles forming current merge frontier 82s * = merge done manually 82s . = merge done automatically 82s # = conflict that is currently blocking progress 82s @ = merge was blocked but has been resolved 82s ? = no merge recorded 82s 82s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 82s Merge b into a (using imerge) 82s 82s # Please enter the commit message for your changes. Lines starting 82s # with '#' will be ignored, and an empty message aborts the commit. 82s # 82s # Date: Wed Dec 3 23:17:07 2025 +0000 82s # 82s # On branch a-b-merge 82s # Changes to be committed: 82s # modified: a.txt 82s # 82s [a-b-merge a663bf2] Merge b into a (using imerge) 82s Date: Wed Dec 3 23:17:07 2025 +0000 82s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 82s + local refname=a-b-merge 82s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 82s + git rev-parse a-b-merge^{tree} 82s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 82s + git-imerge simplify --goal=rebase --branch=a-b-rebase 82s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 82s + local refname=a-b-rebase 82s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 82s + git rev-parse a-b-rebase^{tree} 82s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 82s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 83s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + local refname=a-b-rebase-with-history 83s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git rev-parse a-b-rebase-with-history^{tree} 83s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git-imerge simplify --goal=border --branch=a-b-border 83s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + local refname=a-b-border 83s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git rev-parse a-b-border^{tree} 83s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 83s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + local refname=a-b-border-with-history 83s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git rev-parse a-b-border-with-history^{tree} 83s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 83s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + local refname=a-b-border-with-history2 83s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git rev-parse a-b-border-with-history2^{tree} 83s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git checkout a 83s Switched to branch 'a' 83s + git-imerge start --goal=full --name=a-b b 83s Attempting to merge 1-1...success. 83s Attempting to merge 1-2...success. 83s Attempting to merge 1-3...success. 83s Attempting to merge 1-4...success. 83s Attempting to merge 2-1...success. 83s Attempting to merge 2-2...success. 83s Attempting to merge 2-3...success. 83s Attempting to merge 2-4...success. 83s Attempting to merge 3-1...success. 83s Attempting to merge 3-2...success. 83s Attempting to merge 3-3...success. 83s Attempting to merge 3-4...success. 83s Merge is complete! 83s + git-imerge list 83s * a-b 83s + git-imerge diagram --commits --frontier --html=imerge6.html 83s 0 3 83s | | 83s 0 - **** - a 83s *... 83s *... 83s *... 83s 4 - *... 83s | 83s b 83s 83s 0 3 83s | | 83s 0 - **** - a 83s *..| 83s *..| 83s *..| 83s 4 - *--+ 83s | 83s b 83s 83s Key: 83s |,-,+ = rectangles forming current merge frontier 83s * = merge done manually 83s . = merge done automatically 83s # = conflict that is currently blocking progress 83s @ = merge was blocked but has been resolved 83s ? = no merge recorded 83s 83s + git-imerge finish --branch=a-b-full 83s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + local refname=a-b-full 83s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 83s + git rev-parse a-b-full^{tree} 83s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 83s py313: commands[4] /tmp/autopkgtest.ZvitK4/build.No0/src> /bin/sh t/test-flip-flop 83s + dirname t/test-flip-flop 83s + cd t 83s + pwd 83s + dirname /tmp/autopkgtest.ZvitK4/build.No0/src/t 83s + BASE=/tmp/autopkgtest.ZvitK4/build.No0/src 83s + . /tmp/autopkgtest.ZvitK4/build.No0/src/t/test-lib.sh 83s + GIT_IMERGE=git-imerge 83s + flip_flop_test 1 83s + local n=1 83s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 83s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 83s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s + local description=git-imerge test repository with a commit and its revert at n=1 83s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 83s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s + local description=git-imerge test repository with a commit and its revert at n=1 83s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s hint: Using 'master' as the name for the initial branch. This default branch name 83s hint: is subject to change. To configure the initial branch name to use in all 83s hint: of your new repositories, which will suppress this warning, call: 83s hint: 83s hint: git config --global init.defaultBranch 83s hint: 83s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 83s hint: 'development'. The just-created branch can be renamed via this command: 83s hint: 83s hint: git branch -m 83s hint: 83s hint: Disable this message with "git config set advice.defaultBranchName false" 83s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1/.git/ 83s + echo git-imerge test repository with a commit and its revert at n=1 83s + printf %s\n /*.out /*.css /*.html 83s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1/.git config user.name Loú User 83s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 83s + TIME=1112911993 83s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-1 83s + modify a.txt 0 83s + filename=a.txt 83s + text=0 83s + echo 0 83s + git add a.txt 83s + commit -m m⇒0 83s + TIME=1112911994 83s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 83s [master (root-commit) a733afa] m⇒0 83s 1 file changed, 1 insertion(+) 83s create mode 100644 a.txt 83s + git checkout -b a -- 83s Switched to a new branch 'a' 83s + modify a.txt 1 83s + filename=a.txt 83s + text=1 83s + echo 1 83s + git add a.txt 83s + commit -m a⇒1 on branch a 83s + TIME=1112911995 83s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 83s [a 2f1f75a] a⇒1 on branch a 83s 1 file changed, 1 insertion(+), 1 deletion(-) 83s + modify a.txt 2 83s + filename=a.txt 83s + text=2 83s + echo 2 83s + git add a.txt 83s + commit -m a⇒2 on branch a 83s + TIME=1112911996 83s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 83s [a 4700669] a⇒2 on branch a 83s 1 file changed, 1 insertion(+), 1 deletion(-) 83s + modify a.txt 3 83s + filename=a.txt 83s + text=3 83s + echo 3 83s + git add a.txt 83s + commit -m a⇒3 on branch a 83s + TIME=1112911997 83s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 83s [a 621c381] a⇒3 on branch a 83s 1 file changed, 1 insertion(+), 1 deletion(-) 83s + git checkout -b b master -- 83s Switched to a new branch 'b' 83s + modify b.txt 1 83s + filename=b.txt 83s + text=1 83s + echo 1 83s + git add b.txt 83s + msg=b⇒1 83s + test 1 = 1 83s + modify a.txt X 83s + filename=a.txt 83s + text=X 83s + echo X 83s + git add a.txt 83s + msg=b⇒1 and a⇒X 83s + test 1 = 2 83s + commit -m b⇒1 and a⇒X on branch b 83s + TIME=1112911998 83s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 83s [b 044a3fa] b⇒1 and a⇒X on branch b 83s 2 files changed, 2 insertions(+), 1 deletion(-) 83s create mode 100644 b.txt 83s + modify b.txt 2 83s + filename=b.txt 83s + text=2 83s + echo 2 83s + git add b.txt 83s + msg=b⇒2 83s + test 2 = 1 83s + test 2 = 2 83s + modify a.txt 0 83s + filename=a.txt 83s + text=0 83s + echo 0 83s + git add a.txt 83s + msg=b⇒2 and a⇒0 83s + commit -m b⇒2 and a⇒0 on branch b 83s + TIME=1112911999 83s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 83s [b 7851975] b⇒2 and a⇒0 on branch b 83s 2 files changed, 2 insertions(+), 2 deletions(-) 83s + modify b.txt 3 83s + filename=b.txt 83s + text=3 83s + echo 3 83s + git add b.txt 83s + msg=b⇒3 83s + test 3 = 1 83s + test 3 = 2 83s + commit -m b⇒3 on branch b 83s + TIME=1112912000 83s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 83s [b 6fe24f0] b⇒3 on branch b 83s 1 file changed, 1 insertion(+), 1 deletion(-) 83s + modify b.txt 4 83s + filename=b.txt 83s + text=4 83s + echo 4 83s + git add b.txt 83s + msg=b⇒4 83s + test 4 = 1 83s + test 4 = 2 83s + commit -m b⇒4 on branch b 83s + TIME=1112912001 83s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 83s + test_merge b-into-a-1 a b 1-1 1-2 83s + local name=b-into-a-1 83s + local dst=a 83s + local src=b 83s + local conflict1=1-1 83s + local conflict2=1-2 83s + git checkout a 83s [b 2dc5eb7] b⇒4 on branch b 83s 1 file changed, 1 insertion(+), 1 deletion(-) 83s Switched to branch 'a' 83s + git-imerge merge --branch=b-into-a-1 b 83s + tee imerge-b-into-a-1-1.out 83s Attempting automerge of 3-4...success. 83s Autofilling 1-4...success. 83s Autofilling 2-4...success. 83s Autofilling 3-1...unexpected conflict. Backtracking... 83s Autofilling 1-4...success. 83s Autofilling 2-1...unexpected conflict. Backtracking... 83s Autofilling 1-1...unexpected conflict. Backtracking... 83s Switched to branch 'imerge/b' 83s Auto-merging a.txt 83s CONFLICT (content): Merge conflict in a.txt 83s Automatic merge failed; fix conflicts and then commit the result. 83s 83s Original first commit: 83s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 83s Author: Loú User 83s Date: Thu Apr 7 22:13:15 2005 +0000 83s 83s a⇒1 on branch a 83s 83s Original second commit: 83s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 83s Author: Loú User 83s Date: Thu Apr 7 22:13:18 2005 +0000 83s 83s b⇒1 and a⇒X on branch b 83s 83s There was a conflict merging commit 1-1, shown above. 83s Please resolve the conflict, commit the result, then type 83s 83s git-imerge continue 83s + git-imerge diagram --commits --frontier 83s 0 3 83s | | 83s 0 - **** - a 83s *#?? 83s *??? 83s *??? 83s 4 - *??? 83s | 83s b 83s 83s 0 3 83s | | 83s 0 - **** - a 83s *#?? 83s *??? 83s *??? 83s 4 - *??? 83s | 83s b 83s 83s Key: 83s |,-,+ = rectangles forming current merge frontier 83s * = merge done manually 83s . = merge done automatically 83s # = conflict that is currently blocking progress 83s @ = merge was blocked but has been resolved 83s ? = no merge recorded 83s 83s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 83s + echo 1 83s + git add a.txt 83s + git-imerge continue --no-edit 83s + tee imerge-b-into-a-1-2.out 83s [imerge/b ddad236] imerge 'b': manual merge 1-1 83s Merge has been recorded for merge 1-1. 83s Attempting automerge of 1-4...failure. 83s Attempting automerge of 1-2...failure. 83s Attempting automerge of 3-1...success. 83s Autofilling 2-1...success. 83s Autofilling 3-1...success. 83s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 83s Previous HEAD position was eeee7e0 imerge 'b': automatic merge 3-1 83s Switched to branch 'imerge/b' 83s Auto-merging a.txt 83s CONFLICT (content): Merge conflict in a.txt 83s Automatic merge failed; fix conflicts and then commit the result. 83s 83s Original first commit: 83s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 83s Author: Loú User 83s Date: Thu Apr 7 22:13:15 2005 +0000 83s 83s a⇒1 on branch a 83s 83s Original second commit: 83s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 83s Author: Loú User 83s Date: Thu Apr 7 22:13:19 2005 +0000 83s 83s b⇒2 and a⇒0 on branch b 83s 83s There was a conflict merging commit 1-2, shown above. 83s Please resolve the conflict, commit the result, then type 83s 83s git-imerge continue 83s + git-imerge diagram --commits --frontier 84s 0 3 84s | | 84s 0 - **** - a 84s **.. 84s *#?? 84s *??? 84s 4 - *??? 84s | 84s b 84s 84s 0 3 84s | | 84s 0 - **** - a 84s **-+ 84s *#?? 84s *??? 84s 4 - *??? 84s | 84s b 84s 84s Key: 84s |,-,+ = rectangles forming current merge frontier 84s * = merge done manually 84s . = merge done automatically 84s # = conflict that is currently blocking progress 84s @ = merge was blocked but has been resolved 84s ? = no merge recorded 84s 84s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 84s + echo 1 84s + git add a.txt 84s + git-imerge continue --no-edit 84s + tee imerge-b-into-a-1-3.out 84s [imerge/b ceba8da] imerge 'b': manual merge 1-2 84s Merge has been recorded for merge 1-2. 84s Attempting automerge of 1-4...success. 84s Autofilling 1-3...success. 84s Autofilling 1-4...success. 84s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 84s Attempting automerge of 3-4...success. 84s Autofilling 2-4...success. 84s Autofilling 3-2...success. 84s Autofilling 3-3...success. 84s Autofilling 3-4 (first way)...success. 84s Autofilling 3-4 (second way)...success. 84s The two ways of autofilling 3-4 agree. 84s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 84s Merge is complete! 84s + grep -q Merge is complete imerge-b-into-a-1-3.out 84s + git-imerge diagram --commits --frontier 84s 0 3 84s | | 84s 0 - **** - a 84s **.. 84s **?. 84s *.?. 84s 4 - *... 84s | 84s b 84s 84s 0 3 84s | | 84s 0 - **** - a 84s **.| 84s **?| 84s *.?| 84s 4 - *--+ 84s | 84s b 84s 84s Key: 84s |,-,+ = rectangles forming current merge frontier 84s * = merge done manually 84s . = merge done automatically 84s # = conflict that is currently blocking progress 84s @ = merge was blocked but has been resolved 84s ? = no merge recorded 84s 84s + GIT_EDITOR=cat git-imerge finish 84s Merge b into a (using imerge) 84s 84s # Please enter the commit message for your changes. Lines starting 84s # with '#' will be ignored, and an empty message aborts the commit. 84s # 84s # Date: Wed Dec 3 23:17:09 2025 +0000 84s # 84s # On branch b-into-a-1 84s # Changes to be committed: 84s # new file: b.txt 84s # 84s [b-into-a-1 744eb8a] Merge b into a (using imerge) 84s Date: Wed Dec 3 23:17:09 2025 +0000 84s + test_merge a-into-b-1 b a 1-1 2-1 84s + local name=a-into-b-1 84s + local dst=b 84s + local src=a 84s + local conflict1=1-1 84s + local conflict2=2-1 84s + git checkout b 84s Switched to branch 'b' 84s + git-imerge merge --branch=a-into-b-1 a 84s + tee imerge-a-into-b-1-1.out 84s Attempting automerge of 4-3...success. 84s Autofilling 1-3...unexpected conflict. Backtracking... 84s Autofilling 1-2...unexpected conflict. Backtracking... 84s Autofilling 1-1...unexpected conflict. Backtracking... 84s Switched to branch 'imerge/a' 84s Auto-merging a.txt 84s CONFLICT (content): Merge conflict in a.txt 84s Automatic merge failed; fix conflicts and then commit the result. 84s 84s Original first commit: 84s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 84s Author: Loú User 84s Date: Thu Apr 7 22:13:18 2005 +0000 84s 84s b⇒1 and a⇒X on branch b 84s 84s Original second commit: 84s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 84s Author: Loú User 84s Date: Thu Apr 7 22:13:15 2005 +0000 84s 84s a⇒1 on branch a 84s 84s There was a conflict merging commit 1-1, shown above. 84s Please resolve the conflict, commit the result, then type 84s 84s git-imerge continue 84s + git-imerge diagram --commits --frontier 84s 0 4 84s | | 84s 0 - ***** - b 84s *#??? 84s *???? 84s 3 - *???? 84s | 84s a 84s 84s 0 4 84s | | 84s 0 - ***** - b 84s *#??? 84s *???? 84s 3 - *???? 84s | 84s a 84s 84s Key: 84s |,-,+ = rectangles forming current merge frontier 84s * = merge done manually 84s . = merge done automatically 84s # = conflict that is currently blocking progress 84s @ = merge was blocked but has been resolved 84s ? = no merge recorded 84s 84s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 84s + echo 1 84s + git add a.txt 84s + git-imerge continue --no-edit 84s + tee imerge-a-into-b-1-2.out 84s [imerge/a b380016] imerge 'a': manual merge 1-1 84s Merge has been recorded for merge 1-1. 84s Attempting automerge of 1-3...success. 84s Autofilling 1-2...success. 84s Autofilling 1-3...success. 84s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 84s Attempting automerge of 4-3...failure. 84s Attempting automerge of 2-1...failure. 84s Switched to branch 'imerge/a' 84s Auto-merging a.txt 84s CONFLICT (content): Merge conflict in a.txt 84s Automatic merge failed; fix conflicts and then commit the result. 84s 84s Original first commit: 84s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 84s Author: Loú User 84s Date: Thu Apr 7 22:13:19 2005 +0000 84s 84s b⇒2 and a⇒0 on branch b 84s 84s Original second commit: 84s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 84s Author: Loú User 84s Date: Thu Apr 7 22:13:15 2005 +0000 84s 84s a⇒1 on branch a 84s 84s There was a conflict merging commit 2-1, shown above. 84s Please resolve the conflict, commit the result, then type 84s 84s git-imerge continue 84s + git-imerge diagram --commits --frontier 84s 0 4 84s | | 84s 0 - ***** - b 84s **#?? 84s *.??? 84s 3 - *.??? 84s | 84s a 84s 84s 0 4 84s | | 84s 0 - ***** - b 84s **#?? 84s *|??? 84s 3 - *+??? 84s | 84s a 84s 84s Key: 84s |,-,+ = rectangles forming current merge frontier 84s * = merge done manually 84s . = merge done automatically 84s # = conflict that is currently blocking progress 84s @ = merge was blocked but has been resolved 84s ? = no merge recorded 84s 84s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 84s + echo 1 84s + git add a.txt 84s + git-imerge continue --no-edit 84s + tee imerge-a-into-b-1-3.out 84s [imerge/a 36a6859] imerge 'a': manual merge 2-1 84s Merge has been recorded for merge 2-1. 84s Attempting automerge of 2-3...success. 84s Autofilling 2-2...success. 84s Autofilling 2-3...success. 84s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 84s Attempting automerge of 4-3...success. 84s Autofilling 3-3...success. 84s Autofilling 4-1...success. 84s Autofilling 4-2...success. 84s Autofilling 4-3 (first way)...success. 84s Autofilling 4-3 (second way)...success. 84s The two ways of autofilling 4-3 agree. 84s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 84s Merge is complete! 84s + grep -q Merge is complete imerge-a-into-b-1-3.out 84s + git-imerge diagram --commits --frontier 84s 0 4 84s | | 84s 0 - ***** - b 84s ***?. 84s *..?. 84s 3 - *.... 84s | 84s a 84s 84s 0 4 84s | | 84s 0 - ***** - b 84s ***?| 84s *..?| 84s 3 - *---+ 84s | 84s a 84s 84s Key: 84s |,-,+ = rectangles forming current merge frontier 84s * = merge done manually 84s . = merge done automatically 84s # = conflict that is currently blocking progress 84s @ = merge was blocked but has been resolved 84s ? = no merge recorded 84s 84s + GIT_EDITOR=cat git-imerge finish 84s Merge a into b (using imerge) 84s 84s # Please enter the commit message for your changes. Lines starting 84s # with '#' will be ignored, and an empty message aborts the commit. 84s # 84s # Date: Wed Dec 3 23:17:09 2025 +0000 84s # 84s # On branch a-into-b-1 84s # Changes to be committed: 84s # modified: a.txt 84s # 84s [a-into-b-1 6fbee44] Merge a into b (using imerge) 84s Date: Wed Dec 3 23:17:09 2025 +0000 84s + flip_flop_test 2 84s + local n=2 84s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 84s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 84s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s + local description=git-imerge test repository with a commit and its revert at n=2 84s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 84s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s + local description=git-imerge test repository with a commit and its revert at n=2 84s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s hint: Using 'master' as the name for the initial branch. This default branch name 84s hint: is subject to change. To configure the initial branch name to use in all 84s hint: of your new repositories, which will suppress this warning, call: 84s hint: 84s hint: git config --global init.defaultBranch 84s hint: 84s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 84s hint: 'development'. The just-created branch can be renamed via this command: 84s hint: 84s hint: git branch -m 84s hint: 84s hint: Disable this message with "git config set advice.defaultBranchName false" 84s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2/.git/ 84s + echo git-imerge test repository with a commit and its revert at n=2 84s + printf %s\n /*.out /*.css /*.html 84s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2/.git config user.name Loú User 84s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 84s + TIME=1112911993 84s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-2 84s + modify a.txt 0 84s + filename=a.txt 84s + text=0 84s + echo 0 84s + git add a.txt 84s + commit -m m⇒0 84s + TIME=1112911994 84s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 84s [master (root-commit) a733afa] m⇒0 84s 1 file changed, 1 insertion(+) 84s create mode 100644 a.txt 84s + git checkout -b a -- 84s Switched to a new branch 'a' 84s + modify a.txt 1 84s + filename=a.txt 84s + text=1 84s + echo 1 84s + git add a.txt 84s + commit -m a⇒1 on branch a 84s + TIME=1112911995 84s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 84s + modify a.txt 2 84s + filename=a.txt 84s + text=2 84s + echo 2 84s + git add a.txt 84s [a 2f1f75a] a⇒1 on branch a 84s 1 file changed, 1 insertion(+), 1 deletion(-) 84s + commit -m a⇒2 on branch a 84s + TIME=1112911996 84s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 84s + modify a.txt 3 84s + filename=a.txt 84s + text=3 84s + echo 3 84s + git add a.txt 84s [a 4700669] a⇒2 on branch a 84s 1 file changed, 1 insertion(+), 1 deletion(-) 84s + commit -m a⇒3 on branch a 84s + TIME=1112911997 84s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 84s + git checkout -b b master -- 84s [a 621c381] a⇒3 on branch a 84s 1 file changed, 1 insertion(+), 1 deletion(-) 84s Switched to a new branch 'b' 84s + modify b.txt 1 84s + filename=b.txt 84s + text=1 84s + echo 1 84s + git add b.txt 84s + msg=b⇒1 84s + test 1 = 2 84s + test 1 = 3 84s + commit -m b⇒1 on branch b 84s + TIME=1112911998 84s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 84s [b 1f7d097] b⇒1 on branch b 84s 1 file changed, 1 insertion(+) 84s create mode 100644 b.txt 84s + modify b.txt 2 84s + filename=b.txt 84s + text=2 84s + echo 2 84s + git add b.txt 84s + msg=b⇒2 84s + test 2 = 2 84s + modify a.txt X 84s + filename=a.txt 84s + text=X 84s + echo X 84s + git add a.txt 84s + msg=b⇒2 and a⇒X 84s + test 2 = 3 84s + commit -m b⇒2 and a⇒X on branch b 84s + TIME=1112911999 84s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 84s + modify b.txt 3 84s + filename=b.txt 84s + text=3 84s + echo 3 84s + git add b.txt 84s + msg=b⇒3 84s + test 3 = 2 84s + test 3 = 3 84s + modify a.txt 0 84s + filename=a.txt 84s + text=0 84s + echo 0 84s + git add a.txt 84s + msg=b⇒3 and a⇒0 84s + commit -m b⇒3 and a⇒0 on branch b 84s + TIME=1112912000 84s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 84s [b 48df77d] b⇒2 and a⇒X on branch b 84s 2 files changed, 2 insertions(+), 2 deletions(-) 84s [b f3ef019] b⇒3 and a⇒0 on branch b 84s 2 files changed, 2 insertions(+), 2 deletions(-) 84s + modify b.txt 4 84s + filename=b.txt 84s + text=4 84s + echo 4 84s + git add b.txt 84s + msg=b⇒4 84s + test 4 = 2 84s + test 4 = 3 84s + commit -m b⇒4 on branch b 84s + TIME=1112912001 84s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 84s + test_merge b-into-a-2 a b 1-2 1-3 84s + local name=b-into-a-2 84s + local dst=a 84s + local src=b 84s + local conflict1=1-2 84s + local conflict2=1-3 84s + git checkout a 84s [b 69d0c21] b⇒4 on branch b 84s 1 file changed, 1 insertion(+), 1 deletion(-) 84s Switched to branch 'a' 84s + git-imerge merge --branch=b-into-a-2 b 84s + tee imerge-b-into-a-2-1.out 84s Attempting automerge of 3-4...success. 84s Autofilling 1-4...success. 84s Autofilling 2-4...success. 84s Autofilling 3-1...success. 84s Autofilling 3-2...unexpected conflict. Backtracking... 84s Autofilling 1-4...success. 84s Autofilling 2-1...success. 84s Autofilling 2-2...unexpected conflict. Backtracking... 85s Autofilling 1-1...success. 85s Autofilling 1-2...unexpected conflict. Backtracking... 85s Autofilling 1-1...success. 85s Autofilling 2-1...success. 85s Autofilling 3-1...success. 85s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 85s Attempting automerge of 3-4...success. 85s Autofilling 1-4...success. 85s Autofilling 2-4...success. 85s Autofilling 3-2...unexpected conflict. Backtracking... 85s Autofilling 1-4...success. 85s Autofilling 2-2...unexpected conflict. Backtracking... 85s Autofilling 1-2...unexpected conflict. Backtracking... 85s Switched to branch 'imerge/b' 85s Auto-merging a.txt 85s CONFLICT (content): Merge conflict in a.txt 85s Automatic merge failed; fix conflicts and then commit the result. 85s 85s Original first commit: 85s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 85s Author: Loú User 85s Date: Thu Apr 7 22:13:15 2005 +0000 85s 85s a⇒1 on branch a 85s 85s Original second commit: 85s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 85s Author: Loú User 85s Date: Thu Apr 7 22:13:19 2005 +0000 85s 85s b⇒2 and a⇒X on branch b 85s 85s There was a conflict merging commit 1-2, shown above. 85s Please resolve the conflict, commit the result, then type 85s 85s git-imerge continue 85s + git-imerge diagram --commits --frontier 85s 0 3 85s | | 85s 0 - **** - a 85s *... 85s *#?? 85s *??? 85s 4 - *??? 85s | 85s b 85s 85s 0 3 85s | | 85s 0 - **** - a 85s *--+ 85s *#?? 85s *??? 85s 4 - *??? 85s | 85s b 85s 85s Key: 85s |,-,+ = rectangles forming current merge frontier 85s * = merge done manually 85s . = merge done automatically 85s # = conflict that is currently blocking progress 85s @ = merge was blocked but has been resolved 85s ? = no merge recorded 85s 85s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 85s + echo 1 85s + git add a.txt 85s + git-imerge continue --no-edit 85s + tee imerge-b-into-a-2-2.out 85s [imerge/b b2dac91] imerge 'b': manual merge 1-2 85s Merge has been recorded for merge 1-2. 85s Attempting automerge of 1-4...failure. 85s Attempting automerge of 1-3...failure. 85s Attempting automerge of 3-2...success. 85s Autofilling 2-2...success. 85s Autofilling 3-2...success. 85s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 85s Previous HEAD position was d19e418 imerge 'b': automatic merge 3-2 85s Switched to branch 'imerge/b' 85s Auto-merging a.txt 85s CONFLICT (content): Merge conflict in a.txt 85s Automatic merge failed; fix conflicts and then commit the result. 85s 85s Original first commit: 85s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 85s Author: Loú User 85s Date: Thu Apr 7 22:13:15 2005 +0000 85s 85s a⇒1 on branch a 85s 85s Original second commit: 85s commit f3ef01986be02ef5e40589b283c0385471ecca7d 85s Author: Loú User 85s Date: Thu Apr 7 22:13:20 2005 +0000 85s 85s b⇒3 and a⇒0 on branch b 85s 85s There was a conflict merging commit 1-3, shown above. 85s Please resolve the conflict, commit the result, then type 85s 85s git-imerge continue 85s + git-imerge diagram --commits --frontier 85s 0 3 85s | | 85s 0 - **** - a 85s *... 85s **.. 85s *#?? 85s 4 - *??? 85s | 85s b 85s 85s 0 3 85s | | 85s 0 - **** - a 85s *..| 85s **-+ 85s *#?? 85s 4 - *??? 85s | 85s b 85s 85s Key: 85s |,-,+ = rectangles forming current merge frontier 85s * = merge done manually 85s . = merge done automatically 85s # = conflict that is currently blocking progress 85s @ = merge was blocked but has been resolved 85s ? = no merge recorded 85s 85s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 85s + echo 1 85s + git add a.txt 85s + git-imerge continue --no-edit 85s + tee imerge-b-into-a-2-3.out 85s [imerge/b 117a2b8] imerge 'b': manual merge 1-3 85s Merge has been recorded for merge 1-3. 85s Attempting automerge of 1-4...success. 85s Autofilling 1-4...success. 85s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 85s Attempting automerge of 3-4...success. 85s Autofilling 2-4...success. 85s Autofilling 3-3...success. 85s Autofilling 3-4 (first way)...success. 85s Autofilling 3-4 (second way)...success. 85s The two ways of autofilling 3-4 agree. 85s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 85s Merge is complete! 85s + grep -q Merge is complete imerge-b-into-a-2-3.out 85s + git-imerge diagram --commits --frontier 85s 0 3 85s | | 85s 0 - **** - a 85s *... 85s **.. 85s **?. 85s 4 - *... 85s | 85s b 85s 85s 0 3 85s | | 85s 0 - **** - a 85s *..| 85s **.| 85s **?| 85s 4 - *--+ 85s | 85s b 85s 85s Key: 85s |,-,+ = rectangles forming current merge frontier 85s * = merge done manually 85s . = merge done automatically 85s # = conflict that is currently blocking progress 85s @ = merge was blocked but has been resolved 85s ? = no merge recorded 85s 85s + GIT_EDITOR=cat git-imerge finish 85s Merge b into a (using imerge) 85s 85s # Please enter the commit message for your changes. Lines starting 85s # with '#' will be ignored, and an empty message aborts the commit. 85s # 85s # Date: Wed Dec 3 23:17:10 2025 +0000 85s # 85s # On branch b-into-a-2 85s # Changes to be committed: 85s # new file: b.txt 85s # 85s [b-into-a-2 ea43032] Merge b into a (using imerge) 85s Date: Wed Dec 3 23:17:10 2025 +0000 85s + test_merge a-into-b-2 b a 2-1 3-1 85s + local name=a-into-b-2 85s + local dst=b 85s + local src=a 85s + local conflict1=2-1 85s + local conflict2=3-1 85s + git checkout b 85s Switched to branch 'b' 85s + + tee imerge-a-into-b-2-1.out 85s git-imerge merge --branch=a-into-b-2 a 85s Attempting automerge of 4-3...success. 85s Autofilling 1-3...success. 85s Autofilling 2-3...unexpected conflict. Backtracking... 85s Autofilling 1-1...success. 85s Autofilling 1-2...success. 85s Autofilling 1-3...success. 85s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 85s Autofilling 2-2...unexpected conflict. Backtracking... 85s Autofilling 2-1...unexpected conflict. Backtracking... 85s Switched to branch 'imerge/a' 85s Auto-merging a.txt 85s CONFLICT (content): Merge conflict in a.txt 85s Automatic merge failed; fix conflicts and then commit the result. 85s 85s Original first commit: 85s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 85s Author: Loú User 85s Date: Thu Apr 7 22:13:19 2005 +0000 85s 85s b⇒2 and a⇒X on branch b 85s 85s Original second commit: 85s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 85s Author: Loú User 85s Date: Thu Apr 7 22:13:15 2005 +0000 85s 85s a⇒1 on branch a 85s 85s There was a conflict merging commit 2-1, shown above. 85s Please resolve the conflict, commit the result, then type 85s 85s git-imerge continue 85s + git-imerge diagram --commits --frontier 85s 0 4 85s | | 85s 0 - ***** - b 85s *.#?? 85s *.??? 85s 3 - *.??? 85s | 85s a 85s 85s 0 4 85s | | 85s 0 - ***** - b 85s *|#?? 85s *|??? 85s 3 - *+??? 85s | 85s a 85s 85s Key: 85s |,-,+ = rectangles forming current merge frontier 85s * = merge done manually 85s . = merge done automatically 85s # = conflict that is currently blocking progress 85s @ = merge was blocked but has been resolved 85s ? = no merge recorded 85s 85s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 85s + echo 1 85s + git add a.txt 85s + git-imerge continue --no-edit 85s + tee imerge-a-into-b-2-2.out 85s [imerge/a 3e720e6] imerge 'a': manual merge 2-1 85s Merge has been recorded for merge 2-1. 85s Attempting automerge of 2-3...success. 85s Autofilling 2-2...success. 85s Autofilling 2-3...success. 85s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 85s Attempting automerge of 4-3...failure. 85s Attempting automerge of 3-1...failure. 85s Switched to branch 'imerge/a' 85s Auto-merging a.txt 85s CONFLICT (content): Merge conflict in a.txt 85s Automatic merge failed; fix conflicts and then commit the result. 85s 85s Original first commit: 85s commit f3ef01986be02ef5e40589b283c0385471ecca7d 85s Author: Loú User 85s Date: Thu Apr 7 22:13:20 2005 +0000 85s 85s b⇒3 and a⇒0 on branch b 85s 85s Original second commit: 85s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 85s Author: Loú User 85s Date: Thu Apr 7 22:13:15 2005 +0000 85s 85s a⇒1 on branch a 85s 85s There was a conflict merging commit 3-1, shown above. 85s Please resolve the conflict, commit the result, then type 85s 85s git-imerge continue 85s + git-imerge diagram --commits --frontier 85s 0 4 85s | | 85s 0 - ***** - b 85s *.*#? 85s *..?? 85s 3 - *..?? 85s | 85s a 85s 85s 0 4 85s | | 85s 0 - ***** - b 85s *.*#? 85s *.|?? 85s 3 - *-+?? 85s | 85s a 85s 85s Key: 85s |,-,+ = rectangles forming current merge frontier 85s * = merge done manually 85s . = merge done automatically 85s # = conflict that is currently blocking progress 85s @ = merge was blocked but has been resolved 85s ? = no merge recorded 85s 85s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 85s + echo 1 85s + git add a.txt 85s + git-imerge continue --no-edit 85s + tee imerge-a-into-b-2-3.out 85s [imerge/a df4b3f9] imerge 'a': manual merge 3-1 85s Merge has been recorded for merge 3-1. 85s Attempting automerge of 3-3...success. 85s Autofilling 3-2...success. 85s Autofilling 3-3...success. 85s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 85s Attempting automerge of 4-3...success. 85s Autofilling 4-1...success. 85s Autofilling 4-2...success. 85s Autofilling 4-3...success. 85s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 85s Merge is complete! 85s + grep -q Merge is complete imerge-a-into-b-2-3.out 85s + git-imerge diagram --commits --frontier 86s 0 4 86s | | 86s 0 - ***** - b 86s *.**. 86s *.... 86s 3 - *.... 86s | 86s a 86s 86s 0 4 86s | | 86s 0 - ***** - b 86s *.**| 86s *...| 86s 3 - *---+ 86s | 86s a 86s 86s Key: 86s |,-,+ = rectangles forming current merge frontier 86s * = merge done manually 86s . = merge done automatically 86s # = conflict that is currently blocking progress 86s @ = merge was blocked but has been resolved 86s ? = no merge recorded 86s 86s + GIT_EDITOR=cat git-imerge finish 86s Merge a into b (using imerge) 86s 86s # Please enter the commit message for your changes. Lines starting 86s # with '#' will be ignored, and an empty message aborts the commit. 86s # 86s # Date: Wed Dec 3 23:17:11 2025 +0000 86s # 86s # On branch a-into-b-2 86s # Changes to be committed: 86s # modified: a.txt 86s # 86s [a-into-b-2 7875ab5] Merge a into b (using imerge) 86s Date: Wed Dec 3 23:17:11 2025 +0000 86s + flip_flop_test 3 86s + local n=3 86s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 86s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 86s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s + local description=git-imerge test repository with a commit and its revert at n=3 86s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 86s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s + local description=git-imerge test repository with a commit and its revert at n=3 86s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s hint: Using 'master' as the name for the initial branch. This default branch name 86s hint: is subject to change. To configure the initial branch name to use in all 86s hint: of your new repositories, which will suppress this warning, call: 86s hint: 86s hint: git config --global init.defaultBranch 86s hint: 86s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 86s hint: 'development'. The just-created branch can be renamed via this command: 86s hint: 86s hint: git branch -m 86s hint: 86s hint: Disable this message with "git config set advice.defaultBranchName false" 86s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3/.git/ 86s + echo git-imerge test repository with a commit and its revert at n=3 86s + printf %s\n /*.out /*.css /*.html 86s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3/.git config user.name Loú User 86s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 86s + TIME=1112911993 86s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/flip-flop-3 86s + modify a.txt 0 86s + filename=a.txt 86s + text=0 86s + echo 0 86s + git add a.txt 86s + commit -m m⇒0 86s + TIME=1112911994 86s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 86s + git checkout -b a -- 86s [master (root-commit) a733afa] m⇒0 86s 1 file changed, 1 insertion(+) 86s create mode 100644 a.txt 86s Switched to a new branch 'a' 86s + modify a.txt 1 86s + filename=a.txt 86s + text=1 86s + echo 1 86s + git add a.txt 86s + commit -m a⇒1 on branch a 86s + TIME=1112911995 86s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 86s [a 2f1f75a] a⇒1 on branch a 86s 1 file changed, 1 insertion(+), 1 deletion(-) 86s + modify a.txt 2 86s + filename=a.txt 86s + text=2 86s + echo 2 86s + git add a.txt 86s + commit -m a⇒2 on branch a 86s + TIME=1112911996 86s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 86s [a 4700669] a⇒2 on branch a 86s 1 file changed, 1 insertion(+), 1 deletion(-) 86s + modify a.txt 3 86s + filename=a.txt 86s + text=3 86s + echo 3 86s + git add a.txt 86s + commit -m a⇒3 on branch a 86s + TIME=1112911997 86s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 86s + git checkout -b b master -- 86s Switched to a new branch 'b' 86s + modify b.txt 1 86s + filename=b.txt 86s + text=1 86s + echo 1 86s + git add b.txt 86s + msg=b⇒1 86s + test 1 = 3 86s + test 1 = 4 86s + commit -m b⇒1 on branch b 86s + TIME=1112911998 86s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 86s [a 621c381] a⇒3 on branch a 86s 1 file changed, 1 insertion(+), 1 deletion(-) 86s + modify b.txt 2 86s + filename=b.txt 86s + text=2 86s + echo 2 86s + git add b.txt 86s [b 1f7d097] b⇒1 on branch b 86s 1 file changed, 1 insertion(+) 86s create mode 100644 b.txt 86s + msg=b⇒2 86s + test 2 = 3 86s + test 2 = 4 86s + commit -m b⇒2 on branch b 86s + TIME=1112911999 86s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 86s + modify b.txt 3 86s + filename=b.txt 86s + text=3 86s + echo 3 86s + git add b.txt 86s [b ce671e9] b⇒2 on branch b 86s 1 file changed, 1 insertion(+), 1 deletion(-) 86s + msg=b⇒3 86s + test 3 = 3 86s + modify a.txt X 86s + filename=a.txt 86s + text=X 86s + echo X 86s + git add a.txt 86s + msg=b⇒3 and a⇒X 86s + test 3 = 4 86s + commit -m b⇒3 and a⇒X on branch b 86s + TIME=1112912000 86s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 86s + modify b.txt 4 86s + filename=b.txt 86s + text=4 86s + echo 4 86s + git add b.txt 86s [b d40495e] b⇒3 and a⇒X on branch b 86s 2 files changed, 2 insertions(+), 2 deletions(-) 86s + msg=b⇒4 86s + test 4 = 3 86s + test 4 = 4 86s + modify a.txt 0 86s + filename=a.txt 86s + text=0 86s + echo 0 86s + git add a.txt 86s + msg=b⇒4 and a⇒0 86s + commit -m b⇒4 and a⇒0 on branch b 86s + TIME=1112912001 86s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 86s [b eb736f2] b⇒4 and a⇒0 on branch b 86s 2 files changed, 2 insertions(+), 2 deletions(-) 86s + test_merge b-into-a-3 a b 1-3 1-4 86s + local name=b-into-a-3 86s + local dst=a 86s + local src=b 86s + local conflict1=1-3 86s + local conflict2=1-4 86s + git checkout a 86s Switched to branch 'a' 86s + git-imerge merge --branch=b-into-a-3 b 86s + tee imerge-b-into-a-3-1.out 86s Attempting automerge of 3-4...success. 86s Autofilling 1-4...success. 86s Autofilling 2-4...success. 86s Autofilling 3-1...success. 86s Autofilling 3-2...success. 86s Autofilling 3-3...unexpected conflict. Backtracking... 86s Autofilling 1-4...success. 86s Autofilling 2-1...success. 86s Autofilling 2-2...success. 86s Autofilling 2-3...unexpected conflict. Backtracking... 86s Autofilling 1-1...success. 86s Autofilling 1-2...success. 86s Autofilling 1-3...unexpected conflict. Backtracking... 86s Autofilling 1-2...success. 86s Autofilling 2-2...success. 86s Autofilling 3-1...success. 86s Autofilling 3-2 (first way)...success. 86s Autofilling 3-2 (second way)...success. 86s The two ways of autofilling 3-2 agree. 86s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 86s Attempting automerge of 3-4...success. 86s Autofilling 1-4...success. 86s Autofilling 2-4...success. 86s Autofilling 3-3...unexpected conflict. Backtracking... 86s Autofilling 1-4...success. 86s Autofilling 2-3...unexpected conflict. Backtracking... 86s Autofilling 1-3...unexpected conflict. Backtracking... 86s Switched to branch 'imerge/b' 86s Auto-merging a.txt 86s CONFLICT (content): Merge conflict in a.txt 86s Automatic merge failed; fix conflicts and then commit the result. 86s 86s Original first commit: 86s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 86s Author: Loú User 86s Date: Thu Apr 7 22:13:15 2005 +0000 86s 86s a⇒1 on branch a 86s 86s Original second commit: 86s commit d40495ed379f376841e517047f90b663e8c7c7e1 86s Author: Loú User 86s Date: Thu Apr 7 22:13:20 2005 +0000 86s 86s b⇒3 and a⇒X on branch b 86s 86s There was a conflict merging commit 1-3, shown above. 86s Please resolve the conflict, commit the result, then type 86s 86s git-imerge continue 86s + git-imerge diagram --commits --frontier 86s 0 3 86s | | 86s 0 - **** - a 86s *??. 86s *... 86s *#?? 86s 4 - *??? 86s | 86s b 86s 86s 0 3 86s | | 86s 0 - **** - a 86s *??| 86s *--+ 86s *#?? 86s 4 - *??? 86s | 86s b 86s 86s Key: 86s |,-,+ = rectangles forming current merge frontier 86s * = merge done manually 86s . = merge done automatically 86s # = conflict that is currently blocking progress 86s @ = merge was blocked but has been resolved 86s ? = no merge recorded 86s 86s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 86s + echo 1 86s + git add a.txt 86s + git-imerge continue --no-edit 86s + tee imerge-b-into-a-3-2.out 86s [imerge/b 39a8c10] imerge 'b': manual merge 1-3 86s Merge has been recorded for merge 1-3. 86s Attempting automerge of 1-4...failure. 86s Attempting automerge of 1-4...failure. 86s Attempting automerge of 3-3...success. 86s Autofilling 2-3...success. 86s Autofilling 3-3...success. 86s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 86s Previous HEAD position was 48b0534 imerge 'b': automatic merge 3-3 86s Switched to branch 'imerge/b' 86s Auto-merging a.txt 86s CONFLICT (content): Merge conflict in a.txt 86s Automatic merge failed; fix conflicts and then commit the result. 86s 86s Original first commit: 86s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 86s Author: Loú User 86s Date: Thu Apr 7 22:13:15 2005 +0000 86s 86s a⇒1 on branch a 86s 86s Original second commit: 86s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 86s Author: Loú User 86s Date: Thu Apr 7 22:13:21 2005 +0000 86s 86s b⇒4 and a⇒0 on branch b 86s 86s There was a conflict merging commit 1-4, shown above. 86s Please resolve the conflict, commit the result, then type 86s 86s git-imerge continue 86s + git-imerge diagram --commits --frontier 86s 0 3 86s | | 86s 0 - **** - a 86s *??. 86s *... 86s **.. 86s 4 - *#?? 86s | 86s b 86s 86s 0 3 86s | | 86s 0 - **** - a 86s *??| 86s *..| 86s **-+ 86s 4 - *#?? 86s | 86s b 86s 86s Key: 86s |,-,+ = rectangles forming current merge frontier 86s * = merge done manually 86s . = merge done automatically 86s # = conflict that is currently blocking progress 86s @ = merge was blocked but has been resolved 86s ? = no merge recorded 86s 86s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 86s + echo 1 86s + git add a.txt 86s + git-imerge continue --no-edit 86s + tee imerge-b-into-a-3-3.out 86s [imerge/b 8dbe97d] imerge 'b': manual merge 1-4 86s Merge has been recorded for merge 1-4. 86s Attempting automerge of 3-4...success. 86s Autofilling 2-4...success. 86s Autofilling 3-4...success. 86s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 86s Merge is complete! 86s + grep -q Merge is complete imerge-b-into-a-3-3.out 86s + git-imerge diagram --commits --frontier 86s 0 3 86s | | 86s 0 - **** - a 86s *??. 86s *... 86s **.. 86s 4 - **.. 86s | 86s b 86s 86s 0 3 86s | | 86s 0 - **** - a 86s *??| 86s *..| 86s **.| 86s 4 - **-+ 86s | 86s b 86s 86s Key: 86s |,-,+ = rectangles forming current merge frontier 86s * = merge done manually 86s . = merge done automatically 86s # = conflict that is currently blocking progress 86s @ = merge was blocked but has been resolved 86s ? = no merge recorded 86s 86s + GIT_EDITOR=cat git-imerge finish 86s Merge b into a (using imerge) 86s 86s # Please enter the commit message for your changes. Lines starting 86s # with '#' will be ignored, and an empty message aborts the commit. 86s # 86s # Date: Wed Dec 3 23:17:11 2025 +0000 86s # 86s # On branch b-into-a-3 86s # Changes to be committed: 86s # new file: b.txt 86s # 86s [b-into-a-3 7c7c52f] Merge b into a (using imerge) 86s Date: Wed Dec 3 23:17:11 2025 +0000 86s + test_merge a-into-b-3 b a 3-1 4-1 86s + local name=a-into-b-3 86s + local dst=b 86s + local src=a 86s + local conflict1=3-1 86s + local conflict2=4-1 86s + git checkout b 86s Switched to branch 'b' 86s + git-imerge merge --branch=a-into-b-3 a 86s + tee imerge-a-into-b-3-1.out 86s Attempting automerge of 4-3...success. 86s Autofilling 1-3...success. 86s Autofilling 2-3...success. 86s Autofilling 3-3...unexpected conflict. Backtracking... 86s Autofilling 1-3...success. 86s Autofilling 2-1...success. 86s Autofilling 2-2...success. 86s Autofilling 2-3 (first way)...success. 86s Autofilling 2-3 (second way)...success. 86s The two ways of autofilling 2-3 agree. 86s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 86s Autofilling 3-2...unexpected conflict. Backtracking... 86s Autofilling 3-1...unexpected conflict. Backtracking... 86s Switched to branch 'imerge/a' 86s Auto-merging a.txt 86s CONFLICT (content): Merge conflict in a.txt 86s Automatic merge failed; fix conflicts and then commit the result. 86s 86s Original first commit: 86s commit d40495ed379f376841e517047f90b663e8c7c7e1 86s Author: Loú User 86s Date: Thu Apr 7 22:13:20 2005 +0000 86s 86s b⇒3 and a⇒X on branch b 86s 86s Original second commit: 86s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 86s Author: Loú User 86s Date: Thu Apr 7 22:13:15 2005 +0000 86s 86s a⇒1 on branch a 86s 86s There was a conflict merging commit 3-1, shown above. 86s Please resolve the conflict, commit the result, then type 86s 86s git-imerge continue 86s + git-imerge diagram --commits --frontier 86s 0 4 86s | | 86s 0 - ***** - b 86s *?.#? 86s *?.?? 86s 3 - *..?? 86s | 86s a 86s 86s 0 4 86s | | 86s 0 - ***** - b 86s *?|#? 86s *?|?? 86s 3 - *-+?? 86s | 86s a 86s 86s Key: 86s |,-,+ = rectangles forming current merge frontier 86s * = merge done manually 86s . = merge done automatically 86s # = conflict that is currently blocking progress 86s @ = merge was blocked but has been resolved 86s ? = no merge recorded 86s 86s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 86s + echo 1 86s + git add a.txt 86s + + tee imerge-a-into-b-3-2.out 86s git-imerge continue --no-edit 87s [imerge/a 529ecc8] imerge 'a': manual merge 3-1 87s Merge has been recorded for merge 3-1. 87s Attempting automerge of 3-3...success. 87s Autofilling 3-2...success. 87s Autofilling 3-3...success. 87s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 87s Attempting automerge of 4-3...failure. 87s Attempting automerge of 4-1...failure. 87s Switched to branch 'imerge/a' 87s Auto-merging a.txt 87s CONFLICT (content): Merge conflict in a.txt 87s Automatic merge failed; fix conflicts and then commit the result. 87s 87s Original first commit: 87s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 87s Author: Loú User 87s Date: Thu Apr 7 22:13:21 2005 +0000 87s 87s b⇒4 and a⇒0 on branch b 87s 87s Original second commit: 87s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 87s Author: Loú User 87s Date: Thu Apr 7 22:13:15 2005 +0000 87s 87s a⇒1 on branch a 87s 87s There was a conflict merging commit 4-1, shown above. 87s Please resolve the conflict, commit the result, then type 87s 87s git-imerge continue 87s + git-imerge diagram --commits --frontier 87s 0 4 87s | | 87s 0 - ***** - b 87s *?.*# 87s *?..? 87s 3 - *...? 87s | 87s a 87s 87s 0 4 87s | | 87s 0 - ***** - b 87s *?.*# 87s *?.|? 87s 3 - *--+? 87s | 87s a 87s 87s Key: 87s |,-,+ = rectangles forming current merge frontier 87s * = merge done manually 87s . = merge done automatically 87s # = conflict that is currently blocking progress 87s @ = merge was blocked but has been resolved 87s ? = no merge recorded 87s 87s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 87s + echo 1 87s + git add a.txt 87s + git-imerge continue --no-edit 87s + tee imerge-a-into-b-3-3.out 87s [imerge/a a9d5ca8] imerge 'a': manual merge 4-1 87s Merge has been recorded for merge 4-1. 87s Attempting automerge of 4-3...success. 87s Autofilling 4-2...success. 87s Autofilling 4-3...success. 87s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 87s Merge is complete! 87s + grep -q Merge is complete imerge-a-into-b-3-3.out 87s + git-imerge diagram --commits --frontier 87s 0 4 87s | | 87s 0 - ***** - b 87s *?.** 87s *?... 87s 3 - *.... 87s | 87s a 87s 87s 0 4 87s | | 87s 0 - ***** - b 87s *?.** 87s *?..| 87s 3 - *---+ 87s | 87s a 87s 87s Key: 87s |,-,+ = rectangles forming current merge frontier 87s * = merge done manually 87s . = merge done automatically 87s # = conflict that is currently blocking progress 87s @ = merge was blocked but has been resolved 87s ? = no merge recorded 87s 87s + GIT_EDITOR=cat git-imerge finish 87s Merge a into b (using imerge) 87s 87s # Please enter the commit message for your changes. Lines starting 87s # with '#' will be ignored, and an empty message aborts the commit. 87s # 87s # Date: Wed Dec 3 23:17:12 2025 +0000 87s # 87s # On branch a-into-b-3 87s # Changes to be committed: 87s # modified: a.txt 87s # 87s [a-into-b-3 99c0e96] Merge a into b (using imerge) 87s Date: Wed Dec 3 23:17:12 2025 +0000 87s py313: commands[5] /tmp/autopkgtest.ZvitK4/build.No0/src> /bin/sh t/test-drop 87s + dirname t/test-drop 87s + cd t 87s + pwd 87s + dirname /tmp/autopkgtest.ZvitK4/build.No0/src/t 87s + BASE=/tmp/autopkgtest.ZvitK4/build.No0/src 87s + . /tmp/autopkgtest.ZvitK4/build.No0/src/t/test-lib.sh 87s + GIT_IMERGE=git-imerge 87s + TMP=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s + DESCRIPTION=git-imerge drop test repository 87s + init_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop git-imerge drop test repository 87s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s + local description=git-imerge drop test repository 87s + delete_test_repo /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop git-imerge drop test repository 87s + local path=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s + local description=git-imerge drop test repository 87s + test -d /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s + mkdir -p /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s + git init /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s hint: Using 'master' as the name for the initial branch. This default branch name 87s hint: is subject to change. To configure the initial branch name to use in all 87s hint: of your new repositories, which will suppress this warning, call: 87s hint: 87s hint: git config --global init.defaultBranch 87s hint: 87s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 87s hint: 'development'. The just-created branch can be renamed via this command: 87s hint: 87s hint: git branch -m 87s hint: 87s hint: Disable this message with "git config set advice.defaultBranchName false" 87s Initialized empty Git repository in /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop/.git/ 87s + echo git-imerge drop test repository 87s + printf %s\n /*.out /*.css /*.html 87s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop/.git config user.name Loú User 87s + git --git-dir=/tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop/.git config user.email luser@example.com 87s + TIME=1112911993 87s + ln -s /tmp/autopkgtest.ZvitK4/build.No0/src/imerge.css /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s + cd /tmp/autopkgtest.ZvitK4/build.No0/src/t/tmp/drop 87s + modify a.txt 0 87s + filename=a.txt 87s + text=0 87s + echo 0 87s + git add a.txt 87s + commit -m m⇒0 87s + TIME=1112911994 87s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 87s [master (root-commit) a733afa] m⇒0 87s 1 file changed, 1 insertion(+) 87s create mode 100644 a.txt 87s + seq 6 87s + modify a1.txt 1 87s + filename=a1.txt 87s + text=1 87s + echo 1 87s + git add a1.txt 87s + commit -m a1⇒1 87s + TIME=1112911995 87s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 87s + modify a2.txt 2 87s + filename=a2.txt 87s + text=2 87s + echo 2 87s + git add a2.txt 87s [master 389a4ba] a1⇒1 87s 1 file changed, 1 insertion(+) 87s create mode 100644 a1.txt 87s + commit -m a2⇒2 87s + TIME=1112911996 87s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 87s [master 4785218] a2⇒2 87s 1 file changed, 1 insertion(+) 87s create mode 100644 a2.txt 87s + modify a3.txt 3 87s + filename=a3.txt 87s + text=3 87s + echo 3 87s + git add a3.txt 87s + commit -m a3⇒3 87s + TIME=1112911997 87s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 87s + modify a4.txt 4 87s + filename=a4.txt 87s + text=4 87s + echo 4 87s + git add a4.txt 87s [master 34bdde3] a3⇒3 87s 1 file changed, 1 insertion(+) 87s create mode 100644 a3.txt 87s + commit -m a4⇒4 87s + TIME=1112911998 87s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 87s [master c793a5a] a4⇒4 87s 1 file changed, 1 insertion(+) 87s create mode 100644 a4.txt 87s + modify a5.txt 5 87s + filename=a5.txt 87s + text=5 87s + echo 5 87s + git add a5.txt 87s + commit -m a5⇒5 87s + TIME=1112911999 87s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 87s [master b42f60c] a5⇒5 87s 1 file changed, 1 insertion(+) 87s create mode 100644 a5.txt 87s + modify a6.txt 6 87s + filename=a6.txt 87s + text=6 87s + echo 6 87s + git add a6.txt 87s + commit -m a6⇒6 87s + TIME=1112912000 87s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 87s [master 9d6aec5] a6⇒6 87s 1 file changed, 1 insertion(+) 87s create mode 100644 a6.txt 87s + git checkout -b dropped master 87s Switched to a new branch 'dropped' 87s + git-imerge drop HEAD~5..HEAD~3 87s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 87s 87s You are in 'detached HEAD' state. You can look around, make experimental 87s changes and commit them, and you can discard any commits you make in this 87s state without impacting any branches by switching back to a branch. 87s 87s If you want to create a new branch to retain commits you create, you may 87s do so (now or later) by using -c with the switch command. Example: 87s 87s git switch -c 87s 87s Or undo this operation with: 87s 87s git switch - 87s 87s Turn off this advice by setting config variable advice.detachedHead to false 87s 87s HEAD is now at 34bdde3 a3⇒3 87s [detached HEAD c6e3825] Revert "a3⇒3" 87s Date: Wed Dec 3 23:17:12 2025 +0000 87s 1 file changed, 1 deletion(-) 87s delete mode 100644 a3.txt 87s [detached HEAD 3e636ad] Revert "a2⇒2" 87s Date: Wed Dec 3 23:17:12 2025 +0000 87s 1 file changed, 1 deletion(-) 87s delete mode 100644 a2.txt 87s Attempting automerge of 3-2...success. 87s Autofilling 1-2...success. 87s Autofilling 2-2...success. 87s Autofilling 3-1...success. 87s Autofilling 3-2 (first way)...success. 87s Autofilling 3-2 (second way)...success. 87s The two ways of autofilling 3-2 agree. 87s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='3e636adcee09f624d633b501b9a356de8fabd0a0', goal='drop')[0:4,0:3]. 87s Merge is complete! 87s + git-imerge diagram --commits --frontier --html=imerge-drop.html 87s 0 3 87s | | 87s 0 - **** - dropped 87s *??. 87s 2 - *... 87s | 87s 3e636adcee09f624d633b501b9a356de8fabd0a0 87s 87s 0 3 87s | | 87s 0 - **** - dropped 87s *??| 87s 2 - *--+ 87s | 87s 3e636adcee09f624d633b501b9a356de8fabd0a0 87s 87s Key: 87s |,-,+ = rectangles forming current merge frontier 87s * = merge done manually 87s . = merge done automatically 87s # = conflict that is currently blocking progress 87s @ = merge was blocked but has been resolved 87s ? = no merge recorded 87s 87s + git-imerge finish 87s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 87s + local refname=dropped 87s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 87s + git rev-parse dropped^{tree} 87s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 87s + git checkout -b reverted master 87s Switched to a new branch 'reverted' 87s + git-imerge revert HEAD~5..HEAD~3 87s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 87s 87s You are in 'detached HEAD' state. You can look around, make experimental 87s changes and commit them, and you can discard any commits you make in this 87s state without impacting any branches by switching back to a branch. 87s 87s If you want to create a new branch to retain commits you create, you may 87s do so (now or later) by using -c with the switch command. Example: 87s 87s git switch -c 87s 87s Or undo this operation with: 87s 87s git switch - 87s 87s Turn off this advice by setting config variable advice.detachedHead to false 87s 87s HEAD is now at 34bdde3 a3⇒3 87s [detached HEAD c6e3825] Revert "a3⇒3" 87s Date: Wed Dec 3 23:17:12 2025 +0000 87s 1 file changed, 1 deletion(-) 87s delete mode 100644 a3.txt 87s [detached HEAD 3e636ad] Revert "a2⇒2" 87s Date: Wed Dec 3 23:17:12 2025 +0000 87s 1 file changed, 1 deletion(-) 87s delete mode 100644 a2.txt 87s Attempting automerge of 3-2...success. 87s Autofilling 1-2...success. 87s Autofilling 2-2...success. 87s Autofilling 3-1...success. 87s Autofilling 3-2 (first way)...success. 87s Autofilling 3-2 (second way)...success. 87s The two ways of autofilling 3-2 agree. 87s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='3e636adcee09f624d633b501b9a356de8fabd0a0', goal='revert')[0:4,0:3]. 87s Merge is complete! 87s + git-imerge diagram --commits --frontier --html=imerge-revert.html 87s 0 3 87s | | 87s 0 - **** - reverted 87s *??. 87s 2 - *... 87s | 87s 3e636adcee09f624d633b501b9a356de8fabd0a0 87s 87s 0 3 87s | | 87s 0 - **** - reverted 87s *??| 87s 2 - *--+ 87s | 87s 3e636adcee09f624d633b501b9a356de8fabd0a0 87s 87s Key: 87s |,-,+ = rectangles forming current merge frontier 87s * = merge done manually 87s . = merge done automatically 87s # = conflict that is currently blocking progress 87s @ = merge was blocked but has been resolved 87s ? = no merge recorded 87s 87s + git-imerge finish 87s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 87s + local refname=reverted 87s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 87s + git rev-parse reverted^{tree} 87s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 87s py313: OK (28.87=setup[0.09]+cmd[1.42,18.95,3.05,1.14,3.69,0.52] seconds) 87s congratulations :) (28.92 seconds) 88s autopkgtest [23:17:13]: test pybuild-autopkgtest: -----------------------] 88s autopkgtest [23:17:13]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 88s pybuild-autopkgtest PASS 88s autopkgtest [23:17:13]: @@@@@@@@@@@@@@@@@@@@ summary 88s pybuild-autopkgtest PASS