0s autopkgtest [19:52:56]: starting date and time: 2025-12-05 19:52:56+0000 0s autopkgtest [19:52:56]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [19:52:56]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.hbrj8ysg/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-s390x --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@sto01-s390x-1.secgroup --name adt-resolute-s390x-git-imerge-20251205-195256-juju-7f2275-prod-proposed-migration-environment-15-b569477f-ab1c-4279-83b5-69d0d079c788 --image adt/ubuntu-resolute-s390x-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-autopkgtest-workers-s390x -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 3s Creating nova instance adt-resolute-s390x-git-imerge-20251205-195256-juju-7f2275-prod-proposed-migration-environment-15-b569477f-ab1c-4279-83b5-69d0d079c788 from image adt/ubuntu-resolute-s390x-server-20251205.img (UUID e0f6ccba-b422-4dad-b382-fbc5a99524c4)... 77s autopkgtest [19:54:13]: testbed dpkg architecture: s390x 77s autopkgtest [19:54:13]: testbed apt version: 3.1.12 77s autopkgtest [19:54:13]: @@@@@@@@@@@@@@@@@@@@ test bed setup 77s autopkgtest [19:54:13]: testbed release detected to be: None 78s autopkgtest [19:54:14]: updating testbed package index (apt update) 78s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 78s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 78s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 78s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 78s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [860 kB] 79s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [23.4 kB] 79s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [146 kB] 79s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main s390x Packages [226 kB] 79s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/universe s390x Packages [698 kB] 79s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse s390x Packages [6484 B] 79s Fetched 2085 kB in 1s (3159 kB/s) 81s Reading package lists... 82s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 82s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 82s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 82s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 84s Reading package lists... 84s Reading package lists... 84s Building dependency tree... 84s Reading state information... 85s Calculating upgrade... 85s The following packages will be upgraded: 85s libnftnl11 libpython3-stdlib python3 python3-attr python3-gdbm 85s python3-minimal 85s 6 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 85s Need to get 195 kB of archives. 85s After this operation, 20.5 kB of additional disk space will be used. 85s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed/main s390x python3-minimal s390x 3.13.9-2 [28.1 kB] 85s Get:2 http://ftpmaster.internal/ubuntu resolute-proposed/main s390x python3 s390x 3.13.9-2 [23.0 kB] 85s Get:3 http://ftpmaster.internal/ubuntu resolute-proposed/main s390x libpython3-stdlib s390x 3.13.9-2 [10.8 kB] 85s Get:4 http://ftpmaster.internal/ubuntu resolute/main s390x libnftnl11 s390x 1.3.1-1 [68.7 kB] 85s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main s390x python3-gdbm s390x 3.13.9-2 [11.0 kB] 85s Get:6 http://ftpmaster.internal/ubuntu resolute/main s390x python3-attr all 25.4.0-1 [53.6 kB] 86s dpkg-preconfigure: unable to re-open stdin: No such file or directory 86s Fetched 195 kB in 0s (13.7 MB/s) 86s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 61321 files and directories currently installed.) 86s Preparing to unpack .../python3-minimal_3.13.9-2_s390x.deb ... 87s Unpacking python3-minimal (3.13.9-2) over (3.13.7-1) ... 87s Setting up python3-minimal (3.13.9-2) ... 87s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 61321 files and directories currently installed.) 87s Preparing to unpack .../python3_3.13.9-2_s390x.deb ... 87s running python pre-rtupdate hooks for python3.13... 87s Unpacking python3 (3.13.9-2) over (3.13.7-1) ... 87s Preparing to unpack .../libpython3-stdlib_3.13.9-2_s390x.deb ... 87s Unpacking libpython3-stdlib:s390x (3.13.9-2) over (3.13.7-1) ... 87s Preparing to unpack .../libnftnl11_1.3.1-1_s390x.deb ... 87s Unpacking libnftnl11:s390x (1.3.1-1) over (1.3.0-1) ... 87s Preparing to unpack .../python3-gdbm_3.13.9-2_s390x.deb ... 87s Unpacking python3-gdbm (3.13.9-2) over (3.13.9-1) ... 87s Preparing to unpack .../python3-attr_25.4.0-1_all.deb ... 87s Unpacking python3-attr (25.4.0-1) over (25.3.0-1) ... 87s Setting up python3-gdbm (3.13.9-2) ... 87s Setting up libnftnl11:s390x (1.3.1-1) ... 87s Setting up libpython3-stdlib:s390x (3.13.9-2) ... 87s Setting up python3 (3.13.9-2) ... 87s running python rtupdate hooks for python3.13... 87s running python post-rtupdate hooks for python3.13... 87s Setting up python3-attr (25.4.0-1) ... 88s Processing triggers for man-db (2.13.1-1) ... 89s Processing triggers for libc-bin (2.42-2ubuntu2) ... 89s autopkgtest [19:54:25]: upgrading testbed (apt dist-upgrade and autopurge) 89s Reading package lists... 89s Building dependency tree... 89s Reading state information... 89s Calculating upgrade... 90s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 90s Reading package lists... 91s Building dependency tree... 91s Reading state information... 91s Solving dependencies... 91s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 94s autopkgtest [19:54:30]: testbed running kernel: Linux 6.17.0-6-generic #6-Ubuntu SMP Tue Oct 7 12:36:22 UTC 2025 94s autopkgtest [19:54:30]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 95s Get:1 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (dsc) [1896 B] 95s Get:2 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 95s Get:3 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (diff) [3144 B] 95s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 95s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 95s gpgv: Can't check signature: No public key 95s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 96s autopkgtest [19:54:32]: testing package git-imerge version 1.2.0-5 96s autopkgtest [19:54:32]: build not needed 96s autopkgtest [19:54:32]: test pybuild-autopkgtest: preparing testbed 96s Reading package lists... 96s Building dependency tree... 96s Reading state information... 97s Solving dependencies... 97s The following NEW packages will be installed: 97s autoconf automake autopoint autotools-dev build-essential cpp cpp-15 97s cpp-15-s390x-linux-gnu cpp-s390x-linux-gnu debhelper debugedit dh-autoreconf 97s dh-python dh-strip-nondeterminism dwz g++ g++-15 g++-15-s390x-linux-gnu 97s g++-s390x-linux-gnu gcc gcc-15 gcc-15-s390x-linux-gnu gcc-s390x-linux-gnu 97s gettext git git-imerge git-man intltool-debian libarchive-zip-perl libasan8 97s libcc1-0 libdebhelper-perl liberror-perl libfile-stripnondeterminism-perl 97s libgcc-15-dev libgomp1 libisl23 libitm1 libjs-jquery libjs-sphinxdoc 97s libjs-underscore libmpc3 libpkgconf3 libstdc++-15-dev libtool libubsan1 m4 97s pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest 97s python3-cachetools python3-colorama python3-distlib python3-filelock 97s python3-pip-whl python3-platformdirs python3-pluggy python3-pyproject-api 97s python3-setuptools-whl python3-virtualenv python3-wheel tox 97s 0 upgraded, 64 newly installed, 0 to remove and 0 not upgraded. 97s Need to get 65.5 MB of archives. 97s After this operation, 216 MB of additional disk space will be used. 97s Get:1 http://ftpmaster.internal/ubuntu resolute/main s390x m4 s390x 1.4.20-2 [223 kB] 97s Get:2 http://ftpmaster.internal/ubuntu resolute/main s390x autoconf all 2.72-3.1ubuntu1 [384 kB] 97s Get:3 http://ftpmaster.internal/ubuntu resolute/main s390x autotools-dev all 20240727.1 [43.4 kB] 97s Get:4 http://ftpmaster.internal/ubuntu resolute/main s390x automake all 1:1.18.1-3 [582 kB] 97s Get:5 http://ftpmaster.internal/ubuntu resolute/main s390x autopoint all 0.23.2-1 [620 kB] 97s Get:6 http://ftpmaster.internal/ubuntu resolute/main s390x libisl23 s390x 0.27-1 [704 kB] 97s Get:7 http://ftpmaster.internal/ubuntu resolute/main s390x libmpc3 s390x 1.3.1-2 [57.4 kB] 97s Get:8 http://ftpmaster.internal/ubuntu resolute/main s390x cpp-15-s390x-linux-gnu s390x 15.2.0-9ubuntu1 [10.2 MB] 97s Get:9 http://ftpmaster.internal/ubuntu resolute/main s390x cpp-15 s390x 15.2.0-9ubuntu1 [1024 B] 97s Get:10 http://ftpmaster.internal/ubuntu resolute/main s390x cpp-s390x-linux-gnu s390x 4:15.2.0-4ubuntu1 [5746 B] 97s Get:11 http://ftpmaster.internal/ubuntu resolute/main s390x cpp s390x 4:15.2.0-4ubuntu1 [22.4 kB] 97s Get:12 http://ftpmaster.internal/ubuntu resolute/main s390x libcc1-0 s390x 15.2.0-9ubuntu1 [50.0 kB] 97s Get:13 http://ftpmaster.internal/ubuntu resolute/main s390x libgomp1 s390x 15.2.0-9ubuntu1 [154 kB] 97s Get:14 http://ftpmaster.internal/ubuntu resolute/main s390x libitm1 s390x 15.2.0-9ubuntu1 [30.9 kB] 97s Get:15 http://ftpmaster.internal/ubuntu resolute/main s390x libasan8 s390x 15.2.0-9ubuntu1 [2969 kB] 97s Get:16 http://ftpmaster.internal/ubuntu resolute/main s390x libubsan1 s390x 15.2.0-9ubuntu1 [1211 kB] 97s Get:17 http://ftpmaster.internal/ubuntu resolute/main s390x libgcc-15-dev s390x 15.2.0-9ubuntu1 [1045 kB] 97s Get:18 http://ftpmaster.internal/ubuntu resolute/main s390x gcc-15-s390x-linux-gnu s390x 15.2.0-9ubuntu1 [19.9 MB] 98s Get:19 http://ftpmaster.internal/ubuntu resolute/main s390x gcc-15 s390x 15.2.0-9ubuntu1 [516 kB] 98s Get:20 http://ftpmaster.internal/ubuntu resolute/main s390x gcc-s390x-linux-gnu s390x 4:15.2.0-4ubuntu1 [1208 B] 98s Get:21 http://ftpmaster.internal/ubuntu resolute/main s390x gcc s390x 4:15.2.0-4ubuntu1 [5018 B] 98s Get:22 http://ftpmaster.internal/ubuntu resolute/main s390x libstdc++-15-dev s390x 15.2.0-9ubuntu1 [2659 kB] 98s Get:23 http://ftpmaster.internal/ubuntu resolute/main s390x g++-15-s390x-linux-gnu s390x 15.2.0-9ubuntu1 [11.7 MB] 98s Get:24 http://ftpmaster.internal/ubuntu resolute/main s390x g++-15 s390x 15.2.0-9ubuntu1 [24.3 kB] 98s Get:25 http://ftpmaster.internal/ubuntu resolute/main s390x g++-s390x-linux-gnu s390x 4:15.2.0-4ubuntu1 [956 B] 98s Get:26 http://ftpmaster.internal/ubuntu resolute/main s390x g++ s390x 4:15.2.0-4ubuntu1 [1078 B] 98s Get:27 http://ftpmaster.internal/ubuntu resolute/main s390x build-essential s390x 12.12ubuntu2 [5258 B] 98s Get:28 http://ftpmaster.internal/ubuntu resolute/main s390x libdebhelper-perl all 13.24.2ubuntu1 [95.7 kB] 98s Get:29 http://ftpmaster.internal/ubuntu resolute/main s390x libtool all 2.5.4-7 [169 kB] 98s Get:30 http://ftpmaster.internal/ubuntu resolute/main s390x dh-autoreconf all 21 [12.5 kB] 98s Get:31 http://ftpmaster.internal/ubuntu resolute/main s390x libarchive-zip-perl all 1.68-1 [90.2 kB] 98s Get:32 http://ftpmaster.internal/ubuntu resolute/main s390x libfile-stripnondeterminism-perl all 1.15.0-1 [20.5 kB] 98s Get:33 http://ftpmaster.internal/ubuntu resolute/main s390x dh-strip-nondeterminism all 1.15.0-1 [5090 B] 98s Get:34 http://ftpmaster.internal/ubuntu resolute/main s390x debugedit s390x 1:5.2-3 [52.8 kB] 98s Get:35 http://ftpmaster.internal/ubuntu resolute/main s390x dwz s390x 0.16-2 [121 kB] 98s Get:36 http://ftpmaster.internal/ubuntu resolute/main s390x gettext s390x 0.23.2-1 [1062 kB] 98s Get:37 http://ftpmaster.internal/ubuntu resolute/main s390x intltool-debian all 0.35.0+20060710.6build1 [24.1 kB] 98s Get:38 http://ftpmaster.internal/ubuntu resolute/main s390x po-debconf all 1.0.21+nmu1 [233 kB] 98s Get:39 http://ftpmaster.internal/ubuntu resolute/main s390x debhelper all 13.24.2ubuntu1 [896 kB] 98s Get:40 http://ftpmaster.internal/ubuntu resolute/universe s390x dh-python all 6.20251029 [120 kB] 98s Get:41 http://ftpmaster.internal/ubuntu resolute/main s390x liberror-perl all 0.17030-1 [23.5 kB] 98s Get:42 http://ftpmaster.internal/ubuntu resolute/main s390x git-man all 1:2.51.0-1ubuntu1 [1179 kB] 99s Get:43 http://ftpmaster.internal/ubuntu resolute/main s390x git s390x 1:2.51.0-1ubuntu1 [4290 kB] 99s Get:44 http://ftpmaster.internal/ubuntu resolute/universe s390x git-imerge all 1.2.0-5 [49.5 kB] 99s Get:45 http://ftpmaster.internal/ubuntu resolute/main s390x libjs-jquery all 3.7.1+dfsg+~3.5.33-1build1 [321 kB] 99s Get:46 http://ftpmaster.internal/ubuntu resolute/main s390x libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 99s Get:47 http://ftpmaster.internal/ubuntu resolute/main s390x libjs-sphinxdoc all 8.2.3-1ubuntu2 [28.0 kB] 99s Get:48 http://ftpmaster.internal/ubuntu resolute/main s390x libpkgconf3 s390x 1.8.1-4build1 [31.3 kB] 99s Get:49 http://ftpmaster.internal/ubuntu resolute/main s390x pkgconf-bin s390x 1.8.1-4build1 [21.8 kB] 99s Get:50 http://ftpmaster.internal/ubuntu resolute/main s390x pkgconf s390x 1.8.1-4build1 [16.8 kB] 99s Get:51 http://ftpmaster.internal/ubuntu resolute/main s390x pkg-config s390x 1.8.1-4build1 [7496 B] 99s Get:52 http://ftpmaster.internal/ubuntu resolute/universe s390x pybuild-plugin-autopkgtest all 6.20251029 [1746 B] 99s Get:53 http://ftpmaster.internal/ubuntu resolute/main s390x python3-cachetools all 5.3.3-1 [10.3 kB] 99s Get:54 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-colorama all 0.4.6-4 [32.1 kB] 99s Get:55 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-distlib all 0.4.0-1 [267 kB] 99s Get:56 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-filelock all 3.18.0-1 [13.0 kB] 99s Get:57 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-pip-whl all 25.1.1+dfsg-1ubuntu2 [1430 kB] 99s Get:58 http://ftpmaster.internal/ubuntu resolute/main s390x python3-platformdirs all 4.4.0-1 [16.9 kB] 99s Get:59 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-pluggy all 1.6.0-1 [21.0 kB] 99s Get:60 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-pyproject-api all 1.9.1-1 [52.9 kB] 99s Get:61 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-setuptools-whl all 78.1.1-0.1 [1174 kB] 99s Get:62 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-virtualenv all 20.35.4+ds-1 [76.1 kB] 99s Get:63 http://ftpmaster.internal/ubuntu resolute/universe s390x python3-wheel all 0.46.1-2 [22.1 kB] 99s Get:64 http://ftpmaster.internal/ubuntu resolute/universe s390x tox all 4.25.0-1 [323 kB] 100s Fetched 65.5 MB in 3s (25.6 MB/s) 100s Selecting previously unselected package m4. 100s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 61321 files and directories currently installed.) 100s Preparing to unpack .../00-m4_1.4.20-2_s390x.deb ... 100s Unpacking m4 (1.4.20-2) ... 100s Selecting previously unselected package autoconf. 100s Preparing to unpack .../01-autoconf_2.72-3.1ubuntu1_all.deb ... 100s Unpacking autoconf (2.72-3.1ubuntu1) ... 100s Selecting previously unselected package autotools-dev. 100s Preparing to unpack .../02-autotools-dev_20240727.1_all.deb ... 100s Unpacking autotools-dev (20240727.1) ... 100s Selecting previously unselected package automake. 100s Preparing to unpack .../03-automake_1%3a1.18.1-3_all.deb ... 100s Unpacking automake (1:1.18.1-3) ... 100s Selecting previously unselected package autopoint. 100s Preparing to unpack .../04-autopoint_0.23.2-1_all.deb ... 100s Unpacking autopoint (0.23.2-1) ... 100s Selecting previously unselected package libisl23:s390x. 100s Preparing to unpack .../05-libisl23_0.27-1_s390x.deb ... 100s Unpacking libisl23:s390x (0.27-1) ... 100s Selecting previously unselected package libmpc3:s390x. 100s Preparing to unpack .../06-libmpc3_1.3.1-2_s390x.deb ... 100s Unpacking libmpc3:s390x (1.3.1-2) ... 100s Selecting previously unselected package cpp-15-s390x-linux-gnu. 100s Preparing to unpack .../07-cpp-15-s390x-linux-gnu_15.2.0-9ubuntu1_s390x.deb ... 100s Unpacking cpp-15-s390x-linux-gnu (15.2.0-9ubuntu1) ... 100s Selecting previously unselected package cpp-15. 100s Preparing to unpack .../08-cpp-15_15.2.0-9ubuntu1_s390x.deb ... 100s Unpacking cpp-15 (15.2.0-9ubuntu1) ... 101s Selecting previously unselected package cpp-s390x-linux-gnu. 101s Preparing to unpack .../09-cpp-s390x-linux-gnu_4%3a15.2.0-4ubuntu1_s390x.deb ... 101s Unpacking cpp-s390x-linux-gnu (4:15.2.0-4ubuntu1) ... 101s Selecting previously unselected package cpp. 101s Preparing to unpack .../10-cpp_4%3a15.2.0-4ubuntu1_s390x.deb ... 101s Unpacking cpp (4:15.2.0-4ubuntu1) ... 101s Selecting previously unselected package libcc1-0:s390x. 101s Preparing to unpack .../11-libcc1-0_15.2.0-9ubuntu1_s390x.deb ... 101s Unpacking libcc1-0:s390x (15.2.0-9ubuntu1) ... 101s Selecting previously unselected package libgomp1:s390x. 101s Preparing to unpack .../12-libgomp1_15.2.0-9ubuntu1_s390x.deb ... 101s Unpacking libgomp1:s390x (15.2.0-9ubuntu1) ... 101s Selecting previously unselected package libitm1:s390x. 101s Preparing to unpack .../13-libitm1_15.2.0-9ubuntu1_s390x.deb ... 101s Unpacking libitm1:s390x (15.2.0-9ubuntu1) ... 101s Selecting previously unselected package libasan8:s390x. 101s Preparing to unpack .../14-libasan8_15.2.0-9ubuntu1_s390x.deb ... 101s Unpacking libasan8:s390x (15.2.0-9ubuntu1) ... 101s Selecting previously unselected package libubsan1:s390x. 101s Preparing to unpack .../15-libubsan1_15.2.0-9ubuntu1_s390x.deb ... 101s Unpacking libubsan1:s390x (15.2.0-9ubuntu1) ... 101s Selecting previously unselected package libgcc-15-dev:s390x. 101s Preparing to unpack .../16-libgcc-15-dev_15.2.0-9ubuntu1_s390x.deb ... 101s Unpacking libgcc-15-dev:s390x (15.2.0-9ubuntu1) ... 102s Selecting previously unselected package gcc-15-s390x-linux-gnu. 102s Preparing to unpack .../17-gcc-15-s390x-linux-gnu_15.2.0-9ubuntu1_s390x.deb ... 102s Unpacking gcc-15-s390x-linux-gnu (15.2.0-9ubuntu1) ... 102s Selecting previously unselected package gcc-15. 102s Preparing to unpack .../18-gcc-15_15.2.0-9ubuntu1_s390x.deb ... 102s Unpacking gcc-15 (15.2.0-9ubuntu1) ... 102s Selecting previously unselected package gcc-s390x-linux-gnu. 102s Preparing to unpack .../19-gcc-s390x-linux-gnu_4%3a15.2.0-4ubuntu1_s390x.deb ... 102s Unpacking gcc-s390x-linux-gnu (4:15.2.0-4ubuntu1) ... 102s Selecting previously unselected package gcc. 102s Preparing to unpack .../20-gcc_4%3a15.2.0-4ubuntu1_s390x.deb ... 102s Unpacking gcc (4:15.2.0-4ubuntu1) ... 102s Selecting previously unselected package libstdc++-15-dev:s390x. 102s Preparing to unpack .../21-libstdc++-15-dev_15.2.0-9ubuntu1_s390x.deb ... 102s Unpacking libstdc++-15-dev:s390x (15.2.0-9ubuntu1) ... 102s Selecting previously unselected package g++-15-s390x-linux-gnu. 102s Preparing to unpack .../22-g++-15-s390x-linux-gnu_15.2.0-9ubuntu1_s390x.deb ... 102s Unpacking g++-15-s390x-linux-gnu (15.2.0-9ubuntu1) ... 103s Selecting previously unselected package g++-15. 103s Preparing to unpack .../23-g++-15_15.2.0-9ubuntu1_s390x.deb ... 103s Unpacking g++-15 (15.2.0-9ubuntu1) ... 103s Selecting previously unselected package g++-s390x-linux-gnu. 103s Preparing to unpack .../24-g++-s390x-linux-gnu_4%3a15.2.0-4ubuntu1_s390x.deb ... 103s Unpacking g++-s390x-linux-gnu (4:15.2.0-4ubuntu1) ... 103s Selecting previously unselected package g++. 103s Preparing to unpack .../25-g++_4%3a15.2.0-4ubuntu1_s390x.deb ... 103s Unpacking g++ (4:15.2.0-4ubuntu1) ... 103s Selecting previously unselected package build-essential. 103s Preparing to unpack .../26-build-essential_12.12ubuntu2_s390x.deb ... 103s Unpacking build-essential (12.12ubuntu2) ... 103s Selecting previously unselected package libdebhelper-perl. 103s Preparing to unpack .../27-libdebhelper-perl_13.24.2ubuntu1_all.deb ... 103s Unpacking libdebhelper-perl (13.24.2ubuntu1) ... 103s Selecting previously unselected package libtool. 103s Preparing to unpack .../28-libtool_2.5.4-7_all.deb ... 103s Unpacking libtool (2.5.4-7) ... 104s Selecting previously unselected package dh-autoreconf. 104s Preparing to unpack .../29-dh-autoreconf_21_all.deb ... 104s Unpacking dh-autoreconf (21) ... 104s Selecting previously unselected package libarchive-zip-perl. 104s Preparing to unpack .../30-libarchive-zip-perl_1.68-1_all.deb ... 104s Unpacking libarchive-zip-perl (1.68-1) ... 104s Selecting previously unselected package libfile-stripnondeterminism-perl. 104s Preparing to unpack .../31-libfile-stripnondeterminism-perl_1.15.0-1_all.deb ... 104s Unpacking libfile-stripnondeterminism-perl (1.15.0-1) ... 104s Selecting previously unselected package dh-strip-nondeterminism. 104s Preparing to unpack .../32-dh-strip-nondeterminism_1.15.0-1_all.deb ... 104s Unpacking dh-strip-nondeterminism (1.15.0-1) ... 104s Selecting previously unselected package debugedit. 104s Preparing to unpack .../33-debugedit_1%3a5.2-3_s390x.deb ... 104s Unpacking debugedit (1:5.2-3) ... 104s Selecting previously unselected package dwz. 104s Preparing to unpack .../34-dwz_0.16-2_s390x.deb ... 104s Unpacking dwz (0.16-2) ... 104s Selecting previously unselected package gettext. 104s Preparing to unpack .../35-gettext_0.23.2-1_s390x.deb ... 104s Unpacking gettext (0.23.2-1) ... 105s Selecting previously unselected package intltool-debian. 105s Preparing to unpack .../36-intltool-debian_0.35.0+20060710.6build1_all.deb ... 105s Unpacking intltool-debian (0.35.0+20060710.6build1) ... 105s Selecting previously unselected package po-debconf. 105s Preparing to unpack .../37-po-debconf_1.0.21+nmu1_all.deb ... 105s Unpacking po-debconf (1.0.21+nmu1) ... 105s Selecting previously unselected package debhelper. 105s Preparing to unpack .../38-debhelper_13.24.2ubuntu1_all.deb ... 105s Unpacking debhelper (13.24.2ubuntu1) ... 105s Selecting previously unselected package dh-python. 105s Preparing to unpack .../39-dh-python_6.20251029_all.deb ... 105s Unpacking dh-python (6.20251029) ... 105s Selecting previously unselected package liberror-perl. 105s Preparing to unpack .../40-liberror-perl_0.17030-1_all.deb ... 105s Unpacking liberror-perl (0.17030-1) ... 106s Selecting previously unselected package git-man. 106s Preparing to unpack .../41-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 106s Unpacking git-man (1:2.51.0-1ubuntu1) ... 106s Selecting previously unselected package git. 106s Preparing to unpack .../42-git_1%3a2.51.0-1ubuntu1_s390x.deb ... 106s Unpacking git (1:2.51.0-1ubuntu1) ... 106s Selecting previously unselected package git-imerge. 106s Preparing to unpack .../43-git-imerge_1.2.0-5_all.deb ... 106s Unpacking git-imerge (1.2.0-5) ... 106s Selecting previously unselected package libjs-jquery. 106s Preparing to unpack .../44-libjs-jquery_3.7.1+dfsg+~3.5.33-1build1_all.deb ... 106s Unpacking libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 106s Selecting previously unselected package libjs-underscore. 106s Preparing to unpack .../45-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 106s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 106s Selecting previously unselected package libjs-sphinxdoc. 106s Preparing to unpack .../46-libjs-sphinxdoc_8.2.3-1ubuntu2_all.deb ... 106s Unpacking libjs-sphinxdoc (8.2.3-1ubuntu2) ... 106s Selecting previously unselected package libpkgconf3:s390x. 106s Preparing to unpack .../47-libpkgconf3_1.8.1-4build1_s390x.deb ... 106s Unpacking libpkgconf3:s390x (1.8.1-4build1) ... 106s Selecting previously unselected package pkgconf-bin. 106s Preparing to unpack .../48-pkgconf-bin_1.8.1-4build1_s390x.deb ... 106s Unpacking pkgconf-bin (1.8.1-4build1) ... 106s Selecting previously unselected package pkgconf:s390x. 106s Preparing to unpack .../49-pkgconf_1.8.1-4build1_s390x.deb ... 106s Unpacking pkgconf:s390x (1.8.1-4build1) ... 106s Selecting previously unselected package pkg-config:s390x. 106s Preparing to unpack .../50-pkg-config_1.8.1-4build1_s390x.deb ... 106s Unpacking pkg-config:s390x (1.8.1-4build1) ... 106s Selecting previously unselected package pybuild-plugin-autopkgtest. 106s Preparing to unpack .../51-pybuild-plugin-autopkgtest_6.20251029_all.deb ... 106s Unpacking pybuild-plugin-autopkgtest (6.20251029) ... 106s Selecting previously unselected package python3-cachetools. 106s Preparing to unpack .../52-python3-cachetools_5.3.3-1_all.deb ... 107s Unpacking python3-cachetools (5.3.3-1) ... 107s Selecting previously unselected package python3-colorama. 107s Preparing to unpack .../53-python3-colorama_0.4.6-4_all.deb ... 107s Unpacking python3-colorama (0.4.6-4) ... 107s Selecting previously unselected package python3-distlib. 107s Preparing to unpack .../54-python3-distlib_0.4.0-1_all.deb ... 107s Unpacking python3-distlib (0.4.0-1) ... 107s Selecting previously unselected package python3-filelock. 107s Preparing to unpack .../55-python3-filelock_3.18.0-1_all.deb ... 107s Unpacking python3-filelock (3.18.0-1) ... 107s Selecting previously unselected package python3-pip-whl. 107s Preparing to unpack .../56-python3-pip-whl_25.1.1+dfsg-1ubuntu2_all.deb ... 107s Unpacking python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 107s Selecting previously unselected package python3-platformdirs. 107s Preparing to unpack .../57-python3-platformdirs_4.4.0-1_all.deb ... 107s Unpacking python3-platformdirs (4.4.0-1) ... 107s Selecting previously unselected package python3-pluggy. 107s Preparing to unpack .../58-python3-pluggy_1.6.0-1_all.deb ... 107s Unpacking python3-pluggy (1.6.0-1) ... 107s Selecting previously unselected package python3-pyproject-api. 107s Preparing to unpack .../59-python3-pyproject-api_1.9.1-1_all.deb ... 107s Unpacking python3-pyproject-api (1.9.1-1) ... 107s Selecting previously unselected package python3-setuptools-whl. 107s Preparing to unpack .../60-python3-setuptools-whl_78.1.1-0.1_all.deb ... 107s Unpacking python3-setuptools-whl (78.1.1-0.1) ... 107s Selecting previously unselected package python3-virtualenv. 107s Preparing to unpack .../61-python3-virtualenv_20.35.4+ds-1_all.deb ... 107s Unpacking python3-virtualenv (20.35.4+ds-1) ... 107s Selecting previously unselected package python3-wheel. 107s Preparing to unpack .../62-python3-wheel_0.46.1-2_all.deb ... 107s Unpacking python3-wheel (0.46.1-2) ... 107s Selecting previously unselected package tox. 107s Preparing to unpack .../63-tox_4.25.0-1_all.deb ... 107s Unpacking tox (4.25.0-1) ... 107s Setting up dh-python (6.20251029) ... 107s Setting up python3-setuptools-whl (78.1.1-0.1) ... 107s Setting up python3-filelock (3.18.0-1) ... 108s Setting up python3-cachetools (5.3.3-1) ... 108s Setting up python3-colorama (0.4.6-4) ... 108s Setting up python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 108s Setting up libarchive-zip-perl (1.68-1) ... 108s Setting up libdebhelper-perl (13.24.2ubuntu1) ... 108s Setting up m4 (1.4.20-2) ... 108s Setting up python3-distlib (0.4.0-1) ... 109s Setting up libgomp1:s390x (15.2.0-9ubuntu1) ... 109s Setting up python3-wheel (0.46.1-2) ... 109s Setting up python3-platformdirs (4.4.0-1) ... 109s Setting up liberror-perl (0.17030-1) ... 109s Setting up autotools-dev (20240727.1) ... 109s Setting up libpkgconf3:s390x (1.8.1-4build1) ... 109s Setting up libmpc3:s390x (1.3.1-2) ... 109s Setting up autopoint (0.23.2-1) ... 109s Setting up pkgconf-bin (1.8.1-4build1) ... 109s Setting up autoconf (2.72-3.1ubuntu1) ... 109s Setting up python3-pluggy (1.6.0-1) ... 109s Setting up libubsan1:s390x (15.2.0-9ubuntu1) ... 109s Setting up dwz (0.16-2) ... 109s Setting up libasan8:s390x (15.2.0-9ubuntu1) ... 109s Setting up debugedit (1:5.2-3) ... 109s Setting up git-man (1:2.51.0-1ubuntu1) ... 109s Setting up libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 109s Setting up libisl23:s390x (0.27-1) ... 109s Setting up libcc1-0:s390x (15.2.0-9ubuntu1) ... 109s Setting up libitm1:s390x (15.2.0-9ubuntu1) ... 109s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 109s Setting up automake (1:1.18.1-3) ... 109s update-alternatives: using /usr/bin/automake-1.18 to provide /usr/bin/automake (automake) in auto mode 109s Setting up libfile-stripnondeterminism-perl (1.15.0-1) ... 109s Setting up gettext (0.23.2-1) ... 109s Setting up libgcc-15-dev:s390x (15.2.0-9ubuntu1) ... 109s Setting up python3-virtualenv (20.35.4+ds-1) ... 109s Setting up pkgconf:s390x (1.8.1-4build1) ... 109s Setting up intltool-debian (0.35.0+20060710.6build1) ... 109s Setting up libstdc++-15-dev:s390x (15.2.0-9ubuntu1) ... 109s Setting up pkg-config:s390x (1.8.1-4build1) ... 109s Setting up git (1:2.51.0-1ubuntu1) ... 109s Setting up libjs-sphinxdoc (8.2.3-1ubuntu2) ... 109s Setting up dh-strip-nondeterminism (1.15.0-1) ... 109s Setting up cpp-15-s390x-linux-gnu (15.2.0-9ubuntu1) ... 109s Setting up gcc-15-s390x-linux-gnu (15.2.0-9ubuntu1) ... 109s Setting up g++-15-s390x-linux-gnu (15.2.0-9ubuntu1) ... 109s Setting up cpp-s390x-linux-gnu (4:15.2.0-4ubuntu1) ... 109s Setting up po-debconf (1.0.21+nmu1) ... 109s Setting up python3-pyproject-api (1.9.1-1) ... 110s Setting up git-imerge (1.2.0-5) ... 111s Setting up gcc-s390x-linux-gnu (4:15.2.0-4ubuntu1) ... 111s Setting up cpp-15 (15.2.0-9ubuntu1) ... 111s Setting up cpp (4:15.2.0-4ubuntu1) ... 111s Setting up tox (4.25.0-1) ... 111s Setting up g++-s390x-linux-gnu (4:15.2.0-4ubuntu1) ... 111s Setting up gcc-15 (15.2.0-9ubuntu1) ... 111s Setting up g++-15 (15.2.0-9ubuntu1) ... 111s Setting up libtool (2.5.4-7) ... 111s Setting up gcc (4:15.2.0-4ubuntu1) ... 111s Setting up dh-autoreconf (21) ... 111s Setting up g++ (4:15.2.0-4ubuntu1) ... 111s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 111s Setting up build-essential (12.12ubuntu2) ... 111s Setting up debhelper (13.24.2ubuntu1) ... 111s Setting up pybuild-plugin-autopkgtest (6.20251029) ... 111s Processing triggers for install-info (7.2-5) ... 111s Processing triggers for libc-bin (2.42-2ubuntu2) ... 111s Processing triggers for man-db (2.13.1-1) ... 115s autopkgtest [19:54:51]: test pybuild-autopkgtest: pybuild-autopkgtest 115s autopkgtest [19:54:51]: test pybuild-autopkgtest: [----------------------- 115s pybuild-autopkgtest 117s I: pybuild base:317: cd /tmp/autopkgtest.IpjX5N/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.IpjX5N/build.W0y/src/tox.ini --sitepackages -e py313 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 117s py313: skip building and installing the package 117s py313: commands[0] /tmp/autopkgtest.IpjX5N/build.W0y/src> /bin/sh t/test-unconflicted 117s + dirname t/test-unconflicted 117s + cd t 117s + pwd 117s + dirname /tmp/autopkgtest.IpjX5N/build.W0y/src/t 117s + BASE=/tmp/autopkgtest.IpjX5N/build.W0y/src 117s + . /tmp/autopkgtest.IpjX5N/build.W0y/src/t/test-lib.sh 117s + GIT_IMERGE=git-imerge 117s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s + DESCRIPTION=git-imerge test repository without conflicts 117s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted git-imerge test repository without conflicts 117s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s + local description=git-imerge test repository without conflicts 117s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted git-imerge test repository without conflicts 117s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s + local description=git-imerge test repository without conflicts 117s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s hint: Using 'master' as the name for the initial branch. This default branch name 117s hint: is subject to change. To configure the initial branch name to use in all 117s hint: of your new repositories, which will suppress this warning, call: 117s hint: 117s hint: git config --global init.defaultBranch 117s hint: 117s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 117s hint: 'development'. The just-created branch can be renamed via this command: 117s hint: 117s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted/.git/ 117s [master (root-commit) 780ddf5] m⇒0 117s 2 files changed, 2 insertions(+) 117s create mode 100644 a.txt 117s create mode 100644 b.txt 117s [a b862e30] a⇒1 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s [a dcbe282] a⇒2 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s hint: git branch -m 117s hint: 117s hint: Disable this message with "git config set advice.defaultBranchName false" 117s + echo git-imerge test repository without conflicts 117s + printf %s\n /*.out /*.css /*.html 117s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted/.git config user.name Loú User 117s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted/.git config user.email luser@example.com 117s + TIME=1112911993 117s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/unconflicted 117s + modify a.txt 0 117s + filename=a.txt 117s + text=0 117s + echo 0 117s + git add a.txt 117s + modify b.txt 0 117s + filename=b.txt 117s + text=0 117s + echo 0 117s + git add b.txt 117s + commit -m m⇒0 117s + TIME=1112911994 117s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 117s + git checkout -b a -- 117s Switched to a new branch 'a' 117s + seq 8 117s + modify a.txt 1 117s + filename=a.txt 117s + text=1 117s + echo 1 117s + git add a.txt 117s + commit -m a⇒1 117s + TIME=1112911995 117s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 117s + modify a.txt 2 117s + filename=a.txt 117s + text=2 117s + echo 2 117s + git add a.txt 117s + commit -m a⇒2 117s + TIME=1112911996 117s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 117s + modify a.txt 3 117s + filename=a.txt 117s + text=3 117s + echo 3 117s + git add a.txt 117s [a ecd8647] a⇒3 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + commit -m a⇒3 117s + TIME=1112911997 117s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 117s + modify a.txt 4 117s + filename=a.txt 117s + text=4 117s + echo 4 117s + git add a.txt 117s + commit -m a⇒4 117s + TIME=1112911998 117s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 117s + modify a.txt 5 117s + filename=a.txt 117s + text=5 117s + echo 5 117s + git add a.txt 117s [a 1634bab] a⇒4 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + commit -m a⇒5 117s + TIME=1112911999 117s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 117s [a 909ce12] a⇒5 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + modify a.txt 6 117s + filename=a.txt 117s + text=6 117s + echo 6 117s + git add a.txt 117s + commit -m a⇒6 117s + TIME=1112912000 117s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 117s [a f6520bf] a⇒6 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + modify a.txt 7 117s + filename=a.txt 117s + text=7 117s + echo 7 117s + git add a.txt 117s + commit -m a⇒7 117s + TIME=1112912001 117s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 117s [a 6797186] a⇒7 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + modify a.txt 8 117s + filename=a.txt 117s + text=8 117s + echo 8 117s + git add a.txt 117s + commit -m a⇒8 117s + TIME=1112912002 117s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 117s [a 49643dd] a⇒8 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + git checkout -b b master -- 117s Switched to a new branch 'b' 117s + seq 5 117s + modify b.txt 1 117s + filename=b.txt 117s + text=1 117s + echo 1 117s + git add b.txt 117s + commit -m b⇒1 117s + TIME=1112912003 117s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 117s [b d43305b] b⇒1 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + modify b.txt 2 117s + filename=b.txt 117s + text=2 117s + echo 2 117s + git add b.txt 117s + commit -m b⇒2 117s + TIME=1112912004 117s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 117s [b 853ee68] b⇒2 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + modify b.txt 3 117s + filename=b.txt 117s + text=3 117s + echo 3 117s + git add b.txt 117s + commit -m b⇒3 117s + TIME=1112912005 117s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 117s [b 03a2455] b⇒3 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + modify b.txt 4 117s + filename=b.txt 117s + text=4 117s + echo 4 117s + git add b.txt 117s + commit -m b⇒4 117s + TIME=1112912006 117s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 117s [b 484ea85] b⇒4 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + modify b.txt 5 117s + filename=b.txt 117s + text=5 117s + echo 5 117s + git add b.txt 117s + commit -m b⇒5 117s + TIME=1112912007 117s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 117s [b e22cd97] b⇒5 117s 1 file changed, 1 insertion(+), 1 deletion(-) 117s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 117s + git checkout a 117s Switched to branch 'a' 117s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 118s Attempting automerge of 8-5...success. 118s Autofilling 1-5...success. 118s Autofilling 2-5...success. 118s Autofilling 3-5...success. 118s Autofilling 4-5...success. 118s Autofilling 5-5...success. 118s Autofilling 6-5...success. 118s Autofilling 7-5...success. 118s Autofilling 8-1...success. 118s Autofilling 8-2...success. 118s Autofilling 8-3...success. 118s Autofilling 8-4...success. 118s Autofilling 8-5 (first way)...success. 118s Autofilling 8-5 (second way)...success. 118s The two ways of autofilling 8-5 agree. 118s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 118s Merge is complete! 118s + git-imerge list 118s * a-b 118s + git-imerge diagram --commits --frontier --html=imerge3.html 118s 0 5 8 118s | | | 118s 0 - ********* - a 118s *???????. 118s *???????. 118s *???????. 118s *???????. 118s 5 - *........ 118s | 118s b 118s 118s 0 5 8 118s | | | 118s 0 - ********* - a 118s *???????| 118s *???????| 118s *???????| 118s *???????| 118s 5 - *-------+ 118s | 118s b 118s 118s Key: 118s |,-,+ = rectangles forming current merge frontier 118s * = merge done manually 118s . = merge done automatically 118s # = conflict that is currently blocking progress 118s @ = merge was blocked but has been resolved 118s ? = no merge recorded 118s 118s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 118s Merge b into a (using imerge) 118s 118s # Please enter the commit message for your changes. Lines starting 118s # with '#' will be ignored, and an empty message aborts the commit. 118s # 118s # Date: Fri Dec 5 19:57:08 2025 +0000 118s # 118s # On branch a-b-merge 118s # Changes to be committed: 118s # modified: b.txt 118s # 118s [a-b-merge 842c13c] Merge b into a (using imerge) 118s Date: Fri Dec 5 19:57:08 2025 +0000 118s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 118s + local refname=a-b-merge 118s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 118s + git rev-parse a-b-merge^{tree} 118s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 118s + git-imerge simplify --goal=rebase --branch=a-b-rebase 118s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 118s + local refname=a-b-rebase 118s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 118s + git rev-parse a-b-rebase^{tree} 118s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 118s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 119s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + local refname=a-b-rebase-with-history 119s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git rev-parse a-b-rebase-with-history^{tree} 119s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git-imerge simplify --goal=border --branch=a-b-border 119s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + local refname=a-b-border 119s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git rev-parse a-b-border^{tree} 119s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 119s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + local refname=a-b-border-with-history 119s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git rev-parse a-b-border-with-history^{tree} 119s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 119s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + local refname=a-b-border-with-history2 119s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git rev-parse a-b-border-with-history2^{tree} 119s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git-imerge remove 119s + git checkout a 119s Switched to branch 'a' 119s + git-imerge start --goal=full --name=a-b b 119s Attempting to merge 1-1...success. 119s Attempting to merge 1-2...success. 119s Attempting to merge 1-3...success. 119s Attempting to merge 1-4...success. 119s Attempting to merge 1-5...success. 120s Attempting to merge 2-1...success. 120s Attempting to merge 2-2...success. 120s Attempting to merge 2-3...success. 120s Attempting to merge 2-4...success. 120s Attempting to merge 2-5...success. 120s Attempting to merge 3-1...success. 120s Attempting to merge 3-2...success. 120s Attempting to merge 3-3...success. 120s Attempting to merge 3-4...success. 120s Attempting to merge 3-5...success. 120s Attempting to merge 4-1...success. 120s Attempting to merge 4-2...success. 120s Attempting to merge 4-3...success. 120s Attempting to merge 4-4...success. 120s Attempting to merge 4-5...success. 120s Attempting to merge 5-1...success. 120s Attempting to merge 5-2...success. 120s Attempting to merge 5-3...success. 120s Attempting to merge 5-4...success. 120s Attempting to merge 5-5...success. 120s Attempting to merge 6-1...success. 120s Attempting to merge 6-2...success. 120s Attempting to merge 6-3...success. 120s Attempting to merge 6-4...success. 120s Attempting to merge 6-5...success. 120s Attempting to merge 7-1...success. 120s Attempting to merge 7-2...success. 120s Attempting to merge 7-3...success. 120s Attempting to merge 7-4...success. 120s Attempting to merge 7-5...success. 120s Attempting to merge 8-1...success. 120s Attempting to merge 8-2...success. 120s Attempting to merge 8-3...success. 120s Attempting to merge 8-4...success. 120s Attempting to merge 8-5...success. 120s Merge is complete! 120s + git-imerge list 120s * a-b 120s + git-imerge diagram --commits --frontier --html=imerge4.html 120s 0 5 8 120s | | | 120s 0 - ********* - a 120s *........ 120s *........ 120s *........ 120s *........ 120s 5 - *........ 120s | 120s b 120s 120s 0 5 8 120s | | | 120s 0 - ********* - a 120s *.......| 120s *.......| 120s *.......| 120s *.......| 120s 5 - *-------+ 120s | 120s b 120s 120s Key: 120s |,-,+ = rectangles forming current merge frontier 120s * = merge done manually 120s . = merge done automatically 120s # = conflict that is currently blocking progress 120s @ = merge was blocked but has been resolved 120s ? = no merge recorded 120s 120s + git-imerge finish --branch=a-b-full 121s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 121s + local refname=a-b-full 121s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 121s + git rev-parse a-b-full^{tree} 121s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 121s py313: commands[1] /tmp/autopkgtest.IpjX5N/build.W0y/src> /bin/sh t/test-conflicted 121s + dirname t/test-conflicted 121s + cd t 121s + pwd 121s + dirname /tmp/autopkgtest.IpjX5N/build.W0y/src/t 121s + BASE=/tmp/autopkgtest.IpjX5N/build.W0y/src 121s + . /tmp/autopkgtest.IpjX5N/build.W0y/src/t/test-lib.sh 121s + GIT_IMERGE=git-imerge 121s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 121s + test_conflict 4-3 121s + local conflict=4-3 121s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s + DESCRIPTION=git-imerge test repository with conflict at 4-3 121s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 121s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s + local description=git-imerge test repository with conflict at 4-3 121s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 121s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s + local description=git-imerge test repository with conflict at 4-3 121s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s hint: Using 'master' as the name for the initial branch. This default branch name 121s hint: is subject to change. To configure the initial branch name to use in all 121s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3/.git/ 121s [master (root-commit) d70e04b] m⇒0 121s 3 files changed, 3 insertions(+) 121s create mode 100644 c.txt 121s create mode 100644 conflict.txt 121s create mode 100644 d.txt 121s hint: of your new repositories, which will suppress this warning, call: 121s hint: 121s hint: git config --global init.defaultBranch 121s hint: 121s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 121s hint: 'development'. The just-created branch can be renamed via this command: 121s hint: 121s hint: git branch -m 121s hint: 121s hint: Disable this message with "git config set advice.defaultBranchName false" 121s + echo git-imerge test repository with conflict at 4-3 121s + printf %s\n /*.out /*.css /*.html 121s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3/.git config user.name Loú User 121s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 121s + TIME=1112911993 121s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-4-3 121s + modify c.txt 0 121s + filename=c.txt 121s + text=0 121s + echo 0 121s + git add c.txt 121s + modify d.txt 0 121s + filename=d.txt 121s + text=0 121s + echo 0 121s + git add d.txt 121s + modify conflict.txt original version 121s + filename=conflict.txt 121s + text=original version 121s + echo original version 121s + git add conflict.txt 121s + commit -m m⇒0 121s + TIME=1112911994 121s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 121s + git checkout -b c master -- 121s Switched to a new branch 'c' 121s + seq 9 121s + modify c.txt 1 121s + filename=c.txt 121s + text=1 121s + echo 1 121s + git add c.txt 121s + commit -m c⇒1 121s [c 89e2141] c⇒1 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s [c 7c431f2] c⇒2 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s [c f02ab24] c⇒3 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + TIME=1112911995 121s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 121s + modify c.txt 2 121s + filename=c.txt 121s + text=2 121s + echo 2 121s + git add c.txt 121s + commit -m c⇒2 121s + TIME=1112911996 121s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 121s + modify c.txt 3 121s + filename=c.txt 121s + text=3 121s + echo 3 121s + git add c.txt 121s + commit -m c⇒3 121s + TIME=1112911997 121s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 121s [c 3c091de] c⇒4 121s 2 files changed, 2 insertions(+), 2 deletions(-) 121s [c a0ac37a] c⇒5 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s [c ed9fdfa] c⇒6 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + modify c.txt 4 121s + filename=c.txt 121s + text=4 121s + echo 4 121s + git add c.txt 121s + modify conflict.txt c version 121s + filename=conflict.txt 121s + text=c version 121s + echo c version 121s + git add conflict.txt 121s + commit -m c⇒4 121s + TIME=1112911998 121s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 121s + modify c.txt 5 121s + filename=c.txt 121s + text=5 121s + echo 5 121s + git add c.txt 121s + commit -m c⇒5 121s + TIME=1112911999 121s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 121s + modify c.txt 6 121s + filename=c.txt 121s + text=6 121s + echo 6 121s + git add c.txt 121s + commit -m c⇒6 121s + TIME=1112912000 121s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 121s + modify c.txt 7 121s + filename=c.txt 121s + text=7 121s + echo 7 121s + git add c.txt 121s + commit -m c⇒7 121s + TIME=1112912001 121s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 121s [c 1da7bf5] c⇒7 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + modify c.txt 8 121s + filename=c.txt 121s + text=8 121s + echo 8 121s + git add c.txt 121s + commit -m c⇒8 121s + TIME=1112912002 121s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 121s + modify c.txt 9 121s + filename=c.txt 121s + text=9 121s [c d8de99f] c⇒8 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + echo 9 121s + git add c.txt 121s + commit -m c⇒9 121s + TIME=1112912003 121s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 121s [c 9cde605] c⇒9 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + git checkout -b d master -- 121s Switched to a new branch 'd' 121s + seq 6 121s + modify d.txt 1 121s + filename=d.txt 121s + text=1 121s + echo 1 121s + git add d.txt 121s [d bd5368a] d⇒1 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + commit -m d⇒1 121s + TIME=1112912004 121s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 121s + modify d.txt 2 121s + filename=d.txt 121s + text=2 121s + echo 2 121s + git add d.txt 121s + commit -m d⇒2 121s + TIME=1112912005 121s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 121s [d 93e27e6] d⇒2 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + modify d.txt 3 121s + filename=d.txt 121s + text=3 121s + echo 3 121s + git add d.txt 121s + modify conflict.txt d version 121s + filename=conflict.txt 121s + text=d version 121s + echo d version 121s + git add conflict.txt 121s + commit -m d⇒3 121s + TIME=1112912006 121s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 121s [d 2bb1a7e] d⇒3 121s 2 files changed, 2 insertions(+), 2 deletions(-) 121s + modify d.txt 4 121s + filename=d.txt 121s + text=4 121s + echo 4 121s + git add d.txt 121s + commit -m d⇒4 121s + TIME=1112912007 121s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 121s + modify d.txt 5 121s + filename=d.txt 121s + text=5 121s + echo 5 121s [d 81f9c80] d⇒4 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + git add d.txt 121s + commit -m d⇒5 121s + TIME=1112912008 121s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 121s [d 3690dde] d⇒5 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + modify d.txt 6 121s + filename=d.txt 121s + text=6 121s + echo 6 121s + git add d.txt 121s + commit -m d⇒6 121s + TIME=1112912009 121s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 121s [d 8085853] d⇒6 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + git checkout c 121s Switched to branch 'c' 121s + git-imerge init --name=c-d d 121s + git-imerge list 121s * c-d 121s + git-imerge diagram --commits --frontier --html=imerge0.html 121s 0 5 9 121s | | | 121s 0 - ********** - c 121s *????????? 121s *????????? 121s *????????? 121s *????????? 121s 5 - *????????? 121s 6 - *????????? 121s | 121s d 121s 121s 0 5 9 121s | | | 121s 0 - ********** - c 121s *????????? 121s *????????? 121s *????????? 121s *????????? 121s 5 - *????????? 121s 6 - *????????? 121s | 121s d 121s 121s Key: 121s |,-,+ = rectangles forming current merge frontier 121s * = merge done manually 121s . = merge done automatically 121s # = conflict that is currently blocking progress 121s @ = merge was blocked but has been resolved 121s ? = no merge recorded 121s 121s + git-imerge autofill 121s + tee autofill.out 121s Attempting automerge of 9-6...failure. 121s Attempting automerge of 1-1...success. 121s Attempting automerge of 1-4...success. 121s Attempting automerge of 1-6...success. 121s Attempting automerge of 9-6...failure. 121s Attempting automerge of 5-6...failure. 122s Attempting automerge of 3-6...success. 122s Attempting automerge of 4-6...failure. 122s Attempting automerge of 4-1...success. 122s Attempting automerge of 4-4...failure. 122s Attempting automerge of 4-3...failure. 122s Attempting automerge of 4-2...success. 122s Attempting automerge of 9-2...success. 122s Autofilling 1-6...success. 122s Autofilling 2-6...success. 122s Autofilling 3-1...success. 122s Autofilling 3-2...success. 122s Autofilling 3-3...success. 122s Autofilling 3-4...success. 122s Autofilling 3-5...success. 122s Autofilling 3-6 (first way)...success. 122s Autofilling 3-6 (second way)...success. 122s The two ways of autofilling 3-6 agree. 122s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 122s Autofilling 4-2...success. 122s Autofilling 5-2...success. 122s Autofilling 6-2...success. 122s Autofilling 7-2...success. 122s Autofilling 8-2...success. 122s Autofilling 9-1...success. 122s Autofilling 9-2 (first way)...success. 122s Autofilling 9-2 (second way)...success. 122s The two ways of autofilling 9-2 agree. 122s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 122s Attempting automerge of 9-6...failure. 122s Attempting automerge of 4-3...failure. 122s HEAD is now at 9cde605 c⇒9 122s Conflict; suggest manual merge of 4-3 122s + grep -q Traceback autofill.out 122s + grep -q suggest manual merge of 4-3 autofill.out 122s + git-imerge diagram --commits --frontier --html=imerge1.html 122s 0 5 9 122s | | | 122s 0 - ********** - c 122s *??.?????. 122s *??....... 122s *??.#????? 122s *??.?????? 122s 5 - *??.?????? 122s 6 - *...?????? 122s | 122s d 122s 122s 0 5 9 122s | | | 122s 0 - ********** - c 122s *??.?????| 122s *??.-----+ 122s *??|#????? 122s *??|?????? 122s 5 - *??|?????? 122s 6 - *--+?????? 122s | 122s d 122s 122s Key: 122s |,-,+ = rectangles forming current merge frontier 122s * = merge done manually 122s . = merge done automatically 122s # = conflict that is currently blocking progress 122s @ = merge was blocked but has been resolved 122s ? = no merge recorded 122s 122s + git-imerge continue --edit 122s Switched to branch 'imerge/c-d' 122s Auto-merging conflict.txt 122s CONFLICT (content): Merge conflict in conflict.txt 122s 122s Original first commit: 122s Automatic merge failed; fix conflicts and then commit the result. 122s commit 3c091ded129a5edf9061360bab867edade996c93 122s Author: Loú User 122s Date: Thu Apr 7 22:13:18 2005 +0000 122s 122s c⇒4 122s 122s Original second commit: 122s 122s There was a conflict merging commit 4-3, shown above. 122s Please resolve the conflict, commit the result, then type 122s 122s git-imerge continue 122s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 122s Author: Loú User 122s Date: Thu Apr 7 22:13:26 2005 +0000 122s 122s d⇒3 122s + echo merged version 122s + git add conflict.txt 122s + git-imerge continue --no-edit 123s [imerge/c-d b68af8b] imerge 'c-d': manual merge 4-3 123s Merge has been recorded for merge 4-3. 123s Attempting automerge of 4-6...success. 123s Autofilling 4-4...success. 123s Autofilling 4-5...success. 123s Autofilling 4-6...success. 123s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 123s Attempting automerge of 9-6...success. 123s Autofilling 5-6...success. 123s Autofilling 6-6...success. 123s Autofilling 7-6...success. 123s Autofilling 8-6...success. 123s Autofilling 9-3...success. 123s Autofilling 9-4...success. 123s Autofilling 9-5...success. 123s Autofilling 9-6 (first way)...success. 123s Autofilling 9-6 (second way)...success. 123s The two ways of autofilling 9-6 agree. 123s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 123s Merge is complete! 123s + git-imerge diagram --commits --frontier --html=imerge2.html 123s 0 5 9 123s | | | 123s 0 - ********** - c 123s *??.?????. 123s *??....... 123s *??.*????. 123s *??..????. 123s 5 - *??..????. 123s 6 - *......... 123s | 123s d 123s 123s 0 5 9 123s | | | 123s 0 - ********** - c 123s *??.?????| 123s *??......| 123s *??.*????| 123s *??..????| 123s 5 - *??..????| 123s 6 - *--------+ 123s | 123s d 123s 123s Key: 123s |,-,+ = rectangles forming current merge frontier 123s * = merge done manually 123s . = merge done automatically 123s # = conflict that is currently blocking progress 123s @ = merge was blocked but has been resolved 123s ? = no merge recorded 123s 123s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 124s Merge d into c (using imerge) 124s 124s # Please enter the commit message for your changes. Lines starting 124s # with '#' will be ignored, and an empty message aborts the commit. 124s # 124s # Date: Fri Dec 5 19:57:14 2025 +0000 124s # 124s # On branch c-d-merge 124s # Changes to be committed: 124s # modified: conflict.txt 124s # modified: d.txt 124s # 124s [c-d-merge 138e594] Merge d into c (using imerge) 124s Date: Fri Dec 5 19:57:14 2025 +0000 124s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 124s + local refname=c-d-merge 124s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 124s + git rev-parse c-d-merge^{tree} 124s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 124s + git-imerge simplify --goal=rebase --branch=c-d-rebase 124s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 124s + local refname=c-d-rebase 124s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 124s + git rev-parse c-d-rebase^{tree} 124s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 124s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 125s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + local refname=c-d-rebase-with-history 125s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + git rev-parse c-d-rebase-with-history^{tree} 125s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + git-imerge simplify --goal=border --branch=c-d-border 125s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + local refname=c-d-border 125s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + git rev-parse c-d-border^{tree} 125s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 126s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + local refname=c-d-border-with-history 126s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git rev-parse c-d-border-with-history^{tree} 126s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 126s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + local refname=c-d-border-with-history2 126s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git rev-parse c-d-border-with-history2^{tree} 126s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git-imerge remove 126s + git checkout c 126s Switched to branch 'c' 126s + git-imerge start --goal=full --first-parent --name=c-d d 126s + tee start.out 126s Attempting to merge 1-1...success. 126s Attempting to merge 1-2...success. 126s Attempting to merge 1-3...success. 126s Attempting to merge 1-4...success. 126s Attempting to merge 1-5...success. 126s Attempting to merge 1-6...success. 126s Attempting to merge 2-1...success. 126s Attempting to merge 2-2...success. 126s Attempting to merge 2-3...success. 126s Attempting to merge 2-4...success. 126s Attempting to merge 2-5...success. 126s Attempting to merge 2-6...success. 126s Attempting to merge 3-1...success. 126s Attempting to merge 3-2...success. 127s Attempting to merge 3-3...success. 127s Attempting to merge 3-4...success. 127s Attempting to merge 3-5...success. 127s Attempting to merge 3-6...success. 127s Attempting to merge 4-1...success. 127s Attempting to merge 4-2...success. 127s Attempting to merge 4-3...conflict. 127s Attempting to merge 5-1...success. 127s Attempting to merge 5-2...success. 127s Attempting to merge 6-1...success. 127s Attempting to merge 6-2...success. 127s Attempting to merge 7-1...success. 127s Attempting to merge 7-2...success. 127s Attempting to merge 8-1...success. 127s Attempting to merge 8-2...success. 127s Attempting to merge 9-1...success. 127s Attempting to merge 9-2...success. 127s Previous HEAD position was 9531448 imerge 'c-d': automatic merge 9-2 127s Switched to branch 'imerge/c-d' 127s Auto-merging conflict.txt 127s CONFLICT (content): Merge conflict in conflict.txt 127s Automatic merge failed; fix conflicts and then commit the result. 127s 127s Original first commit: 127s commit 3c091ded129a5edf9061360bab867edade996c93 127s Author: Loú User 127s Date: Thu Apr 7 22:13:18 2005 +0000 127s 127s c⇒4 127s 127s Original second commit: 127s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 127s Author: Loú User 127s Date: Thu Apr 7 22:13:26 2005 +0000 127s 127s d⇒3 127s 127s There was a conflict merging commit 4-3, shown above. 127s Please resolve the conflict, commit the result, then type 127s 127s git-imerge continue 127s + grep -q Traceback start.out 127s + grep -q suggest manual merge of 4-3 autofill.out 127s + git-imerge diagram --commits --frontier --html=imerge3.html 127s 0 5 9 127s | | | 127s 0 - ********** - c 127s *......... 127s *......... 127s *...#????? 127s *...?????? 127s 5 - *...?????? 127s 6 - *...?????? 127s | 127s d 127s 127s 0 5 9 127s | | | 127s 0 - ********** - c 127s *........| 127s *...-----+ 127s *..|#????? 127s *..|?????? 127s 5 - *..|?????? 127s 6 - *--+?????? 127s | 127s d 127s 127s Key: 127s |,-,+ = rectangles forming current merge frontier 127s * = merge done manually 127s . = merge done automatically 127s # = conflict that is currently blocking progress 127s @ = merge was blocked but has been resolved 127s ? = no merge recorded 127s 127s + echo merged version 127s + git add conflict.txt 127s + GIT_EDITOR=cat git commit 127s imerge 'c-d': manual merge 4-3 127s 127s # Conflicts: 127s # conflict.txt 127s # 127s # It looks like you may be committing a merge. 127s # If this is not correct, please run 127s # git update-ref -d MERGE_HEAD 127s # and try again. 127s 127s 127s # Please enter the commit message for your changes. Lines starting 127s # with '#' will be ignored, and an empty message aborts the commit. 127s # 127s # On branch imerge/c-d 127s # All conflicts fixed but you are still merging. 127s # 127s # Changes to be committed: 127s # modified: conflict.txt 127s # modified: d.txt 127s # 127s [imerge/c-d b2f3112] imerge 'c-d': manual merge 4-3 127s + git-imerge continue --edit 127s Merge has been recorded for merge 4-3. 127s Attempting to merge 4-4...success. 127s Attempting to merge 4-5...success. 127s Attempting to merge 4-6...success. 127s Attempting to merge 5-3...success. 127s Attempting to merge 5-4...success. 127s Attempting to merge 5-5...success. 128s Attempting to merge 5-6...success. 128s Attempting to merge 6-3...success. 128s Attempting to merge 6-4...success. 128s Attempting to merge 6-5...success. 128s Attempting to merge 6-6...success. 128s Attempting to merge 7-3...success. 128s Attempting to merge 7-4...success. 128s Attempting to merge 7-5...success. 128s Attempting to merge 7-6...success. 128s Attempting to merge 8-3...success. 128s Attempting to merge 8-4...success. 128s Attempting to merge 8-5...success. 128s Attempting to merge 8-6...success. 128s Attempting to merge 9-3...success. 128s Attempting to merge 9-4...success. 128s Attempting to merge 9-5...success. 128s Attempting to merge 9-6...success. 128s Merge is complete! 128s + git-imerge diagram --commits --frontier --html=imerge4.html 128s 0 5 9 128s | | | 128s 0 - ********** - c 128s *......... 128s *......... 128s *...*..... 128s *......... 128s 5 - *......... 128s 6 - *......... 128s | 128s d 128s 128s 0 5 9 128s | | | 128s 0 - ********** - c 128s *........| 128s *........| 128s *...*....| 128s *........| 128s 5 - *........| 128s 6 - *--------+ 128s | 128s d 128s 128s Key: 128s |,-,+ = rectangles forming current merge frontier 128s * = merge done manually 128s . = merge done automatically 128s # = conflict that is currently blocking progress 128s @ = merge was blocked but has been resolved 128s ? = no merge recorded 128s 128s + git-imerge finish --branch=c-d-full 128s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 128s + local refname=c-d-full 128s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 128s + git rev-parse c-d-full^{tree} 128s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 128s + test_conflict 1-1 128s + local conflict=1-1 128s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s + DESCRIPTION=git-imerge test repository with conflict at 1-1 128s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 128s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s + local description=git-imerge test repository with conflict at 1-1 128s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 128s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s + local description=git-imerge test repository with conflict at 1-1 128s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s hint: Using 'master' as the name for the initial branch. This default branch name 128s hint: is subject to change. To configure the initial branch name to use in all 128s hint: of your new repositories, which will suppress this warning, call: 128s hint: 128s hint: git config --global init.defaultBranch 128s hint: 128s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 128s hint: 'development'. The just-created branch can be renamed via this command: 128s hint: 128s hint: git branch -m 128s hint: 128s hint: Disable this message with "git config set advice.defaultBranchName false" 128s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1/.git/ 128s + echo git-imerge test repository with conflict at 1-1 128s + printf %s\n /*.out /*.css /*.html 128s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1/.git config user.name Loú User 128s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 128s + TIME=1112911993 128s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-1 128s + modify c.txt 0 128s + filename=c.txt 128s + text=0 128s + echo 0 128s + git add c.txt 128s + modify d.txt 0 128s + filename=d.txt 128s + text=0 128s + echo 0 128s + git add d.txt 128s + modify conflict.txt original version 128s + filename=conflict.txt 128s + text=original version 128s + echo original version 128s + git add conflict.txt 128s + commit -m m⇒0 128s + TIME=1112911994 128s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 128s [master (root-commit) d70e04b] m⇒0 128s 3 files changed, 3 insertions(+) 128s create mode 100644 c.txt 128s create mode 100644 conflict.txt 128s create mode 100644 d.txt 128s + git checkout -b c master -- 128s Switched to a new branch 'c' 128s + seq 9 128s + modify c.txt 1 128s + filename=c.txt 128s + text=1 128s + echo 1 128s + git add c.txt 128s + modify conflict.txt c version 128s + filename=conflict.txt 128s + text=c version 128s + echo c version 128s + git add conflict.txt 128s + commit -m c⇒1 128s + TIME=1112911995 128s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 128s [c 2120f40] c⇒1 128s 2 files changed, 2 insertions(+), 2 deletions(-) 128s + modify c.txt 2 128s + filename=c.txt 128s + text=2 128s + echo 2 128s + git add c.txt 128s + commit -m c⇒2 128s + TIME=1112911996 128s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 128s + modify c.txt 3 128s + filename=c.txt 128s + text=3 128s + echo 3 128s + git add c.txt 128s + commit -m c⇒3 128s + TIME=1112911997 128s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 128s [c 90cc7de] c⇒2 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s [c 2046ed2] c⇒3 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify c.txt 4 128s + filename=c.txt 128s + text=4 128s + echo 4 128s + git add c.txt 128s + commit -m c⇒4 128s + TIME=1112911998 128s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 128s [c 8a2cee9] c⇒4 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify c.txt 5 128s + filename=c.txt 128s + text=5 128s + echo 5 128s + git add c.txt 128s + commit -m c⇒5 128s + TIME=1112911999 128s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 128s [c ac16a05] c⇒5 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify c.txt 6 128s + filename=c.txt 128s + text=6 128s + echo 6 128s + git add c.txt 128s + commit -m c⇒6 128s + TIME=1112912000 128s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 128s [c 30dd2ae] c⇒6 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify c.txt 7 128s + filename=c.txt 128s + text=7 128s + echo 7 128s + git add c.txt 128s + commit -m c⇒7 128s + TIME=1112912001 128s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 128s [c 0883eb9] c⇒7 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify c.txt 8 128s + filename=c.txt 128s + text=8 128s + echo 8 128s + git add c.txt 128s + commit -m c⇒8 128s + TIME=1112912002 128s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 128s [c f661c06] c⇒8 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify c.txt 9 128s + filename=c.txt 128s + text=9 128s + echo 9 128s + git add c.txt 128s + commit -m c⇒9 128s + TIME=1112912003 128s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 128s [c 243e8ed] c⇒9 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + git checkout -b d master -- 128s Switched to a new branch 'd' 128s + seq 6 128s + modify d.txt 1 128s + filename=d.txt 128s + text=1 128s + echo 1 128s + git add d.txt 128s + modify conflict.txt d version 128s + filename=conflict.txt 128s + text=d version 128s + echo d version 128s + git add conflict.txt 128s + commit -m d⇒1 128s + TIME=1112912004 128s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 128s [d ac0427a] d⇒1 128s 2 files changed, 2 insertions(+), 2 deletions(-) 128s + modify d.txt 2 128s + filename=d.txt 128s + text=2 128s + echo 2 128s + git add d.txt 128s + commit -m d⇒2 128s + TIME=1112912005 128s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 128s [d 43c38c0] d⇒2 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify d.txt 3 128s + filename=d.txt 128s + text=3 128s + echo 3 128s + git add d.txt 128s + commit -m d⇒3 128s + TIME=1112912006 128s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 128s [d 0260058] d⇒3 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify d.txt 4 128s + filename=d.txt 128s + text=4 128s + echo 4 128s + git add d.txt 128s + commit -m d⇒4 128s + TIME=1112912007 128s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 128s [d 40fef44] d⇒4 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify d.txt 5 128s + filename=d.txt 128s + text=5 128s + echo 5 128s + git add d.txt 128s + commit -m d⇒5 128s + TIME=1112912008 128s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 128s [d b080a65] d⇒5 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + modify d.txt 6 128s + filename=d.txt 128s + text=6 128s + echo 6 128s + git add d.txt 128s + commit -m d⇒6 128s + TIME=1112912009 128s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 128s [d 200ce5c] d⇒6 128s 1 file changed, 1 insertion(+), 1 deletion(-) 128s + git checkout c 128s Switched to branch 'c' 128s + git-imerge init --name=c-d d 129s + git-imerge list 129s * c-d 129s + git-imerge diagram --commits --frontier --html=imerge0.html 129s 0 5 9 129s | | | 129s 0 - ********** - c 129s *????????? 129s *????????? 129s *????????? 129s *????????? 129s 5 - *????????? 129s 6 - *????????? 129s | 129s d 129s 129s 0 5 9 129s | | | 129s 0 - ********** - c 129s *????????? 129s *????????? 129s *????????? 129s *????????? 129s 5 - *????????? 129s 6 - *????????? 129s | 129s d 129s 129s Key: 129s |,-,+ = rectangles forming current merge frontier 129s * = merge done manually 129s . = merge done automatically 129s # = conflict that is currently blocking progress 129s @ = merge was blocked but has been resolved 129s ? = no merge recorded 129s 129s + git-imerge autofill 129s + tee autofill.out 130s Attempting automerge of 9-6...failure. 130s Attempting automerge of 1-1...failure. 130s HEAD is now at 243e8ed c⇒9 130s No progress was possible; suggest manual merge of 1-1 130s + grep -q Traceback autofill.out 130s + grep -q suggest manual merge of 1-1 autofill.out 130s + git-imerge diagram --commits --frontier --html=imerge1.html 130s 0 5 9 130s | | | 130s 0 - ********** - c 130s *#???????? 130s *????????? 130s *????????? 130s *????????? 130s 5 - *????????? 130s 6 - *????????? 130s | 130s d 130s 130s 0 5 9 130s | | | 130s 0 - ********** - c 130s *#???????? 130s *????????? 130s *????????? 130s *????????? 130s 5 - *????????? 130s 6 - *????????? 130s | 130s d 130s 130s Key: 130s |,-,+ = rectangles forming current merge frontier 130s * = merge done manually 130s . = merge done automatically 130s # = conflict that is currently blocking progress 130s @ = merge was blocked but has been resolved 130s ? = no merge recorded 130s 130s + git-imerge continue --edit 130s Switched to branch 'imerge/c-d' 130s Auto-merging conflict.txt 130s CONFLICT (content): Merge conflict in conflict.txt 130s Automatic merge failed; fix conflicts and then commit the result. 130s 130s Original first commit: 130s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 130s Author: Loú User 130s Date: Thu Apr 7 22:13:15 2005 +0000 130s 130s c⇒1 130s 130s Original second commit: 130s 130s There was a conflict merging commit 1-1, shown above. 130s Please resolve the conflict, commit the result, then type 130s 130s git-imerge continue 130s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 130s Author: Loú User 130s Date: Thu Apr 7 22:13:24 2005 +0000 130s 130s d⇒1 130s + echo merged version 130s + git add conflict.txt 130s + git-imerge continue --no-edit 130s [imerge/c-d 6b2f4d0] imerge 'c-d': manual merge 1-1 130s Merge has been recorded for merge 1-1. 130s Attempting automerge of 1-6...success. 131s Autofilling 1-2...success. 131s Autofilling 1-3...success. 131s Autofilling 1-4...success. 131s Autofilling 1-5...success. 131s Autofilling 1-6...success. 131s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 131s Attempting automerge of 9-6...success. 131s Autofilling 2-6...success. 131s Autofilling 3-6...success. 131s Autofilling 4-6...success. 131s Autofilling 5-6...success. 131s Autofilling 6-6...success. 131s Autofilling 7-6...success. 131s Autofilling 8-6...success. 131s Autofilling 9-1...success. 131s Autofilling 9-2...success. 131s Autofilling 9-3...success. 131s Autofilling 9-4...success. 131s Autofilling 9-5...success. 131s Autofilling 9-6 (first way)...success. 131s Autofilling 9-6 (second way)...success. 131s The two ways of autofilling 9-6 agree. 131s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 131s Merge is complete! 131s + git-imerge diagram --commits --frontier --html=imerge2.html 131s 0 5 9 131s | | | 131s 0 - ********** - c 131s **???????. 131s *.???????. 131s *.???????. 131s *.???????. 131s 5 - *.???????. 131s 6 - *......... 131s | 131s d 131s 131s 0 5 9 131s | | | 131s 0 - ********** - c 131s **???????| 131s *.???????| 131s *.???????| 131s *.???????| 131s 5 - *.???????| 131s 6 - *--------+ 131s | 131s d 131s 131s Key: 131s |,-,+ = rectangles forming current merge frontier 131s * = merge done manually 131s . = merge done automatically 131s # = conflict that is currently blocking progress 131s @ = merge was blocked but has been resolved 131s ? = no merge recorded 131s 132s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 132s Merge d into c (using imerge) 132s 132s # Please enter the commit message for your changes. Lines starting 132s # with '#' will be ignored, and an empty message aborts the commit. 132s # 132s # Date: Fri Dec 5 19:57:22 2025 +0000 132s # 132s # On branch c-d-merge 132s # Changes to be committed: 132s # modified: conflict.txt 132s # modified: d.txt 132s # 132s [c-d-merge 21c3588] Merge d into c (using imerge) 132s Date: Fri Dec 5 19:57:22 2025 +0000 132s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + local refname=c-d-merge 132s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + git rev-parse c-d-merge^{tree} 132s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + git-imerge simplify --goal=rebase --branch=c-d-rebase 132s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + local refname=c-d-rebase 132s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + git rev-parse c-d-rebase^{tree} 132s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 132s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + local refname=c-d-rebase-with-history 132s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + git rev-parse c-d-rebase-with-history^{tree} 132s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + git-imerge simplify --goal=border --branch=c-d-border 133s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 133s + local refname=c-d-border 133s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 133s + git rev-parse c-d-border^{tree} 133s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 133s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 134s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + local refname=c-d-border-with-history 134s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git rev-parse c-d-border-with-history^{tree} 134s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 134s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + local refname=c-d-border-with-history2 134s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git rev-parse c-d-border-with-history2^{tree} 134s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git-imerge remove 134s + git checkout c 134s Switched to branch 'c' 134s + git-imerge start --goal=full --first-parent --name=c-d d 134s + tee start.out 135s Attempting to merge 1-1...conflict. 135s Switched to branch 'imerge/c-d' 135s Auto-merging conflict.txt 135s CONFLICT (content): Merge conflict in conflict.txt 135s Automatic merge failed; fix conflicts and then commit the result. 135s 135s Original first commit: 135s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 135s Author: Loú User 135s Date: Thu Apr 7 22:13:15 2005 +0000 135s 135s c⇒1 135s 135s Original second commit: 135s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 135s Author: Loú User 135s Date: Thu Apr 7 22:13:24 2005 +0000 135s 135s d⇒1 135s 135s There was a conflict merging commit 1-1, shown above. 135s Please resolve the conflict, commit the result, then type 135s 135s git-imerge continue 135s + grep -q Traceback start.out 135s + grep -q suggest manual merge of 1-1 autofill.out 135s + git-imerge diagram --commits --frontier --html=imerge3.html 136s 0 5 9 136s | | | 136s 0 - ********** - c 136s *#???????? 136s *????????? 136s *????????? 136s *????????? 136s 5 - *????????? 136s 6 - *????????? 136s | 136s d 136s 136s 0 5 9 136s | | | 136s 0 - ********** - c 136s *#???????? 136s *????????? 136s *????????? 136s *????????? 136s 5 - *????????? 136s 6 - *????????? 136s | 136s d 136s 136s Key: 136s |,-,+ = rectangles forming current merge frontier 136s * = merge done manually 136s . = merge done automatically 136s # = conflict that is currently blocking progress 136s @ = merge was blocked but has been resolved 136s ? = no merge recorded 136s 136s + echo merged version 136s + git add conflict.txt 136s + GIT_EDITOR=cat git commit 136s imerge 'c-d': manual merge 1-1 136s 136s # Conflicts: 136s # conflict.txt 136s # 136s # It looks like you may be committing a merge. 136s # If this is not correct, please run 136s # git update-ref -d MERGE_HEAD 136s # and try again. 136s 136s 136s # Please enter the commit message for your changes. Lines starting 136s # with '#' will be ignored, and an empty message aborts the commit. 136s # 136s # On branch imerge/c-d 136s # All conflicts fixed but you are still merging. 136s # 136s # Changes to be committed: 136s # modified: conflict.txt 136s # modified: d.txt 136s # 136s [imerge/c-d 67e2727] imerge 'c-d': manual merge 1-1 136s + git-imerge continue --edit 136s Merge has been recorded for merge 1-1. 136s Attempting to merge 1-2...success. 136s Attempting to merge 1-3...success. 136s Attempting to merge 1-4...success. 136s Attempting to merge 1-5...success. 137s Attempting to merge 1-6...success. 137s Attempting to merge 2-1...success. 137s Attempting to merge 2-2...success. 137s Attempting to merge 2-3...success. 137s Attempting to merge 2-4...success. 137s Attempting to merge 2-5...success. 137s Attempting to merge 2-6...success. 137s Attempting to merge 3-1...success. 137s Attempting to merge 3-2...success. 137s Attempting to merge 3-3...success. 137s Attempting to merge 3-4...success. 138s Attempting to merge 3-5...success. 138s Attempting to merge 3-6...success. 138s Attempting to merge 4-1...success. 138s Attempting to merge 4-2...success. 138s Attempting to merge 4-3...success. 138s Attempting to merge 4-4...success. 138s Attempting to merge 4-5...success. 138s Attempting to merge 4-6...success. 138s Attempting to merge 5-1...success. 138s Attempting to merge 5-2...success. 138s Attempting to merge 5-3...success. 138s Attempting to merge 5-4...success. 138s Attempting to merge 5-5...success. 138s Attempting to merge 5-6...success. 138s Attempting to merge 6-1...success. 138s Attempting to merge 6-2...success. 138s Attempting to merge 6-3...success. 138s Attempting to merge 6-4...success. 138s Attempting to merge 6-5...success. 138s Attempting to merge 6-6...success. 138s Attempting to merge 7-1...success. 138s Attempting to merge 7-2...success. 138s Attempting to merge 7-3...success. 139s Attempting to merge 7-4...success. 139s Attempting to merge 7-5...success. 139s Attempting to merge 7-6...success. 139s Attempting to merge 8-1...success. 139s Attempting to merge 8-2...success. 139s Attempting to merge 8-3...success. 139s Attempting to merge 8-4...success. 139s Attempting to merge 8-5...success. 139s Attempting to merge 8-6...success. 139s Attempting to merge 9-1...success. 139s Attempting to merge 9-2...success. 139s Attempting to merge 9-3...success. 139s Attempting to merge 9-4...success. 139s Attempting to merge 9-5...success. 139s Attempting to merge 9-6...success. 139s Merge is complete! 139s + git-imerge diagram --commits --frontier --html=imerge4.html 139s 0 5 9 139s | | | 139s 0 - ********** - c 139s **........ 139s *......... 139s *......... 139s *......... 139s 5 - *......... 139s 6 - *......... 139s | 139s d 139s 139s 0 5 9 139s | | | 139s 0 - ********** - c 139s **.......| 139s *........| 139s *........| 139s *........| 139s 5 - *........| 139s 6 - *--------+ 139s | 139s d 139s 139s Key: 139s |,-,+ = rectangles forming current merge frontier 139s * = merge done manually 139s . = merge done automatically 139s # = conflict that is currently blocking progress 139s @ = merge was blocked but has been resolved 139s ? = no merge recorded 139s 139s + git-imerge finish --branch=c-d-full 140s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 140s + local refname=c-d-full 140s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 140s + git rev-parse c-d-full^{tree} 140s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 140s + test_conflict 9-1 140s + local conflict=9-1 140s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s + DESCRIPTION=git-imerge test repository with conflict at 9-1 140s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 140s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s + local description=git-imerge test repository with conflict at 9-1 140s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 140s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s + local description=git-imerge test repository with conflict at 9-1 140s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1/.git/ 140s hint: Using 'master' as the name for the initial branch. This default branch name 140s hint: is subject to change. To configure the initial branch name to use in all 140s hint: of your new repositories, which will suppress this warning, call: 140s hint: 140s hint: git config --global init.defaultBranch 140s hint: 140s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 140s hint: 'development'. The just-created branch can be renamed via this command: 140s hint: 140s hint: git branch -m 140s hint: 140s hint: Disable this message with "git config set advice.defaultBranchName false" 140s + echo git-imerge test repository with conflict at 9-1 140s + printf %s\n /*.out /*.css /*.html 140s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1/.git config user.name Loú User 140s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 140s + TIME=1112911993 140s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s [master (root-commit) d70e04b] m⇒0 140s 3 files changed, 3 insertions(+) 140s create mode 100644 c.txt 140s create mode 100644 conflict.txt 140s create mode 100644 d.txt 140s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-1 140s + modify c.txt 0 140s + filename=c.txt 140s + text=0 140s + echo 0 140s + git add c.txt 140s + modify d.txt 0 140s + filename=d.txt 140s + text=0 140s + echo 0 140s + git add d.txt 140s + modify conflict.txt original version 140s + filename=conflict.txt 140s + text=original version 140s + echo original version 140s + git add conflict.txt 140s + commit -m m⇒0 140s + TIME=1112911994 140s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 140s + git checkout -b c master -- 140s Switched to a new branch 'c' 140s + seq 9 140s + modify c.txt 1 140s + filename=c.txt 140s + text=1 140s + echo 1 140s + git add c.txt 140s + commit -m c⇒1 140s + TIME=1112911995 140s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 140s [c 89e2141] c⇒1 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + modify c.txt 2 140s + filename=c.txt 140s + text=2 140s + echo 2 140s + git add c.txt 140s + commit -m c⇒2 140s + TIME=1112911996 140s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 140s [c 7c431f2] c⇒2 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s [c f02ab24] c⇒3 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s [c ed9122f] c⇒4 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s [c 1d3bf09] c⇒5 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + modify c.txt 3 140s + filename=c.txt 140s + text=3 140s + echo 3 140s + git add c.txt 140s + commit -m c⇒3 140s + TIME=1112911997 140s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 140s + modify c.txt 4 140s + filename=c.txt 140s + text=4 140s + echo 4 140s + git add c.txt 140s + commit -m c⇒4 140s + TIME=1112911998 140s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 140s + modify c.txt 5 140s + filename=c.txt 140s + text=5 140s + echo 5 140s + git add c.txt 140s + commit -m c⇒5 140s + TIME=1112911999 140s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 140s + modify c.txt 6 140s + filename=c.txt 140s + text=6 140s + echo 6 140s + git add c.txt 140s + commit -m c⇒6 140s + TIME=1112912000 140s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 140s [c f999ecd] c⇒6 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + modify c.txt 7 140s + filename=c.txt 140s + text=7 140s + echo 7 140s + git add c.txt 140s + commit -m c⇒7 140s + TIME=1112912001 140s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 140s [c 7050a8a] c⇒7 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + modify c.txt 8 140s + filename=c.txt 140s + text=8 140s + echo 8 140s + git add c.txt 140s + commit -m c⇒8 140s + TIME=1112912002 140s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 140s [c 9732e77] c⇒8 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + modify c.txt 9 140s + filename=c.txt 140s + text=9 140s + echo 9 140s + git add c.txt 140s + modify conflict.txt c version 140s + filename=conflict.txt 140s + text=c version 140s + echo c version 140s + git add conflict.txt 140s + commit -m c⇒9 140s + TIME=1112912003 140s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 140s [c 73a5eed] c⇒9 140s 2 files changed, 2 insertions(+), 2 deletions(-) 140s + git checkout -b d master -- 140s Switched to a new branch 'd' 140s + seq 6 140s + modify d.txt 1 140s + filename=d.txt 140s + text=1 140s + echo 1 140s + git add d.txt 140s + modify conflict.txt d version 140s + filename=conflict.txt 140s + text=d version 140s + echo d version 140s + git add conflict.txt 140s + commit -m d⇒1 140s + TIME=1112912004 140s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 140s + modify d.txt 2 140s + filename=d.txt 140s + text=2 140s [d ac0427a] d⇒1 140s 2 files changed, 2 insertions(+), 2 deletions(-) 140s + echo 2 140s + git add d.txt 140s + commit -m d⇒2 140s + TIME=1112912005 140s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 140s [d 43c38c0] d⇒2 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + modify d.txt 3 140s + filename=d.txt 140s + text=3 140s + echo 3 140s [d 0260058] d⇒3 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s [d 40fef44] d⇒4 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s [d b080a65] d⇒5 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + git add d.txt 140s + commit -m d⇒3 140s + TIME=1112912006 140s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 140s + modify d.txt 4 140s + filename=d.txt 140s + text=4 140s + echo 4 140s + git add d.txt 140s + commit -m d⇒4 140s + TIME=1112912007 140s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 140s + modify d.txt 5 140s + filename=d.txt 140s + text=5 140s + echo 5 140s + git add d.txt 140s + commit -m d⇒5 140s + TIME=1112912008 140s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 140s + modify d.txt 6 140s + filename=d.txt 140s + text=6 140s + echo 6 140s + git add d.txt 140s + commit -m d⇒6 140s + TIME=1112912009 140s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 140s + git checkout c 140s Switched to branch 'c' 140s + git-imerge init --name=c-d d 140s [d 200ce5c] d⇒6 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + git-imerge list 140s * c-d 140s + git-imerge diagram --commits --frontier --html=imerge0.html 140s 0 5 9 140s | | | 140s 0 - ********** - c 140s *????????? 140s *????????? 140s *????????? 140s *????????? 140s 5 - *????????? 140s 6 - *????????? 140s | 140s d 140s 140s 0 5 9 140s | | | 140s 0 - ********** - c 140s *????????? 140s *????????? 140s *????????? 140s *????????? 140s 5 - *????????? 140s 6 - *????????? 140s | 140s d 140s 140s Key: 140s |,-,+ = rectangles forming current merge frontier 140s * = merge done manually 140s . = merge done automatically 140s # = conflict that is currently blocking progress 140s @ = merge was blocked but has been resolved 140s ? = no merge recorded 140s 140s + git-imerge autofill 140s + tee autofill.out 140s Attempting automerge of 9-6...failure. 141s Attempting automerge of 1-1...success. 141s Attempting automerge of 1-4...success. 141s Attempting automerge of 1-6...success. 141s Attempting automerge of 9-6...failure. 141s Attempting automerge of 5-6...success. 141s Attempting automerge of 7-6...success. 141s Attempting automerge of 8-6...success. 141s Attempting automerge of 9-1...failure. 141s Autofilling 1-6...success. 141s Autofilling 2-6...success. 141s Autofilling 3-6...success. 141s Autofilling 4-6...success. 141s Autofilling 5-6...success. 141s Autofilling 6-6...success. 141s Autofilling 7-6...success. 141s Autofilling 8-1...success. 141s Autofilling 8-2...success. 141s Autofilling 8-3...success. 141s Autofilling 8-4...success. 141s Autofilling 8-5...success. 141s Autofilling 8-6 (first way)...success. 142s Autofilling 8-6 (second way)...success. 142s The two ways of autofilling 8-6 agree. 142s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 142s Attempting automerge of 9-6...failure. 142s Attempting automerge of 9-1...failure. 142s HEAD is now at 73a5eed c⇒9 142s Conflict; suggest manual merge of 9-1 142s + grep -q Traceback autofill.out 142s + grep -q suggest manual merge of 9-1 autofill.out 142s + git-imerge diagram --commits --frontier --html=imerge1.html 142s 0 5 9 142s | | | 142s 0 - ********** - c 142s *???????.# 142s *???????.? 142s *???????.? 142s *???????.? 142s 5 - *???????.? 142s 6 - *........? 142s | 142s d 142s 142s 0 5 9 142s | | | 142s 0 - ********** - c 142s *???????|# 142s *???????|? 142s *???????|? 142s *???????|? 142s 5 - *???????|? 142s 6 - *-------+? 142s | 142s d 142s 142s Key: 142s |,-,+ = rectangles forming current merge frontier 142s * = merge done manually 142s . = merge done automatically 142s # = conflict that is currently blocking progress 142s @ = merge was blocked but has been resolved 142s ? = no merge recorded 142s 142s + git-imerge continue --edit 142s Switched to branch 'imerge/c-d' 142s Auto-merging conflict.txt 142s CONFLICT (content): Merge conflict in conflict.txt 142s Automatic merge failed; fix conflicts and then commit the result. 142s 142s Original first commit: 142s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 142s Author: Loú User 142s Date: Thu Apr 7 22:13:23 2005 +0000 142s 142s c⇒9 142s 142s Original second commit: 142s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 142s Author: Loú User 142s Date: Thu Apr 7 22:13:24 2005 +0000 142s 142s d⇒1 142s 142s There was a conflict merging commit 9-1, shown above. 142s Please resolve the conflict, commit the result, then type 142s 142s git-imerge continue 142s + echo merged version 142s + git add conflict.txt 142s + git-imerge continue --no-edit 143s [imerge/c-d 36175e9] imerge 'c-d': manual merge 9-1 143s Merge has been recorded for merge 9-1. 143s Attempting automerge of 9-6...success. 143s Autofilling 9-2...success. 143s Autofilling 9-3...success. 143s Autofilling 9-4...success. 143s Autofilling 9-5...success. 143s Autofilling 9-6...success. 143s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 143s Merge is complete! 143s + git-imerge diagram --commits --frontier --html=imerge2.html 143s 0 5 9 143s | | | 143s 0 - ********** - c 143s *???????.* 143s *???????.. 143s *???????.. 143s *???????.. 143s 5 - *???????.. 143s 6 - *......... 143s | 143s d 143s 143s 0 5 9 143s | | | 143s 0 - ********** - c 143s *???????.* 143s *???????.| 143s *???????.| 143s *???????.| 143s 5 - *???????.| 143s 6 - *--------+ 143s | 143s d 143s 143s Key: 143s |,-,+ = rectangles forming current merge frontier 143s * = merge done manually 143s . = merge done automatically 143s # = conflict that is currently blocking progress 143s @ = merge was blocked but has been resolved 143s ? = no merge recorded 143s 143s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 143s Merge d into c (using imerge) 143s 143s # Please enter the commit message for your changes. Lines starting 143s # with '#' will be ignored, and an empty message aborts the commit. 143s # 143s # Date: Fri Dec 5 19:57:34 2025 +0000 143s # 143s # On branch c-d-merge 143s # Changes to be committed: 143s # modified: conflict.txt 143s # modified: d.txt 143s # 143s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + local refname=c-d-merge 143s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + git rev-parse c-d-merge^{tree} 143s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + git-imerge simplify --goal=rebase --branch=c-d-rebase 143s [c-d-merge 3abb042] Merge d into c (using imerge) 143s Date: Fri Dec 5 19:57:34 2025 +0000 143s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + local refname=c-d-rebase 143s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + git rev-parse c-d-rebase^{tree} 143s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 143s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + local refname=c-d-rebase-with-history 143s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 143s + git rev-parse c-d-rebase-with-history^{tree} 144s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 144s + git-imerge simplify --goal=border --branch=c-d-border 144s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 144s + local refname=c-d-border 144s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 144s + git rev-parse c-d-border^{tree} 144s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 144s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 145s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + local refname=c-d-border-with-history 145s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git rev-parse c-d-border-with-history^{tree} 145s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 145s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + local refname=c-d-border-with-history2 145s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git rev-parse c-d-border-with-history2^{tree} 145s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git-imerge remove 145s + git checkout c 145s Switched to branch 'c' 145s + git-imerge start --goal=full --first-parent --name=c-d d 145s + tee start.out 146s Attempting to merge 1-1...success. 146s Attempting to merge 1-2...success. 146s Attempting to merge 1-3...success. 146s Attempting to merge 1-4...success. 146s Attempting to merge 1-5...success. 146s Attempting to merge 1-6...success. 146s Attempting to merge 2-1...success. 146s Attempting to merge 2-2...success. 146s Attempting to merge 2-3...success. 146s Attempting to merge 2-4...success. 146s Attempting to merge 2-5...success. 146s Attempting to merge 2-6...success. 146s Attempting to merge 3-1...success. 146s Attempting to merge 3-2...success. 146s Attempting to merge 3-3...success. 146s Attempting to merge 3-4...success. 146s Attempting to merge 3-5...success. 146s Attempting to merge 3-6...success. 146s Attempting to merge 4-1...success. 146s Attempting to merge 4-2...success. 146s Attempting to merge 4-3...success. 146s Attempting to merge 4-4...success. 146s Attempting to merge 4-5...success. 146s Attempting to merge 4-6...success. 146s Attempting to merge 5-1...success. 146s Attempting to merge 5-2...success. 146s Attempting to merge 5-3...success. 146s Attempting to merge 5-4...success. 146s Attempting to merge 5-5...success. 147s Attempting to merge 5-6...success. 147s Attempting to merge 6-1...success. 147s Attempting to merge 6-2...success. 147s Attempting to merge 6-3...success. 147s Attempting to merge 6-4...success. 147s Attempting to merge 6-5...success. 147s Attempting to merge 6-6...success. 147s Attempting to merge 7-1...success. 147s Attempting to merge 7-2...success. 147s Attempting to merge 7-3...success. 147s Attempting to merge 7-4...success. 147s Attempting to merge 7-5...success. 147s Attempting to merge 7-6...success. 147s Attempting to merge 8-1...success. 147s Attempting to merge 8-2...success. 147s Attempting to merge 8-3...success. 147s Attempting to merge 8-4...success. 147s Attempting to merge 8-5...success. 147s Attempting to merge 8-6...success. 147s Attempting to merge 9-1...conflict. 147s Switched to branch 'imerge/c-d' 147s Auto-merging conflict.txt 147s CONFLICT (content): Merge conflict in conflict.txt 147s Automatic merge failed; fix conflicts and then commit the result. 147s 147s Original first commit: 147s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 147s Author: Loú User 147s Date: Thu Apr 7 22:13:23 2005 +0000 147s 147s c⇒9 147s 147s Original second commit: 147s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 147s Author: Loú User 147s Date: Thu Apr 7 22:13:24 2005 +0000 147s 147s d⇒1 147s 147s There was a conflict merging commit 9-1, shown above. 147s Please resolve the conflict, commit the result, then type 147s 147s git-imerge continue 147s + grep -q Traceback start.out 147s + grep -q suggest manual merge of 9-1 autofill.out 147s + git-imerge diagram --commits --frontier --html=imerge3.html 147s 0 5 9 147s | | | 147s 0 - ********** - c 147s *........# 147s *........? 147s *........? 147s *........? 147s 5 - *........? 147s 6 - *........? 147s | 147s d 147s 147s 0 5 9 147s | | | 147s 0 - ********** - c 147s *.......|# 147s *.......|? 147s *.......|? 147s *.......|? 147s 5 - *.......|? 147s 6 - *-------+? 147s | 147s d 147s 147s Key: 147s |,-,+ = rectangles forming current merge frontier 147s * = merge done manually 147s . = merge done automatically 147s # = conflict that is currently blocking progress 147s @ = merge was blocked but has been resolved 147s ? = no merge recorded 147s 147s + echo merged version 147s + git add conflict.txt 147s + GIT_EDITOR=cat git commit 147s imerge 'c-d': manual merge 9-1 147s 147s # Conflicts: 147s # conflict.txt 147s # 147s # It looks like you may be committing a merge. 147s # If this is not correct, please run 147s # git update-ref -d MERGE_HEAD 147s # and try again. 147s 147s 147s # Please enter the commit message for your changes. Lines starting 147s # with '#' will be ignored, and an empty message aborts the commit. 147s # 147s # On branch imerge/c-d 147s # All conflicts fixed but you are still merging. 147s # 147s # Changes to be committed: 147s # modified: conflict.txt 147s # modified: d.txt 147s # 147s [imerge/c-d 1c665b0] imerge 'c-d': manual merge 9-1 147s + git-imerge continue --edit 148s Merge has been recorded for merge 9-1. 148s Attempting to merge 9-2...success. 148s Attempting to merge 9-3...success. 148s Attempting to merge 9-4...success. 148s Attempting to merge 9-5...success. 148s Attempting to merge 9-6...success. 148s Merge is complete! 148s + git-imerge diagram --commits --frontier --html=imerge4.html 148s 0 5 9 148s | | | 148s 0 - ********** - c 148s *........* 148s *......... 148s *......... 148s *......... 148s 5 - *......... 148s 6 - *......... 148s | 148s d 148s 148s 0 5 9 148s | | | 148s 0 - ********** - c 148s *........* 148s *........| 148s *........| 148s *........| 148s 5 - *........| 148s 6 - *--------+ 148s | 148s d 148s 148s Key: 148s |,-,+ = rectangles forming current merge frontier 148s * = merge done manually 148s . = merge done automatically 148s # = conflict that is currently blocking progress 148s @ = merge was blocked but has been resolved 148s ? = no merge recorded 148s 148s + git-imerge finish --branch=c-d-full 148s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 148s + local refname=c-d-full 148s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 148s + git rev-parse c-d-full^{tree} 148s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 148s + test_conflict 1-6 148s + local conflict=1-6 148s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s + DESCRIPTION=git-imerge test repository with conflict at 1-6 148s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 148s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s + local description=git-imerge test repository with conflict at 1-6 148s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 148s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s + local description=git-imerge test repository with conflict at 1-6 148s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s hint: Using 'master' as the name for the initial branch. This default branch name 148s hint: is subject to change. To configure the initial branch name to use in all 148s hint: of your new repositories, which will suppress this warning, call: 148s hint: 148s hint: git config --global init.defaultBranch 148s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6/.git/ 148s hint: 148s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 148s hint: 'development'. The just-created branch can be renamed via this command: 148s hint: 148s hint: git branch -m 148s hint: 148s hint: Disable this message with "git config set advice.defaultBranchName false" 148s + echo git-imerge test repository with conflict at 1-6 148s + printf %s\n /*.out /*.css /*.html 148s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6/.git config user.name Loú User 148s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 148s + TIME=1112911993 148s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-6 148s + modify c.txt 0 148s + filename=c.txt 148s + text=0 148s + echo 0 148s + git add c.txt 148s + modify d.txt 0 148s + filename=d.txt 148s + text=0 148s + echo 0 148s + git add d.txt 148s + modify conflict.txt original version 148s + filename=conflict.txt 148s + text=original version 148s + echo original version 148s + git add conflict.txt 148s + commit -m m⇒0 148s + TIME=1112911994 148s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 149s [master (root-commit) d70e04b] m⇒0 149s 3 files changed, 3 insertions(+) 149s create mode 100644 c.txt 149s create mode 100644 conflict.txt 149s create mode 100644 d.txt 149s + git checkout -b c master -- 149s Switched to a new branch 'c' 149s + seq 9 149s + modify c.txt 1 149s + filename=c.txt 149s + text=1 149s + echo 1 149s + git add c.txt 149s + modify conflict.txt c version 149s + filename=conflict.txt 149s + text=c version 149s + echo c version 149s + git add conflict.txt 149s + commit -m c⇒1 149s + TIME=1112911995 149s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 149s [c 2120f40] c⇒1 149s 2 files changed, 2 insertions(+), 2 deletions(-) 149s + modify c.txt 2 149s + filename=c.txt 149s + text=2 149s + echo 2 149s + git add c.txt 149s + commit -m c⇒2 149s + TIME=1112911996 149s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 149s [c 90cc7de] c⇒2 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify c.txt 3 149s + filename=c.txt 149s + text=3 149s + echo 3 149s + git add c.txt 149s + commit -m c⇒3 149s + TIME=1112911997 149s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 149s [c 2046ed2] c⇒3 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify c.txt 4 149s + filename=c.txt 149s + text=4 149s + echo 4 149s + git add c.txt 149s + commit -m c⇒4 149s + TIME=1112911998 149s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 149s [c 8a2cee9] c⇒4 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify c.txt 5 149s + filename=c.txt 149s + text=5 149s + echo 5 149s + git add c.txt 149s + commit -m c⇒5 149s + TIME=1112911999 149s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 149s [c ac16a05] c⇒5 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify c.txt 6 149s + filename=c.txt 149s + text=6 149s + echo 6 149s + git add c.txt 149s + commit -m c⇒6 149s + TIME=1112912000 149s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 149s [c 30dd2ae] c⇒6 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify c.txt 7 149s + filename=c.txt 149s + text=7 149s + echo 7 149s + git add c.txt 149s + commit -m c⇒7 149s + TIME=1112912001 149s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 149s [c 0883eb9] c⇒7 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify c.txt 8 149s + filename=c.txt 149s + text=8 149s + echo 8 149s + git add c.txt 149s + commit -m c⇒8 149s + TIME=1112912002 149s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 149s + modify c.txt 9 149s + filename=c.txt 149s + text=9 149s + echo 9 149s + git add c.txt 149s + commit -m c⇒9 149s + TIME=1112912003 149s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 149s [c f661c06] c⇒8 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + git checkout -b d master -- 149s [c 243e8ed] c⇒9 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s Switched to a new branch 'd' 149s + seq 6 149s + modify d.txt 1 149s + filename=d.txt 149s + text=1 149s + echo 1 149s + git add d.txt 149s + commit -m d⇒1 149s + TIME=1112912004 149s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 149s [d bd5368a] d⇒1 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s [d 93e27e6] d⇒2 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify d.txt 2 149s + filename=d.txt 149s + text=2 149s + echo 2 149s + git add d.txt 149s + commit -m d⇒2 149s + TIME=1112912005 149s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 149s + modify d.txt 3 149s + filename=d.txt 149s + text=3 149s + echo 3 149s + git add d.txt 149s + commit -m d⇒3 149s + TIME=1112912006 149s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 149s + modify d.txt 4 149s + filename=d.txt 149s + text=4 149s + echo 4 149s + git add d.txt 149s [d 133f385] d⇒3 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + commit -m d⇒4 149s + TIME=1112912007 149s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 149s [d 586472a] d⇒4 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + modify d.txt 5 149s + filename=d.txt 149s + text=5 149s + echo 5 149s + git add d.txt 149s [d 9522207] d⇒5 149s 1 file changed, 1 insertion(+), 1 deletion(-) 149s + commit -m d⇒5 149s + TIME=1112912008 149s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 149s + modify d.txt 6 149s + filename=d.txt 149s + text=6 149s + echo 6 149s + git add d.txt 149s + modify conflict.txt d version 149s + filename=conflict.txt 149s + text=d version 149s + echo d version 149s + git add conflict.txt 149s + commit -m d⇒6 149s + TIME=1112912009 149s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 149s [d f7e451a] d⇒6 149s 2 files changed, 2 insertions(+), 2 deletions(-) 149s + git checkout c 149s Switched to branch 'c' 149s + git-imerge init --name=c-d d 149s + git-imerge list 149s * c-d 149s + git-imerge diagram --commits --frontier --html=imerge0.html 150s 0 5 9 150s | | | 150s 0 - ********** - c 150s *????????? 150s *????????? 150s *????????? 150s *????????? 150s 5 - *????????? 150s 6 - *????????? 150s | 150s d 150s 150s 0 5 9 150s | | | 150s 0 - ********** - c 150s *????????? 150s *????????? 150s *????????? 150s *????????? 150s 5 - *????????? 150s 6 - *????????? 150s | 150s d 150s 150s Key: 150s |,-,+ = rectangles forming current merge frontier 150s * = merge done manually 150s . = merge done automatically 150s # = conflict that is currently blocking progress 150s @ = merge was blocked but has been resolved 150s ? = no merge recorded 150s 150s + git-imerge autofill 150s + tee autofill.out 150s Attempting automerge of 9-6...failure. 150s Attempting automerge of 1-1...success. 150s Attempting automerge of 1-4...success. 150s Attempting automerge of 1-6...failure. 150s Attempting automerge of 1-5...success. 150s Attempting automerge of 9-5...success. 150s Autofilling 1-5...success. 150s Autofilling 2-5...success. 150s Autofilling 3-5...success. 150s Autofilling 4-5...success. 150s Autofilling 5-5...success. 150s Autofilling 6-5...success. 150s Autofilling 7-5...success. 150s Autofilling 8-5...success. 150s Autofilling 9-1...success. 150s Autofilling 9-2...success. 150s Autofilling 9-3...success. 150s Autofilling 9-4...success. 150s Autofilling 9-5 (first way)...success. 150s Autofilling 9-5 (second way)...success. 150s The two ways of autofilling 9-5 agree. 150s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 150s Attempting automerge of 9-6...failure. 150s Attempting automerge of 1-6...failure. 150s HEAD is now at 243e8ed c⇒9 150s Conflict; suggest manual merge of 1-6 150s + grep -q Traceback autofill.out 150s + grep -q suggest manual merge of 1-6 autofill.out 150s + git-imerge diagram --commits --frontier --html=imerge1.html 151s 0 5 9 151s | | | 151s 0 - ********** - c 151s *????????. 151s *????????. 151s *????????. 151s *????????. 151s 5 - *......... 151s 6 - *#???????? 151s | 151s d 151s 151s 0 5 9 151s | | | 151s 0 - ********** - c 151s *????????| 151s *????????| 151s *????????| 151s *????????| 151s 5 - *--------+ 151s 6 - *#???????? 151s | 151s d 151s 151s Key: 151s |,-,+ = rectangles forming current merge frontier 151s * = merge done manually 151s . = merge done automatically 151s # = conflict that is currently blocking progress 151s @ = merge was blocked but has been resolved 151s ? = no merge recorded 151s 151s + git-imerge continue --edit 151s Switched to branch 'imerge/c-d' 151s Auto-merging conflict.txt 151s CONFLICT (content): Merge conflict in conflict.txt 151s 151s Original first commit: 151s Automatic merge failed; fix conflicts and then commit the result. 151s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 151s Author: Loú User 151s Date: Thu Apr 7 22:13:15 2005 +0000 151s 151s c⇒1 151s 151s Original second commit: 151s 151s There was a conflict merging commit 1-6, shown above. 151s Please resolve the conflict, commit the result, then type 151s 151s git-imerge continue 151s commit f7e451a6c9656dda15641a9fbc591a602f158692 151s Author: Loú User 151s Date: Thu Apr 7 22:13:29 2005 +0000 151s 151s d⇒6 151s + echo merged version 151s + git add conflict.txt 151s + git-imerge continue --no-edit 152s [imerge/c-d daadef5] imerge 'c-d': manual merge 1-6 152s Merge has been recorded for merge 1-6. 152s Attempting automerge of 9-6...success. 152s Autofilling 2-6...success. 152s Autofilling 3-6...success. 152s Autofilling 4-6...success. 152s Autofilling 5-6...success. 152s Autofilling 6-6...success. 152s Autofilling 7-6...success. 152s Autofilling 8-6...success. 152s Autofilling 9-6...success. 152s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 152s Merge is complete! 152s + git-imerge diagram --commits --frontier --html=imerge2.html 152s 0 5 9 152s | | | 152s 0 - ********** - c 152s *????????. 152s *????????. 152s *????????. 152s *????????. 152s 5 - *......... 152s 6 - **........ 152s | 152s d 152s 152s 0 5 9 152s | | | 152s 0 - ********** - c 152s *????????| 152s *????????| 152s *????????| 152s *????????| 152s 5 - *........| 152s 6 - **-------+ 152s | 152s d 152s 152s Key: 152s |,-,+ = rectangles forming current merge frontier 152s * = merge done manually 152s . = merge done automatically 152s # = conflict that is currently blocking progress 152s @ = merge was blocked but has been resolved 152s ? = no merge recorded 152s 152s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 152s Merge d into c (using imerge) 152s 152s # Please enter the commit message for your changes. Lines starting 152s # with '#' will be ignored, and an empty message aborts the commit. 152s # 152s # Date: Fri Dec 5 19:57:43 2025 +0000 152s # 152s # On branch c-d-merge 152s # Changes to be committed: 152s # modified: conflict.txt 152s # modified: d.txt 152s # 152s [c-d-merge 6521891] Merge d into c (using imerge) 152s Date: Fri Dec 5 19:57:43 2025 +0000 153s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + local refname=c-d-merge 153s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git rev-parse c-d-merge^{tree} 153s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git-imerge simplify --goal=rebase --branch=c-d-rebase 153s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + local refname=c-d-rebase 153s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git rev-parse c-d-rebase^{tree} 153s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 153s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + local refname=c-d-rebase-with-history 153s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git rev-parse c-d-rebase-with-history^{tree} 153s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git-imerge simplify --goal=border --branch=c-d-border 154s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + local refname=c-d-border 154s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + git rev-parse c-d-border^{tree} 154s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 154s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + local refname=c-d-border-with-history 154s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + git rev-parse c-d-border-with-history^{tree} 154s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 155s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 155s + local refname=c-d-border-with-history2 155s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 155s + git rev-parse c-d-border-with-history2^{tree} 155s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 155s + git-imerge remove 156s + git checkout c 156s Switched to branch 'c' 156s + tee start.out 156s + git-imerge start --goal=full --first-parent --name=c-d d 156s Attempting to merge 1-1...success. 156s Attempting to merge 1-2...success. 156s Attempting to merge 1-3...success. 156s Attempting to merge 1-4...success. 156s Attempting to merge 1-5...success. 156s Attempting to merge 1-6...conflict. 156s Attempting to merge 2-1...success. 156s Attempting to merge 2-2...success. 156s Attempting to merge 2-3...success. 156s Attempting to merge 2-4...success. 156s Attempting to merge 2-5...success. 156s Attempting to merge 3-1...success. 156s Attempting to merge 3-2...success. 156s Attempting to merge 3-3...success. 156s Attempting to merge 3-4...success. 156s Attempting to merge 3-5...success. 156s Attempting to merge 4-1...success. 157s Attempting to merge 4-2...success. 157s Attempting to merge 4-3...success. 157s Attempting to merge 4-4...success. 157s Attempting to merge 4-5...success. 157s Attempting to merge 5-1...success. 157s Attempting to merge 5-2...success. 157s Attempting to merge 5-3...success. 157s Attempting to merge 5-4...success. 157s Attempting to merge 5-5...success. 157s Attempting to merge 6-1...success. 157s Attempting to merge 6-2...success. 157s Attempting to merge 6-3...success. 157s Attempting to merge 6-4...success. 157s Attempting to merge 6-5...success. 157s Attempting to merge 7-1...success. 157s Attempting to merge 7-2...success. 157s Attempting to merge 7-3...success. 157s Attempting to merge 7-4...success. 157s Attempting to merge 7-5...success. 157s Attempting to merge 8-1...success. 157s Attempting to merge 8-2...success. 157s Attempting to merge 8-3...success. 157s Attempting to merge 8-4...success. 157s Attempting to merge 8-5...success. 157s Attempting to merge 9-1...success. 157s Attempting to merge 9-2...success. 157s Attempting to merge 9-3...success. 157s Attempting to merge 9-4...success. 157s Attempting to merge 9-5...success. 157s Previous HEAD position was fc402f2 imerge 'c-d': automatic merge 9-5 157s Switched to branch 'imerge/c-d' 157s Auto-merging conflict.txt 157s CONFLICT (content): Merge conflict in conflict.txt 157s Automatic merge failed; fix conflicts and then commit the result. 157s 157s Original first commit: 157s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 157s Author: Loú User 157s Date: Thu Apr 7 22:13:15 2005 +0000 157s 157s c⇒1 157s 157s Original second commit: 157s commit f7e451a6c9656dda15641a9fbc591a602f158692 157s Author: Loú User 157s Date: Thu Apr 7 22:13:29 2005 +0000 157s 157s d⇒6 157s 157s There was a conflict merging commit 1-6, shown above. 157s Please resolve the conflict, commit the result, then type 157s 157s git-imerge continue 157s + grep -q Traceback start.out 157s + grep -q suggest manual merge of 1-6 autofill.out 157s + git-imerge diagram --commits --frontier --html=imerge3.html 158s 0 5 9 158s | | | 158s 0 - ********** - c 158s *......... 158s *......... 158s *......... 158s *......... 158s 5 - *......... 158s 6 - *#???????? 158s | 158s d 158s 158s 0 5 9 158s | | | 158s 0 - ********** - c 158s *........| 158s *........| 158s *........| 158s *........| 158s 5 - *--------+ 158s 6 - *#???????? 158s | 158s d 158s 158s Key: 158s |,-,+ = rectangles forming current merge frontier 158s * = merge done manually 158s . = merge done automatically 158s # = conflict that is currently blocking progress 158s @ = merge was blocked but has been resolved 158s ? = no merge recorded 158s 158s + echo merged version 158s + git add conflict.txt 158s + GIT_EDITOR=cat git commit 158s imerge 'c-d': manual merge 1-6 158s 158s # Conflicts: 158s # conflict.txt 158s # 158s # It looks like you may be committing a merge. 158s # If this is not correct, please run 158s # git update-ref -d MERGE_HEAD 158s # and try again. 158s 158s 158s # Please enter the commit message for your changes. Lines starting 158s # with '#' will be ignored, and an empty message aborts the commit. 158s # 158s # On branch imerge/c-d 158s # All conflicts fixed but you are still merging. 158s # 158s # Changes to be committed: 158s # modified: conflict.txt 158s # modified: d.txt 158s # 158s [imerge/c-d 5c5bc12] imerge 'c-d': manual merge 1-6 158s + git-imerge continue --edit 158s Merge has been recorded for merge 1-6. 158s Attempting to merge 2-6...success. 158s Attempting to merge 3-6...success. 158s Attempting to merge 4-6...success. 158s Attempting to merge 5-6...success. 158s Attempting to merge 6-6...success. 158s Attempting to merge 7-6...success. 158s Attempting to merge 8-6...success. 158s Attempting to merge 9-6...success. 158s Merge is complete! 158s + git-imerge diagram --commits --frontier --html=imerge4.html 159s 0 5 9 159s | | | 159s 0 - ********** - c 159s *......... 159s *......... 159s *......... 159s *......... 159s 5 - *......... 159s 6 - **........ 159s | 159s d 159s 159s 0 5 9 159s | | | 159s 0 - ********** - c 159s *........| 159s *........| 159s *........| 159s *........| 159s 5 - *........| 159s 6 - **-------+ 159s | 159s d 159s 159s Key: 159s |,-,+ = rectangles forming current merge frontier 159s * = merge done manually 159s . = merge done automatically 159s # = conflict that is currently blocking progress 159s @ = merge was blocked but has been resolved 159s ? = no merge recorded 159s 159s + git-imerge finish --branch=c-d-full 159s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 159s + local refname=c-d-full 159s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 159s + git rev-parse c-d-full^{tree} 159s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 159s + test_conflict 9-6 159s + local conflict=9-6 159s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s + DESCRIPTION=git-imerge test repository with conflict at 9-6 159s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 159s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s + local description=git-imerge test repository with conflict at 9-6 159s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 159s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s + local description=git-imerge test repository with conflict at 9-6 159s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6/.git/ 159s hint: Using 'master' as the name for the initial branch. This default branch name 159s hint: is subject to change. To configure the initial branch name to use in all 159s hint: of your new repositories, which will suppress this warning, call: 159s hint: 159s hint: git config --global init.defaultBranch 159s hint: 159s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 159s hint: 'development'. The just-created branch can be renamed via this command: 159s hint: 159s hint: git branch -m 159s hint: 159s hint: Disable this message with "git config set advice.defaultBranchName false" 159s + echo git-imerge test repository with conflict at 9-6 159s + printf %s\n /*.out /*.css /*.html 159s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6/.git config user.name Loú User 159s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 159s + TIME=1112911993 159s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-6 159s + modify c.txt 0 159s + filename=c.txt 159s + text=0 159s + echo 0 159s + git add c.txt 159s + modify d.txt 0 159s + filename=d.txt 159s + text=0 159s + echo 0 159s + git add d.txt 159s + modify conflict.txt original version 159s + filename=conflict.txt 159s + text=original version 159s + echo original version 159s + git add conflict.txt 159s + commit -m m⇒0 159s + TIME=1112911994 159s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 159s [master (root-commit) d70e04b] m⇒0 159s 3 files changed, 3 insertions(+) 159s create mode 100644 c.txt 159s create mode 100644 conflict.txt 159s create mode 100644 d.txt 159s + git checkout -b c master -- 159s Switched to a new branch 'c' 159s + seq 9 159s + modify c.txt 1 159s + filename=c.txt 159s + text=1 159s + echo 1 159s + git add c.txt 159s + commit -m c⇒1 159s + TIME=1112911995 159s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 159s [c 89e2141] c⇒1 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 2 159s + filename=c.txt 159s + text=2 159s + echo 2 159s + git add c.txt 159s + commit -m c⇒2 159s + TIME=1112911996 159s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 159s [c 7c431f2] c⇒2 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 3 159s + filename=c.txt 159s + text=3 159s + echo 3 159s + git add c.txt 159s + commit -m c⇒3 159s + TIME=1112911997 159s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 159s [c f02ab24] c⇒3 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 4 159s + filename=c.txt 159s + text=4 159s + echo 4 159s + git add c.txt 159s + commit -m c⇒4 159s + TIME=1112911998 159s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 159s [c ed9122f] c⇒4 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 5 159s + filename=c.txt 159s + text=5 159s + echo 5 159s + git add c.txt 159s + commit -m c⇒5 159s + TIME=1112911999 159s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 159s [c 1d3bf09] c⇒5 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 6 159s + filename=c.txt 159s + text=6 159s + echo 6 159s + git add c.txt 159s + commit -m c⇒6 159s + TIME=1112912000 159s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 159s [c f999ecd] c⇒6 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 7 159s + filename=c.txt 159s + text=7 159s + echo 7 159s + git add c.txt 159s + commit -m c⇒7 159s + TIME=1112912001 159s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 159s [c 7050a8a] c⇒7 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 8 159s + filename=c.txt 159s + text=8 159s + echo 8 159s + git add c.txt 159s + commit -m c⇒8 159s + TIME=1112912002 159s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 159s [c 9732e77] c⇒8 159s 1 file changed, 1 insertion(+), 1 deletion(-) 159s + modify c.txt 9 159s + filename=c.txt 159s + text=9 159s + echo 9 159s + git add c.txt 159s + modify conflict.txt c version 159s + filename=conflict.txt 159s + text=c version 159s + echo c version 159s + git add conflict.txt 159s + commit -m c⇒9 159s + TIME=1112912003 159s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 160s [c 73a5eed] c⇒9 160s 2 files changed, 2 insertions(+), 2 deletions(-) 160s + git checkout -b d master -- 160s Switched to a new branch 'd' 160s + seq 6 160s + modify d.txt 1 160s + filename=d.txt 160s + text=1 160s + echo 1 160s + git add d.txt 160s + commit -m d⇒1 160s + TIME=1112912004 160s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 160s [d bd5368a] d⇒1 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + modify d.txt 2 160s + filename=d.txt 160s + text=2 160s + echo 2 160s + git add d.txt 160s + commit -m d⇒2 160s + TIME=1112912005 160s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 160s [d 93e27e6] d⇒2 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + modify d.txt 3 160s + filename=d.txt 160s + text=3 160s + echo 3 160s + git add d.txt 160s + commit -m d⇒3 160s + TIME=1112912006 160s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 160s [d 133f385] d⇒3 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + modify d.txt 4 160s + filename=d.txt 160s + text=4 160s + echo 4 160s + git add d.txt 160s + commit -m d⇒4 160s + TIME=1112912007 160s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 160s [d 586472a] d⇒4 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + modify d.txt 5 160s + filename=d.txt 160s + text=5 160s + echo 5 160s + git add d.txt 160s + commit -m d⇒5 160s + TIME=1112912008 160s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 160s [d 9522207] d⇒5 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + modify d.txt 6 160s + filename=d.txt 160s + text=6 160s + echo 6 160s + git add d.txt 160s + modify conflict.txt d version 160s + filename=conflict.txt 160s + text=d version 160s + echo d version 160s + git add conflict.txt 160s + commit -m d⇒6 160s + TIME=1112912009 160s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 160s [d f7e451a] d⇒6 160s 2 files changed, 2 insertions(+), 2 deletions(-) 160s + git checkout c 160s Switched to branch 'c' 160s + git-imerge init --name=c-d d 160s + git-imerge list 160s * c-d 160s + git-imerge diagram --commits --frontier --html=imerge0.html 160s 0 5 9 160s | | | 160s 0 - ********** - c 160s *????????? 160s *????????? 160s *????????? 160s *????????? 160s 5 - *????????? 160s 6 - *????????? 160s | 160s d 160s 160s 0 5 9 160s | | | 160s 0 - ********** - c 160s *????????? 160s *????????? 160s *????????? 160s *????????? 160s 5 - *????????? 160s 6 - *????????? 160s | 160s d 160s 160s Key: 160s |,-,+ = rectangles forming current merge frontier 160s * = merge done manually 160s . = merge done automatically 160s # = conflict that is currently blocking progress 160s @ = merge was blocked but has been resolved 160s ? = no merge recorded 160s 160s + git-imerge autofill 160s + tee autofill.out 161s Attempting automerge of 9-6...failure. 161s Attempting automerge of 1-1...success. 161s Attempting automerge of 1-4...success. 161s Attempting automerge of 1-6...success. 161s Attempting automerge of 9-6...failure. 161s Attempting automerge of 5-6...success. 161s Attempting automerge of 7-6...success. 161s Attempting automerge of 8-6...success. 161s Attempting automerge of 9-1...success. 161s Attempting automerge of 9-4...success. 161s Attempting automerge of 9-5...success. 161s Autofilling 1-6...success. 161s Autofilling 2-6...success. 161s Autofilling 3-6...success. 161s Autofilling 4-6...success. 161s Autofilling 5-6...success. 161s Autofilling 6-6...success. 161s Autofilling 7-6...success. 161s Autofilling 8-1...success. 161s Autofilling 8-2...success. 161s Autofilling 8-3...success. 161s Autofilling 8-4...success. 161s Autofilling 8-5...success. 161s Autofilling 8-6 (first way)...success. 161s Autofilling 8-6 (second way)...success. 161s The two ways of autofilling 8-6 agree. 161s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 161s Autofilling 9-1...success. 161s Autofilling 9-2...success. 161s Autofilling 9-3...success. 161s Autofilling 9-4...success. 161s Autofilling 9-5...success. 161s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 162s Attempting automerge of 9-6...failure. 162s Attempting automerge of 9-6...failure. 162s HEAD is now at 73a5eed c⇒9 162s Conflict; suggest manual merge of 9-6 162s + grep -q Traceback autofill.out 162s + grep -q suggest manual merge of 9-6 autofill.out 162s + git-imerge diagram --commits --frontier --html=imerge1.html 162s 0 5 9 162s | | | 162s 0 - ********** - c 162s *???????.. 162s *???????.. 162s *???????.. 162s *???????.. 162s 5 - *???????.. 162s 6 - *........# 162s | 162s d 162s 162s 0 5 9 162s | | | 162s 0 - ********** - c 162s *???????.| 162s *???????.| 162s *???????.| 162s *???????.| 162s 5 - *???????.+ 162s 6 - *-------+# 162s | 162s d 162s 162s Key: 162s |,-,+ = rectangles forming current merge frontier 162s * = merge done manually 162s . = merge done automatically 162s # = conflict that is currently blocking progress 162s @ = merge was blocked but has been resolved 162s ? = no merge recorded 162s 162s + git-imerge continue --edit 162s Switched to branch 'imerge/c-d' 162s Auto-merging conflict.txt 162s CONFLICT (content): Merge conflict in conflict.txt 162s Automatic merge failed; fix conflicts and then commit the result. 162s 162s Original first commit: 162s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 162s Author: Loú User 162s Date: Thu Apr 7 22:13:23 2005 +0000 162s 162s c⇒9 162s 162s Original second commit: 162s 162s There was a conflict merging commit 9-6, shown above. 162s Please resolve the conflict, commit the result, then type 162s 162s git-imerge continue 162s commit f7e451a6c9656dda15641a9fbc591a602f158692 162s Author: Loú User 162s Date: Thu Apr 7 22:13:29 2005 +0000 162s 162s d⇒6 162s + echo merged version 162s + git add conflict.txt 162s + git-imerge continue --no-edit 162s [imerge/c-d 8d3e1a4] imerge 'c-d': manual merge 9-6 162s Merge has been recorded for merge 9-6. 162s Merge is complete! 162s + git-imerge diagram --commits --frontier --html=imerge2.html 162s 0 5 9 162s | | | 162s 0 - ********** - c 162s *???????.. 162s *???????.. 162s *???????.. 162s *???????.. 162s 5 - *???????.. 162s 6 - *........* 162s | 162s d 162s 162s 0 5 9 162s | | | 162s 0 - ********** - c 162s *???????.| 162s *???????.| 162s *???????.| 162s *???????.| 162s 5 - *???????.| 162s 6 - *--------* 162s | 162s d 162s 162s Key: 162s |,-,+ = rectangles forming current merge frontier 162s * = merge done manually 162s . = merge done automatically 162s # = conflict that is currently blocking progress 162s @ = merge was blocked but has been resolved 162s ? = no merge recorded 162s 162s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 163s Merge d into c (using imerge) 163s 163s # Please enter the commit message for your changes. Lines starting 163s # with '#' will be ignored, and an empty message aborts the commit. 163s # 163s # Date: Fri Dec 5 19:57:53 2025 +0000 163s # 163s # On branch c-d-merge 163s # Changes to be committed: 163s # modified: conflict.txt 163s # modified: d.txt 163s # 163s [c-d-merge b2ab4c7] Merge d into c (using imerge) 163s Date: Fri Dec 5 19:57:53 2025 +0000 163s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + local refname=c-d-merge 163s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + git rev-parse c-d-merge^{tree} 163s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + git-imerge simplify --goal=rebase --branch=c-d-rebase 163s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + local refname=c-d-rebase 163s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + git rev-parse c-d-rebase^{tree} 163s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 163s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + local refname=c-d-rebase-with-history 163s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + git rev-parse c-d-rebase-with-history^{tree} 163s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 163s + git-imerge simplify --goal=border --branch=c-d-border 164s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 164s + local refname=c-d-border 164s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 164s + git rev-parse c-d-border^{tree} 164s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 164s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 164s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 164s + local refname=c-d-border-with-history 164s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 164s + git rev-parse c-d-border-with-history^{tree} 164s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 164s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 165s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 165s + local refname=c-d-border-with-history2 165s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 165s + git rev-parse c-d-border-with-history2^{tree} 165s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 165s + git-imerge remove 165s + git checkout c 165s Switched to branch 'c' 166s + git-imerge start --goal=full --first-parent --name=c-d d 166s + tee start.out 166s Attempting to merge 1-1...success. 166s Attempting to merge 1-2...success. 166s Attempting to merge 1-3...success. 166s Attempting to merge 1-4...success. 166s Attempting to merge 1-5...success. 166s Attempting to merge 1-6...success. 166s Attempting to merge 2-1...success. 166s Attempting to merge 2-2...success. 166s Attempting to merge 2-3...success. 166s Attempting to merge 2-4...success. 166s Attempting to merge 2-5...success. 166s Attempting to merge 2-6...success. 166s Attempting to merge 3-1...success. 166s Attempting to merge 3-2...success. 166s Attempting to merge 3-3...success. 167s Attempting to merge 3-4...success. 167s Attempting to merge 3-5...success. 167s Attempting to merge 3-6...success. 167s Attempting to merge 4-1...success. 167s Attempting to merge 4-2...success. 167s Attempting to merge 4-3...success. 167s Attempting to merge 4-4...success. 167s Attempting to merge 4-5...success. 167s Attempting to merge 4-6...success. 167s Attempting to merge 5-1...success. 167s Attempting to merge 5-2...success. 167s Attempting to merge 5-3...success. 167s Attempting to merge 5-4...success. 167s Attempting to merge 5-5...success. 167s Attempting to merge 5-6...success. 167s Attempting to merge 6-1...success. 167s Attempting to merge 6-2...success. 168s Attempting to merge 6-3...success. 168s Attempting to merge 6-4...success. 168s Attempting to merge 6-5...success. 168s Attempting to merge 6-6...success. 168s Attempting to merge 7-1...success. 168s Attempting to merge 7-2...success. 168s Attempting to merge 7-3...success. 168s Attempting to merge 7-4...success. 168s Attempting to merge 7-5...success. 168s Attempting to merge 7-6...success. 168s Attempting to merge 8-1...success. 168s Attempting to merge 8-2...success. 168s Attempting to merge 8-3...success. 168s Attempting to merge 8-4...success. 168s Attempting to merge 8-5...success. 168s Attempting to merge 8-6...success. 169s Attempting to merge 9-1...success. 169s Attempting to merge 9-2...success. 169s Attempting to merge 9-3...success. 169s Attempting to merge 9-4...success. 169s Attempting to merge 9-5...success. 169s Attempting to merge 9-6...conflict. 169s Switched to branch 'imerge/c-d' 169s Auto-merging conflict.txt 169s CONFLICT (content): Merge conflict in conflict.txt 169s Automatic merge failed; fix conflicts and then commit the result. 169s 169s Original first commit: 169s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 169s Author: Loú User 169s Date: Thu Apr 7 22:13:23 2005 +0000 169s 169s c⇒9 169s 169s Original second commit: 169s commit f7e451a6c9656dda15641a9fbc591a602f158692 169s Author: Loú User 169s Date: Thu Apr 7 22:13:29 2005 +0000 169s 169s d⇒6 169s 169s There was a conflict merging commit 9-6, shown above. 169s Please resolve the conflict, commit the result, then type 169s 169s git-imerge continue 169s + grep -q Traceback start.out 169s + grep -q suggest manual merge of 9-6 autofill.out 169s + git-imerge diagram --commits --frontier --html=imerge3.html 170s 0 5 9 170s | | | 170s 0 - ********** - c 170s *......... 170s *......... 170s *......... 170s *......... 170s 5 - *......... 170s 6 - *........# 170s | 170s d 170s 170s 0 5 9 170s | | | 170s 0 - ********** - c 170s *........| 170s *........| 170s *........| 170s *........| 170s 5 - *........+ 170s 6 - *-------+# 170s | 170s d 170s 170s Key: 170s |,-,+ = rectangles forming current merge frontier 170s * = merge done manually 170s . = merge done automatically 170s # = conflict that is currently blocking progress 170s @ = merge was blocked but has been resolved 170s ? = no merge recorded 170s 170s + echo merged version 170s + git add conflict.txt 170s + GIT_EDITOR=cat git commit 170s imerge 'c-d': manual merge 9-6 170s 170s # Conflicts: 170s # conflict.txt 170s # 170s # It looks like you may be committing a merge. 170s # If this is not correct, please run 170s # git update-ref -d MERGE_HEAD 170s # and try again. 170s 170s 170s # Please enter the commit message for your changes. Lines starting 170s # with '#' will be ignored, and an empty message aborts the commit. 170s # 170s # On branch imerge/c-d 170s # All conflicts fixed but you are still merging. 170s # 170s # Changes to be committed: 170s # modified: conflict.txt 170s # modified: d.txt 170s # 170s [imerge/c-d 8a77799] imerge 'c-d': manual merge 9-6 170s + git-imerge continue --edit 170s Merge has been recorded for merge 9-6. 170s Merge is complete! 170s + git-imerge diagram --commits --frontier --html=imerge4.html 170s 0 5 9 170s | | | 170s 0 - ********** - c 170s *......... 170s *......... 170s *......... 170s *......... 170s 5 - *......... 170s 6 - *........* 170s | 170s d 170s 170s 0 5 9 170s | | | 170s 0 - ********** - c 170s *........| 170s *........| 170s *........| 170s *........| 170s 5 - *........| 170s 6 - *--------* 170s | 170s d 170s 170s Key: 170s |,-,+ = rectangles forming current merge frontier 170s * = merge done manually 170s . = merge done automatically 170s # = conflict that is currently blocking progress 170s @ = merge was blocked but has been resolved 170s ? = no merge recorded 170s 170s + git-imerge finish --branch=c-d-full 170s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 170s + local refname=c-d-full 170s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 170s + git rev-parse c-d-full^{tree} 170s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 170s + test_conflict 1-2 170s + local conflict=1-2 170s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s + DESCRIPTION=git-imerge test repository with conflict at 1-2 170s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 170s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s + local description=git-imerge test repository with conflict at 1-2 170s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 170s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s + local description=git-imerge test repository with conflict at 1-2 170s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s hint: Using 'master' as the name for the initial branch. This default branch name 170s hint: is subject to change. To configure the initial branch name to use in all 170s hint: of your new repositories, which will suppress this warning, call: 170s hint: 170s hint: git config --global init.defaultBranch 170s hint: 170s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 170s hint: 'development'. The just-created branch can be renamed via this command: 170s hint: 170s hint: git branch -m 170s hint: 170s hint: Disable this message with "git config set advice.defaultBranchName false" 170s + echo git-imerge test repository with conflict at 1-2 170s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2/.git/ 170s + printf %s\n /*.out /*.css /*.html 170s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2/.git config user.name Loú User 170s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 170s + TIME=1112911993 170s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-1-2 170s + modify c.txt 0 170s + filename=c.txt 170s + text=0 170s + echo 0 170s + git add c.txt 170s + modify d.txt 0 170s + filename=d.txt 170s + text=0 170s + echo 0 170s + git add d.txt 170s + modify conflict.txt original version 170s + filename=conflict.txt 170s + text=original version 170s + echo original version 170s + git add conflict.txt 170s + commit -m m⇒0 170s + TIME=1112911994 170s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 170s [master (root-commit) d70e04b] m⇒0 170s 3 files changed, 3 insertions(+) 170s create mode 100644 c.txt 170s create mode 100644 conflict.txt 170s create mode 100644 d.txt 170s + git checkout -b c master -- 170s Switched to a new branch 'c' 170s + seq 9 170s + modify c.txt 1 170s + filename=c.txt 170s + text=1 170s + echo 1 170s + git add c.txt 170s + modify conflict.txt c version 170s + filename=conflict.txt 170s + text=c version 170s + echo c version 170s + git add conflict.txt 170s + commit -m c⇒1 170s + TIME=1112911995 170s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 170s [c 2120f40] c⇒1 170s 2 files changed, 2 insertions(+), 2 deletions(-) 170s + modify c.txt 2 170s + filename=c.txt 170s + text=2 170s + echo 2 170s + git add c.txt 170s + commit -m c⇒2 170s + TIME=1112911996 170s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 170s [c 90cc7de] c⇒2 170s 1 file changed, 1 insertion(+), 1 deletion(-) 170s + modify c.txt 3 170s + filename=c.txt 170s + text=3 170s + echo 3 170s + git add c.txt 170s + commit -m c⇒3 170s + TIME=1112911997 170s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 170s + modify c.txt 4 170s + filename=c.txt 170s + text=4 170s + echo 4 170s + git add c.txt 170s [c 2046ed2] c⇒3 170s 1 file changed, 1 insertion(+), 1 deletion(-) 170s + commit -m c⇒4 170s + TIME=1112911998 170s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 170s [c 8a2cee9] c⇒4 170s 1 file changed, 1 insertion(+), 1 deletion(-) 170s + modify c.txt 5 170s + filename=c.txt 170s + text=5 170s + echo 5 170s + git add c.txt 170s + commit -m c⇒5 170s + TIME=1112911999 170s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 170s [c ac16a05] c⇒5 170s 1 file changed, 1 insertion(+), 1 deletion(-) 170s + modify c.txt 6 170s + filename=c.txt 170s + text=6 170s + echo 6 170s + git add c.txt 170s + commit -m c⇒6 170s + TIME=1112912000 170s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 170s [c 30dd2ae] c⇒6 170s 1 file changed, 1 insertion(+), 1 deletion(-) 170s + modify c.txt 7 170s + filename=c.txt 170s + text=7 170s + echo 7 170s + git add c.txt 170s + commit -m c⇒7 170s + TIME=1112912001 170s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 170s [c 0883eb9] c⇒7 170s 1 file changed, 1 insertion(+), 1 deletion(-) 170s + modify c.txt 8 170s + filename=c.txt 170s + text=8 170s + echo 8 170s + git add c.txt 170s + commit -m c⇒8 170s + TIME=1112912002 170s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 171s [c f661c06] c⇒8 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify c.txt 9 171s + filename=c.txt 171s + text=9 171s + echo 9 171s + git add c.txt 171s + commit -m c⇒9 171s + TIME=1112912003 171s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 171s [c 243e8ed] c⇒9 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + git checkout -b d master -- 171s Switched to a new branch 'd' 171s + seq 6 171s + modify d.txt 1 171s + filename=d.txt 171s + text=1 171s + echo 1 171s + git add d.txt 171s + commit -m d⇒1 171s + TIME=1112912004 171s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 171s [d bd5368a] d⇒1 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify d.txt 2 171s + filename=d.txt 171s + text=2 171s + echo 2 171s + git add d.txt 171s + modify conflict.txt d version 171s + filename=conflict.txt 171s + text=d version 171s + echo d version 171s + git add conflict.txt 171s + commit -m d⇒2 171s + TIME=1112912005 171s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 171s [d 69efde8] d⇒2 171s 2 files changed, 2 insertions(+), 2 deletions(-) 171s + modify d.txt 3 171s + filename=d.txt 171s + text=3 171s + echo 3 171s + git add d.txt 171s + commit -m d⇒3 171s + TIME=1112912006 171s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 171s [d 3169557] d⇒3 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify d.txt 4 171s + filename=d.txt 171s + text=4 171s + echo 4 171s + git add d.txt 171s + commit -m d⇒4 171s + TIME=1112912007 171s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 171s [d 86c8052] d⇒4 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify d.txt 5 171s + filename=d.txt 171s + text=5 171s + echo 5 171s + git add d.txt 171s + commit -m d⇒5 171s + TIME=1112912008 171s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 171s [d 1700773] d⇒5 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + modify d.txt 6 171s + filename=d.txt 171s + text=6 171s + echo 6 171s + git add d.txt 171s + commit -m d⇒6 171s + TIME=1112912009 171s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 171s [d df2e493] d⇒6 171s 1 file changed, 1 insertion(+), 1 deletion(-) 171s + git checkout c 171s Switched to branch 'c' 171s + git-imerge init --name=c-d d 171s + git-imerge list 171s * c-d 171s + git-imerge diagram --commits --frontier --html=imerge0.html 172s 0 5 9 172s | | | 172s 0 - ********** - c 172s *????????? 172s *????????? 172s *????????? 172s *????????? 172s 5 - *????????? 172s 6 - *????????? 172s | 172s d 172s 172s 0 5 9 172s | | | 172s 0 - ********** - c 172s *????????? 172s *????????? 172s *????????? 172s *????????? 172s 5 - *????????? 172s 6 - *????????? 172s | 172s d 172s 172s Key: 172s |,-,+ = rectangles forming current merge frontier 172s * = merge done manually 172s . = merge done automatically 172s # = conflict that is currently blocking progress 172s @ = merge was blocked but has been resolved 172s ? = no merge recorded 172s 172s + git-imerge autofill 172s + tee autofill.out 172s Attempting automerge of 9-6...failure. 172s Attempting automerge of 1-1...success. 172s Attempting automerge of 1-4...failure. 172s Attempting automerge of 1-3...failure. 172s Attempting automerge of 1-2...failure. 172s Attempting automerge of 9-1...success. 172s Autofilling 1-1...success. 172s Autofilling 2-1...success. 172s Autofilling 3-1...success. 172s Autofilling 4-1...success. 172s Autofilling 5-1...success. 172s Autofilling 6-1...success. 172s Autofilling 7-1...success. 172s Autofilling 8-1...success. 173s Autofilling 9-1...success. 173s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 173s Attempting automerge of 9-6...failure. 173s Attempting automerge of 1-2...failure. 173s HEAD is now at 243e8ed c⇒9 173s Conflict; suggest manual merge of 1-2 173s + grep -q Traceback autofill.out 173s + grep -q suggest manual merge of 1-2 autofill.out 173s + git-imerge diagram --commits --frontier --html=imerge1.html 174s 0 5 9 174s | | | 174s 0 - ********** - c 174s *......... 174s *#???????? 174s *????????? 174s *????????? 174s 5 - *????????? 174s 6 - *????????? 174s | 174s d 174s 174s 0 5 9 174s | | | 174s 0 - ********** - c 174s *--------+ 174s *#???????? 174s *????????? 174s *????????? 174s 5 - *????????? 174s 6 - *????????? 174s | 174s d 174s 174s Key: 174s |,-,+ = rectangles forming current merge frontier 174s * = merge done manually 174s . = merge done automatically 174s # = conflict that is currently blocking progress 174s @ = merge was blocked but has been resolved 174s ? = no merge recorded 174s 174s + git-imerge continue --edit 174s Switched to branch 'imerge/c-d' 174s Auto-merging conflict.txt 174s CONFLICT (content): Merge conflict in conflict.txt 174s Automatic merge failed; fix conflicts and then commit the result. 174s 174s Original first commit: 174s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 174s Author: Loú User 174s Date: Thu Apr 7 22:13:15 2005 +0000 174s 174s c⇒1 174s 174s Original second commit: 174s commit 69efde8f66d581a765a3909ffacb9f895f95c345 174s Author: Loú User 174s Date: Thu Apr 7 22:13:25 2005 +0000 174s 174s d⇒2 174s 174s There was a conflict merging commit 1-2, shown above. 174s Please resolve the conflict, commit the result, then type 174s 174s git-imerge continue 174s + echo merged version 174s + git add conflict.txt 174s + git-imerge continue --no-edit 175s [imerge/c-d 7458003] imerge 'c-d': manual merge 1-2 175s Merge has been recorded for merge 1-2. 175s Attempting automerge of 1-6...success. 175s Autofilling 1-3...success. 175s Autofilling 1-4...success. 175s Autofilling 1-5...success. 175s Autofilling 1-6...success. 175s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 175s Attempting automerge of 9-6...success. 175s Autofilling 2-6...success. 175s Autofilling 3-6...success. 175s Autofilling 4-6...success. 175s Autofilling 5-6...success. 175s Autofilling 6-6...success. 175s Autofilling 7-6...success. 175s Autofilling 8-6...success. 175s Autofilling 9-2...success. 175s Autofilling 9-3...success. 175s Autofilling 9-4...success. 175s Autofilling 9-5...success. 175s Autofilling 9-6 (first way)...success. 175s Autofilling 9-6 (second way)...success. 175s The two ways of autofilling 9-6 agree. 175s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 175s Merge is complete! 176s + git-imerge diagram --commits --frontier --html=imerge2.html 176s 0 5 9 176s | | | 176s 0 - ********** - c 176s *......... 176s **???????. 176s *.???????. 176s *.???????. 176s 5 - *.???????. 176s 6 - *......... 176s | 176s d 176s 176s 0 5 9 176s | | | 176s 0 - ********** - c 176s *........| 176s **???????| 176s *.???????| 176s *.???????| 176s 5 - *.???????| 176s 6 - *--------+ 176s | 176s d 176s 176s Key: 176s |,-,+ = rectangles forming current merge frontier 176s * = merge done manually 176s . = merge done automatically 176s # = conflict that is currently blocking progress 176s @ = merge was blocked but has been resolved 176s ? = no merge recorded 176s 176s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 176s Merge d into c (using imerge) 176s 176s # Please enter the commit message for your changes. Lines starting 176s # with '#' will be ignored, and an empty message aborts the commit. 176s # 176s # Date: Fri Dec 5 19:58:06 2025 +0000 176s # 176s # On branch c-d-merge 176s # Changes to be committed: 176s # modified: conflict.txt 176s # modified: d.txt 176s # 176s [c-d-merge 9708872] Merge d into c (using imerge) 176s Date: Fri Dec 5 19:58:06 2025 +0000 176s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + local refname=c-d-merge 176s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git rev-parse c-d-merge^{tree} 176s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git-imerge simplify --goal=rebase --branch=c-d-rebase 176s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + local refname=c-d-rebase 176s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git rev-parse c-d-rebase^{tree} 176s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 176s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 177s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + local refname=c-d-rebase-with-history 177s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git rev-parse c-d-rebase-with-history^{tree} 177s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git-imerge simplify --goal=border --branch=c-d-border 177s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + local refname=c-d-border 177s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git rev-parse c-d-border^{tree} 177s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 177s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 178s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 178s + local refname=c-d-border-with-history 178s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 178s + git rev-parse c-d-border-with-history^{tree} 178s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 178s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 178s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 178s + local refname=c-d-border-with-history2 178s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 178s + git rev-parse c-d-border-with-history2^{tree} 178s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 178s + git-imerge remove 178s + git checkout c 178s Switched to branch 'c' 178s + + git-imerge start --goal=full --first-parent --name=c-d d 178s tee start.out 178s Attempting to merge 1-1...success. 178s Attempting to merge 1-2...conflict. 178s Attempting to merge 2-1...success. 179s Attempting to merge 3-1...success. 179s Attempting to merge 4-1...success. 179s Attempting to merge 5-1...success. 179s Attempting to merge 6-1...success. 179s Attempting to merge 7-1...success. 179s Attempting to merge 8-1...success. 179s Attempting to merge 9-1...success. 179s Previous HEAD position was 35e8f6e imerge 'c-d': automatic merge 9-1 179s Switched to branch 'imerge/c-d' 179s Auto-merging conflict.txt 179s CONFLICT (content): Merge conflict in conflict.txt 179s Automatic merge failed; fix conflicts and then commit the result. 179s 179s Original first commit: 179s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 179s Author: Loú User 179s Date: Thu Apr 7 22:13:15 2005 +0000 179s 179s c⇒1 179s 179s Original second commit: 179s commit 69efde8f66d581a765a3909ffacb9f895f95c345 179s Author: Loú User 179s Date: Thu Apr 7 22:13:25 2005 +0000 179s 179s d⇒2 179s 179s There was a conflict merging commit 1-2, shown above. 179s Please resolve the conflict, commit the result, then type 179s 179s git-imerge continue 179s + grep -q Traceback start.out 179s + grep -q suggest manual merge of 1-2 autofill.out 179s + git-imerge diagram --commits --frontier --html=imerge3.html 180s 0 5 9 180s | | | 180s 0 - ********** - c 180s *......... 180s *#???????? 180s *????????? 180s *????????? 180s 5 - *????????? 180s 6 - *????????? 180s | 180s d 180s 180s 0 5 9 180s | | | 180s 0 - ********** - c 180s *--------+ 180s *#???????? 180s *????????? 180s *????????? 180s 5 - *????????? 180s 6 - *????????? 180s | 180s d 180s 180s Key: 180s |,-,+ = rectangles forming current merge frontier 180s * = merge done manually 180s . = merge done automatically 180s # = conflict that is currently blocking progress 180s @ = merge was blocked but has been resolved 180s ? = no merge recorded 180s 180s + echo merged version 180s + git add conflict.txt 180s + GIT_EDITOR=cat git commit 180s imerge 'c-d': manual merge 1-2 180s 180s # Conflicts: 180s # conflict.txt 180s # 180s # It looks like you may be committing a merge. 180s # If this is not correct, please run 180s # git update-ref -d MERGE_HEAD 180s # and try again. 180s 180s 180s # Please enter the commit message for your changes. Lines starting 180s # with '#' will be ignored, and an empty message aborts the commit. 180s # 180s # On branch imerge/c-d 180s # All conflicts fixed but you are still merging. 180s # 180s # Changes to be committed: 180s # modified: conflict.txt 180s # modified: d.txt 180s # 180s + git-imerge continue --edit 180s [imerge/c-d 1a7d20a] imerge 'c-d': manual merge 1-2 180s Merge has been recorded for merge 1-2. 180s Attempting to merge 1-3...success. 180s Attempting to merge 1-4...success. 180s Attempting to merge 1-5...success. 180s Attempting to merge 1-6...success. 180s Attempting to merge 2-2...success. 180s Attempting to merge 2-3...success. 180s Attempting to merge 2-4...success. 180s Attempting to merge 2-5...success. 180s Attempting to merge 2-6...success. 180s Attempting to merge 3-2...success. 180s Attempting to merge 3-3...success. 180s Attempting to merge 3-4...success. 180s Attempting to merge 3-5...success. 180s Attempting to merge 3-6...success. 180s Attempting to merge 4-2...success. 180s Attempting to merge 4-3...success. 180s Attempting to merge 4-4...success. 180s Attempting to merge 4-5...success. 180s Attempting to merge 4-6...success. 180s Attempting to merge 5-2...success. 180s Attempting to merge 5-3...success. 180s Attempting to merge 5-4...success. 180s Attempting to merge 5-5...success. 180s Attempting to merge 5-6...success. 180s Attempting to merge 6-2...success. 180s Attempting to merge 6-3...success. 180s Attempting to merge 6-4...success. 180s Attempting to merge 6-5...success. 180s Attempting to merge 6-6...success. 180s Attempting to merge 7-2...success. 180s Attempting to merge 7-3...success. 180s Attempting to merge 7-4...success. 180s Attempting to merge 7-5...success. 180s Attempting to merge 7-6...success. 180s Attempting to merge 8-2...success. 180s Attempting to merge 8-3...success. 180s Attempting to merge 8-4...success. 180s Attempting to merge 8-5...success. 180s Attempting to merge 8-6...success. 180s Attempting to merge 9-2...success. 180s Attempting to merge 9-3...success. 180s Attempting to merge 9-4...success. 180s Attempting to merge 9-5...success. 180s Attempting to merge 9-6...success. 180s Merge is complete! 180s + git-imerge diagram --commits --frontier --html=imerge4.html 180s 0 5 9 180s | | | 180s 0 - ********** - c 180s *......... 180s **........ 180s *......... 180s *......... 180s 5 - *......... 180s 6 - *......... 180s | 180s d 180s 180s 0 5 9 180s | | | 180s 0 - ********** - c 180s *........| 180s **.......| 180s *........| 180s *........| 180s 5 - *........| 180s 6 - *--------+ 180s | 180s d 180s 180s Key: 180s |,-,+ = rectangles forming current merge frontier 180s * = merge done manually 180s . = merge done automatically 180s # = conflict that is currently blocking progress 180s @ = merge was blocked but has been resolved 180s ? = no merge recorded 180s 180s + git-imerge finish --branch=c-d-full 180s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 180s + local refname=c-d-full 180s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 180s + git rev-parse c-d-full^{tree} 180s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 180s + test_conflict 9-5 180s + local conflict=9-5 180s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s + DESCRIPTION=git-imerge test repository with conflict at 9-5 180s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 180s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s + local description=git-imerge test repository with conflict at 9-5 180s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 180s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s + local description=git-imerge test repository with conflict at 9-5 180s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s hint: Using 'master' as the name for the initial branch. This default branch name 180s hint: is subject to change. To configure the initial branch name to use in all 180s hint: of your new repositories, which will suppress this warning, call: 180s hint: 180s hint: git config --global init.defaultBranch 180s hint: 180s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 180s hint: 'development'. The just-created branch can be renamed via this command: 180s hint: 180s hint: git branch -m 180s hint: 180s hint: Disable this message with "git config set advice.defaultBranchName false" 180s + echo git-imerge test repository with conflict at 9-5 180s + printf %s\n /*.out /*.css /*.html 180s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5/.git config user.name Loú User 180s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5/.git/ 180s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 180s + TIME=1112911993 180s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-9-5 180s + modify c.txt 0 180s + filename=c.txt 180s + text=0 180s + echo 0 180s + git add c.txt 180s + modify d.txt 0 180s + filename=d.txt 180s + text=0 180s + echo 0 180s + git add d.txt 180s + modify conflict.txt original version 180s + filename=conflict.txt 180s + text=original version 180s + echo original version 180s + git add conflict.txt 180s + commit -m m⇒0 180s + TIME=1112911994 180s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 180s [master (root-commit) d70e04b] m⇒0 180s 3 files changed, 3 insertions(+) 180s create mode 100644 c.txt 180s create mode 100644 conflict.txt 180s create mode 100644 d.txt 180s + git checkout -b c master -- 180s Switched to a new branch 'c' 180s + seq 9 180s + modify c.txt 1 180s + filename=c.txt 180s + text=1 180s + echo 1 180s + git add c.txt 180s + commit -m c⇒1 180s + TIME=1112911995 180s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 180s [c 89e2141] c⇒1 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s + modify c.txt 2 180s + filename=c.txt 180s + text=2 180s + echo 2 180s + git add c.txt 180s + commit -m c⇒2 180s + TIME=1112911996 180s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 180s + modify c.txt 3 180s + filename=c.txt 180s + text=3 180s + echo 3 180s + git add c.txt 180s + commit -m c⇒3 180s + TIME=1112911997 180s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 180s + modify c.txt 4 180s + filename=c.txt 180s + text=4 180s + echo 4 180s + git add c.txt 180s + commit -m c⇒4 180s + TIME=1112911998 180s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 180s + modify c.txt 5 180s + filename=c.txt 180s + text=5 180s + echo 5 180s + git add c.txt 180s + commit -m c⇒5 180s + TIME=1112911999 180s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 180s + modify c.txt 6 180s + filename=c.txt 180s + text=6 180s + echo 6 180s + git add c.txt 180s + commit -m c⇒6 180s + TIME=1112912000 180s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 180s + modify c.txt 7 180s + filename=c.txt 180s + text=7 180s + echo 7 180s + git add c.txt 180s + commit -m c⇒7 180s + TIME=1112912001 180s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 180s [c 7c431f2] c⇒2 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s [c f02ab24] c⇒3 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s [c ed9122f] c⇒4 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s [c 1d3bf09] c⇒5 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s [c f999ecd] c⇒6 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s [c 7050a8a] c⇒7 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s + modify c.txt 8 180s + filename=c.txt 180s + text=8 180s + echo 8 180s + git add c.txt 180s + commit -m c⇒8 180s + TIME=1112912002 180s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 180s + modify c.txt 9 180s + filename=c.txt 180s + text=9 180s + echo 9 180s + git add c.txt 180s + modify conflict.txt c version 180s + filename=conflict.txt 180s + text=c version 180s + echo c version 180s + git add conflict.txt 180s + commit -m c⇒9 180s + TIME=1112912003 180s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 180s + git checkout -b d master -- 180s Switched to a new branch 'd' 180s + seq 6 180s + modify d.txt 1 180s + filename=d.txt 180s + text=1 180s + echo 1 180s + git add d.txt 180s + commit -m d⇒1 180s + TIME=1112912004 180s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 180s [c 9732e77] c⇒8 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s [c 73a5eed] c⇒9 180s 2 files changed, 2 insertions(+), 2 deletions(-) 180s + modify d.txt 2 180s + filename=d.txt 180s + text=2 180s + echo 2 180s + git add d.txt 180s [d bd5368a] d⇒1 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s + commit -m d⇒2 180s + TIME=1112912005 180s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 180s [d 93e27e6] d⇒2 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s + modify d.txt 3 180s + filename=d.txt 180s + text=3 180s + echo 3 180s + git add d.txt 180s + commit -m d⇒3 180s + TIME=1112912006 180s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 180s [d 133f385] d⇒3 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s + modify d.txt 4 180s + filename=d.txt 180s + text=4 180s + echo 4 180s + git add d.txt 180s + commit -m d⇒4 180s + TIME=1112912007 180s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 180s [d 586472a] d⇒4 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s + modify d.txt 5 180s + filename=d.txt 180s + text=5 180s + echo 5 180s + git add d.txt 180s + modify conflict.txt d version 180s + filename=conflict.txt 180s + text=d version 180s + echo d version 180s + git add conflict.txt 180s + commit -m d⇒5 180s + TIME=1112912008 180s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 180s [d 0a6f956] d⇒5 180s 2 files changed, 2 insertions(+), 2 deletions(-) 180s + modify d.txt 6 180s + filename=d.txt 180s + text=6 180s + echo 6 180s + git add d.txt 180s + commit -m d⇒6 180s + TIME=1112912009 180s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 180s + git checkout c 180s [d bfb30f0] d⇒6 180s 1 file changed, 1 insertion(+), 1 deletion(-) 180s Switched to branch 'c' 180s + git-imerge init --name=c-d d 181s + git-imerge list 181s * c-d 181s + git-imerge diagram --commits --frontier --html=imerge0.html 181s 0 5 9 181s | | | 181s 0 - ********** - c 181s *????????? 181s *????????? 181s *????????? 181s *????????? 181s 5 - *????????? 181s 6 - *????????? 181s | 181s d 181s 181s 0 5 9 181s | | | 181s 0 - ********** - c 181s *????????? 181s *????????? 181s *????????? 181s *????????? 181s 5 - *????????? 181s 6 - *????????? 181s | 181s d 181s 181s Key: 181s |,-,+ = rectangles forming current merge frontier 181s * = merge done manually 181s . = merge done automatically 181s # = conflict that is currently blocking progress 181s @ = merge was blocked but has been resolved 181s ? = no merge recorded 181s 181s + git-imerge autofill 181s + tee autofill.out 181s Attempting automerge of 9-6...failure. 181s Attempting automerge of 1-1...success. 181s Attempting automerge of 1-4...success. 182s Attempting automerge of 1-6...success. 182s Attempting automerge of 9-6...failure. 182s Attempting automerge of 5-6...success. 182s Attempting automerge of 7-6...success. 182s Attempting automerge of 8-6...success. 182s Attempting automerge of 9-1...success. 182s Attempting automerge of 9-4...success. 182s Attempting automerge of 9-5...failure. 182s Autofilling 1-6...success. 182s Autofilling 2-6...success. 182s Autofilling 3-6...success. 182s Autofilling 4-6...success. 182s Autofilling 5-6...success. 182s Autofilling 6-6...success. 182s Autofilling 7-6...success. 182s Autofilling 8-1...success. 182s Autofilling 8-2...success. 182s Autofilling 8-3...success. 182s Autofilling 8-4...success. 182s Autofilling 8-5...success. 182s Autofilling 8-6 (first way)...success. 182s Autofilling 8-6 (second way)...success. 182s The two ways of autofilling 8-6 agree. 182s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 182s Autofilling 9-1...success. 182s Autofilling 9-2...success. 182s Autofilling 9-3...success. 182s Autofilling 9-4...success. 182s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 182s Attempting automerge of 9-6...failure. 182s Attempting automerge of 9-5...failure. 182s HEAD is now at 73a5eed c⇒9 182s Conflict; suggest manual merge of 9-5 182s + grep -q Traceback autofill.out 182s + grep -q suggest manual merge of 9-5 autofill.out 182s + git-imerge diagram --commits --frontier --html=imerge1.html 183s 0 5 9 183s | | | 183s 0 - ********** - c 183s *???????.. 183s *???????.. 183s *???????.. 183s *???????.. 183s 5 - *???????.# 183s 6 - *........? 183s | 183s d 183s 183s 0 5 9 183s | | | 183s 0 - ********** - c 183s *???????.| 183s *???????.| 183s *???????.| 183s *???????.+ 183s 5 - *???????|# 183s 6 - *-------+? 183s | 183s d 183s 183s Key: 183s |,-,+ = rectangles forming current merge frontier 183s * = merge done manually 183s . = merge done automatically 183s # = conflict that is currently blocking progress 183s @ = merge was blocked but has been resolved 183s ? = no merge recorded 183s 183s + git-imerge continue --edit 183s Switched to branch 'imerge/c-d' 183s Auto-merging conflict.txt 183s CONFLICT (content): Merge conflict in conflict.txt 183s Automatic merge failed; fix conflicts and then commit the result. 183s 183s Original first commit: 183s 183s Original second commit: 183s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 183s Author: Loú User 183s Date: Thu Apr 7 22:13:23 2005 +0000 183s 183s c⇒9 183s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 183s Author: Loú User 183s Date: Thu Apr 7 22:13:28 2005 +0000 183s 183s d⇒5 183s 183s There was a conflict merging commit 9-5, shown above. 183s Please resolve the conflict, commit the result, then type 183s 183s git-imerge continue 183s + echo merged version 183s + git add conflict.txt 183s + git-imerge continue --no-edit 183s [imerge/c-d 1e5b288] imerge 'c-d': manual merge 9-5 183s Merge has been recorded for merge 9-5. 183s Attempting automerge of 9-6...success. 183s Autofilling 9-6...success. 183s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 183s Merge is complete! 183s + git-imerge diagram --commits --frontier --html=imerge2.html 183s 0 5 9 183s | | | 183s 0 - ********** - c 183s *???????.. 183s *???????.. 183s *???????.. 183s *???????.. 183s 5 - *???????.* 183s 6 - *......... 183s | 183s d 183s 183s 0 5 9 183s | | | 183s 0 - ********** - c 183s *???????.| 183s *???????.| 183s *???????.| 183s *???????.| 183s 5 - *???????.* 183s 6 - *--------+ 183s | 183s d 183s 183s Key: 183s |,-,+ = rectangles forming current merge frontier 183s * = merge done manually 183s . = merge done automatically 183s # = conflict that is currently blocking progress 183s @ = merge was blocked but has been resolved 183s ? = no merge recorded 183s 183s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 183s Merge d into c (using imerge) 183s 183s # Please enter the commit message for your changes. Lines starting 183s # with '#' will be ignored, and an empty message aborts the commit. 183s # 183s # Date: Fri Dec 5 19:58:14 2025 +0000 183s # 183s # On branch c-d-merge 183s # Changes to be committed: 183s # modified: conflict.txt 183s # modified: d.txt 183s # 183s [c-d-merge 53f1df4] Merge d into c (using imerge) 183s Date: Fri Dec 5 19:58:14 2025 +0000 183s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 183s + local refname=c-d-merge 183s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 183s + git rev-parse c-d-merge^{tree} 183s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 183s + git-imerge simplify --goal=rebase --branch=c-d-rebase 183s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 183s + local refname=c-d-rebase 183s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 183s + git rev-parse c-d-rebase^{tree} 183s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 183s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 184s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + local refname=c-d-rebase-with-history 184s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git rev-parse c-d-rebase-with-history^{tree} 184s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git-imerge simplify --goal=border --branch=c-d-border 184s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + local refname=c-d-border 184s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git rev-parse c-d-border^{tree} 184s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 184s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + local refname=c-d-border-with-history 184s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git rev-parse c-d-border-with-history^{tree} 184s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 184s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 185s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + local refname=c-d-border-with-history2 185s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git rev-parse c-d-border-with-history2^{tree} 185s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 185s + git-imerge remove 185s + git checkout c 185s Switched to branch 'c' 185s + git-imerge start --goal=full --first-parent --name=c-d d 185s + tee start.out 185s Attempting to merge 1-1...success. 185s Attempting to merge 1-2...success. 185s Attempting to merge 1-3...success. 185s Attempting to merge 1-4...success. 185s Attempting to merge 1-5...success. 185s Attempting to merge 1-6...success. 185s Attempting to merge 2-1...success. 185s Attempting to merge 2-2...success. 185s Attempting to merge 2-3...success. 185s Attempting to merge 2-4...success. 185s Attempting to merge 2-5...success. 185s Attempting to merge 2-6...success. 185s Attempting to merge 3-1...success. 185s Attempting to merge 3-2...success. 185s Attempting to merge 3-3...success. 185s Attempting to merge 3-4...success. 185s Attempting to merge 3-5...success. 185s Attempting to merge 3-6...success. 185s Attempting to merge 4-1...success. 185s Attempting to merge 4-2...success. 185s Attempting to merge 4-3...success. 185s Attempting to merge 4-4...success. 185s Attempting to merge 4-5...success. 185s Attempting to merge 4-6...success. 185s Attempting to merge 5-1...success. 185s Attempting to merge 5-2...success. 185s Attempting to merge 5-3...success. 185s Attempting to merge 5-4...success. 185s Attempting to merge 5-5...success. 185s Attempting to merge 5-6...success. 185s Attempting to merge 6-1...success. 185s Attempting to merge 6-2...success. 185s Attempting to merge 6-3...success. 185s Attempting to merge 6-4...success. 185s Attempting to merge 6-5...success. 185s Attempting to merge 6-6...success. 185s Attempting to merge 7-1...success. 185s Attempting to merge 7-2...success. 186s Attempting to merge 7-3...success. 186s Attempting to merge 7-4...success. 186s Attempting to merge 7-5...success. 186s Attempting to merge 7-6...success. 186s Attempting to merge 8-1...success. 186s Attempting to merge 8-2...success. 186s Attempting to merge 8-3...success. 186s Attempting to merge 8-4...success. 186s Attempting to merge 8-5...success. 186s Attempting to merge 8-6...success. 186s Attempting to merge 9-1...success. 186s Attempting to merge 9-2...success. 186s Attempting to merge 9-3...success. 186s Attempting to merge 9-4...success. 186s Attempting to merge 9-5...conflict. 186s Switched to branch 'imerge/c-d' 186s Auto-merging conflict.txt 186s CONFLICT (content): Merge conflict in conflict.txt 186s Automatic merge failed; fix conflicts and then commit the result. 186s 186s Original first commit: 186s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 186s Author: Loú User 186s Date: Thu Apr 7 22:13:23 2005 +0000 186s 186s c⇒9 186s 186s Original second commit: 186s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 186s Author: Loú User 186s Date: Thu Apr 7 22:13:28 2005 +0000 186s 186s d⇒5 186s 186s There was a conflict merging commit 9-5, shown above. 186s Please resolve the conflict, commit the result, then type 186s 186s git-imerge continue 186s + grep -q Traceback start.out 186s + grep -q suggest manual merge of 9-5 autofill.out 186s + git-imerge diagram --commits --frontier --html=imerge3.html 186s 0 5 9 186s | | | 186s 0 - ********** - c 186s *......... 186s *......... 186s *......... 186s *......... 186s 5 - *........# 186s 6 - *........? 186s | 186s d 186s 186s 0 5 9 186s | | | 186s 0 - ********** - c 186s *........| 186s *........| 186s *........| 186s *........+ 186s 5 - *.......|# 186s 6 - *-------+? 186s | 186s d 186s 186s Key: 186s |,-,+ = rectangles forming current merge frontier 186s * = merge done manually 186s . = merge done automatically 186s # = conflict that is currently blocking progress 186s @ = merge was blocked but has been resolved 186s ? = no merge recorded 186s 186s + echo merged version 186s + git add conflict.txt 186s + GIT_EDITOR=cat git commit 186s imerge 'c-d': manual merge 9-5 186s 186s # Conflicts: 186s # conflict.txt 186s # 186s # It looks like you may be committing a merge. 186s # If this is not correct, please run 186s # git update-ref -d MERGE_HEAD 186s # and try again. 186s 186s 186s # Please enter the commit message for your changes. Lines starting 186s # with '#' will be ignored, and an empty message aborts the commit. 186s # 186s # On branch imerge/c-d 186s # All conflicts fixed but you are still merging. 186s # 186s # Changes to be committed: 186s # modified: conflict.txt 186s # modified: d.txt 186s # 186s [imerge/c-d 0095518] imerge 'c-d': manual merge 9-5 186s + git-imerge continue --edit 186s Merge has been recorded for merge 9-5. 186s Attempting to merge 9-6...success. 186s Merge is complete! 186s + git-imerge diagram --commits --frontier --html=imerge4.html 186s 0 5 9 186s | | | 186s 0 - ********** - c 186s *......... 186s *......... 186s *......... 186s *......... 186s 5 - *........* 186s 6 - *......... 186s | 186s d 186s 186s 0 5 9 186s | | | 186s 0 - ********** - c 186s *........| 186s *........| 186s *........| 186s *........| 186s 5 - *........* 186s 6 - *--------+ 186s | 186s d 186s 186s Key: 186s |,-,+ = rectangles forming current merge frontier 186s * = merge done manually 186s . = merge done automatically 186s # = conflict that is currently blocking progress 186s @ = merge was blocked but has been resolved 186s ? = no merge recorded 186s 186s + git-imerge finish --branch=c-d-full 186s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 186s + local refname=c-d-full 186s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 186s + git rev-parse c-d-full^{tree} 186s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 186s + test_conflict 5-1 186s + local conflict=5-1 186s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s + DESCRIPTION=git-imerge test repository with conflict at 5-1 186s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 186s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s + local description=git-imerge test repository with conflict at 5-1 186s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 186s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s + local description=git-imerge test repository with conflict at 5-1 186s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s hint: Using 'master' as the name for the initial branch. This default branch name 186s hint: is subject to change. To configure the initial branch name to use in all 186s hint: of your new repositories, which will suppress this warning, call: 186s hint: 186s hint: git config --global init.defaultBranch 186s hint: 186s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 186s hint: 'development'. The just-created branch can be renamed via this command: 186s hint: 186s hint: git branch -m 186s hint: 186s hint: Disable this message with "git config set advice.defaultBranchName false" 186s + echo git-imerge test repository with conflict at 5-1 186s + printf %s\n /*.out /*.css /*.html 186s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1/.git config user.name Loú User 186s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1/.git/ 186s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 186s + TIME=1112911993 186s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-5-1 186s + modify c.txt 0 186s + filename=c.txt 186s + text=0 186s + echo 0 186s + git add c.txt 186s + modify d.txt 0 186s + filename=d.txt 186s + text=0 186s + echo 0 186s + git add d.txt 186s + modify conflict.txt original version 186s + filename=conflict.txt 186s + text=original version 186s + echo original version 186s + git add conflict.txt 186s + commit -m m⇒0 186s + TIME=1112911994 186s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 186s [master (root-commit) d70e04b] m⇒0 186s 3 files changed, 3 insertions(+) 186s create mode 100644 c.txt 186s create mode 100644 conflict.txt 186s create mode 100644 d.txt 186s + git checkout -b c master -- 186s Switched to a new branch 'c' 186s + seq 9 186s + modify c.txt 1 186s + filename=c.txt 186s + text=1 186s + echo 1 186s + git add c.txt 186s + commit -m c⇒1 186s + TIME=1112911995 186s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 186s + modify c.txt 2 186s + filename=c.txt 186s + text=2 186s + echo 2 186s + git add c.txt 186s + commit -m c⇒2 186s + TIME=1112911996 186s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 186s + modify c.txt 3 186s + filename=c.txt 186s + text=3 186s + echo 3 186s + git add c.txt 186s + commit -m c⇒3 186s + TIME=1112911997 186s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 186s + modify c.txt 4 186s + filename=c.txt 186s + text=4 186s + echo 4 186s + git add c.txt 186s + commit -m c⇒4 186s + TIME=1112911998 186s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 186s [c 89e2141] c⇒1 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s [c 7c431f2] c⇒2 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s [c f02ab24] c⇒3 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s + modify c.txt 5 186s + filename=c.txt 186s + text=5 186s + echo 5 186s + git add c.txt 186s [c ed9122f] c⇒4 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s + modify conflict.txt c version 186s + filename=conflict.txt 186s + text=c version 186s + echo c version 186s + git add conflict.txt 186s + commit -m c⇒5 186s + TIME=1112911999 186s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 186s + modify c.txt 6 186s + filename=c.txt 186s + text=6 186s + echo 6 186s + git add c.txt 186s + commit -m c⇒6 186s + TIME=1112912000 186s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 186s + modify c.txt 7 186s + filename=c.txt 186s + text=7 186s + echo 7 186s + git add c.txt 186s + commit -m c⇒7 186s + TIME=1112912001 186s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 186s + modify c.txt 8 186s + filename=c.txt 186s + text=8 186s + echo 8 186s + git add c.txt 186s + commit -m c⇒8 186s + TIME=1112912002 186s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 186s + modify c.txt 9 186s + filename=c.txt 186s + text=9 186s + echo 9 186s + git add c.txt 186s + commit -m c⇒9 186s + TIME=1112912003 186s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 186s [c 7e31f25] c⇒5 186s 2 files changed, 2 insertions(+), 2 deletions(-) 186s [c df3c57a] c⇒6 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s [c ea32d81] c⇒7 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s [c 44473d6] c⇒8 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s + git checkout -b d master -- 186s [c d8d80cf] c⇒9 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s Switched to a new branch 'd' 186s + seq 6 186s + modify d.txt 1 186s + filename=d.txt 186s + text=1 186s + echo 1 186s + git add d.txt 186s + modify conflict.txt d version 186s + filename=conflict.txt 186s + text=d version 186s + echo d version 186s + git add conflict.txt 186s + commit -m d⇒1 186s + TIME=1112912004 186s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 186s [d ac0427a] d⇒1 186s 2 files changed, 2 insertions(+), 2 deletions(-) 186s + modify d.txt 2 186s + filename=d.txt 186s + text=2 186s + echo 2 186s + git add d.txt 186s + commit -m d⇒2 186s + TIME=1112912005 186s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 186s [d 43c38c0] d⇒2 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s + modify d.txt 3 186s + filename=d.txt 186s + text=3 186s + echo 3 186s + git add d.txt 186s + commit -m d⇒3 186s + TIME=1112912006 186s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 186s [d 0260058] d⇒3 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s + modify d.txt 4 186s + filename=d.txt 186s + text=4 186s + echo 4 186s + git add d.txt 186s + commit -m d⇒4 186s + TIME=1112912007 186s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 186s [d 40fef44] d⇒4 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s + modify d.txt 5 186s + filename=d.txt 186s + text=5 186s + echo 5 186s + git add d.txt 186s + commit -m d⇒5 186s + TIME=1112912008 186s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 186s + modify d.txt 6 186s + filename=d.txt 186s + text=6 186s + echo 6 186s + git add d.txt 186s + commit -m d⇒6 186s + TIME=1112912009 186s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 186s [d b080a65] d⇒5 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s + git checkout c 186s [d 200ce5c] d⇒6 186s 1 file changed, 1 insertion(+), 1 deletion(-) 186s Switched to branch 'c' 186s + git-imerge init --name=c-d d 187s + git-imerge list 187s * c-d 187s + git-imerge diagram --commits --frontier --html=imerge0.html 187s 0 5 9 187s | | | 187s 0 - ********** - c 187s *????????? 187s *????????? 187s *????????? 187s *????????? 187s 5 - *????????? 187s 6 - *????????? 187s | 187s d 187s 187s 0 5 9 187s | | | 187s 0 - ********** - c 187s *????????? 187s *????????? 187s *????????? 187s *????????? 187s 5 - *????????? 187s 6 - *????????? 187s | 187s d 187s 187s Key: 187s |,-,+ = rectangles forming current merge frontier 187s * = merge done manually 187s . = merge done automatically 187s # = conflict that is currently blocking progress 187s @ = merge was blocked but has been resolved 187s ? = no merge recorded 187s 187s + git-imerge autofill 187s + tee autofill.out 187s Attempting automerge of 9-6...failure. 187s Attempting automerge of 1-1...success. 187s Attempting automerge of 1-4...success. 187s Attempting automerge of 1-6...success. 187s Attempting automerge of 9-6...failure. 187s Attempting automerge of 5-6...failure. 187s Attempting automerge of 3-6...success. 187s Attempting automerge of 4-6...success. 187s Attempting automerge of 5-1...failure. 187s Autofilling 1-6...success. 187s Autofilling 2-6...success. 187s Autofilling 3-6...success. 187s Autofilling 4-1...success. 187s Autofilling 4-2...success. 187s Autofilling 4-3...success. 187s Autofilling 4-4...success. 187s Autofilling 4-5...success. 187s Autofilling 4-6 (first way)...success. 187s Autofilling 4-6 (second way)...success. 187s The two ways of autofilling 4-6 agree. 187s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 187s Attempting automerge of 9-6...failure. 187s Attempting automerge of 5-1...failure. 187s HEAD is now at d8d80cf c⇒9 187s Conflict; suggest manual merge of 5-1 187s + grep -q Traceback autofill.out 187s + grep -q suggest manual merge of 5-1 autofill.out 187s + git-imerge diagram --commits --frontier --html=imerge1.html 187s 0 5 9 187s | | | 187s 0 - ********** - c 187s *???.#???? 187s *???.????? 187s *???.????? 187s *???.????? 187s 5 - *???.????? 187s 6 - *....????? 187s | 187s d 187s 187s 0 5 9 187s | | | 187s 0 - ********** - c 187s *???|#???? 187s *???|????? 187s *???|????? 187s *???|????? 187s 5 - *???|????? 187s 6 - *---+????? 187s | 187s d 187s 187s Key: 187s |,-,+ = rectangles forming current merge frontier 187s * = merge done manually 187s . = merge done automatically 187s # = conflict that is currently blocking progress 187s @ = merge was blocked but has been resolved 187s ? = no merge recorded 187s 187s + git-imerge continue --edit 187s Switched to branch 'imerge/c-d' 187s 187s Original first commit: 187s 187s Original second commit: 187s Auto-merging conflict.txt 187s CONFLICT (content): Merge conflict in conflict.txt 187s Automatic merge failed; fix conflicts and then commit the result. 187s commit 7e31f254c318decc434628f023dac0703f3d2b9e 187s Author: Loú User 187s Date: Thu Apr 7 22:13:19 2005 +0000 187s 187s c⇒5 187s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 187s Author: Loú User 187s Date: Thu Apr 7 22:13:24 2005 +0000 187s 187s d⇒1 187s 187s There was a conflict merging commit 5-1, shown above. 187s Please resolve the conflict, commit the result, then type 187s 187s git-imerge continue 187s + echo merged version 187s + git add conflict.txt 187s + git-imerge continue --no-edit 188s [imerge/c-d 9f65ef5] imerge 'c-d': manual merge 5-1 188s Merge has been recorded for merge 5-1. 188s Attempting automerge of 5-6...success. 188s Autofilling 5-2...success. 188s Autofilling 5-3...success. 188s Autofilling 5-4...success. 188s Autofilling 5-5...success. 188s Autofilling 5-6...success. 188s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 188s Attempting automerge of 9-6...success. 188s Autofilling 6-6...success. 188s Autofilling 7-6...success. 188s Autofilling 8-6...success. 188s Autofilling 9-1...success. 188s Autofilling 9-2...success. 188s Autofilling 9-3...success. 188s Autofilling 9-4...success. 188s Autofilling 9-5...success. 188s Autofilling 9-6 (first way)...success. 188s Autofilling 9-6 (second way)...success. 188s The two ways of autofilling 9-6 agree. 188s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 188s Merge is complete! 188s + git-imerge diagram --commits --frontier --html=imerge2.html 189s 0 5 9 189s | | | 189s 0 - ********** - c 189s *???.*???. 189s *???..???. 189s *???..???. 189s *???..???. 189s 5 - *???..???. 189s 6 - *......... 189s | 189s d 189s 189s 0 5 9 189s | | | 189s 0 - ********** - c 189s *???.*???| 189s *???..???| 189s *???..???| 189s *???..???| 189s 5 - *???..???| 189s 6 - *--------+ 189s | 189s d 189s 189s Key: 189s |,-,+ = rectangles forming current merge frontier 189s * = merge done manually 189s . = merge done automatically 189s # = conflict that is currently blocking progress 189s @ = merge was blocked but has been resolved 189s ? = no merge recorded 189s 189s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 189s Merge d into c (using imerge) 189s 189s # Please enter the commit message for your changes. Lines starting 189s # with '#' will be ignored, and an empty message aborts the commit. 189s # 189s # Date: Fri Dec 5 19:58:19 2025 +0000 189s # 189s # On branch c-d-merge 189s # Changes to be committed: 189s # modified: conflict.txt 189s # modified: d.txt 189s # 189s [c-d-merge d2b4680] Merge d into c (using imerge) 189s Date: Fri Dec 5 19:58:19 2025 +0000 189s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + local refname=c-d-merge 189s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + git rev-parse c-d-merge^{tree} 189s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + git-imerge simplify --goal=rebase --branch=c-d-rebase 189s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + local refname=c-d-rebase 189s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + git rev-parse c-d-rebase^{tree} 189s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 189s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 190s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 190s + local refname=c-d-rebase-with-history 190s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 190s + git rev-parse c-d-rebase-with-history^{tree} 190s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 190s + git-imerge simplify --goal=border --branch=c-d-border 190s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 190s + local refname=c-d-border 190s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 190s + git rev-parse c-d-border^{tree} 190s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 190s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 191s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 191s + local refname=c-d-border-with-history 191s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 191s + git rev-parse c-d-border-with-history^{tree} 191s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 191s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 191s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 191s + local refname=c-d-border-with-history2 191s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 191s + git rev-parse c-d-border-with-history2^{tree} 191s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 191s + git-imerge remove 191s + git checkout c 191s Switched to branch 'c' 191s + git-imerge start --goal=full --first-parent --name=c-d d 191s + tee start.out 192s Attempting to merge 1-1...success. 192s Attempting to merge 1-2...success. 192s Attempting to merge 1-3...success. 192s Attempting to merge 1-4...success. 192s Attempting to merge 1-5...success. 192s Attempting to merge 1-6...success. 192s Attempting to merge 2-1...success. 192s Attempting to merge 2-2...success. 192s Attempting to merge 2-3...success. 192s Attempting to merge 2-4...success. 192s Attempting to merge 2-5...success. 192s Attempting to merge 2-6...success. 192s Attempting to merge 3-1...success. 192s Attempting to merge 3-2...success. 192s Attempting to merge 3-3...success. 192s Attempting to merge 3-4...success. 192s Attempting to merge 3-5...success. 193s Attempting to merge 3-6...success. 193s Attempting to merge 4-1...success. 193s Attempting to merge 4-2...success. 193s Attempting to merge 4-3...success. 193s Attempting to merge 4-4...success. 193s Attempting to merge 4-5...success. 193s Attempting to merge 4-6...success. 193s Attempting to merge 5-1...conflict. 193s Switched to branch 'imerge/c-d' 193s Auto-merging conflict.txt 193s CONFLICT (content): Merge conflict in conflict.txt 193s Automatic merge failed; fix conflicts and then commit the result. 193s 193s Original first commit: 193s commit 7e31f254c318decc434628f023dac0703f3d2b9e 193s Author: Loú User 193s Date: Thu Apr 7 22:13:19 2005 +0000 193s 193s c⇒5 193s 193s Original second commit: 193s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 193s Author: Loú User 193s Date: Thu Apr 7 22:13:24 2005 +0000 193s 193s d⇒1 193s 193s There was a conflict merging commit 5-1, shown above. 193s Please resolve the conflict, commit the result, then type 193s 193s git-imerge continue 193s + grep -q Traceback start.out 193s + grep -q suggest manual merge of 5-1 autofill.out 193s + git-imerge diagram --commits --frontier --html=imerge3.html 193s 0 5 9 193s | | | 193s 0 - ********** - c 193s *....#???? 193s *....????? 193s *....????? 193s *....????? 193s 5 - *....????? 193s 6 - *....????? 193s | 193s d 193s 193s 0 5 9 193s | | | 193s 0 - ********** - c 193s *...|#???? 193s *...|????? 193s *...|????? 193s *...|????? 193s 5 - *...|????? 193s 6 - *---+????? 193s | 193s d 193s 193s Key: 193s |,-,+ = rectangles forming current merge frontier 193s * = merge done manually 193s . = merge done automatically 193s # = conflict that is currently blocking progress 193s @ = merge was blocked but has been resolved 193s ? = no merge recorded 193s 193s + echo merged version 193s + git add conflict.txt 193s + GIT_EDITOR=cat git commit 193s imerge 'c-d': manual merge 5-1 193s 193s # Conflicts: 193s # conflict.txt 193s # 193s # It looks like you may be committing a merge. 193s # If this is not correct, please run 193s # git update-ref -d MERGE_HEAD 193s # and try again. 193s 193s 193s # Please enter the commit message for your changes. Lines starting 193s # with '#' will be ignored, and an empty message aborts the commit. 193s # 193s # On branch imerge/c-d 193s # All conflicts fixed but you are still merging. 193s # 193s # Changes to be committed: 193s # modified: conflict.txt 193s # modified: d.txt 193s # 193s + git-imerge continue --edit 193s [imerge/c-d d2e56c2] imerge 'c-d': manual merge 5-1 193s Merge has been recorded for merge 5-1. 194s Attempting to merge 5-2...success. 194s Attempting to merge 5-3...success. 194s Attempting to merge 5-4...success. 194s Attempting to merge 5-5...success. 194s Attempting to merge 5-6...success. 194s Attempting to merge 6-1...success. 194s Attempting to merge 6-2...success. 194s Attempting to merge 6-3...success. 194s Attempting to merge 6-4...success. 194s Attempting to merge 6-5...success. 194s Attempting to merge 6-6...success. 194s Attempting to merge 7-1...success. 194s Attempting to merge 7-2...success. 194s Attempting to merge 7-3...success. 194s Attempting to merge 7-4...success. 194s Attempting to merge 7-5...success. 194s Attempting to merge 7-6...success. 194s Attempting to merge 8-1...success. 194s Attempting to merge 8-2...success. 194s Attempting to merge 8-3...success. 194s Attempting to merge 8-4...success. 194s Attempting to merge 8-5...success. 194s Attempting to merge 8-6...success. 194s Attempting to merge 9-1...success. 194s Attempting to merge 9-2...success. 194s Attempting to merge 9-3...success. 194s Attempting to merge 9-4...success. 194s Attempting to merge 9-5...success. 194s Attempting to merge 9-6...success. 194s Merge is complete! 194s + git-imerge diagram --commits --frontier --html=imerge4.html 194s 0 5 9 194s | | | 194s 0 - ********** - c 194s *....*.... 194s *......... 194s *......... 194s *......... 194s 5 - *......... 194s 6 - *......... 194s | 194s d 194s 194s 0 5 9 194s | | | 194s 0 - ********** - c 194s *....*...| 194s *........| 194s *........| 194s *........| 194s 5 - *........| 194s 6 - *--------+ 194s | 194s d 194s 194s Key: 194s |,-,+ = rectangles forming current merge frontier 194s * = merge done manually 194s . = merge done automatically 194s # = conflict that is currently blocking progress 194s @ = merge was blocked but has been resolved 194s ? = no merge recorded 194s 194s + git-imerge finish --branch=c-d-full 195s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + local refname=c-d-full 195s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + git rev-parse c-d-full^{tree} 195s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 195s + test_conflict 6-6 195s + local conflict=6-6 195s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s + DESCRIPTION=git-imerge test repository with conflict at 6-6 195s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 195s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s + local description=git-imerge test repository with conflict at 6-6 195s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 195s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s + local description=git-imerge test repository with conflict at 6-6 195s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s hint: Using 'master' as the name for the initial branch. This default branch name 195s hint: is subject to change. To configure the initial branch name to use in all 195s hint: of your new repositories, which will suppress this warning, call: 195s hint: 195s hint: git config --global init.defaultBranch 195s hint: 195s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 195s hint: 'development'. The just-created branch can be renamed via this command: 195s hint: 195s hint: git branch -m 195s hint: 195s hint: Disable this message with "git config set advice.defaultBranchName false" 195s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6/.git/ 195s + echo git-imerge test repository with conflict at 6-6 195s + printf %s\n /*.out /*.css /*.html 195s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6/.git config user.name Loú User 195s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 195s + TIME=1112911993 195s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s [master (root-commit) d70e04b] m⇒0 195s 3 files changed, 3 insertions(+) 195s create mode 100644 c.txt 195s create mode 100644 conflict.txt 195s create mode 100644 d.txt 195s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/conflicted-6-6 195s + modify c.txt 0 195s + filename=c.txt 195s + text=0 195s + echo 0 195s + git add c.txt 195s + modify d.txt 0 195s + filename=d.txt 195s + text=0 195s + echo 0 195s + git add d.txt 195s + modify conflict.txt original version 195s + filename=conflict.txt 195s + text=original version 195s + echo original version 195s + git add conflict.txt 195s + commit -m m⇒0 195s + TIME=1112911994 195s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 195s + git checkout -b c master -- 195s Switched to a new branch 'c' 195s + seq 9 195s + modify c.txt 1 195s + filename=c.txt 195s + text=1 195s + echo 1 195s + git add c.txt 195s + commit -m c⇒1 195s + TIME=1112911995 195s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 195s [c 89e2141] c⇒1 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify c.txt 2 195s + filename=c.txt 195s + text=2 195s + echo 2 195s + git add c.txt 195s + commit -m c⇒2 195s + TIME=1112911996 195s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 195s [c 7c431f2] c⇒2 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify c.txt 3 195s + filename=c.txt 195s + text=3 195s + echo 3 195s + git add c.txt 195s + commit -m c⇒3 195s + TIME=1112911997 195s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 195s [c f02ab24] c⇒3 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify c.txt 4 195s + filename=c.txt 195s + text=4 195s + echo 4 195s + git add c.txt 195s + commit -m c⇒4 195s + TIME=1112911998 195s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 195s [c ed9122f] c⇒4 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify c.txt 5 195s + filename=c.txt 195s + text=5 195s + echo 5 195s + git add c.txt 195s + commit -m c⇒5 195s + TIME=1112911999 195s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 195s [c 1d3bf09] c⇒5 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify c.txt 6 195s + filename=c.txt 195s + text=6 195s + echo 6 195s + git add c.txt 195s + modify conflict.txt c version 195s + filename=conflict.txt 195s + text=c version 195s + echo c version 195s + git add conflict.txt 195s + commit -m c⇒6 195s + TIME=1112912000 195s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 195s [c fe4fed8] c⇒6 195s 2 files changed, 2 insertions(+), 2 deletions(-) 195s + modify c.txt 7 195s + filename=c.txt 195s + text=7 195s + echo 7 195s + git add c.txt 195s + commit -m c⇒7 195s + TIME=1112912001 195s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 195s [c ec255ea] c⇒7 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify c.txt 8 195s + filename=c.txt 195s + text=8 195s + echo 8 195s + git add c.txt 195s + commit -m c⇒8 195s + TIME=1112912002 195s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 195s [c 7459ac3] c⇒8 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify c.txt 9 195s + filename=c.txt 195s + text=9 195s + echo 9 195s + git add c.txt 195s + commit -m c⇒9 195s + TIME=1112912003 195s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 195s [c 70408c8] c⇒9 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + git checkout -b d master -- 195s Switched to a new branch 'd' 195s + seq 6 195s + modify d.txt 1 195s + filename=d.txt 195s + text=1 195s + echo 1 195s + git add d.txt 195s + commit -m d⇒1 195s + TIME=1112912004 195s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 195s [d bd5368a] d⇒1 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify d.txt 2 195s + filename=d.txt 195s + text=2 195s + echo 2 195s + git add d.txt 195s + commit -m d⇒2 195s + TIME=1112912005 195s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 195s [d 93e27e6] d⇒2 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify d.txt 3 195s + filename=d.txt 195s + text=3 195s + echo 3 195s + git add d.txt 195s + commit -m d⇒3 195s + TIME=1112912006 195s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 195s [d 133f385] d⇒3 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify d.txt 4 195s + filename=d.txt 195s + text=4 195s + echo 4 195s + git add d.txt 195s + commit -m d⇒4 195s + TIME=1112912007 195s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 195s [d 586472a] d⇒4 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify d.txt 5 195s + filename=d.txt 195s + text=5 195s + echo 5 195s + git add d.txt 195s + commit -m d⇒5 195s + TIME=1112912008 195s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 195s [d 9522207] d⇒5 195s 1 file changed, 1 insertion(+), 1 deletion(-) 195s + modify d.txt 6 195s + filename=d.txt 195s + text=6 195s + echo 6 195s + git add d.txt 195s + modify conflict.txt d version 195s + filename=conflict.txt 195s + text=d version 195s + echo d version 195s + git add conflict.txt 195s + commit -m d⇒6 195s + TIME=1112912009 195s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 195s [d f7e451a] d⇒6 195s 2 files changed, 2 insertions(+), 2 deletions(-) 195s + git checkout c 195s Switched to branch 'c' 195s + git-imerge init --name=c-d d 195s + git-imerge list 195s * c-d 195s + git-imerge diagram --commits --frontier --html=imerge0.html 196s 0 5 9 196s | | | 196s 0 - ********** - c 196s *????????? 196s *????????? 196s *????????? 196s *????????? 196s 5 - *????????? 196s 6 - *????????? 196s | 196s d 196s 196s 0 5 9 196s | | | 196s 0 - ********** - c 196s *????????? 196s *????????? 196s *????????? 196s *????????? 196s 5 - *????????? 196s 6 - *????????? 196s | 196s d 196s 196s Key: 196s |,-,+ = rectangles forming current merge frontier 196s * = merge done manually 196s . = merge done automatically 196s # = conflict that is currently blocking progress 196s @ = merge was blocked but has been resolved 196s ? = no merge recorded 196s 196s + + tee autofill.out 196s git-imerge autofill 196s Attempting automerge of 9-6...failure. 196s Attempting automerge of 1-1...success. 196s Attempting automerge of 1-4...success. 196s Attempting automerge of 1-6...success. 196s Attempting automerge of 9-6...failure. 196s Attempting automerge of 5-6...success. 196s Attempting automerge of 7-6...failure. 196s Attempting automerge of 6-6...failure. 196s Attempting automerge of 6-1...success. 196s Attempting automerge of 6-4...success. 196s Attempting automerge of 6-5...success. 196s Attempting automerge of 9-5...success. 196s Autofilling 1-6...success. 196s Autofilling 2-6...success. 196s Autofilling 3-6...success. 196s Autofilling 4-6...success. 196s Autofilling 5-1...success. 196s Autofilling 5-2...success. 196s Autofilling 5-3...success. 196s Autofilling 5-4...success. 196s Autofilling 5-5...success. 196s Autofilling 5-6 (first way)...success. 196s Autofilling 5-6 (second way)...success. 196s The two ways of autofilling 5-6 agree. 196s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 196s Autofilling 6-5...success. 196s Autofilling 7-5...success. 196s Autofilling 8-5...success. 196s Autofilling 9-1...success. 196s Autofilling 9-2...success. 196s Autofilling 9-3...success. 196s Autofilling 9-4...success. 196s Autofilling 9-5 (first way)...success. 196s Autofilling 9-5 (second way)...success. 196s The two ways of autofilling 9-5 agree. 196s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 197s Attempting automerge of 9-6...failure. 197s Attempting automerge of 6-6...failure. 197s HEAD is now at 70408c8 c⇒9 197s Conflict; suggest manual merge of 6-6 197s + grep -q Traceback autofill.out 197s + grep -q suggest manual merge of 6-6 autofill.out 197s + git-imerge diagram --commits --frontier --html=imerge1.html 197s 0 5 9 197s | | | 197s 0 - ********** - c 197s *????.???. 197s *????.???. 197s *????.???. 197s *????.???. 197s 5 - *????..... 197s 6 - *.....#??? 197s | 197s d 197s 197s 0 5 9 197s | | | 197s 0 - ********** - c 197s *????.???| 197s *????.???| 197s *????.???| 197s *????.???| 197s 5 - *????.---+ 197s 6 - *----+#??? 197s | 197s d 197s 197s Key: 197s |,-,+ = rectangles forming current merge frontier 197s * = merge done manually 197s . = merge done automatically 197s # = conflict that is currently blocking progress 197s @ = merge was blocked but has been resolved 197s ? = no merge recorded 197s 197s + git-imerge continue --edit 197s Switched to branch 'imerge/c-d' 197s Auto-merging conflict.txt 197s CONFLICT (content): Merge conflict in conflict.txt 197s Automatic merge failed; fix conflicts and then commit the result. 197s 197s Original first commit: 197s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 197s Author: Loú User 197s Date: Thu Apr 7 22:13:20 2005 +0000 197s 197s c⇒6 197s 197s Original second commit: 197s commit f7e451a6c9656dda15641a9fbc591a602f158692 197s Author: Loú User 197s Date: Thu Apr 7 22:13:29 2005 +0000 197s 197s d⇒6 197s 197s There was a conflict merging commit 6-6, shown above. 197s Please resolve the conflict, commit the result, then type 197s 197s git-imerge continue 197s + echo merged version 197s + git add conflict.txt 197s + git-imerge continue --no-edit 197s [imerge/c-d 907ddd5] imerge 'c-d': manual merge 6-6 197s Merge has been recorded for merge 6-6. 197s Attempting automerge of 9-6...success. 197s Autofilling 7-6...success. 197s Autofilling 8-6...success. 197s Autofilling 9-6...success. 197s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 198s Merge is complete! 198s + git-imerge diagram --commits --frontier --html=imerge2.html 198s 0 5 9 198s | | | 198s 0 - ********** - c 198s *????.???. 198s *????.???. 198s *????.???. 198s *????.???. 198s 5 - *????..... 198s 6 - *.....*... 198s | 198s d 198s 198s 0 5 9 198s | | | 198s 0 - ********** - c 198s *????.???| 198s *????.???| 198s *????.???| 198s *????.???| 198s 5 - *????....| 198s 6 - *-----*--+ 198s | 198s d 198s 198s Key: 198s |,-,+ = rectangles forming current merge frontier 198s * = merge done manually 198s . = merge done automatically 198s # = conflict that is currently blocking progress 198s @ = merge was blocked but has been resolved 198s ? = no merge recorded 198s 198s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 199s Merge d into c (using imerge) 199s 199s # Please enter the commit message for your changes. Lines starting 199s # with '#' will be ignored, and an empty message aborts the commit. 199s # 199s # Date: Fri Dec 5 19:58:28 2025 +0000 199s # 199s # On branch c-d-merge 199s # Changes to be committed: 199s # modified: conflict.txt 199s # modified: d.txt 199s # 199s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + local refname=c-d-merge 199s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git rev-parse c-d-merge^{tree} 199s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git-imerge simplify --goal=rebase --branch=c-d-rebase 199s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + local refname=c-d-rebase 199s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git rev-parse c-d-rebase^{tree} 199s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 199s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + local refname=c-d-rebase-with-history 199s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git rev-parse c-d-rebase-with-history^{tree} 199s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git-imerge simplify --goal=border --branch=c-d-border 199s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + local refname=c-d-border 199s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git rev-parse c-d-border^{tree} 199s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 199s [c-d-merge edf6830] Merge d into c (using imerge) 199s Date: Fri Dec 5 19:58:28 2025 +0000 199s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + local refname=c-d-border-with-history 199s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git rev-parse c-d-border-with-history^{tree} 199s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 199s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + local refname=c-d-border-with-history2 199s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git rev-parse c-d-border-with-history2^{tree} 199s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 199s + git-imerge remove 199s + git checkout c 199s Switched to branch 'c' 199s + git-imerge start --goal=full --first-parent --name=c-d d 199s + tee start.out 200s Attempting to merge 1-1...success. 200s Attempting to merge 1-2...success. 200s Attempting to merge 1-3...success. 200s Attempting to merge 1-4...success. 200s Attempting to merge 1-5...success. 200s Attempting to merge 1-6...success. 200s Attempting to merge 2-1...success. 200s Attempting to merge 2-2...success. 200s Attempting to merge 2-3...success. 201s Attempting to merge 2-4...success. 201s Attempting to merge 2-5...success. 201s Attempting to merge 2-6...success. 201s Attempting to merge 3-1...success. 201s Attempting to merge 3-2...success. 201s Attempting to merge 3-3...success. 201s Attempting to merge 3-4...success. 201s Attempting to merge 3-5...success. 201s Attempting to merge 3-6...success. 201s Attempting to merge 4-1...success. 201s Attempting to merge 4-2...success. 201s Attempting to merge 4-3...success. 201s Attempting to merge 4-4...success. 201s Attempting to merge 4-5...success. 201s Attempting to merge 4-6...success. 201s Attempting to merge 5-1...success. 201s Attempting to merge 5-2...success. 201s Attempting to merge 5-3...success. 201s Attempting to merge 5-4...success. 201s Attempting to merge 5-5...success. 201s Attempting to merge 5-6...success. 201s Attempting to merge 6-1...success. 201s Attempting to merge 6-2...success. 201s Attempting to merge 6-3...success. 201s Attempting to merge 6-4...success. 201s Attempting to merge 6-5...success. 201s Attempting to merge 6-6...conflict. 201s Attempting to merge 7-1...success. 201s Attempting to merge 7-2...success. 201s Attempting to merge 7-3...success. 201s Attempting to merge 7-4...success. 201s Attempting to merge 7-5...success. 201s Attempting to merge 8-1...success. 201s Attempting to merge 8-2...success. 201s Attempting to merge 8-3...success. 201s Attempting to merge 8-4...success. 201s Attempting to merge 8-5...success. 202s Attempting to merge 9-1...success. 202s Attempting to merge 9-2...success. 202s Attempting to merge 9-3...success. 202s Attempting to merge 9-4...success. 202s Attempting to merge 9-5...success. 202s Previous HEAD position was 8692c60 imerge 'c-d': automatic merge 9-5 202s Switched to branch 'imerge/c-d' 202s Auto-merging conflict.txt 202s CONFLICT (content): Merge conflict in conflict.txt 202s Automatic merge failed; fix conflicts and then commit the result. 202s 202s Original first commit: 202s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 202s Author: Loú User 202s Date: Thu Apr 7 22:13:20 2005 +0000 202s 202s c⇒6 202s 202s Original second commit: 202s commit f7e451a6c9656dda15641a9fbc591a602f158692 202s Author: Loú User 202s Date: Thu Apr 7 22:13:29 2005 +0000 202s 202s d⇒6 202s 202s There was a conflict merging commit 6-6, shown above. 202s Please resolve the conflict, commit the result, then type 202s 202s git-imerge continue 202s + grep -q Traceback start.out 202s + grep -q suggest manual merge of 6-6 autofill.out 202s + git-imerge diagram --commits --frontier --html=imerge3.html 202s 0 5 9 202s | | | 202s 0 - ********** - c 202s *......... 202s *......... 202s *......... 202s *......... 202s 5 - *......... 202s 6 - *.....#??? 202s | 202s d 202s 202s 0 5 9 202s | | | 202s 0 - ********** - c 202s *........| 202s *........| 202s *........| 202s *........| 202s 5 - *.....---+ 202s 6 - *----+#??? 202s | 202s d 202s 202s Key: 202s |,-,+ = rectangles forming current merge frontier 202s * = merge done manually 202s . = merge done automatically 202s # = conflict that is currently blocking progress 202s @ = merge was blocked but has been resolved 202s ? = no merge recorded 202s 202s + echo merged version 202s + git add conflict.txt 202s + GIT_EDITOR=cat git commit 202s imerge 'c-d': manual merge 6-6 202s 202s # Conflicts: 202s # conflict.txt 202s # 202s # It looks like you may be committing a merge. 202s # If this is not correct, please run 202s # git update-ref -d MERGE_HEAD 202s # and try again. 202s 202s 202s # Please enter the commit message for your changes. Lines starting 202s # with '#' will be ignored, and an empty message aborts the commit. 202s # 202s # On branch imerge/c-d 202s # All conflicts fixed but you are still merging. 202s # 202s # Changes to be committed: 202s # modified: conflict.txt 202s # modified: d.txt 202s # 202s [imerge/c-d a3d0893] imerge 'c-d': manual merge 6-6 202s + git-imerge continue --edit 202s Merge has been recorded for merge 6-6. 202s Attempting to merge 7-6...success. 202s Attempting to merge 8-6...success. 202s Attempting to merge 9-6...success. 202s Merge is complete! 202s + git-imerge diagram --commits --frontier --html=imerge4.html 202s 0 5 9 202s | | | 202s 0 - ********** - c 202s *......... 202s *......... 202s *......... 202s *......... 202s 5 - *......... 202s 6 - *.....*... 202s | 202s d 202s 202s 0 5 9 202s | | | 202s 0 - ********** - c 202s *........| 202s *........| 202s *........| 202s *........| 202s 5 - *........| 202s 6 - *-----*--+ 202s | 202s d 202s 202s Key: 202s |,-,+ = rectangles forming current merge frontier 202s * = merge done manually 202s . = merge done automatically 202s # = conflict that is currently blocking progress 202s @ = merge was blocked but has been resolved 202s ? = no merge recorded 202s 202s + git-imerge finish --branch=c-d-full 202s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 202s + local refname=c-d-full 202s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 202s + git rev-parse c-d-full^{tree} 202s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 202s py313: commands[2] /tmp/autopkgtest.IpjX5N/build.W0y/src> /bin/sh t/test-really-conflicted 202s + dirname t/test-really-conflicted 202s + cd t 202s + pwd 202s + dirname /tmp/autopkgtest.IpjX5N/build.W0y/src/t 202s + BASE=/tmp/autopkgtest.IpjX5N/build.W0y/src 202s + . /tmp/autopkgtest.IpjX5N/build.W0y/src/t/test-lib.sh 202s + GIT_IMERGE=git-imerge 202s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 202s + DESCRIPTION=git-imerge test repository with multiple conflicts 202s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 202s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 202s + local description=git-imerge test repository with multiple conflicts 202s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 202s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 202s + local description=git-imerge test repository with multiple conflicts 202s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 202s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 202s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 202s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted/.git/ 202s hint: Using 'master' as the name for the initial branch. This default branch name 202s hint: is subject to change. To configure the initial branch name to use in all 202s hint: of your new repositories, which will suppress this warning, call: 202s hint: 202s hint: git config --global init.defaultBranch 202s hint: 202s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 202s hint: 'development'. The just-created branch can be renamed via this command: 202s hint: 202s hint: git branch -m 202s hint: 202s hint: Disable this message with "git config set advice.defaultBranchName false" 202s + echo git-imerge test repository with multiple conflicts 202s + printf %s\n /*.out /*.css /*.html 202s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted/.git config user.name Loú User 202s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted/.git config user.email luser@example.com 202s + TIME=1112911993 202s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 203s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/really-conflicted 203s + modify c.txt 0 203s + filename=c.txt 203s + text=0 203s + echo 0 203s + git add c.txt 203s + modify d.txt 0 203s + filename=d.txt 203s + text=0 203s + echo 0 203s + git add d.txt 203s + seq 0 7 203s + modify conflict0.txt original version 203s + filename=conflict0.txt 203s + text=original version 203s + echo original version 203s + git add conflict0.txt 203s + modify conflict1.txt original version 203s + filename=conflict1.txt 203s + text=original version 203s + echo original version 203s + git add conflict1.txt 203s + modify conflict2.txt original version 203s + filename=conflict2.txt 203s + text=original version 203s + echo original version 203s + git add conflict2.txt 203s + modify conflict3.txt original version 203s + filename=conflict3.txt 203s + text=original version 203s + echo original version 203s + git add conflict3.txt 203s + modify conflict4.txt original version 203s + filename=conflict4.txt 203s + text=original version 203s + echo original version 203s + git add conflict4.txt 203s + modify conflict5.txt original version 203s + filename=conflict5.txt 203s + text=original version 203s + echo original version 203s + git add conflict5.txt 203s + modify conflict6.txt original version 203s + filename=conflict6.txt 203s + text=original version 203s + echo original version 203s + git add conflict6.txt 203s + modify conflict7.txt original version 203s + filename=conflict7.txt 203s + text=original version 203s + echo original version 203s + git add conflict7.txt 203s + commit -m m⇒0 203s + TIME=1112911994 203s [master (root-commit) 8e21fbd] m⇒0 203s 10 files changed, 10 insertions(+) 203s create mode 100644 c.txt 203s create mode 100644 conflict0.txt 203s create mode 100644 conflict1.txt 203s create mode 100644 conflict2.txt 203s create mode 100644 conflict3.txt 203s create mode 100644 conflict4.txt 203s create mode 100644 conflict5.txt 203s create mode 100644 conflict6.txt 203s create mode 100644 conflict7.txt 203s create mode 100644 d.txt 203s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 203s + git checkout -b c master -- 203s Switched to a new branch 'c' 203s + modify c.txt 1 203s + filename=c.txt 203s + text=1 203s + echo 1 203s + git add c.txt 203s [c 4e6007a] c⇒1 203s 3 files changed, 3 insertions(+), 3 deletions(-) 203s [c c2b7c49] c⇒2 203s 1 file changed, 1 insertion(+), 1 deletion(-) 203s + modify conflict0.txt c version 203s + filename=conflict0.txt 203s + text=c version 203s + echo c version 203s + git add conflict0.txt 203s + modify conflict4.txt c version 203s + filename=conflict4.txt 203s + text=c version 203s + echo c version 203s + git add conflict4.txt 203s + commit -m c⇒1 203s + TIME=1112911995 203s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 203s + modify c.txt 2 203s + filename=c.txt 203s + text=2 203s + echo 2 203s + git add c.txt 203s + commit -m c⇒2 203s + TIME=1112911996 203s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 203s + modify c.txt 3 203s + filename=c.txt 203s + text=3 203s + echo 3 203s + git add c.txt 203s + commit -m c⇒3 203s + TIME=1112911997 203s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 203s [c 42ad55a] c⇒3 203s 1 file changed, 1 insertion(+), 1 deletion(-) 203s + modify c.txt 4 203s + filename=c.txt 203s + text=4 203s + echo 4 203s + git add c.txt 203s + modify conflict1.txt c version 203s + filename=conflict1.txt 203s + text=c version 203s + echo c version 203s + git add conflict1.txt 203s + commit -m c⇒4 203s + TIME=1112911998 203s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 203s [c a891793] c⇒4 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + modify c.txt 5 203s + filename=c.txt 203s + text=5 203s + echo 5 203s + git add c.txt 203s + modify conflict3.txt c version 203s + filename=conflict3.txt 203s + text=c version 203s + echo c version 203s + git add conflict3.txt 203s + modify conflict6.txt c version 203s + filename=conflict6.txt 203s + text=c version 203s + echo c version 203s + git add conflict6.txt 203s + commit -m c⇒5 203s + TIME=1112911999 203s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 203s [c c21441d] c⇒5 203s 3 files changed, 3 insertions(+), 3 deletions(-) 203s + modify c.txt 6 203s + filename=c.txt 203s + text=6 203s + echo 6 203s + git add c.txt 203s + modify conflict5.txt c version 203s + filename=conflict5.txt 203s + text=c version 203s + echo c version 203s + git add conflict5.txt 203s + commit -m c⇒6 203s + TIME=1112912000 203s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 203s + modify c.txt 7 203s + filename=c.txt 203s + text=7 203s [c a797a66] c⇒6 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + echo 7 203s + git add c.txt 203s + modify conflict2.txt c version 203s + filename=conflict2.txt 203s + text=c version 203s + echo c version 203s + git add conflict2.txt 203s + commit -m c⇒7 203s + TIME=1112912001 203s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 203s [c c0e1537] c⇒7 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + modify c.txt 8 203s + filename=c.txt 203s + text=8 203s + echo 8 203s + git add c.txt 203s + commit -m c⇒8 203s + TIME=1112912002 203s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 203s [c 9f3e7c8] c⇒8 203s 1 file changed, 1 insertion(+), 1 deletion(-) 203s + modify c.txt 9 203s + filename=c.txt 203s + text=9 203s + echo 9 203s + git add c.txt 203s + modify conflict7.txt c version 203s + filename=conflict7.txt 203s + text=c version 203s + echo c version 203s + git add conflict7.txt 203s + commit -m c⇒9 203s + TIME=1112912003 203s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 203s [c ccbfccb] c⇒9 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + git checkout -b d master -- 203s Switched to a new branch 'd' 203s + modify d.txt 1 203s + filename=d.txt 203s + text=1 203s + echo 1 203s + git add d.txt 203s + modify conflict0.txt d version 203s + filename=conflict0.txt 203s + text=d version 203s + echo d version 203s + git add conflict0.txt 203s + modify conflict6.txt d version 203s + filename=conflict6.txt 203s + text=d version 203s + echo d version 203s + git add conflict6.txt 203s + commit -m d⇒1 203s + TIME=1112912004 203s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 203s [d 8c3c065] d⇒1 203s 3 files changed, 3 insertions(+), 3 deletions(-) 203s + modify d.txt 2 203s + filename=d.txt 203s + text=2 203s + echo 2 203s + git add d.txt 203s + modify conflict1.txt d version 203s + filename=conflict1.txt 203s + text=d version 203s + echo d version 203s + git add conflict1.txt 203s + modify conflict2.txt d version 203s + filename=conflict2.txt 203s + text=d version 203s + echo d version 203s + git add conflict2.txt 203s + commit -m d⇒2 203s + TIME=1112912005 203s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 203s [d 820b787] d⇒2 203s 3 files changed, 3 insertions(+), 3 deletions(-) 203s + modify d.txt 3 203s + filename=d.txt 203s + text=3 203s + echo 3 203s + git add d.txt 203s + commit -m d⇒3 203s + TIME=1112912006 203s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 203s [d 821c792] d⇒3 203s 1 file changed, 1 insertion(+), 1 deletion(-) 203s + modify d.txt 4 203s + filename=d.txt 203s + text=4 203s + echo 4 203s + git add d.txt 203s + commit -m d⇒4 203s + TIME=1112912007 203s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 203s [d c2a1456] d⇒4 203s 1 file changed, 1 insertion(+), 1 deletion(-) 203s + modify d.txt 5 203s + filename=d.txt 203s + text=5 203s + echo 5 203s + git add d.txt 203s + modify conflict3.txt d version 203s + filename=conflict3.txt 203s + text=d version 203s + echo d version 203s + git add conflict3.txt 203s + commit -m d⇒5 203s + TIME=1112912008 203s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 203s [d c3e3890] d⇒5 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + modify d.txt 6 203s + filename=d.txt 203s + text=6 203s + echo 6 203s + git add d.txt 203s + modify conflict4.txt d version 203s + filename=conflict4.txt 203s + text=d version 203s + echo d version 203s + git add conflict4.txt 203s + commit -m d⇒6 203s + TIME=1112912009 203s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 203s + modify d.txt 7 203s + filename=d.txt 203s + text=7 203s [d b2f5c5e] d⇒6 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + echo 7 203s + git add d.txt 203s + modify conflict5.txt d version 203s + filename=conflict5.txt 203s + text=d version 203s + echo d version 203s + git add conflict5.txt 203s + commit -m d⇒7 203s + TIME=1112912010 203s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 203s [d 892af56] d⇒7 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + modify d.txt 8 203s + filename=d.txt 203s + text=8 203s + echo 8 203s + git add d.txt 203s + modify conflict7.txt d version 203s + filename=conflict7.txt 203s + text=d version 203s + echo d version 203s + git add conflict7.txt 203s + commit -m d⇒8 203s + TIME=1112912011 203s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 203s [d 67099d0] d⇒8 203s 2 files changed, 2 insertions(+), 2 deletions(-) 203s + git checkout c 203s Switched to branch 'c' 203s + git-imerge init --name=c-d d 203s + git-imerge diagram --commits --frontier 204s 0 5 9 204s | | | 204s 0 - ********** - c 204s *????????? 204s *????????? 204s *????????? 204s *????????? 204s 5 - *????????? 204s *????????? 204s *????????? 204s 8 - *????????? 204s | 204s d 204s 204s 0 5 9 204s | | | 204s 0 - ********** - c 204s *????????? 204s *????????? 204s *????????? 204s *????????? 204s 5 - *????????? 204s *????????? 204s *????????? 204s 8 - *????????? 204s | 204s d 204s 204s Key: 204s |,-,+ = rectangles forming current merge frontier 204s * = merge done manually 204s . = merge done automatically 204s # = conflict that is currently blocking progress 204s @ = merge was blocked but has been resolved 204s ? = no merge recorded 204s 204s + conflict_count=0 204s + true 204s + git-imerge continue --no-edit 204s + tee autofill.out 204s Attempting automerge of 9-8...failure. 204s Attempting automerge of 1-1...failure. 204s Switched to branch 'imerge/c-d' 204s Auto-merging conflict0.txt 204s CONFLICT (content): Merge conflict in conflict0.txt 204s Automatic merge failed; fix conflicts and then commit the result. 204s 204s Original first commit: 204s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 204s Author: Loú User 204s Date: Thu Apr 7 22:13:15 2005 +0000 204s 204s c⇒1 204s 204s Original second commit: 204s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 204s Author: Loú User 204s Date: Thu Apr 7 22:13:24 2005 +0000 204s 204s d⇒1 204s 204s There was a conflict merging commit 1-1, shown above. 204s Please resolve the conflict, commit the result, then type 204s 204s git-imerge continue 204s + grep -q Traceback autofill.out 204s + git-imerge diagram --frontier 204s 0 5 9 204s | | | 204s 0 - ********** - c 204s *#???????? 204s *????????? 204s *????????? 204s *????????? 204s 5 - *????????? 204s *????????? 204s *????????? 204s 8 - *????????? 204s | 204s d 204s 204s Key: 204s |,-,+ = rectangles forming current merge frontier 204s * = merge done manually 204s . = merge done automatically 204s # = conflict that is currently blocking progress 204s @ = merge was blocked but has been resolved 204s ? = no merge recorded 204s 204s + grep -q There was a conflict merging autofill.out 204s + seq 0 7 204s + grep -q ==== conflict0.txt 204s + modify conflict0.txt merged version 204s + filename=conflict0.txt 204s + text=merged version 204s + echo merged version 204s + git add conflict0.txt 204s + conflict_count=1 204s + grep -q ==== conflict1.txt 204s + grep -q ==== conflict2.txt 204s + grep -q ==== conflict3.txt 204s + grep -q ==== conflict4.txt 204s + grep -q ==== conflict5.txt 204s + grep -q ==== conflict6.txt 204s + grep -q ==== conflict7.txt 204s + true 204s + git-imerge continue --no-edit 204s + tee autofill.out 204s [imerge/c-d a7f4a19] imerge 'c-d': manual merge 1-1 204s Merge has been recorded for merge 1-1. 204s Attempting automerge of 1-8...failure. 204s Attempting automerge of 1-2...success. 204s Attempting automerge of 1-6...failure. 204s Attempting automerge of 1-4...success. 204s Attempting automerge of 1-5...success. 204s Autofilling 1-2...success. 204s Autofilling 1-3...success. 204s Autofilling 1-4...success. 205s Autofilling 1-5...success. 205s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 205s Attempting automerge of 1-8...failure. 205s Attempting automerge of 1-6...failure. 205s Attempting automerge of 9-5...failure. 205s Attempting automerge of 2-1...success. 205s Attempting automerge of 2-4...success. 205s Attempting automerge of 2-5...success. 205s Attempting automerge of 9-5...failure. 205s Attempting automerge of 6-5...failure. 205s Attempting automerge of 4-5...failure. 205s Attempting automerge of 3-5...success. 205s Attempting automerge of 4-1...success. 205s Attempting automerge of 4-3...failure. 205s Attempting automerge of 4-2...failure. 205s Attempting automerge of 9-1...failure. 205s Attempting automerge of 7-1...failure. 205s Attempting automerge of 6-1...failure. 205s Attempting automerge of 5-1...failure. 205s Autofilling 2-5...success. 205s Autofilling 3-1...success. 205s Autofilling 3-2...success. 205s Autofilling 3-3...success. 205s Autofilling 3-4...success. 205s Autofilling 3-5 (first way)...success. 205s Autofilling 3-5 (second way)...success. 205s The two ways of autofilling 3-5 agree. 205s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 205s Autofilling 4-1...success. 205s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 205s Attempting automerge of 4-5...failure. 205s Attempting automerge of 4-2...failure. 205s Attempting automerge of 9-1...failure. 205s Attempting automerge of 5-1...failure. 205s Previous HEAD position was c21441d c⇒5 205s Switched to branch 'imerge/c-d' 205s Auto-merging conflict4.txt 205s CONFLICT (content): Merge conflict in conflict4.txt 205s Automatic merge failed; fix conflicts and then commit the result. 205s 205s Original first commit: 205s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 205s Author: Loú User 205s Date: Thu Apr 7 22:13:15 2005 +0000 205s 205s c⇒1 205s 205s Original second commit: 205s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 205s Author: Loú User 205s Date: Thu Apr 7 22:13:29 2005 +0000 205s 205s d⇒6 205s 205s There was a conflict merging commit 1-6, shown above. 205s Please resolve the conflict, commit the result, then type 205s 205s git-imerge continue 205s + grep -q Traceback autofill.out 205s + git-imerge diagram --frontier 205s 0 5 9 205s | | | 205s 0 - ********** - c 205s **?.+#???? 205s *.?|#????? 205s *.?|?????? 205s *.?|?????? 205s 5 - *--+?????? 205s *#???????? 205s *????????? 205s 8 - *????????? 205s | 205s d 205s 205s Key: 205s |,-,+ = rectangles forming current merge frontier 205s * = merge done manually 205s . = merge done automatically 205s # = conflict that is currently blocking progress 205s @ = merge was blocked but has been resolved 205s ? = no merge recorded 205s 205s + grep -q There was a conflict merging autofill.out 205s + seq 0 7 205s + grep -q ==== conflict0.txt 205s + grep -q ==== conflict1.txt 205s + grep -q ==== conflict2.txt 205s + grep -q ==== conflict3.txt 205s + grep -q ==== conflict4.txt 205s + modify conflict4.txt merged version 205s + filename=conflict4.txt 205s + text=merged version 205s + echo merged version 205s + git add conflict4.txt 205s + conflict_count=2 205s + grep -q ==== conflict5.txt 205s + grep -q ==== conflict6.txt 205s + grep -q ==== conflict7.txt 205s + true 205s + git-imerge continue --no-edit 205s + tee autofill.out 205s [imerge/c-d b22ea46] imerge 'c-d': manual merge 1-6 205s Merge has been recorded for merge 1-6. 206s Attempting automerge of 1-8...success. 206s Autofilling 1-7...success. 206s Autofilling 1-8...success. 206s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 206s Attempting automerge of 3-8...success. 206s Autofilling 2-8...success. 206s Autofilling 3-6...success. 206s Autofilling 3-7...success. 206s Autofilling 3-8 (first way)...success. 206s Autofilling 3-8 (second way)...success. 206s The two ways of autofilling 3-8 agree. 206s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 206s Warning: you are leaving 1 commit behind, not connected to 206s any of your branches: 206s 206s a5d69f4 imerge 'c-d': automatic merge 3-8 206s 206s If you want to keep it by creating a new branch, this may be a good time 206s to do so with: 206s 206s git branch a5d69f4 206s 206s Switched to branch 'imerge/c-d' 206s Auto-merging conflict1.txt 206s CONFLICT (content): Merge conflict in conflict1.txt 206s Automatic merge failed; fix conflicts and then commit the result. 206s 206s Original first commit: 206s commit a89179336bb40a4ca90903425239a9ef3ce659bd 206s Author: Loú User 206s Date: Thu Apr 7 22:13:18 2005 +0000 206s 206s c⇒4 206s 206s Original second commit: 206s commit 820b787e86e22612af7a061db842dc95e9f1d49f 206s Author: Loú User 206s Date: Thu Apr 7 22:13:25 2005 +0000 206s 206s d⇒2 206s 206s There was a conflict merging commit 4-2, shown above. 206s Please resolve the conflict, commit the result, then type 206s 206s git-imerge continue 206s + grep -q Traceback autofill.out 206s + git-imerge diagram --frontier 206s 0 5 9 206s | | | 206s 0 - ********** - c 206s **?.+#???? 206s *.?|#????? 206s *.?|?????? 206s *.?|?????? 206s 5 - *..|?????? 206s **?|?????? 206s *.?|?????? 206s 8 - *--+?????? 206s | 206s d 206s 206s Key: 206s |,-,+ = rectangles forming current merge frontier 206s * = merge done manually 206s . = merge done automatically 206s # = conflict that is currently blocking progress 206s @ = merge was blocked but has been resolved 206s ? = no merge recorded 206s 206s + grep -q There was a conflict merging autofill.out 206s + seq 0 7 206s + grep -q ==== conflict0.txt 206s + grep -q ==== conflict1.txt 206s + modify conflict1.txt merged version 206s + filename=conflict1.txt 206s + text=merged version 206s + echo merged version 206s + git add conflict1.txt 206s + conflict_count=3 206s + grep -q ==== conflict2.txt 206s + grep -q ==== conflict3.txt 206s + grep -q ==== conflict4.txt 206s + grep -q ==== conflict5.txt 206s + grep -q ==== conflict6.txt 206s + grep -q ==== conflict7.txt 206s + true 206s + + tee autofill.out 206s git-imerge continue --no-edit 206s [imerge/c-d fa0a14f] imerge 'c-d': manual merge 4-2 206s Merge has been recorded for merge 4-2. 206s Attempting automerge of 4-8...success. 206s Autofilling 4-3...success. 206s Autofilling 4-4...success. 206s Autofilling 4-5...success. 206s Autofilling 4-6...success. 206s Autofilling 4-7...success. 206s Autofilling 4-8...success. 206s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 206s Previous HEAD position was 88476ce imerge 'c-d': automatic merge 4-8 206s Switched to branch 'imerge/c-d' 206s Auto-merging conflict6.txt 206s CONFLICT (content): Merge conflict in conflict6.txt 206s Automatic merge failed; fix conflicts and then commit the result. 206s 206s Original first commit: 206s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 206s Author: Loú User 206s Date: Thu Apr 7 22:13:19 2005 +0000 206s 206s c⇒5 206s 206s Original second commit: 206s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 206s Author: Loú User 206s Date: Thu Apr 7 22:13:24 2005 +0000 206s 206s d⇒1 206s 206s There was a conflict merging commit 5-1, shown above. 206s Please resolve the conflict, commit the result, then type 206s 206s git-imerge continue 206s + grep -q Traceback autofill.out 206s + git-imerge diagram --frontier 206s 0 5 9 206s | | | 206s 0 - ********** - c 206s **?.|#???? 206s *.?.*????? 206s *.?.|????? 206s *.?.|????? 206s 5 - *...|????? 206s **?.|????? 206s *.?.|????? 206s 8 - *---+????? 206s | 206s d 206s 206s Key: 206s |,-,+ = rectangles forming current merge frontier 206s * = merge done manually 206s . = merge done automatically 206s # = conflict that is currently blocking progress 206s @ = merge was blocked but has been resolved 206s ? = no merge recorded 206s 206s + grep -q There was a conflict merging autofill.out 206s + seq 0 7 206s + grep -q ==== conflict0.txt 206s + grep -q ==== conflict1.txt 206s + grep -q ==== conflict2.txt 206s + grep -q ==== conflict3.txt 206s + grep -q ==== conflict4.txt 206s + grep -q ==== conflict5.txt 206s + grep -q ==== conflict6.txt 206s + modify conflict6.txt merged version 206s + filename=conflict6.txt 206s + text=merged version 206s + echo merged version 206s + git add conflict6.txt 206s + conflict_count=4 206s + grep -q ==== conflict7.txt 206s + true 206s + git-imerge continue --no-edit 206s + tee autofill.out 206s [imerge/c-d 8b19ca1] imerge 'c-d': manual merge 5-1 206s Merge has been recorded for merge 5-1. 206s Attempting automerge of 5-8...failure. 206s Attempting automerge of 5-2...success. 206s Attempting automerge of 5-6...failure. 206s Attempting automerge of 5-4...success. 206s Attempting automerge of 5-5...failure. 206s Autofilling 5-2...success. 206s Autofilling 5-3...success. 206s Autofilling 5-4...success. 206s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 206s Attempting automerge of 5-8...failure. 206s Attempting automerge of 5-5...failure. 206s Attempting automerge of 9-4...failure. 206s Attempting automerge of 6-1...success. 206s Attempting automerge of 6-3...success. 206s Attempting automerge of 6-4...success. 206s Attempting automerge of 9-4...failure. 206s Attempting automerge of 8-4...failure. 206s Attempting automerge of 7-4...failure. 206s Attempting automerge of 7-1...success. 206s Attempting automerge of 7-3...failure. 206s Attempting automerge of 7-2...failure. 206s Attempting automerge of 9-1...success. 206s Autofilling 6-1...success. 206s Autofilling 6-2...success. 206s Autofilling 6-3...success. 206s Autofilling 6-4...success. 206s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 206s Autofilling 7-1...success. 206s Autofilling 8-1...success. 206s Autofilling 9-1...success. 206s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 206s Attempting automerge of 9-4...failure. 206s Attempting automerge of 7-2...failure. 206s Previous HEAD position was 3f061c8 imerge 'c-d': automatic merge 7-1 206s Switched to branch 'imerge/c-d' 206s Auto-merging conflict3.txt 206s CONFLICT (content): Merge conflict in conflict3.txt 206s Automatic merge failed; fix conflicts and then commit the result. 206s 206s Original first commit: 206s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 206s Author: Loú User 206s Date: Thu Apr 7 22:13:19 2005 +0000 206s 206s c⇒5 206s 206s Original second commit: 206s commit c3e3890b9e3c756c1d8f7e345184d576739be079 206s Author: Loú User 206s Date: Thu Apr 7 22:13:28 2005 +0000 206s 206s d⇒5 206s 206s There was a conflict merging commit 5-5, shown above. 206s Please resolve the conflict, commit the result, then type 206s 206s git-imerge continue 206s + grep -q Traceback autofill.out 206s + git-imerge diagram --frontier 206s 0 5 9 206s | | | 206s 0 - ********** - c 206s **?..*.--+ 206s *.?.*.|#?? 206s *.?...|??? 206s *.?..-+??? 206s 5 - *...|#???? 206s **?.|????? 206s *.?.|????? 206s 8 - *---+????? 206s | 206s d 206s 206s Key: 206s |,-,+ = rectangles forming current merge frontier 206s * = merge done manually 206s . = merge done automatically 206s # = conflict that is currently blocking progress 206s @ = merge was blocked but has been resolved 206s ? = no merge recorded 206s 206s + grep -q There was a conflict merging autofill.out 206s + seq 0 7 206s + grep -q ==== conflict0.txt 206s + grep -q ==== conflict1.txt 206s + grep -q ==== conflict2.txt 206s + grep -q ==== conflict3.txt 206s + modify conflict3.txt merged version 206s + filename=conflict3.txt 206s + text=merged version 206s + echo merged version 206s + git add conflict3.txt 206s + conflict_count=5 206s + grep -q ==== conflict4.txt 206s + grep -q ==== conflict5.txt 206s + grep -q ==== conflict6.txt 206s + grep -q ==== conflict7.txt 206s + true 206s + git-imerge continue --no-edit 206s + tee autofill.out 206s [imerge/c-d 379c3ce] imerge 'c-d': manual merge 5-5 206s Merge has been recorded for merge 5-5. 206s Attempting automerge of 5-8...success. 206s Autofilling 5-6...success. 206s Autofilling 5-7...success. 206s Autofilling 5-8...success. 206s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 207s Attempting automerge of 6-8...failure. 207s Attempting automerge of 6-5...success. 207s Attempting automerge of 6-7...failure. 207s Attempting automerge of 6-6...success. 207s Autofilling 6-5...success. 207s Autofilling 6-6...success. 207s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 207s Attempting automerge of 6-8...failure. 207s Attempting automerge of 6-7...failure. 207s Switched to branch 'imerge/c-d' 207s Auto-merging conflict5.txt 207s CONFLICT (content): Merge conflict in conflict5.txt 207s Automatic merge failed; fix conflicts and then commit the result. 207s 207s Original first commit: 207s commit a797a66a0e4b89690099557280641efeac302bcf 207s Author: Loú User 207s Date: Thu Apr 7 22:13:20 2005 +0000 207s 207s c⇒6 207s 207s Original second commit: 207s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 207s Author: Loú User 207s Date: Thu Apr 7 22:13:30 2005 +0000 207s 207s d⇒7 207s 207s There was a conflict merging commit 6-7, shown above. 207s Please resolve the conflict, commit the result, then type 207s 207s git-imerge continue 207s + grep -q Traceback autofill.out 207s + git-imerge diagram --frontier 207s 0 5 9 207s | | | 207s 0 - ********** - c 207s **?..*.--+ 207s *.?.*.|#?? 207s *.?...|??? 207s *.?...|??? 207s 5 - *....*|??? 207s **?...+??? 207s *.?..|#??? 207s 8 - *----+???? 207s | 207s d 207s 207s Key: 207s |,-,+ = rectangles forming current merge frontier 207s * = merge done manually 207s . = merge done automatically 207s # = conflict that is currently blocking progress 207s @ = merge was blocked but has been resolved 207s ? = no merge recorded 207s 207s + grep -q There was a conflict merging autofill.out 207s + seq 0 7 207s + grep -q ==== conflict0.txt 207s + grep -q ==== conflict1.txt 207s + grep -q ==== conflict2.txt 207s + grep -q ==== conflict3.txt 207s + grep -q ==== conflict4.txt 207s + grep -q ==== conflict5.txt 207s + modify conflict5.txt merged version 207s + filename=conflict5.txt 207s + text=merged version 207s + echo merged version 207s + git add conflict5.txt 207s + conflict_count=6 207s + grep -q ==== conflict6.txt 207s + grep -q ==== conflict7.txt 207s + true 207s + git-imerge continue --no-edit 207s + tee autofill.out 207s [imerge/c-d 0c4b757] imerge 'c-d': manual merge 6-7 207s Merge has been recorded for merge 6-7. 207s Attempting automerge of 6-8...success. 207s Autofilling 6-8...success. 207s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 207s Previous HEAD position was 0debbe8 imerge 'c-d': automatic merge 6-8 207s Switched to branch 'imerge/c-d' 207s Auto-merging conflict2.txt 207s CONFLICT (content): Merge conflict in conflict2.txt 207s Automatic merge failed; fix conflicts and then commit the result. 207s 207s Original first commit: 207s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 207s Author: Loú User 207s Date: Thu Apr 7 22:13:21 2005 +0000 207s 207s c⇒7 207s 207s Original second commit: 207s commit 820b787e86e22612af7a061db842dc95e9f1d49f 207s Author: Loú User 207s Date: Thu Apr 7 22:13:25 2005 +0000 207s 207s d⇒2 207s 207s There was a conflict merging commit 7-2, shown above. 207s Please resolve the conflict, commit the result, then type 207s 207s git-imerge continue 207s + grep -q Traceback autofill.out 207s + git-imerge diagram --frontier 207s 0 5 9 207s | | | 207s 0 - ********** - c 207s **?..*.--+ 207s *.?.*.|#?? 207s *.?...|??? 207s *.?...|??? 207s 5 - *....*|??? 207s **?...|??? 207s *.?...*??? 207s 8 - *-----+??? 207s | 207s d 207s 207s Key: 207s |,-,+ = rectangles forming current merge frontier 207s * = merge done manually 207s . = merge done automatically 207s # = conflict that is currently blocking progress 207s @ = merge was blocked but has been resolved 207s ? = no merge recorded 207s 207s + grep -q There was a conflict merging autofill.out 207s + seq 0 7 207s + grep -q ==== conflict0.txt 207s + grep -q ==== conflict1.txt 207s + grep -q ==== conflict2.txt 207s + modify conflict2.txt merged version 207s + filename=conflict2.txt 207s + text=merged version 207s + echo merged version 207s + git add conflict2.txt 207s + conflict_count=7 207s + grep -q ==== conflict3.txt 207s + grep -q ==== conflict4.txt 207s + grep -q ==== conflict5.txt 207s + grep -q ==== conflict6.txt 207s + grep -q ==== conflict7.txt 207s + true 207s + git-imerge continue --no-edit 207s + tee autofill.out 207s [imerge/c-d 0899a1f] imerge 'c-d': manual merge 7-2 207s Merge has been recorded for merge 7-2. 207s Attempting automerge of 7-8...success. 207s Autofilling 7-3...success. 207s Autofilling 7-4...success. 207s Autofilling 7-5...success. 207s Autofilling 7-6...success. 207s Autofilling 7-7...success. 207s Autofilling 7-8...success. 207s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 207s Attempting automerge of 9-8...failure. 207s Attempting automerge of 8-2...success. 207s Attempting automerge of 8-6...success. 207s Attempting automerge of 8-8...success. 207s Attempting automerge of 9-8...failure. 207s Attempting automerge of 9-2...success. 207s Attempting automerge of 9-5...success. 207s Attempting automerge of 9-7...success. 207s Autofilling 8-2...success. 207s Autofilling 8-3...success. 207s Autofilling 8-4...success. 207s Autofilling 8-5...success. 207s Autofilling 8-6...success. 207s Autofilling 8-7...success. 207s Autofilling 8-8...success. 207s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 207s Autofilling 9-2...success. 207s Autofilling 9-3...success. 207s Autofilling 9-4...success. 207s Autofilling 9-5...success. 207s Autofilling 9-6...success. 207s Autofilling 9-7...success. 207s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 207s Attempting automerge of 9-8...failure. 207s Attempting automerge of 9-8...failure. 207s Switched to branch 'imerge/c-d' 207s Auto-merging conflict7.txt 207s CONFLICT (content): Merge conflict in conflict7.txt 207s Automatic merge failed; fix conflicts and then commit the result. 207s 207s Original first commit: 207s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 207s Author: Loú User 207s Date: Thu Apr 7 22:13:23 2005 +0000 207s 207s c⇒9 207s 207s Original second commit: 207s commit 67099d078100141fbe4063d46a6408200f4ff311 207s Author: Loú User 207s Date: Thu Apr 7 22:13:31 2005 +0000 207s 207s d⇒8 207s 207s There was a conflict merging commit 9-8, shown above. 207s Please resolve the conflict, commit the result, then type 207s 207s git-imerge continue 207s + grep -q Traceback autofill.out 207s + git-imerge diagram --frontier 207s 0 5 9 207s | | | 207s 0 - ********** - c 207s **?..*...| 207s *.?.*..*.| 207s *.?......| 207s *.?......| 207s 5 - *....*...| 207s **?......| 207s *.?...*..+ 207s 8 - *-------+# 207s | 207s d 207s 207s Key: 207s |,-,+ = rectangles forming current merge frontier 207s * = merge done manually 207s . = merge done automatically 207s # = conflict that is currently blocking progress 207s @ = merge was blocked but has been resolved 207s ? = no merge recorded 207s 207s + grep -q There was a conflict merging autofill.out 207s + seq 0 7 207s + grep -q ==== conflict0.txt 207s + grep -q ==== conflict1.txt 207s + grep -q ==== conflict2.txt 207s + grep -q ==== conflict3.txt 207s + grep -q ==== conflict4.txt 207s + grep -q ==== conflict5.txt 207s + grep -q ==== conflict6.txt 207s + grep -q ==== conflict7.txt 207s + modify conflict7.txt merged version 207s + filename=conflict7.txt 207s + text=merged version 207s + echo merged version 207s + git add conflict7.txt 207s + conflict_count=8 207s + true 207s + git-imerge continue --no-edit 207s + tee autofill.out 207s [imerge/c-d 6f117a3] imerge 'c-d': manual merge 9-8 207s Merge has been recorded for merge 9-8. 207s Merge is complete! 207s + grep -q Traceback autofill.out 207s + git-imerge diagram --frontier 207s 0 5 9 207s | | | 207s 0 - ********** - c 207s **?..*...| 207s *.?.*..*.| 207s *.?......| 207s *.?......| 207s 5 - *....*...| 207s **?......| 207s *.?...*..| 207s 8 - *--------* 207s | 207s d 207s 207s Key: 207s |,-,+ = rectangles forming current merge frontier 207s * = merge done manually 207s . = merge done automatically 207s # = conflict that is currently blocking progress 207s @ = merge was blocked but has been resolved 207s ? = no merge recorded 207s 207s + grep -q There was a conflict merging autofill.out 207s + break 207s + test 8 -ne 8 207s + git-imerge diagram --commits 208s + cat 208s + diff -u - diagram.out 208s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 208s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 208s Merge d into c (using imerge) 208s 208s # Please enter the commit message for your changes. Lines starting 208s # with '#' will be ignored, and an empty message aborts the commit. 208s # 208s # Date: Fri Dec 5 19:58:38 2025 +0000 208s # 208s # On branch c-d-merge 208s # Changes to be committed: 208s # modified: conflict0.txt 208s # modified: conflict1.txt 208s # modified: conflict2.txt 208s # modified: conflict3.txt 208s # modified: conflict4.txt 208s # modified: conflict5.txt 208s # modified: conflict6.txt 208s # modified: conflict7.txt 208s # modified: d.txt 208s # 208s [c-d-merge 2a36109] Merge d into c (using imerge) 208s Date: Fri Dec 5 19:58:38 2025 +0000 208s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 208s + local refname=c-d-merge 208s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 208s + git rev-parse c-d-merge^{tree} 208s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 208s + git-imerge simplify --goal=rebase --branch=c-d-rebase 208s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 208s + local refname=c-d-rebase 208s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 208s + git rev-parse c-d-rebase^{tree} 208s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 208s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 209s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + local refname=c-d-rebase-with-history 209s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git rev-parse c-d-rebase-with-history^{tree} 209s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git-imerge simplify --goal=border --branch=c-d-border 209s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + local refname=c-d-border 209s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git rev-parse c-d-border^{tree} 209s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 209s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + local refname=c-d-border-with-history 209s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git rev-parse c-d-border-with-history^{tree} 209s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 209s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + local refname=c-d-border-with-history2 209s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git rev-parse c-d-border-with-history2^{tree} 209s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 209s + git-imerge remove 209s py313: commands[3] /tmp/autopkgtest.IpjX5N/build.W0y/src> /bin/sh t/test-duplicated 209s + dirname t/test-duplicated 209s + cd t 209s + pwd 209s + dirname /tmp/autopkgtest.IpjX5N/build.W0y/src/t 209s + BASE=/tmp/autopkgtest.IpjX5N/build.W0y/src 209s + . /tmp/autopkgtest.IpjX5N/build.W0y/src/t/test-lib.sh 209s + GIT_IMERGE=git-imerge 209s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s + DESCRIPTION=git-imerge test repository with duplicate commits 209s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated git-imerge test repository with duplicate commits 209s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s + local description=git-imerge test repository with duplicate commits 209s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated git-imerge test repository with duplicate commits 209s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s + local description=git-imerge test repository with duplicate commits 209s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated/.git/ 209s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s hint: Using 'master' as the name for the initial branch. This default branch name 209s hint: is subject to change. To configure the initial branch name to use in all 209s hint: of your new repositories, which will suppress this warning, call: 209s hint: 209s hint: git config --global init.defaultBranch 209s hint: 209s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 209s hint: 'development'. The just-created branch can be renamed via this command: 209s hint: 209s hint: git branch -m 209s hint: 209s hint: Disable this message with "git config set advice.defaultBranchName false" 209s + echo git-imerge test repository with duplicate commits 209s [master (root-commit) a733afa] m⇒0 209s 1 file changed, 1 insertion(+) 209s create mode 100644 a.txt 209s [a 2f1f75a] a⇒1 on branch a 209s 1 file changed, 1 insertion(+), 1 deletion(-) 209s + printf %s\n /*.out /*.css /*.html 209s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated/.git config user.name Loú User 209s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated/.git config user.email luser@example.com 209s + TIME=1112911993 209s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/duplicated 209s + modify a.txt 0 209s + filename=a.txt 209s + text=0 209s + echo 0 209s + git add a.txt 209s + commit -m m⇒0 209s + TIME=1112911994 209s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 209s + git checkout -b a -- 209s Switched to a new branch 'a' 209s + seq 3 209s + modify a.txt 1 209s + filename=a.txt 209s + text=1 209s + echo 1 209s + git add a.txt 209s + commit -m a⇒1 on branch a 209s + TIME=1112911995 209s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 209s + modify a.txt 2 209s + filename=a.txt 209s + text=2 209s + echo 2 209s + git add a.txt 209s + commit -m a⇒2 on branch a 209s + TIME=1112911996 209s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 209s + modify a.txt 3 209s + filename=a.txt 209s + text=3 209s + echo 3 209s + git add a.txt 209s + commit -m a⇒3 on branch a 209s + TIME=1112911997 209s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 209s + git checkout -b b master -- 209s Switched to a new branch 'b' 209s + seq 4 209s + modify a.txt 1 209s + filename=a.txt 209s + text=1 209s [a 4700669] a⇒2 on branch a 209s 1 file changed, 1 insertion(+), 1 deletion(-) 209s [a 621c381] a⇒3 on branch a 209s 1 file changed, 1 insertion(+), 1 deletion(-) 209s + echo 1 209s + git add a.txt 209s + commit -m a⇒1 on branch b 209s + TIME=1112911998 209s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 209s [b 62a5c56] a⇒1 on branch b 209s 1 file changed, 1 insertion(+), 1 deletion(-) 209s + modify a.txt 2 209s + filename=a.txt 209s + text=2 209s + echo 2 209s + git add a.txt 209s + commit -m a⇒2 on branch b 209s + TIME=1112911999 209s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 209s [b f846281] a⇒2 on branch b 209s 1 file changed, 1 insertion(+), 1 deletion(-) 209s + modify a.txt 3 209s + filename=a.txt 209s + text=3 209s + echo 3 209s + git add a.txt 209s + commit -m a⇒3 on branch b 209s + TIME=1112912000 209s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 209s [b a4b2c2b] a⇒3 on branch b 209s 1 file changed, 1 insertion(+), 1 deletion(-) 209s + modify a.txt 4 209s + filename=a.txt 209s + text=4 209s + echo 4 209s + git add a.txt 209s + commit -m a⇒4 on branch b 209s + TIME=1112912001 209s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 209s [b 5b24553] a⇒4 on branch b 209s 1 file changed, 1 insertion(+), 1 deletion(-) 209s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 209s + git checkout a 209s Switched to branch 'a' 209s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 209s Attempting automerge of 3-4...failure. 209s Attempting automerge of 1-1...success. 209s Attempting automerge of 1-3...failure. 209s Attempting automerge of 1-2...failure. 209s Attempting automerge of 3-1...failure. 209s Attempting automerge of 2-1...failure. 209s Autofilling 1-1...success. 209s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 209s Attempting automerge of 1-4...success. 209s Autofilling 1-2...success. 209s Autofilling 1-3...success. 209s Autofilling 1-4...success. 209s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 209s Attempting automerge of 3-4...failure. 209s Attempting automerge of 2-1...success. 209s Attempting automerge of 2-3...failure. 210s Attempting automerge of 2-2...success. 210s Attempting automerge of 3-2...failure. 210s Attempting automerge of 3-1...success. 210s Autofilling 2-1...success. 210s Autofilling 2-2...success. 210s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 210s Autofilling 3-1...success. 210s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 210s Attempting automerge of 2-4...success. 210s Autofilling 2-3...success. 210s Autofilling 2-4...success. 210s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 210s Attempting automerge of 3-4...failure. 210s Attempting automerge of 3-2...success. 210s Attempting automerge of 3-4...failure. 210s Attempting automerge of 3-3...success. 210s Autofilling 3-2...success. 210s Autofilling 3-3...success. 210s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 210s Attempting automerge of 3-4...success. 210s Autofilling 3-4...success. 210s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 210s Merge is complete! 210s + git-imerge diagram --commits --frontier --html=imerge5.html 210s 0 3 210s | | 210s 0 - **** - a 210s *... 210s *... 210s *... 210s 4 - *... 210s | 210s b 210s 210s 0 3 210s | | 210s 0 - **** - a 210s *..| 210s *..| 210s *..| 210s 4 - *--+ 210s | 210s b 210s 210s Key: 210s |,-,+ = rectangles forming current merge frontier 210s * = merge done manually 210s . = merge done automatically 210s # = conflict that is currently blocking progress 210s @ = merge was blocked but has been resolved 210s ? = no merge recorded 210s 210s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 210s Merge b into a (using imerge) 210s 210s # Please enter the commit message for your changes. Lines starting 210s # with '#' will be ignored, and an empty message aborts the commit. 210s # 210s # Date: Fri Dec 5 19:58:40 2025 +0000 210s # 210s # On branch a-b-merge 210s # Changes to be committed: 210s # modified: a.txt 210s # 210s [a-b-merge 76245f2] Merge b into a (using imerge) 210s Date: Fri Dec 5 19:58:40 2025 +0000 210s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 210s + local refname=a-b-merge 210s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 210s + git rev-parse a-b-merge^{tree} 210s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 210s + git-imerge simplify --goal=rebase --branch=a-b-rebase 210s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 210s + local refname=a-b-rebase 210s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 210s + git rev-parse a-b-rebase^{tree} 210s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 210s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 211s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + local refname=a-b-rebase-with-history 211s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + git rev-parse a-b-rebase-with-history^{tree} 211s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + git-imerge simplify --goal=border --branch=a-b-border 211s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + local refname=a-b-border 211s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + git rev-parse a-b-border^{tree} 211s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 211s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + local refname=a-b-border-with-history 211s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + git rev-parse a-b-border-with-history^{tree} 211s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 211s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 212s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 212s + local refname=a-b-border-with-history2 212s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 212s + git rev-parse a-b-border-with-history2^{tree} 212s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 212s + git checkout a 212s Switched to branch 'a' 212s + git-imerge start --goal=full --name=a-b b 212s Attempting to merge 1-1...success. 212s Attempting to merge 1-2...success. 212s Attempting to merge 1-3...success. 212s Attempting to merge 1-4...success. 212s Attempting to merge 2-1...success. 212s Attempting to merge 2-2...success. 212s Attempting to merge 2-3...success. 212s Attempting to merge 2-4...success. 212s Attempting to merge 3-1...success. 212s Attempting to merge 3-2...success. 213s Attempting to merge 3-3...success. 213s Attempting to merge 3-4...success. 213s Merge is complete! 213s + git-imerge list 213s * a-b 213s + git-imerge diagram --commits --frontier --html=imerge6.html 213s 0 3 213s | | 213s 0 - **** - a 213s *... 213s *... 213s *... 213s 4 - *... 213s | 213s b 213s 213s 0 3 213s | | 213s 0 - **** - a 213s *..| 213s *..| 213s *..| 213s 4 - *--+ 213s | 213s b 213s 213s Key: 213s |,-,+ = rectangles forming current merge frontier 213s * = merge done manually 213s . = merge done automatically 213s # = conflict that is currently blocking progress 213s @ = merge was blocked but has been resolved 213s ? = no merge recorded 213s 213s + git-imerge finish --branch=a-b-full 213s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 213s + local refname=a-b-full 213s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 213s + git rev-parse a-b-full^{tree} 213s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 213s py313: commands[4] /tmp/autopkgtest.IpjX5N/build.W0y/src> /bin/sh t/test-flip-flop 213s + dirname t/test-flip-flop 213s + cd t 213s + pwd 213s + dirname /tmp/autopkgtest.IpjX5N/build.W0y/src/t 213s + BASE=/tmp/autopkgtest.IpjX5N/build.W0y/src 213s + . /tmp/autopkgtest.IpjX5N/build.W0y/src/t/test-lib.sh 213s + GIT_IMERGE=git-imerge 213s + flip_flop_test 1 213s + local n=1 213s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 213s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 213s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 213s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 213s + local description=git-imerge test repository with a commit and its revert at n=1 213s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 213s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 213s + local description=git-imerge test repository with a commit and its revert at n=1 213s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 213s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 213s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 214s hint: Using 'master' as the name for the initial branch. This default branch name 214s hint: is subject to change. To configure the initial branch name to use in all 214s hint: of your new repositories, which will suppress this warning, call: 214s hint: 214s hint: git config --global init.defaultBranch 214s hint: 214s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 214s hint: 'development'. The just-created branch can be renamed via this command: 214s hint: 214s hint: git branch -m 214s hint: 214s hint: Disable this message with "git config set advice.defaultBranchName false" 214s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1/.git/ 214s [master (root-commit) a733afa] m⇒0 214s 1 file changed, 1 insertion(+) 214s create mode 100644 a.txt 214s [a 2f1f75a] a⇒1 on branch a 214s 1 file changed, 1 insertion(+), 1 deletion(-) 214s [a 4700669] a⇒2 on branch a 214s 1 file changed, 1 insertion(+), 1 deletion(-) 214s [a 621c381] a⇒3 on branch a 214s 1 file changed, 1 insertion(+), 1 deletion(-) 214s [b 044a3fa] b⇒1 and a⇒X on branch b 214s 2 files changed, 2 insertions(+), 1 deletion(-) 214s create mode 100644 b.txt 214s [b 7851975] b⇒2 and a⇒0 on branch b 214s 2 files changed, 2 insertions(+), 2 deletions(-) 214s [b 6fe24f0] b⇒3 on branch b 214s 1 file changed, 1 insertion(+), 1 deletion(-) 214s [b 2dc5eb7] b⇒4 on branch b 214s 1 file changed, 1 insertion(+), 1 deletion(-) 214s Attempting automerge of 3-4...success. 214s Autofilling 1-4...success. 214s Autofilling 2-4...success. 214s Autofilling 3-1...unexpected conflict. Backtracking... 214s Autofilling 1-4...success. 214s Autofilling 2-1...unexpected conflict. Backtracking... 214s Autofilling 1-1...unexpected conflict. Backtracking... 214s Switched to branch 'imerge/b' 214s Auto-merging a.txt 214s CONFLICT (content): Merge conflict in a.txt 214s Automatic merge failed; fix conflicts and then commit the result. 214s 214s Original first commit: 214s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 214s Author: Loú User 214s Date: Thu Apr 7 22:13:15 2005 +0000 214s 214s a⇒1 on branch a 214s 214s Original second commit: 214s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 214s Author: Loú User 214s Date: Thu Apr 7 22:13:18 2005 +0000 214s 214s b⇒1 and a⇒X on branch b 214s 214s There was a conflict merging commit 1-1, shown above. 214s Please resolve the conflict, commit the result, then type 214s 214s git-imerge continue 214s 0 3 214s | | 214s 0 - **** - a 214s *#?? 214s *??? 214s *??? 214s 4 - *??? 214s | 214s b 214s 214s 0 3 214s | | 214s 0 - **** - a 214s *#?? 214s *??? 214s *??? 214s 4 - *??? 214s | 214s b 214s 214s Key: 214s |,-,+ = rectangles forming current merge frontier 214s * = merge done manually 214s . = merge done automatically 214s # = conflict that is currently blocking progress 214s @ = merge was blocked but has been resolved 214s ? = no merge recorded 214s 214s [imerge/b bb473ca] imerge 'b': manual merge 1-1 214s Merge has been recorded for merge 1-1. 214s Attempting automerge of 1-4...failure. 214s Attempting automerge of 1-2...failure. 214s Attempting automerge of 3-1...success. 214s Autofilling 2-1...success. 214s Autofilling 3-1...success. 214s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 214s Previous HEAD position was 1c5ce08 imerge 'b': automatic merge 3-1 214s Switched to branch 'imerge/b' 214s Auto-merging a.txt 214s CONFLICT (content): Merge conflict in a.txt 214s Automatic merge failed; fix conflicts and then commit the result. 214s 214s Original first commit: 214s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 214s Author: Loú User 214s Date: Thu Apr 7 22:13:15 2005 +0000 214s 214s a⇒1 on branch a 214s 214s Original second commit: 214s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 214s Author: Loú User 214s Date: Thu Apr 7 22:13:19 2005 +0000 214s 214s b⇒2 and a⇒0 on branch b 214s 214s There was a conflict merging commit 1-2, shown above. 214s Please resolve the conflict, commit the result, then type 214s 214s git-imerge continue 214s + echo git-imerge test repository with a commit and its revert at n=1 214s + printf %s\n /*.out /*.css /*.html 214s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1/.git config user.name Loú User 214s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 214s + TIME=1112911993 214s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 214s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-1 214s + modify a.txt 0 214s + filename=a.txt 214s + text=0 214s + echo 0 214s + git add a.txt 214s + commit -m m⇒0 214s + TIME=1112911994 214s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 214s + git checkout -b a -- 214s Switched to a new branch 'a' 214s + modify a.txt 1 214s + filename=a.txt 214s + text=1 214s + echo 1 214s + git add a.txt 214s + commit -m a⇒1 on branch a 214s + TIME=1112911995 214s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 214s + modify a.txt 2 214s + filename=a.txt 214s + text=2 214s + echo 2 214s + git add a.txt 214s + commit -m a⇒2 on branch a 214s + TIME=1112911996 214s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 214s + modify a.txt 3 214s + filename=a.txt 214s + text=3 214s + echo 3 214s + git add a.txt 214s + commit -m a⇒3 on branch a 214s + TIME=1112911997 214s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 214s + git checkout -b b master -- 214s Switched to a new branch 'b' 214s + modify b.txt 1 214s + filename=b.txt 214s + text=1 214s + echo 1 214s + git add b.txt 214s + msg=b⇒1 214s + test 1 = 1 214s + modify a.txt X 214s + filename=a.txt 214s + text=X 214s + echo X 214s + git add a.txt 214s + msg=b⇒1 and a⇒X 214s + test 1 = 2 214s + commit -m b⇒1 and a⇒X on branch b 214s + TIME=1112911998 214s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 214s + modify b.txt 2 214s + filename=b.txt 214s + text=2 214s + echo 2 214s + git add b.txt 214s + msg=b⇒2 214s + test 2 = 1 214s + test 2 = 2 214s + modify a.txt 0 214s + filename=a.txt 214s + text=0 214s + echo 0 214s + git add a.txt 214s + msg=b⇒2 and a⇒0 214s + commit -m b⇒2 and a⇒0 on branch b 214s + TIME=1112911999 214s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 214s + modify b.txt 3 214s + filename=b.txt 214s + text=3 214s + echo 3 214s + git add b.txt 214s + msg=b⇒3 214s + test 3 = 1 214s + test 3 = 2 214s + commit -m b⇒3 on branch b 214s + TIME=1112912000 214s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 214s + modify b.txt 4 214s + filename=b.txt 214s + text=4 214s + echo 4 214s + git add b.txt 214s + msg=b⇒4 214s + test 4 = 1 214s + test 4 = 2 214s + commit -m b⇒4 on branch b 214s + TIME=1112912001 214s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 214s + test_merge b-into-a-1 a b 1-1 1-2 214s + local name=b-into-a-1 214s + local dst=a 214s + local src=b 214s + local conflict1=1-1 214s + local conflict2=1-2 214s + git checkout a 214s Switched to branch 'a' 214s + git-imerge merge --branch=b-into-a-1 b 214s + tee imerge-b-into-a-1-1.out 214s + git-imerge diagram --commits --frontier 214s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 214s + echo 1 214s + git add a.txt 214s + git-imerge continue --no-edit 214s + tee imerge-b-into-a-1-2.out 214s + git-imerge diagram --commits --frontier 215s 0 3 215s | | 215s 0 - **** - a 215s **.. 215s *#?? 215s *??? 215s 4 - *??? 215s | 215s b 215s 215s 0 3 215s | | 215s 0 - **** - a 215s **-+ 215s *#?? 215s *??? 215s 4 - *??? 215s | 215s b 215s 215s Key: 215s |,-,+ = rectangles forming current merge frontier 215s * = merge done manually 215s . = merge done automatically 215s # = conflict that is currently blocking progress 215s @ = merge was blocked but has been resolved 215s ? = no merge recorded 215s 215s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 215s + echo 1 215s + git add a.txt 215s + git-imerge continue --no-edit 215s + tee imerge-b-into-a-1-3.out 215s [imerge/b 314616d] imerge 'b': manual merge 1-2 215s Merge has been recorded for merge 1-2. 215s Attempting automerge of 1-4...success. 215s Autofilling 1-3...success. 215s Autofilling 1-4...success. 215s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 215s Attempting automerge of 3-4...success. 215s Autofilling 2-4...success. 215s Autofilling 3-2...success. 215s Autofilling 3-3...success. 215s Autofilling 3-4 (first way)...success. 215s Autofilling 3-4 (second way)...success. 215s The two ways of autofilling 3-4 agree. 215s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 215s Merge is complete! 215s + grep -q Merge is complete imerge-b-into-a-1-3.out 215s + git-imerge diagram --commits --frontier 215s 0 3 215s | | 215s 0 - **** - a 215s **.. 215s **?. 215s *.?. 215s 4 - *... 215s | 215s b 215s 215s 0 3 215s | | 215s 0 - **** - a 215s **.| 215s **?| 215s *.?| 215s 4 - *--+ 215s | 215s b 215s 215s Key: 215s |,-,+ = rectangles forming current merge frontier 215s * = merge done manually 215s . = merge done automatically 215s # = conflict that is currently blocking progress 215s @ = merge was blocked but has been resolved 215s ? = no merge recorded 215s 215s + GIT_EDITOR=cat git-imerge finish 215s Merge b into a (using imerge) 215s 215s # Please enter the commit message for your changes. Lines starting 215s # with '#' will be ignored, and an empty message aborts the commit. 215s # 215s # Date: Fri Dec 5 19:58:46 2025 +0000 215s # 215s # On branch b-into-a-1 215s # Changes to be committed: 215s # new file: b.txt 215s # 215s [b-into-a-1 adb4be3] Merge b into a (using imerge) 215s Date: Fri Dec 5 19:58:46 2025 +0000 215s + test_merge a-into-b-1 b a 1-1 2-1 215s + local name=a-into-b-1 215s + local dst=b 215s + local src=a 215s + local conflict1=1-1 215s + local conflict2=2-1 215s + git checkout b 215s Switched to branch 'b' 215s + git-imerge merge --branch=a-into-b-1 a 215s + tee imerge-a-into-b-1-1.out 215s Attempting automerge of 4-3...success. 215s Autofilling 1-3...unexpected conflict. Backtracking... 215s Autofilling 1-2...unexpected conflict. Backtracking... 215s Autofilling 1-1...unexpected conflict. Backtracking... 215s Switched to branch 'imerge/a' 215s Auto-merging a.txt 215s CONFLICT (content): Merge conflict in a.txt 215s Automatic merge failed; fix conflicts and then commit the result. 215s 215s Original first commit: 215s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 215s Author: Loú User 215s Date: Thu Apr 7 22:13:18 2005 +0000 215s 215s b⇒1 and a⇒X on branch b 215s 215s Original second commit: 215s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 215s Author: Loú User 215s Date: Thu Apr 7 22:13:15 2005 +0000 215s 215s a⇒1 on branch a 215s 215s There was a conflict merging commit 1-1, shown above. 215s Please resolve the conflict, commit the result, then type 215s 215s git-imerge continue 215s + git-imerge diagram --commits --frontier 215s 0 4 215s | | 215s 0 - ***** - b 215s *#??? 215s *???? 215s 3 - *???? 215s | 215s a 215s 215s 0 4 215s | | 215s 0 - ***** - b 215s *#??? 215s *???? 215s 3 - *???? 215s | 215s a 215s 215s Key: 215s |,-,+ = rectangles forming current merge frontier 215s * = merge done manually 215s . = merge done automatically 215s # = conflict that is currently blocking progress 215s @ = merge was blocked but has been resolved 215s ? = no merge recorded 215s 215s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 215s + echo 1 215s + git add a.txt 215s + git-imerge continue --no-edit 215s + tee imerge-a-into-b-1-2.out 215s [imerge/a 7f4ef53] imerge 'a': manual merge 1-1 215s Merge has been recorded for merge 1-1. 216s Attempting automerge of 1-3...success. 216s Autofilling 1-2...success. 216s Autofilling 1-3...success. 216s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 216s Attempting automerge of 4-3...failure. 216s Attempting automerge of 2-1...failure. 216s Switched to branch 'imerge/a' 216s Auto-merging a.txt 216s CONFLICT (content): Merge conflict in a.txt 216s Automatic merge failed; fix conflicts and then commit the result. 216s 216s Original first commit: 216s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 216s Author: Loú User 216s Date: Thu Apr 7 22:13:19 2005 +0000 216s 216s b⇒2 and a⇒0 on branch b 216s 216s Original second commit: 216s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 216s Author: Loú User 216s Date: Thu Apr 7 22:13:15 2005 +0000 216s 216s a⇒1 on branch a 216s 216s There was a conflict merging commit 2-1, shown above. 216s Please resolve the conflict, commit the result, then type 216s 216s git-imerge continue 216s + git-imerge diagram --commits --frontier 216s 0 4 216s | | 216s 0 - ***** - b 216s **#?? 216s *.??? 216s 3 - *.??? 216s | 216s a 216s 216s 0 4 216s | | 216s 0 - ***** - b 216s **#?? 216s *|??? 216s 3 - *+??? 216s | 216s a 216s 216s Key: 216s |,-,+ = rectangles forming current merge frontier 216s * = merge done manually 216s . = merge done automatically 216s # = conflict that is currently blocking progress 216s @ = merge was blocked but has been resolved 216s ? = no merge recorded 216s 216s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 216s + echo 1 216s + git add a.txt 216s + git-imerge continue --no-edit 216s + tee imerge-a-into-b-1-3.out 216s [imerge/a 289abaa] imerge 'a': manual merge 2-1 216s Merge has been recorded for merge 2-1. 216s Attempting automerge of 2-3...success. 216s Autofilling 2-2...success. 216s Autofilling 2-3...success. 216s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 216s Attempting automerge of 4-3...success. 216s Autofilling 3-3...success. 216s Autofilling 4-1...success. 216s Autofilling 4-2...success. 216s Autofilling 4-3 (first way)...success. 216s Autofilling 4-3 (second way)...success. 216s The two ways of autofilling 4-3 agree. 216s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 216s Merge is complete! 216s + grep -q Merge is complete imerge-a-into-b-1-3.out 216s + git-imerge diagram --commits --frontier 216s 0 4 216s | | 216s 0 - ***** - b 216s ***?. 216s *..?. 216s 3 - *.... 216s | 216s a 216s 216s 0 4 216s | | 216s 0 - ***** - b 216s ***?| 216s *..?| 216s 3 - *---+ 216s | 216s a 216s 216s Key: 216s |,-,+ = rectangles forming current merge frontier 216s * = merge done manually 216s . = merge done automatically 216s # = conflict that is currently blocking progress 216s @ = merge was blocked but has been resolved 216s ? = no merge recorded 216s 216s + GIT_EDITOR=cat git-imerge finish 216s Merge a into b (using imerge) 216s 216s # Please enter the commit message for your changes. Lines starting 216s # with '#' will be ignored, and an empty message aborts the commit. 216s # 216s # Date: Fri Dec 5 19:58:47 2025 +0000 216s # 216s # On branch a-into-b-1 216s # Changes to be committed: 216s # modified: a.txt 216s # 216s [a-into-b-1 79dcbf9] Merge a into b (using imerge) 216s Date: Fri Dec 5 19:58:47 2025 +0000 216s + flip_flop_test 2 216s + local n=2 216s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 216s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 216s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s + local description=git-imerge test repository with a commit and its revert at n=2 216s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 216s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s + local description=git-imerge test repository with a commit and its revert at n=2 216s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2/.git/ 216s hint: Using 'master' as the name for the initial branch. This default branch name 216s hint: is subject to change. To configure the initial branch name to use in all 216s hint: of your new repositories, which will suppress this warning, call: 216s hint: 216s hint: git config --global init.defaultBranch 216s hint: 216s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 216s hint: 'development'. The just-created branch can be renamed via this command: 216s hint: 216s hint: git branch -m 216s hint: 216s hint: Disable this message with "git config set advice.defaultBranchName false" 216s + echo git-imerge test repository with a commit and its revert at n=2 216s + printf %s\n /*.out /*.css /*.html 216s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2/.git config user.name Loú User 216s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 216s + TIME=1112911993 216s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-2 216s + modify a.txt 0 216s + filename=a.txt 216s + text=0 216s + echo 0 216s + git add a.txt 216s + commit -m m⇒0 216s + TIME=1112911994 216s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 216s [master (root-commit) a733afa] m⇒0 216s 1 file changed, 1 insertion(+) 216s create mode 100644 a.txt 216s + git checkout -b a -- 216s Switched to a new branch 'a' 216s + modify a.txt 1 216s + filename=a.txt 216s + text=1 216s + echo 1 216s + git add a.txt 216s + commit -m a⇒1 on branch a 216s + TIME=1112911995 216s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 216s [a 2f1f75a] a⇒1 on branch a 216s 1 file changed, 1 insertion(+), 1 deletion(-) 216s [a 4700669] a⇒2 on branch a 216s 1 file changed, 1 insertion(+), 1 deletion(-) 216s + modify a.txt 2 216s + filename=a.txt 216s + text=2 216s + echo 2 216s + git add a.txt 216s + commit -m a⇒2 on branch a 216s + TIME=1112911996 216s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 216s + modify a.txt 3 216s + filename=a.txt 216s + text=3 216s + echo 3 216s + git add a.txt 216s + commit -m a⇒3 on branch a 216s + TIME=1112911997 216s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 216s [a 621c381] a⇒3 on branch a 216s 1 file changed, 1 insertion(+), 1 deletion(-) 216s + git checkout -b b master -- 216s Switched to a new branch 'b' 216s + modify b.txt 1 216s + filename=b.txt 216s + text=1 216s + echo 1 216s + git add b.txt 216s + msg=b⇒1 216s + test 1 = 2 216s + test 1 = 3 216s + commit -m b⇒1 on branch b 216s + TIME=1112911998 216s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 216s [b 1f7d097] b⇒1 on branch b 216s 1 file changed, 1 insertion(+) 216s create mode 100644 b.txt 216s + modify b.txt 2 216s + filename=b.txt 216s + text=2 216s + echo 2 216s + git add b.txt 216s [b 48df77d] b⇒2 and a⇒X on branch b 216s 2 files changed, 2 insertions(+), 2 deletions(-) 216s + msg=b⇒2 216s + test 2 = 2 216s + modify a.txt X 216s + filename=a.txt 216s + text=X 216s + echo X 216s + git add a.txt 216s + msg=b⇒2 and a⇒X 216s + test 2 = 3 216s + commit -m b⇒2 and a⇒X on branch b 216s + TIME=1112911999 216s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 216s + modify b.txt 3 216s + filename=b.txt 216s + text=3 216s + echo 3 216s + git add b.txt 216s + msg=b⇒3 216s + test 3 = 2 216s + test 3 = 3 216s + modify a.txt 0 216s + filename=a.txt 216s + text=0 216s + echo 0 216s + git add a.txt 216s + msg=b⇒3 and a⇒0 216s + commit -m b⇒3 and a⇒0 on branch b 216s + TIME=1112912000 216s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 216s [b f3ef019] b⇒3 and a⇒0 on branch b 216s 2 files changed, 2 insertions(+), 2 deletions(-) 216s + modify b.txt 4 216s + filename=b.txt 216s + text=4 216s + echo 4 216s + git add b.txt 216s + msg=b⇒4 216s + test 4 = 2 216s + test 4 = 3 216s + commit -m b⇒4 on branch b 216s + TIME=1112912001 216s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 216s + test_merge b-into-a-2 a b 1-2 1-3 216s + local name=b-into-a-2 216s + local dst=a 216s + local src=b 216s + local conflict1=1-2 216s + local conflict2=1-3 216s + git checkout a 216s Switched to branch 'a' 216s + git-imerge merge --branch=b-into-a-2 b 216s + tee imerge-b-into-a-2-1.out 216s [b 69d0c21] b⇒4 on branch b 216s 1 file changed, 1 insertion(+), 1 deletion(-) 216s Attempting automerge of 3-4...success. 216s Autofilling 1-4...success. 216s Autofilling 2-4...success. 216s Autofilling 3-1...success. 216s Autofilling 3-2...unexpected conflict. Backtracking... 216s Autofilling 1-4...success. 216s Autofilling 2-1...success. 216s Autofilling 2-2...unexpected conflict. Backtracking... 216s Autofilling 1-1...success. 216s Autofilling 1-2...unexpected conflict. Backtracking... 216s Autofilling 1-1...success. 217s Autofilling 2-1...success. 217s Autofilling 3-1...success. 217s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 217s Attempting automerge of 3-4...success. 217s Autofilling 1-4...success. 217s Autofilling 2-4...success. 217s Autofilling 3-2...unexpected conflict. Backtracking... 217s Autofilling 1-4...success. 217s Autofilling 2-2...unexpected conflict. Backtracking... 217s Autofilling 1-2...unexpected conflict. Backtracking... 217s Switched to branch 'imerge/b' 217s Auto-merging a.txt 217s CONFLICT (content): Merge conflict in a.txt 217s Automatic merge failed; fix conflicts and then commit the result. 217s 217s Original first commit: 217s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 217s Author: Loú User 217s Date: Thu Apr 7 22:13:15 2005 +0000 217s 217s a⇒1 on branch a 217s 217s Original second commit: 217s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 217s Author: Loú User 217s Date: Thu Apr 7 22:13:19 2005 +0000 217s 217s b⇒2 and a⇒X on branch b 217s 217s There was a conflict merging commit 1-2, shown above. 217s Please resolve the conflict, commit the result, then type 217s 217s git-imerge continue 217s + git-imerge diagram --commits --frontier 217s 0 3 217s | | 217s 0 - **** - a 217s *... 217s *#?? 217s *??? 217s 4 - *??? 217s | 217s b 217s 217s 0 3 217s | | 217s 0 - **** - a 217s *--+ 217s *#?? 217s *??? 217s 4 - *??? 217s | 217s b 217s 217s Key: 217s |,-,+ = rectangles forming current merge frontier 217s * = merge done manually 217s . = merge done automatically 217s # = conflict that is currently blocking progress 217s @ = merge was blocked but has been resolved 217s ? = no merge recorded 217s 217s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 217s + echo 1 217s + git add a.txt 217s + git-imerge continue --no-edit 217s + tee imerge-b-into-a-2-2.out 217s [imerge/b 663ced5] imerge 'b': manual merge 1-2 217s Merge has been recorded for merge 1-2. 217s Attempting automerge of 1-4...failure. 217s Attempting automerge of 1-3...failure. 217s Attempting automerge of 3-2...success. 217s Autofilling 2-2...success. 217s Autofilling 3-2...success. 217s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 217s Previous HEAD position was bd21612 imerge 'b': automatic merge 3-2 217s Switched to branch 'imerge/b' 217s Auto-merging a.txt 217s CONFLICT (content): Merge conflict in a.txt 217s Automatic merge failed; fix conflicts and then commit the result. 217s 217s Original first commit: 217s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 217s Author: Loú User 217s Date: Thu Apr 7 22:13:15 2005 +0000 217s 217s a⇒1 on branch a 217s 217s Original second commit: 217s commit f3ef01986be02ef5e40589b283c0385471ecca7d 217s Author: Loú User 217s Date: Thu Apr 7 22:13:20 2005 +0000 217s 217s b⇒3 and a⇒0 on branch b 217s 217s There was a conflict merging commit 1-3, shown above. 217s Please resolve the conflict, commit the result, then type 217s 217s git-imerge continue 217s + git-imerge diagram --commits --frontier 217s 0 3 217s | | 217s 0 - **** - a 217s *... 217s **.. 217s *#?? 217s 4 - *??? 217s | 217s b 217s 217s 0 3 217s | | 217s 0 - **** - a 217s *..| 217s **-+ 217s *#?? 217s 4 - *??? 217s | 217s b 217s 217s Key: 217s |,-,+ = rectangles forming current merge frontier 217s * = merge done manually 217s . = merge done automatically 217s # = conflict that is currently blocking progress 217s @ = merge was blocked but has been resolved 217s ? = no merge recorded 217s 217s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 217s + echo 1 217s + git add a.txt 217s + + git-imerge continue --no-edit 217s tee imerge-b-into-a-2-3.out 217s [imerge/b 82578ec] imerge 'b': manual merge 1-3 217s Merge has been recorded for merge 1-3. 217s Attempting automerge of 1-4...success. 217s Autofilling 1-4...success. 217s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 217s Attempting automerge of 3-4...success. 217s Autofilling 2-4...success. 217s Autofilling 3-3...success. 218s Autofilling 3-4 (first way)...success. 218s Autofilling 3-4 (second way)...success. 218s The two ways of autofilling 3-4 agree. 218s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 218s Merge is complete! 218s + grep -q Merge is complete imerge-b-into-a-2-3.out 218s + git-imerge diagram --commits --frontier 218s 0 3 218s | | 218s 0 - **** - a 218s *... 218s **.. 218s **?. 218s 4 - *... 218s | 218s b 218s 218s 0 3 218s | | 218s 0 - **** - a 218s *..| 218s **.| 218s **?| 218s 4 - *--+ 218s | 218s b 218s 218s Key: 218s |,-,+ = rectangles forming current merge frontier 218s * = merge done manually 218s . = merge done automatically 218s # = conflict that is currently blocking progress 218s @ = merge was blocked but has been resolved 218s ? = no merge recorded 218s 218s + GIT_EDITOR=cat git-imerge finish 218s Merge b into a (using imerge) 218s 218s # Please enter the commit message for your changes. Lines starting 218s # with '#' will be ignored, and an empty message aborts the commit. 218s # 218s # Date: Fri Dec 5 19:58:48 2025 +0000 218s # 218s # On branch b-into-a-2 218s # Changes to be committed: 218s # new file: b.txt 218s # 218s [b-into-a-2 23f9dc9] Merge b into a (using imerge) 218s Date: Fri Dec 5 19:58:48 2025 +0000 218s + test_merge a-into-b-2 b a 2-1 3-1 218s + local name=a-into-b-2 218s + local dst=b 218s + local src=a 218s + local conflict1=2-1 218s + local conflict2=3-1 218s + git checkout b 218s Switched to branch 'b' 218s + git-imerge merge --branch=a-into-b-2 a 218s + tee imerge-a-into-b-2-1.out 218s Attempting automerge of 4-3...success. 218s Autofilling 1-3...success. 218s Autofilling 2-3...unexpected conflict. Backtracking... 218s Autofilling 1-1...success. 218s Autofilling 1-2...success. 218s Autofilling 1-3...success. 218s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 218s Autofilling 2-2...unexpected conflict. Backtracking... 218s Autofilling 2-1...unexpected conflict. Backtracking... 218s Switched to branch 'imerge/a' 218s Auto-merging a.txt 218s CONFLICT (content): Merge conflict in a.txt 218s Automatic merge failed; fix conflicts and then commit the result. 218s 218s Original first commit: 218s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 218s Author: Loú User 218s Date: Thu Apr 7 22:13:19 2005 +0000 218s 218s b⇒2 and a⇒X on branch b 218s 218s Original second commit: 218s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 218s Author: Loú User 218s Date: Thu Apr 7 22:13:15 2005 +0000 218s 218s a⇒1 on branch a 218s 218s There was a conflict merging commit 2-1, shown above. 218s Please resolve the conflict, commit the result, then type 218s 218s git-imerge continue 218s + git-imerge diagram --commits --frontier 218s 0 4 218s | | 218s 0 - ***** - b 218s *.#?? 218s *.??? 218s 3 - *.??? 218s | 218s a 218s 218s 0 4 218s | | 218s 0 - ***** - b 218s *|#?? 218s *|??? 218s 3 - *+??? 218s | 218s a 218s 218s Key: 218s |,-,+ = rectangles forming current merge frontier 218s * = merge done manually 218s . = merge done automatically 218s # = conflict that is currently blocking progress 218s @ = merge was blocked but has been resolved 218s ? = no merge recorded 218s 218s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 218s + echo 1 218s + git add a.txt 218s + git-imerge continue --no-edit 218s + tee imerge-a-into-b-2-2.out 218s [imerge/a bbfdb9e] imerge 'a': manual merge 2-1 218s Merge has been recorded for merge 2-1. 218s Attempting automerge of 2-3...success. 218s Autofilling 2-2...success. 218s Autofilling 2-3...success. 218s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 218s Attempting automerge of 4-3...failure. 218s Attempting automerge of 3-1...failure. 218s Switched to branch 'imerge/a' 218s Auto-merging a.txt 218s CONFLICT (content): Merge conflict in a.txt 218s Automatic merge failed; fix conflicts and then commit the result. 218s 218s Original first commit: 218s commit f3ef01986be02ef5e40589b283c0385471ecca7d 218s Author: Loú User 218s Date: Thu Apr 7 22:13:20 2005 +0000 218s 218s b⇒3 and a⇒0 on branch b 218s 218s Original second commit: 218s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 218s Author: Loú User 218s Date: Thu Apr 7 22:13:15 2005 +0000 218s 218s a⇒1 on branch a 218s 218s There was a conflict merging commit 3-1, shown above. 218s Please resolve the conflict, commit the result, then type 218s 218s git-imerge continue 218s + git-imerge diagram --commits --frontier 218s 0 4 218s | | 218s 0 - ***** - b 218s *.*#? 218s *..?? 218s 3 - *..?? 218s | 218s a 218s 218s 0 4 218s | | 218s 0 - ***** - b 218s *.*#? 218s *.|?? 218s 3 - *-+?? 218s | 218s a 218s 218s Key: 218s |,-,+ = rectangles forming current merge frontier 218s * = merge done manually 218s . = merge done automatically 218s # = conflict that is currently blocking progress 218s @ = merge was blocked but has been resolved 218s ? = no merge recorded 218s 218s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 218s + echo 1 218s + git add a.txt 218s + + tee imerge-a-into-b-2-3.out 218s git-imerge continue --no-edit 218s [imerge/a 642f4f5] imerge 'a': manual merge 3-1 218s Merge has been recorded for merge 3-1. 218s Attempting automerge of 3-3...success. 218s Autofilling 3-2...success. 218s Autofilling 3-3...success. 218s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 218s Attempting automerge of 4-3...success. 218s Autofilling 4-1...success. 218s Autofilling 4-2...success. 218s Autofilling 4-3...success. 218s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 218s Merge is complete! 218s + grep -q Merge is complete imerge-a-into-b-2-3.out 218s + git-imerge diagram --commits --frontier 218s 0 4 218s | | 218s 0 - ***** - b 218s *.**. 218s *.... 218s 3 - *.... 218s | 218s a 218s 218s 0 4 218s | | 218s 0 - ***** - b 218s *.**| 218s *...| 218s 3 - *---+ 218s | 218s a 218s 218s Key: 218s |,-,+ = rectangles forming current merge frontier 218s * = merge done manually 218s . = merge done automatically 218s # = conflict that is currently blocking progress 218s @ = merge was blocked but has been resolved 218s ? = no merge recorded 218s 218s + GIT_EDITOR=cat git-imerge finish 218s Merge a into b (using imerge) 218s 218s # Please enter the commit message for your changes. Lines starting 218s # with '#' will be ignored, and an empty message aborts the commit. 218s # 218s # Date: Fri Dec 5 19:58:49 2025 +0000 218s # 218s # On branch a-into-b-2 218s # Changes to be committed: 218s # modified: a.txt 218s # 218s [a-into-b-2 2a3862a] Merge a into b (using imerge) 218s Date: Fri Dec 5 19:58:49 2025 +0000 218s + flip_flop_test 3 218s + local n=3 218s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 218s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 218s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s + local description=git-imerge test repository with a commit and its revert at n=3 218s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 218s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s + local description=git-imerge test repository with a commit and its revert at n=3 218s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s hint: Using 'master' as the name for the initial branch. This default branch name 218s hint: is subject to change. To configure the initial branch name to use in all 218s hint: of your new repositories, which will suppress this warning, call: 218s hint: 218s hint: git config --global init.defaultBranch 218s hint: 218s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 218s hint: 'development'. The just-created branch can be renamed via this command: 218s hint: 218s hint: git branch -m 218s hint: 218s hint: Disable this message with "git config set advice.defaultBranchName false" 218s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3/.git/ 218s + echo git-imerge test repository with a commit and its revert at n=3 218s + printf %s\n /*.out /*.css /*.html 218s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3/.git config user.name Loú User 218s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 218s + TIME=1112911993 218s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/flip-flop-3 218s + modify a.txt 0 218s + filename=a.txt 218s + text=0 218s + echo 0 218s + git add a.txt 218s + commit -m m⇒0 218s + TIME=1112911994 218s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 218s [master (root-commit) a733afa] m⇒0 218s 1 file changed, 1 insertion(+) 218s create mode 100644 a.txt 218s + git checkout -b a -- 218s Switched to a new branch 'a' 218s + modify a.txt 1 218s + filename=a.txt 218s + text=1 218s + echo 1 218s + git add a.txt 218s + commit -m a⇒1 on branch a 218s + TIME=1112911995 218s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 218s [a 2f1f75a] a⇒1 on branch a 218s 1 file changed, 1 insertion(+), 1 deletion(-) 218s + modify a.txt 2 218s + filename=a.txt 218s + text=2 218s + echo 2 218s + git add a.txt 219s + commit -m a⇒2 on branch a 219s + TIME=1112911996 219s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 219s [a 4700669] a⇒2 on branch a 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify a.txt 3 219s + filename=a.txt 219s + text=3 219s + echo 3 219s + git add a.txt 219s + commit -m a⇒3 on branch a 219s + TIME=1112911997 219s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 219s [a 621c381] a⇒3 on branch a 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + git checkout -b b master -- 219s Switched to a new branch 'b' 219s + modify b.txt 1 219s + filename=b.txt 219s + text=1 219s + echo 1 219s + git add b.txt 219s + msg=b⇒1 219s + test 1 = 3 219s + test 1 = 4 219s + commit -m b⇒1 on branch b 219s + TIME=1112911998 219s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 219s [b 1f7d097] b⇒1 on branch b 219s 1 file changed, 1 insertion(+) 219s create mode 100644 b.txt 219s + modify b.txt 2 219s + filename=b.txt 219s + text=2 219s + echo 2 219s + git add b.txt 219s + msg=b⇒2 219s + test 2 = 3 219s + test 2 = 4 219s + commit -m b⇒2 on branch b 219s + TIME=1112911999 219s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 219s [b ce671e9] b⇒2 on branch b 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify b.txt 3 219s + filename=b.txt 219s + text=3 219s + echo 3 219s + git add b.txt 219s + msg=b⇒3 219s + test 3 = 3 219s + modify a.txt X 219s + filename=a.txt 219s + text=X 219s + echo X 219s + git add a.txt 219s + msg=b⇒3 and a⇒X 219s + test 3 = 4 219s + commit -m b⇒3 and a⇒X on branch b 219s + TIME=1112912000 219s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 219s [b d40495e] b⇒3 and a⇒X on branch b 219s 2 files changed, 2 insertions(+), 2 deletions(-) 219s + modify b.txt 4 219s + filename=b.txt 219s + text=4 219s + echo 4 219s + git add b.txt 219s + msg=b⇒4 219s + test 4 = 3 219s + test 4 = 4 219s + modify a.txt 0 219s + filename=a.txt 219s + text=0 219s + echo 0 219s + git add a.txt 219s + msg=b⇒4 and a⇒0 219s + commit -m b⇒4 and a⇒0 on branch b 219s + TIME=1112912001 219s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 219s [b eb736f2] b⇒4 and a⇒0 on branch b 219s 2 files changed, 2 insertions(+), 2 deletions(-) 219s + test_merge b-into-a-3 a b 1-3 1-4 219s + local name=b-into-a-3 219s + local dst=a 219s + local src=b 219s + local conflict1=1-3 219s + local conflict2=1-4 219s + git checkout a 219s Switched to branch 'a' 219s + git-imerge merge --branch=b-into-a-3 b 219s + tee imerge-b-into-a-3-1.out 219s Attempting automerge of 3-4...success. 219s Autofilling 1-4...success. 219s Autofilling 2-4...success. 219s Autofilling 3-1...success. 219s Autofilling 3-2...success. 219s Autofilling 3-3...unexpected conflict. Backtracking... 219s Autofilling 1-4...success. 219s Autofilling 2-1...success. 219s Autofilling 2-2...success. 219s Autofilling 2-3...unexpected conflict. Backtracking... 219s Autofilling 1-1...success. 219s Autofilling 1-2...success. 219s Autofilling 1-3...unexpected conflict. Backtracking... 219s Autofilling 1-2...success. 219s Autofilling 2-2...success. 219s Autofilling 3-1...success. 219s Autofilling 3-2 (first way)...success. 219s Autofilling 3-2 (second way)...success. 219s The two ways of autofilling 3-2 agree. 219s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 219s Attempting automerge of 3-4...success. 219s Autofilling 1-4...success. 219s Autofilling 2-4...success. 219s Autofilling 3-3...unexpected conflict. Backtracking... 219s Autofilling 1-4...success. 219s Autofilling 2-3...unexpected conflict. Backtracking... 219s Autofilling 1-3...unexpected conflict. Backtracking... 219s Switched to branch 'imerge/b' 219s Auto-merging a.txt 219s CONFLICT (content): Merge conflict in a.txt 219s Automatic merge failed; fix conflicts and then commit the result. 219s 219s Original first commit: 219s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 219s Author: Loú User 219s Date: Thu Apr 7 22:13:15 2005 +0000 219s 219s a⇒1 on branch a 219s 219s Original second commit: 219s commit d40495ed379f376841e517047f90b663e8c7c7e1 219s Author: Loú User 219s Date: Thu Apr 7 22:13:20 2005 +0000 219s 219s b⇒3 and a⇒X on branch b 219s 219s There was a conflict merging commit 1-3, shown above. 219s Please resolve the conflict, commit the result, then type 219s 219s git-imerge continue 219s + git-imerge diagram --commits --frontier 219s 0 3 219s | | 219s 0 - **** - a 219s *??. 219s *... 219s *#?? 219s 4 - *??? 219s | 219s b 219s 219s 0 3 219s | | 219s 0 - **** - a 219s *??| 219s *--+ 219s *#?? 219s 4 - *??? 219s | 219s b 219s 219s Key: 219s |,-,+ = rectangles forming current merge frontier 219s * = merge done manually 219s . = merge done automatically 219s # = conflict that is currently blocking progress 219s @ = merge was blocked but has been resolved 219s ? = no merge recorded 219s 219s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 219s + echo 1 219s + git add a.txt 219s + tee imerge-b-into-a-3-2.out 219s + git-imerge continue --no-edit 219s [imerge/b 5135cd5] imerge 'b': manual merge 1-3 219s Merge has been recorded for merge 1-3. 219s Attempting automerge of 1-4...failure. 219s Attempting automerge of 1-4...failure. 219s Attempting automerge of 3-3...success. 219s Autofilling 2-3...success. 219s Autofilling 3-3...success. 219s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 219s Previous HEAD position was b10fb90 imerge 'b': automatic merge 3-3 219s Switched to branch 'imerge/b' 219s Auto-merging a.txt 219s CONFLICT (content): Merge conflict in a.txt 219s Automatic merge failed; fix conflicts and then commit the result. 219s 219s Original first commit: 219s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 219s Author: Loú User 219s Date: Thu Apr 7 22:13:15 2005 +0000 219s 219s a⇒1 on branch a 219s 219s Original second commit: 219s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 219s Author: Loú User 219s Date: Thu Apr 7 22:13:21 2005 +0000 219s 219s b⇒4 and a⇒0 on branch b 219s 219s There was a conflict merging commit 1-4, shown above. 219s Please resolve the conflict, commit the result, then type 219s 219s git-imerge continue 219s + git-imerge diagram --commits --frontier 220s 0 3 220s | | 220s 0 - **** - a 220s *??. 220s *... 220s **.. 220s 4 - *#?? 220s | 220s b 220s 220s 0 3 220s | | 220s 0 - **** - a 220s *??| 220s *..| 220s **-+ 220s 4 - *#?? 220s | 220s b 220s 220s Key: 220s |,-,+ = rectangles forming current merge frontier 220s * = merge done manually 220s . = merge done automatically 220s # = conflict that is currently blocking progress 220s @ = merge was blocked but has been resolved 220s ? = no merge recorded 220s 220s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 220s + echo 1 220s + git add a.txt 220s + git-imerge continue --no-edit 220s + tee imerge-b-into-a-3-3.out 220s [imerge/b ab1eec6] imerge 'b': manual merge 1-4 220s Merge has been recorded for merge 1-4. 220s Attempting automerge of 3-4...success. 220s Autofilling 2-4...success. 220s Autofilling 3-4...success. 220s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 220s Merge is complete! 220s + grep -q Merge is complete imerge-b-into-a-3-3.out 220s + git-imerge diagram --commits --frontier 220s 0 3 220s | | 220s 0 - **** - a 220s *??. 220s *... 220s **.. 220s 4 - **.. 220s | 220s b 220s 220s 0 3 220s | | 220s 0 - **** - a 220s *??| 220s *..| 220s **.| 220s 4 - **-+ 220s | 220s b 220s 220s Key: 220s |,-,+ = rectangles forming current merge frontier 220s * = merge done manually 220s . = merge done automatically 220s # = conflict that is currently blocking progress 220s @ = merge was blocked but has been resolved 220s ? = no merge recorded 220s 220s + GIT_EDITOR=cat git-imerge finish 220s Merge b into a (using imerge) 220s 220s # Please enter the commit message for your changes. Lines starting 220s # with '#' will be ignored, and an empty message aborts the commit. 220s # 220s # Date: Fri Dec 5 19:58:50 2025 +0000 220s # 220s # On branch b-into-a-3 220s # Changes to be committed: 220s # new file: b.txt 220s # 220s [b-into-a-3 1ac30ab] Merge b into a (using imerge) 220s Date: Fri Dec 5 19:58:50 2025 +0000 220s + test_merge a-into-b-3 b a 3-1 4-1 220s + local name=a-into-b-3 220s + local dst=b 220s + local src=a 220s + local conflict1=3-1 220s + local conflict2=4-1 220s + git checkout b 220s Switched to branch 'b' 220s + tee imerge-a-into-b-3-1.out 220s + git-imerge merge --branch=a-into-b-3 a 220s Attempting automerge of 4-3...success. 220s Autofilling 1-3...success. 220s Autofilling 2-3...success. 220s Autofilling 3-3...unexpected conflict. Backtracking... 220s Autofilling 1-3...success. 220s Autofilling 2-1...success. 220s Autofilling 2-2...success. 220s Autofilling 2-3 (first way)...success. 220s Autofilling 2-3 (second way)...success. 220s The two ways of autofilling 2-3 agree. 220s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 220s Autofilling 3-2...unexpected conflict. Backtracking... 220s Autofilling 3-1...unexpected conflict. Backtracking... 220s Switched to branch 'imerge/a' 220s Auto-merging a.txt 220s CONFLICT (content): Merge conflict in a.txt 220s Automatic merge failed; fix conflicts and then commit the result. 220s 220s Original first commit: 220s commit d40495ed379f376841e517047f90b663e8c7c7e1 220s Author: Loú User 220s Date: Thu Apr 7 22:13:20 2005 +0000 220s 220s b⇒3 and a⇒X on branch b 220s 220s Original second commit: 220s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 220s Author: Loú User 220s Date: Thu Apr 7 22:13:15 2005 +0000 220s 220s a⇒1 on branch a 220s 220s There was a conflict merging commit 3-1, shown above. 220s Please resolve the conflict, commit the result, then type 220s 220s git-imerge continue 220s + git-imerge diagram --commits --frontier 221s 0 4 221s | | 221s 0 - ***** - b 221s *?.#? 221s *?.?? 221s 3 - *..?? 221s | 221s a 221s 221s 0 4 221s | | 221s 0 - ***** - b 221s *?|#? 221s *?|?? 221s 3 - *-+?? 221s | 221s a 221s 221s Key: 221s |,-,+ = rectangles forming current merge frontier 221s * = merge done manually 221s . = merge done automatically 221s # = conflict that is currently blocking progress 221s @ = merge was blocked but has been resolved 221s ? = no merge recorded 221s 221s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 221s + echo 1 221s + git add a.txt 221s + tee imerge-a-into-b-3-2.out 221s + git-imerge continue --no-edit 221s [imerge/a f2b81a4] imerge 'a': manual merge 3-1 221s Merge has been recorded for merge 3-1. 221s Attempting automerge of 3-3...success. 221s Autofilling 3-2...success. 221s Autofilling 3-3...success. 221s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 221s Attempting automerge of 4-3...failure. 221s Attempting automerge of 4-1...failure. 221s Switched to branch 'imerge/a' 221s Auto-merging a.txt 221s CONFLICT (content): Merge conflict in a.txt 221s Automatic merge failed; fix conflicts and then commit the result. 221s 221s Original first commit: 221s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 221s Author: Loú User 221s Date: Thu Apr 7 22:13:21 2005 +0000 221s 221s b⇒4 and a⇒0 on branch b 221s 221s Original second commit: 221s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 221s Author: Loú User 221s Date: Thu Apr 7 22:13:15 2005 +0000 221s 221s a⇒1 on branch a 221s 221s There was a conflict merging commit 4-1, shown above. 221s Please resolve the conflict, commit the result, then type 221s 221s git-imerge continue 221s + git-imerge diagram --commits --frontier 221s 0 4 221s | | 221s 0 - ***** - b 221s *?.*# 221s *?..? 221s 3 - *...? 221s | 221s a 221s 221s 0 4 221s | | 221s 0 - ***** - b 221s *?.*# 221s *?.|? 221s 3 - *--+? 221s | 221s a 221s 221s Key: 221s |,-,+ = rectangles forming current merge frontier 221s * = merge done manually 221s . = merge done automatically 221s # = conflict that is currently blocking progress 221s @ = merge was blocked but has been resolved 221s ? = no merge recorded 221s 221s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 221s + echo 1 221s + git add a.txt 221s + git-imerge continue --no-edit 221s + tee imerge-a-into-b-3-3.out 221s [imerge/a fa6d735] imerge 'a': manual merge 4-1 221s Merge has been recorded for merge 4-1. 221s Attempting automerge of 4-3...success. 221s Autofilling 4-2...success. 221s Autofilling 4-3...success. 221s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 221s Merge is complete! 221s + grep -q Merge is complete imerge-a-into-b-3-3.out 221s + git-imerge diagram --commits --frontier 221s 0 4 221s | | 221s 0 - ***** - b 221s *?.** 221s *?... 221s 3 - *.... 221s | 221s a 221s 221s 0 4 221s | | 221s 0 - ***** - b 221s *?.** 221s *?..| 221s 3 - *---+ 221s | 221s a 221s 221s Key: 221s |,-,+ = rectangles forming current merge frontier 221s * = merge done manually 221s . = merge done automatically 221s # = conflict that is currently blocking progress 221s @ = merge was blocked but has been resolved 221s ? = no merge recorded 221s 221s + GIT_EDITOR=cat git-imerge finish 221s Merge a into b (using imerge) 221s 221s # Please enter the commit message for your changes. Lines starting 221s # with '#' will be ignored, and an empty message aborts the commit. 221s # 221s # Date: Fri Dec 5 19:58:52 2025 +0000 221s # 221s # On branch a-into-b-3 221s # Changes to be committed: 221s # modified: a.txt 221s # 221s [a-into-b-3 d258798] Merge a into b (using imerge) 221s Date: Fri Dec 5 19:58:52 2025 +0000 222s py313: commands[5] /tmp/autopkgtest.IpjX5N/build.W0y/src> /bin/sh t/test-drop 222s + dirname t/test-drop 222s + cd t 222s + pwd 222s + dirname /tmp/autopkgtest.IpjX5N/build.W0y/src/t 222s + BASE=/tmp/autopkgtest.IpjX5N/build.W0y/src 222s + . /tmp/autopkgtest.IpjX5N/build.W0y/src/t/test-lib.sh 222s + GIT_IMERGE=git-imerge 222s + TMP=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s + DESCRIPTION=git-imerge drop test repository 222s + init_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop git-imerge drop test repository 222s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s + local description=git-imerge drop test repository 222s + delete_test_repo /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop git-imerge drop test repository 222s + local path=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s + local description=git-imerge drop test repository 222s + test -d /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s + mkdir -p /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s + git init /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s hint: Using 'master' as the name for the initial branch. This default branch name 222s hint: is subject to change. To configure the initial branch name to use in all 222s hint: of your new repositories, which will suppress this warning, call: 222s hint: 222s hint: git config --global init.defaultBranch 222s hint: 222s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 222s hint: 'development'. The just-created branch can be renamed via this command: 222s hint: 222s hint: git branch -m 222s hint: 222s hint: Disable this message with "git config set advice.defaultBranchName false" 222s Initialized empty Git repository in /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop/.git/ 222s + echo git-imerge drop test repository 222s + printf %s\n /*.out /*.css /*.html 222s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop/.git config user.name Loú User 222s + git --git-dir=/tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop/.git config user.email luser@example.com 222s + TIME=1112911993 222s + ln -s /tmp/autopkgtest.IpjX5N/build.W0y/src/imerge.css /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s + cd /tmp/autopkgtest.IpjX5N/build.W0y/src/t/tmp/drop 222s + modify a.txt 0 222s + filename=a.txt 222s + text=0 222s + echo 0 222s + git add a.txt 222s + commit -m m⇒0 222s + TIME=1112911994 222s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 222s [master (root-commit) a733afa] m⇒0 222s 1 file changed, 1 insertion(+) 222s create mode 100644 a.txt 222s + seq 6 222s + modify a1.txt 1 222s + filename=a1.txt 222s + text=1 222s + echo 1 222s + git add a1.txt 222s + commit -m a1⇒1 222s + TIME=1112911995 222s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 222s + modify a2.txt 2 222s + filename=a2.txt 222s + text=2 222s + echo 2 222s + git add a2.txt 222s [master 389a4ba] a1⇒1 222s 1 file changed, 1 insertion(+) 222s create mode 100644 a1.txt 222s + commit -m a2⇒2 222s + TIME=1112911996 222s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 222s [master 4785218] a2⇒2 222s 1 file changed, 1 insertion(+) 222s create mode 100644 a2.txt 222s + modify a3.txt 3 222s + filename=a3.txt 222s + text=3 222s + echo 3 222s + git add a3.txt 222s + commit -m a3⇒3 222s + TIME=1112911997 222s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 222s [master 34bdde3] a3⇒3 222s 1 file changed, 1 insertion(+) 222s create mode 100644 a3.txt 222s + modify a4.txt 4 222s + filename=a4.txt 222s + text=4 222s + echo 4 222s + git add a4.txt 222s + commit -m a4⇒4 222s + TIME=1112911998 222s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 222s [master c793a5a] a4⇒4 222s 1 file changed, 1 insertion(+) 222s create mode 100644 a4.txt 222s + modify a5.txt 5 222s + filename=a5.txt 222s + text=5 222s + echo 5 222s + git add a5.txt 222s + commit -m a5⇒5 222s + TIME=1112911999 222s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 222s [master b42f60c] a5⇒5 222s 1 file changed, 1 insertion(+) 222s create mode 100644 a5.txt 222s + modify a6.txt 6 222s + filename=a6.txt 222s + text=6 222s + echo 6 222s + git add a6.txt 222s + commit -m a6⇒6 222s + TIME=1112912000 222s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 222s [master 9d6aec5] a6⇒6 222s 1 file changed, 1 insertion(+) 222s create mode 100644 a6.txt 222s + git checkout -b dropped master 222s Switched to a new branch 'dropped' 222s + git-imerge drop HEAD~5..HEAD~3 222s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 222s 222s You are in 'detached HEAD' state. You can look around, make experimental 222s changes and commit them, and you can discard any commits you make in this 222s state without impacting any branches by switching back to a branch. 222s 222s If you want to create a new branch to retain commits you create, you may 222s do so (now or later) by using -c with the switch command. Example: 222s 222s git switch -c 222s 222s Or undo this operation with: 222s 222s git switch - 222s 222s Turn off this advice by setting config variable advice.detachedHead to false 222s 222s HEAD is now at 34bdde3 a3⇒3 222s [detached HEAD 149eefa] Revert "a3⇒3" 222s Date: Fri Dec 5 19:58:53 2025 +0000 222s 1 file changed, 1 deletion(-) 222s delete mode 100644 a3.txt 222s [detached HEAD 10a2066] Revert "a2⇒2" 222s Date: Fri Dec 5 19:58:53 2025 +0000 222s 1 file changed, 1 deletion(-) 222s delete mode 100644 a2.txt 222s Attempting automerge of 3-2...success. 222s Autofilling 1-2...success. 222s Autofilling 2-2...success. 222s Autofilling 3-1...success. 222s Autofilling 3-2 (first way)...success. 222s Autofilling 3-2 (second way)...success. 222s The two ways of autofilling 3-2 agree. 222s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='10a2066a3b0ef7ccd1c9e99b00208b764b05ce7c', goal='drop')[0:4,0:3]. 222s Merge is complete! 222s + git-imerge diagram --commits --frontier --html=imerge-drop.html 223s 0 3 223s | | 223s 0 - **** - dropped 223s *??. 223s 2 - *... 223s | 223s 10a2066a3b0ef7ccd1c9e99b00208b764b05ce7c 223s 223s 0 3 223s | | 223s 0 - **** - dropped 223s *??| 223s 2 - *--+ 223s | 223s 10a2066a3b0ef7ccd1c9e99b00208b764b05ce7c 223s 223s Key: 223s |,-,+ = rectangles forming current merge frontier 223s * = merge done manually 223s . = merge done automatically 223s # = conflict that is currently blocking progress 223s @ = merge was blocked but has been resolved 223s ? = no merge recorded 223s 223s + git-imerge finish 223s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 223s + local refname=dropped 223s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 223s + git rev-parse dropped^{tree} 223s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 223s + git checkout -b reverted master 223s Switched to a new branch 'reverted' 223s + git-imerge revert HEAD~5..HEAD~3 223s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 223s 223s You are in 'detached HEAD' state. You can look around, make experimental 223s changes and commit them, and you can discard any commits you make in this 223s state without impacting any branches by switching back to a branch. 223s 223s If you want to create a new branch to retain commits you create, you may 223s do so (now or later) by using -c with the switch command. Example: 223s 223s git switch -c 223s 223s Or undo this operation with: 223s 223s git switch - 223s 223s Turn off this advice by setting config variable advice.detachedHead to false 223s 223s HEAD is now at 34bdde3 a3⇒3 223s [detached HEAD 149eefa] Revert "a3⇒3" 223s Date: Fri Dec 5 19:58:53 2025 +0000 223s 1 file changed, 1 deletion(-) 223s delete mode 100644 a3.txt 223s [detached HEAD 10a2066] Revert "a2⇒2" 223s Date: Fri Dec 5 19:58:53 2025 +0000 223s 1 file changed, 1 deletion(-) 223s delete mode 100644 a2.txt 223s Attempting automerge of 3-2...success. 223s Autofilling 1-2...success. 223s Autofilling 2-2...success. 223s Autofilling 3-1...success. 223s Autofilling 3-2 (first way)...success. 223s Autofilling 3-2 (second way)...success. 223s The two ways of autofilling 3-2 agree. 223s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='10a2066a3b0ef7ccd1c9e99b00208b764b05ce7c', goal='revert')[0:4,0:3]. 223s Merge is complete! 223s + git-imerge diagram --commits --frontier --html=imerge-revert.html 223s 0 3 223s | | 223s 0 - **** - reverted 223s *??. 223s 2 - *... 223s | 223s 10a2066a3b0ef7ccd1c9e99b00208b764b05ce7c 223s 223s 0 3 223s | | 223s 0 - **** - reverted 223s *??| 223s 2 - *--+ 223s | 223s 10a2066a3b0ef7ccd1c9e99b00208b764b05ce7c 223s 223s Key: 223s |,-,+ = rectangles forming current merge frontier 223s * = merge done manually 223s . = merge done automatically 223s # = conflict that is currently blocking progress 223s @ = merge was blocked but has been resolved 223s ? = no merge recorded 223s 223s + git-imerge finish 223s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 223s + local refname=reverted 223s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 223s + git rev-parse reverted^{tree} 223s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 223s py313: OK (105.97=setup[0.12]+cmd[3.45,81.88,6.58,4.14,8.34,1.46] seconds) 223s congratulations :) (106.05 seconds) 223s autopkgtest [19:56:39]: test pybuild-autopkgtest: -----------------------] 224s pybuild-autopkgtest PASS 224s autopkgtest [19:56:40]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 224s autopkgtest [19:56:40]: @@@@@@@@@@@@@@@@@@@@ summary 224s pybuild-autopkgtest PASS