0s autopkgtest [02:58:30]: starting date and time: 2025-12-06 02:58:30+0000 0s autopkgtest [02:58:30]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [02:58:30]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.l18y00t2/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-ppc64el --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@sto01-ppc64el-10.secgroup --name adt-resolute-ppc64el-git-imerge-20251206-025830-juju-7f2275-prod-proposed-migration-environment-15-b24e0d45-8ce9-4e4a-a3da-19306f218bea --image adt/ubuntu-resolute-ppc64el-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-autopkgtest-workers-ppc64el -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 4s Creating nova instance adt-resolute-ppc64el-git-imerge-20251206-025830-juju-7f2275-prod-proposed-migration-environment-15-b24e0d45-8ce9-4e4a-a3da-19306f218bea from image adt/ubuntu-resolute-ppc64el-server-20251205.img (UUID ec8e7418-51bb-4f88-80fc-4d434bdc97c2)... 54s autopkgtest [02:59:24]: testbed dpkg architecture: ppc64el 54s autopkgtest [02:59:24]: testbed apt version: 3.1.12 54s autopkgtest [02:59:24]: @@@@@@@@@@@@@@@@@@@@ test bed setup 54s autopkgtest [02:59:24]: testbed release detected to be: None 55s autopkgtest [02:59:25]: updating testbed package index (apt update) 55s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 55s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 55s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 55s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 55s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [139 kB] 55s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [22.8 kB] 55s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [852 kB] 56s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el Packages [224 kB] 56s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el Packages [700 kB] 56s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse ppc64el Packages [6648 B] 56s Fetched 2067 kB in 1s (2940 kB/s) 57s Reading package lists... 57s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 57s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 57s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 57s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 58s Reading package lists... 58s Reading package lists... 59s Building dependency tree... 59s Reading state information... 59s Calculating upgrade... 59s The following packages will be upgraded: 59s libnftnl11 libpython3-stdlib lxd-installer python3 python3-attr python3-gdbm 59s python3-minimal 59s 7 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 59s Need to get 212 kB of archives. 59s After this operation, 16.4 kB of additional disk space will be used. 59s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el python3-minimal ppc64el 3.13.9-2 [28.1 kB] 59s Get:2 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el python3 ppc64el 3.13.9-2 [23.0 kB] 59s Get:3 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el libpython3-stdlib ppc64el 3.13.9-2 [10.8 kB] 59s Get:4 http://ftpmaster.internal/ubuntu resolute/main ppc64el libnftnl11 ppc64el 1.3.1-1 [80.0 kB] 59s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el python3-gdbm ppc64el 3.13.9-2 [11.0 kB] 59s Get:6 http://ftpmaster.internal/ubuntu resolute/main ppc64el lxd-installer all 14ubuntu0 [5428 B] 59s Get:7 http://ftpmaster.internal/ubuntu resolute/main ppc64el python3-attr all 25.4.0-1 [53.6 kB] 59s dpkg-preconfigure: unable to re-open stdin: No such file or directory 59s Fetched 212 kB in 0s (12.0 MB/s) 59s (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 ... 81185 files and directories currently installed.) 59s Preparing to unpack .../python3-minimal_3.13.9-2_ppc64el.deb ... 59s Unpacking python3-minimal (3.13.9-2) over (3.13.7-1) ... 60s Setting up python3-minimal (3.13.9-2) ... 60s (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 ... 81185 files and directories currently installed.) 60s Preparing to unpack .../0-python3_3.13.9-2_ppc64el.deb ... 60s running python pre-rtupdate hooks for python3.13... 60s Unpacking python3 (3.13.9-2) over (3.13.7-1) ... 60s Preparing to unpack .../1-libpython3-stdlib_3.13.9-2_ppc64el.deb ... 60s Unpacking libpython3-stdlib:ppc64el (3.13.9-2) over (3.13.7-1) ... 60s Preparing to unpack .../2-libnftnl11_1.3.1-1_ppc64el.deb ... 60s Unpacking libnftnl11:ppc64el (1.3.1-1) over (1.3.0-1) ... 60s Preparing to unpack .../3-python3-gdbm_3.13.9-2_ppc64el.deb ... 60s Unpacking python3-gdbm (3.13.9-2) over (3.13.9-1) ... 60s Preparing to unpack .../4-lxd-installer_14ubuntu0_all.deb ... 60s Unpacking lxd-installer (14ubuntu0) over (13ubuntu0) ... 60s Preparing to unpack .../5-python3-attr_25.4.0-1_all.deb ... 60s Unpacking python3-attr (25.4.0-1) over (25.3.0-1) ... 60s Setting up python3-gdbm (3.13.9-2) ... 60s Setting up libnftnl11:ppc64el (1.3.1-1) ... 60s Setting up lxd-installer (14ubuntu0) ... 61s Setting up libpython3-stdlib:ppc64el (3.13.9-2) ... 61s Setting up python3 (3.13.9-2) ... 61s running python rtupdate hooks for python3.13... 61s running python post-rtupdate hooks for python3.13... 61s Setting up python3-attr (25.4.0-1) ... 61s Processing triggers for man-db (2.13.1-1) ... 62s Processing triggers for libc-bin (2.42-2ubuntu2) ... 62s autopkgtest [02:59:32]: upgrading testbed (apt dist-upgrade and autopurge) 62s Reading package lists... 62s Building dependency tree... 62s Reading state information... 62s Calculating upgrade... 63s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 63s Reading package lists... 63s Building dependency tree... 63s Reading state information... 63s Solving dependencies... 63s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 63s autopkgtest [02:59:33]: rebooting testbed after setup commands that affected boot 101s autopkgtest [03:00:11]: testbed running kernel: Linux 6.17.0-6-generic #6-Ubuntu SMP PREEMPT_DYNAMIC Tue Oct 7 13:47:32 UTC 2025 103s autopkgtest [03:00:13]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 105s Get:1 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (dsc) [1896 B] 105s Get:2 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 105s Get:3 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (diff) [3144 B] 105s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 105s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 105s gpgv: Can't check signature: No public key 105s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 105s autopkgtest [03:00:15]: testing package git-imerge version 1.2.0-5 105s autopkgtest [03:00:15]: build not needed 106s autopkgtest [03:00:16]: test pybuild-autopkgtest: preparing testbed 106s Reading package lists... 106s Building dependency tree... 106s Reading state information... 106s Solving dependencies... 106s The following NEW packages will be installed: 106s autoconf automake autopoint autotools-dev build-essential cpp cpp-15 106s cpp-15-powerpc64le-linux-gnu cpp-powerpc64le-linux-gnu debhelper debugedit 106s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-15 106s g++-15-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu gcc gcc-15 106s gcc-15-powerpc64le-linux-gnu gcc-powerpc64le-linux-gnu gettext git 106s git-imerge git-man intltool-debian libarchive-zip-perl libasan8 libcc1-0 106s libdebhelper-perl liberror-perl libfile-stripnondeterminism-perl 106s libgcc-15-dev libgomp1 libisl23 libitm1 libjs-jquery libjs-sphinxdoc 106s libjs-underscore liblsan0 libmpc3 libpkgconf3 libquadmath0 libstdc++-15-dev 106s libtool libtsan2 libubsan1 m4 pkg-config pkgconf pkgconf-bin po-debconf 106s pybuild-plugin-autopkgtest python3-cachetools python3-colorama 106s python3-distlib python3-filelock python3-pip-whl python3-platformdirs 106s python3-pluggy python3-pyproject-api python3-setuptools-whl 106s python3-virtualenv python3-wheel tox 106s 0 upgraded, 67 newly installed, 0 to remove and 0 not upgraded. 106s Need to get 79.3 MB of archives. 106s After this operation, 283 MB of additional disk space will be used. 106s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el m4 ppc64el 1.4.20-2 [236 kB] 106s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el autoconf all 2.72-3.1ubuntu1 [384 kB] 106s Get:3 http://ftpmaster.internal/ubuntu resolute/main ppc64el autotools-dev all 20240727.1 [43.4 kB] 106s Get:4 http://ftpmaster.internal/ubuntu resolute/main ppc64el automake all 1:1.18.1-3 [582 kB] 106s Get:5 http://ftpmaster.internal/ubuntu resolute/main ppc64el autopoint all 0.23.2-1 [620 kB] 106s Get:6 http://ftpmaster.internal/ubuntu resolute/main ppc64el libisl23 ppc64el 0.27-1 [882 kB] 106s Get:7 http://ftpmaster.internal/ubuntu resolute/main ppc64el libmpc3 ppc64el 1.3.1-2 [62.5 kB] 106s Get:8 http://ftpmaster.internal/ubuntu resolute/main ppc64el cpp-15-powerpc64le-linux-gnu ppc64el 15.2.0-9ubuntu1 [11.4 MB] 107s Get:9 http://ftpmaster.internal/ubuntu resolute/main ppc64el cpp-15 ppc64el 15.2.0-9ubuntu1 [1034 B] 107s Get:10 http://ftpmaster.internal/ubuntu resolute/main ppc64el cpp-powerpc64le-linux-gnu ppc64el 4:15.2.0-4ubuntu1 [5746 B] 107s Get:11 http://ftpmaster.internal/ubuntu resolute/main ppc64el cpp ppc64el 4:15.2.0-4ubuntu1 [22.4 kB] 107s Get:12 http://ftpmaster.internal/ubuntu resolute/main ppc64el libcc1-0 ppc64el 15.2.0-9ubuntu1 [49.0 kB] 107s Get:13 http://ftpmaster.internal/ubuntu resolute/main ppc64el libgomp1 ppc64el 15.2.0-9ubuntu1 [169 kB] 107s Get:14 http://ftpmaster.internal/ubuntu resolute/main ppc64el libitm1 ppc64el 15.2.0-9ubuntu1 [32.3 kB] 107s Get:15 http://ftpmaster.internal/ubuntu resolute/main ppc64el libasan8 ppc64el 15.2.0-9ubuntu1 [3006 kB] 107s Get:16 http://ftpmaster.internal/ubuntu resolute/main ppc64el liblsan0 ppc64el 15.2.0-9ubuntu1 [1374 kB] 107s Get:17 http://ftpmaster.internal/ubuntu resolute/main ppc64el libtsan2 ppc64el 15.2.0-9ubuntu1 [2729 kB] 107s Get:18 http://ftpmaster.internal/ubuntu resolute/main ppc64el libubsan1 ppc64el 15.2.0-9ubuntu1 [1231 kB] 107s Get:19 http://ftpmaster.internal/ubuntu resolute/main ppc64el libquadmath0 ppc64el 15.2.0-9ubuntu1 [160 kB] 107s Get:20 http://ftpmaster.internal/ubuntu resolute/main ppc64el libgcc-15-dev ppc64el 15.2.0-9ubuntu1 [1670 kB] 107s Get:21 http://ftpmaster.internal/ubuntu resolute/main ppc64el gcc-15-powerpc64le-linux-gnu ppc64el 15.2.0-9ubuntu1 [22.4 MB] 107s Get:22 http://ftpmaster.internal/ubuntu resolute/main ppc64el gcc-15 ppc64el 15.2.0-9ubuntu1 [527 kB] 107s Get:23 http://ftpmaster.internal/ubuntu resolute/main ppc64el gcc-powerpc64le-linux-gnu ppc64el 4:15.2.0-4ubuntu1 [1220 B] 107s Get:24 http://ftpmaster.internal/ubuntu resolute/main ppc64el gcc ppc64el 4:15.2.0-4ubuntu1 [5032 B] 107s Get:25 http://ftpmaster.internal/ubuntu resolute/main ppc64el libstdc++-15-dev ppc64el 15.2.0-9ubuntu1 [2745 kB] 107s Get:26 http://ftpmaster.internal/ubuntu resolute/main ppc64el g++-15-powerpc64le-linux-gnu ppc64el 15.2.0-9ubuntu1 [13.0 MB] 108s Get:27 http://ftpmaster.internal/ubuntu resolute/main ppc64el g++-15 ppc64el 15.2.0-9ubuntu1 [24.3 kB] 108s Get:28 http://ftpmaster.internal/ubuntu resolute/main ppc64el g++-powerpc64le-linux-gnu ppc64el 4:15.2.0-4ubuntu1 [970 B] 108s Get:29 http://ftpmaster.internal/ubuntu resolute/main ppc64el g++ ppc64el 4:15.2.0-4ubuntu1 [1092 B] 108s Get:30 http://ftpmaster.internal/ubuntu resolute/main ppc64el build-essential ppc64el 12.12ubuntu2 [5256 B] 108s Get:31 http://ftpmaster.internal/ubuntu resolute/main ppc64el libdebhelper-perl all 13.24.2ubuntu1 [95.7 kB] 108s Get:32 http://ftpmaster.internal/ubuntu resolute/main ppc64el libtool all 2.5.4-7 [169 kB] 108s Get:33 http://ftpmaster.internal/ubuntu resolute/main ppc64el dh-autoreconf all 21 [12.5 kB] 108s Get:34 http://ftpmaster.internal/ubuntu resolute/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 108s Get:35 http://ftpmaster.internal/ubuntu resolute/main ppc64el libfile-stripnondeterminism-perl all 1.15.0-1 [20.5 kB] 108s Get:36 http://ftpmaster.internal/ubuntu resolute/main ppc64el dh-strip-nondeterminism all 1.15.0-1 [5090 B] 108s Get:37 http://ftpmaster.internal/ubuntu resolute/main ppc64el debugedit ppc64el 1:5.2-3 [57.3 kB] 108s Get:38 http://ftpmaster.internal/ubuntu resolute/main ppc64el dwz ppc64el 0.16-2 [142 kB] 108s Get:39 http://ftpmaster.internal/ubuntu resolute/main ppc64el gettext ppc64el 0.23.2-1 [1177 kB] 108s Get:40 http://ftpmaster.internal/ubuntu resolute/main ppc64el intltool-debian all 0.35.0+20060710.6build1 [24.1 kB] 108s Get:41 http://ftpmaster.internal/ubuntu resolute/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 108s Get:42 http://ftpmaster.internal/ubuntu resolute/main ppc64el debhelper all 13.24.2ubuntu1 [896 kB] 108s Get:43 http://ftpmaster.internal/ubuntu resolute/universe ppc64el dh-python all 6.20251029 [120 kB] 108s Get:44 http://ftpmaster.internal/ubuntu resolute/main ppc64el liberror-perl all 0.17030-1 [23.5 kB] 108s Get:45 http://ftpmaster.internal/ubuntu resolute/main ppc64el git-man all 1:2.51.0-1ubuntu1 [1179 kB] 108s Get:46 http://ftpmaster.internal/ubuntu resolute/main ppc64el git ppc64el 1:2.51.0-1ubuntu1 [7646 kB] 108s Get:47 http://ftpmaster.internal/ubuntu resolute/universe ppc64el git-imerge all 1.2.0-5 [49.5 kB] 108s Get:48 http://ftpmaster.internal/ubuntu resolute/main ppc64el libjs-jquery all 3.7.1+dfsg+~3.5.33-1build1 [321 kB] 108s Get:49 http://ftpmaster.internal/ubuntu resolute/main ppc64el libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 108s Get:50 http://ftpmaster.internal/ubuntu resolute/main ppc64el libjs-sphinxdoc all 8.2.3-1ubuntu2 [28.0 kB] 108s Get:51 http://ftpmaster.internal/ubuntu resolute/main ppc64el libpkgconf3 ppc64el 1.8.1-4build1 [37.9 kB] 108s Get:52 http://ftpmaster.internal/ubuntu resolute/main ppc64el pkgconf-bin ppc64el 1.8.1-4build1 [22.7 kB] 108s Get:53 http://ftpmaster.internal/ubuntu resolute/main ppc64el pkgconf ppc64el 1.8.1-4build1 [16.8 kB] 108s Get:54 http://ftpmaster.internal/ubuntu resolute/main ppc64el pkg-config ppc64el 1.8.1-4build1 [7494 B] 108s Get:55 http://ftpmaster.internal/ubuntu resolute/universe ppc64el pybuild-plugin-autopkgtest all 6.20251029 [1746 B] 108s Get:56 http://ftpmaster.internal/ubuntu resolute/main ppc64el python3-cachetools all 5.3.3-1 [10.3 kB] 108s Get:57 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-colorama all 0.4.6-4 [32.1 kB] 108s Get:58 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-distlib all 0.4.0-1 [267 kB] 108s Get:59 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-filelock all 3.18.0-1 [13.0 kB] 108s Get:60 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-pip-whl all 25.1.1+dfsg-1ubuntu2 [1430 kB] 108s Get:61 http://ftpmaster.internal/ubuntu resolute/main ppc64el python3-platformdirs all 4.4.0-1 [16.9 kB] 108s Get:62 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-pluggy all 1.6.0-1 [21.0 kB] 108s Get:63 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-pyproject-api all 1.9.1-1 [52.9 kB] 108s Get:64 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-setuptools-whl all 78.1.1-0.1 [1174 kB] 108s Get:65 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-virtualenv all 20.35.4+ds-1 [76.1 kB] 108s Get:66 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-wheel all 0.46.1-2 [22.1 kB] 108s Get:67 http://ftpmaster.internal/ubuntu resolute/universe ppc64el tox all 4.25.0-1 [323 kB] 109s Fetched 79.3 MB in 2s (39.1 MB/s) 109s Selecting previously unselected package m4. 109s (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 ... 81185 files and directories currently installed.) 109s Preparing to unpack .../00-m4_1.4.20-2_ppc64el.deb ... 109s Unpacking m4 (1.4.20-2) ... 109s Selecting previously unselected package autoconf. 109s Preparing to unpack .../01-autoconf_2.72-3.1ubuntu1_all.deb ... 109s Unpacking autoconf (2.72-3.1ubuntu1) ... 109s Selecting previously unselected package autotools-dev. 109s Preparing to unpack .../02-autotools-dev_20240727.1_all.deb ... 109s Unpacking autotools-dev (20240727.1) ... 109s Selecting previously unselected package automake. 109s Preparing to unpack .../03-automake_1%3a1.18.1-3_all.deb ... 109s Unpacking automake (1:1.18.1-3) ... 109s Selecting previously unselected package autopoint. 109s Preparing to unpack .../04-autopoint_0.23.2-1_all.deb ... 109s Unpacking autopoint (0.23.2-1) ... 109s Selecting previously unselected package libisl23:ppc64el. 109s Preparing to unpack .../05-libisl23_0.27-1_ppc64el.deb ... 109s Unpacking libisl23:ppc64el (0.27-1) ... 109s Selecting previously unselected package libmpc3:ppc64el. 109s Preparing to unpack .../06-libmpc3_1.3.1-2_ppc64el.deb ... 109s Unpacking libmpc3:ppc64el (1.3.1-2) ... 109s Selecting previously unselected package cpp-15-powerpc64le-linux-gnu. 109s Preparing to unpack .../07-cpp-15-powerpc64le-linux-gnu_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking cpp-15-powerpc64le-linux-gnu (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package cpp-15. 109s Preparing to unpack .../08-cpp-15_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking cpp-15 (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package cpp-powerpc64le-linux-gnu. 109s Preparing to unpack .../09-cpp-powerpc64le-linux-gnu_4%3a15.2.0-4ubuntu1_ppc64el.deb ... 109s Unpacking cpp-powerpc64le-linux-gnu (4:15.2.0-4ubuntu1) ... 109s Selecting previously unselected package cpp. 109s Preparing to unpack .../10-cpp_4%3a15.2.0-4ubuntu1_ppc64el.deb ... 109s Unpacking cpp (4:15.2.0-4ubuntu1) ... 109s Selecting previously unselected package libcc1-0:ppc64el. 109s Preparing to unpack .../11-libcc1-0_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libcc1-0:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package libgomp1:ppc64el. 109s Preparing to unpack .../12-libgomp1_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libgomp1:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package libitm1:ppc64el. 109s Preparing to unpack .../13-libitm1_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libitm1:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package libasan8:ppc64el. 109s Preparing to unpack .../14-libasan8_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libasan8:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package liblsan0:ppc64el. 109s Preparing to unpack .../15-liblsan0_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking liblsan0:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package libtsan2:ppc64el. 109s Preparing to unpack .../16-libtsan2_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libtsan2:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package libubsan1:ppc64el. 109s Preparing to unpack .../17-libubsan1_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libubsan1:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package libquadmath0:ppc64el. 109s Preparing to unpack .../18-libquadmath0_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libquadmath0:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package libgcc-15-dev:ppc64el. 109s Preparing to unpack .../19-libgcc-15-dev_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking libgcc-15-dev:ppc64el (15.2.0-9ubuntu1) ... 109s Selecting previously unselected package gcc-15-powerpc64le-linux-gnu. 109s Preparing to unpack .../20-gcc-15-powerpc64le-linux-gnu_15.2.0-9ubuntu1_ppc64el.deb ... 109s Unpacking gcc-15-powerpc64le-linux-gnu (15.2.0-9ubuntu1) ... 110s Selecting previously unselected package gcc-15. 110s Preparing to unpack .../21-gcc-15_15.2.0-9ubuntu1_ppc64el.deb ... 110s Unpacking gcc-15 (15.2.0-9ubuntu1) ... 110s Selecting previously unselected package gcc-powerpc64le-linux-gnu. 110s Preparing to unpack .../22-gcc-powerpc64le-linux-gnu_4%3a15.2.0-4ubuntu1_ppc64el.deb ... 110s Unpacking gcc-powerpc64le-linux-gnu (4:15.2.0-4ubuntu1) ... 110s Selecting previously unselected package gcc. 110s Preparing to unpack .../23-gcc_4%3a15.2.0-4ubuntu1_ppc64el.deb ... 110s Unpacking gcc (4:15.2.0-4ubuntu1) ... 110s Selecting previously unselected package libstdc++-15-dev:ppc64el. 110s Preparing to unpack .../24-libstdc++-15-dev_15.2.0-9ubuntu1_ppc64el.deb ... 110s Unpacking libstdc++-15-dev:ppc64el (15.2.0-9ubuntu1) ... 110s Selecting previously unselected package g++-15-powerpc64le-linux-gnu. 110s Preparing to unpack .../25-g++-15-powerpc64le-linux-gnu_15.2.0-9ubuntu1_ppc64el.deb ... 110s Unpacking g++-15-powerpc64le-linux-gnu (15.2.0-9ubuntu1) ... 110s Selecting previously unselected package g++-15. 110s Preparing to unpack .../26-g++-15_15.2.0-9ubuntu1_ppc64el.deb ... 110s Unpacking g++-15 (15.2.0-9ubuntu1) ... 110s Selecting previously unselected package g++-powerpc64le-linux-gnu. 110s Preparing to unpack .../27-g++-powerpc64le-linux-gnu_4%3a15.2.0-4ubuntu1_ppc64el.deb ... 110s Unpacking g++-powerpc64le-linux-gnu (4:15.2.0-4ubuntu1) ... 110s Selecting previously unselected package g++. 110s Preparing to unpack .../28-g++_4%3a15.2.0-4ubuntu1_ppc64el.deb ... 110s Unpacking g++ (4:15.2.0-4ubuntu1) ... 110s Selecting previously unselected package build-essential. 110s Preparing to unpack .../29-build-essential_12.12ubuntu2_ppc64el.deb ... 110s Unpacking build-essential (12.12ubuntu2) ... 110s Selecting previously unselected package libdebhelper-perl. 110s Preparing to unpack .../30-libdebhelper-perl_13.24.2ubuntu1_all.deb ... 110s Unpacking libdebhelper-perl (13.24.2ubuntu1) ... 110s Selecting previously unselected package libtool. 110s Preparing to unpack .../31-libtool_2.5.4-7_all.deb ... 110s Unpacking libtool (2.5.4-7) ... 110s Selecting previously unselected package dh-autoreconf. 110s Preparing to unpack .../32-dh-autoreconf_21_all.deb ... 110s Unpacking dh-autoreconf (21) ... 110s Selecting previously unselected package libarchive-zip-perl. 110s Preparing to unpack .../33-libarchive-zip-perl_1.68-1_all.deb ... 110s Unpacking libarchive-zip-perl (1.68-1) ... 110s Selecting previously unselected package libfile-stripnondeterminism-perl. 110s Preparing to unpack .../34-libfile-stripnondeterminism-perl_1.15.0-1_all.deb ... 110s Unpacking libfile-stripnondeterminism-perl (1.15.0-1) ... 110s Selecting previously unselected package dh-strip-nondeterminism. 110s Preparing to unpack .../35-dh-strip-nondeterminism_1.15.0-1_all.deb ... 110s Unpacking dh-strip-nondeterminism (1.15.0-1) ... 110s Selecting previously unselected package debugedit. 110s Preparing to unpack .../36-debugedit_1%3a5.2-3_ppc64el.deb ... 110s Unpacking debugedit (1:5.2-3) ... 110s Selecting previously unselected package dwz. 110s Preparing to unpack .../37-dwz_0.16-2_ppc64el.deb ... 110s Unpacking dwz (0.16-2) ... 110s Selecting previously unselected package gettext. 110s Preparing to unpack .../38-gettext_0.23.2-1_ppc64el.deb ... 110s Unpacking gettext (0.23.2-1) ... 110s Selecting previously unselected package intltool-debian. 110s Preparing to unpack .../39-intltool-debian_0.35.0+20060710.6build1_all.deb ... 110s Unpacking intltool-debian (0.35.0+20060710.6build1) ... 110s Selecting previously unselected package po-debconf. 110s Preparing to unpack .../40-po-debconf_1.0.21+nmu1_all.deb ... 110s Unpacking po-debconf (1.0.21+nmu1) ... 111s Selecting previously unselected package debhelper. 111s Preparing to unpack .../41-debhelper_13.24.2ubuntu1_all.deb ... 111s Unpacking debhelper (13.24.2ubuntu1) ... 111s Selecting previously unselected package dh-python. 111s Preparing to unpack .../42-dh-python_6.20251029_all.deb ... 111s Unpacking dh-python (6.20251029) ... 111s Selecting previously unselected package liberror-perl. 111s Preparing to unpack .../43-liberror-perl_0.17030-1_all.deb ... 111s Unpacking liberror-perl (0.17030-1) ... 111s Selecting previously unselected package git-man. 111s Preparing to unpack .../44-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 111s Unpacking git-man (1:2.51.0-1ubuntu1) ... 111s Selecting previously unselected package git. 111s Preparing to unpack .../45-git_1%3a2.51.0-1ubuntu1_ppc64el.deb ... 111s Unpacking git (1:2.51.0-1ubuntu1) ... 111s Selecting previously unselected package git-imerge. 111s Preparing to unpack .../46-git-imerge_1.2.0-5_all.deb ... 111s Unpacking git-imerge (1.2.0-5) ... 111s Selecting previously unselected package libjs-jquery. 111s Preparing to unpack .../47-libjs-jquery_3.7.1+dfsg+~3.5.33-1build1_all.deb ... 111s Unpacking libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 111s Selecting previously unselected package libjs-underscore. 111s Preparing to unpack .../48-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 111s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 112s Selecting previously unselected package libjs-sphinxdoc. 112s Preparing to unpack .../49-libjs-sphinxdoc_8.2.3-1ubuntu2_all.deb ... 112s Unpacking libjs-sphinxdoc (8.2.3-1ubuntu2) ... 112s Selecting previously unselected package libpkgconf3:ppc64el. 112s Preparing to unpack .../50-libpkgconf3_1.8.1-4build1_ppc64el.deb ... 112s Unpacking libpkgconf3:ppc64el (1.8.1-4build1) ... 112s Selecting previously unselected package pkgconf-bin. 112s Preparing to unpack .../51-pkgconf-bin_1.8.1-4build1_ppc64el.deb ... 112s Unpacking pkgconf-bin (1.8.1-4build1) ... 112s Selecting previously unselected package pkgconf:ppc64el. 112s Preparing to unpack .../52-pkgconf_1.8.1-4build1_ppc64el.deb ... 112s Unpacking pkgconf:ppc64el (1.8.1-4build1) ... 112s Selecting previously unselected package pkg-config:ppc64el. 112s Preparing to unpack .../53-pkg-config_1.8.1-4build1_ppc64el.deb ... 112s Unpacking pkg-config:ppc64el (1.8.1-4build1) ... 112s Selecting previously unselected package pybuild-plugin-autopkgtest. 112s Preparing to unpack .../54-pybuild-plugin-autopkgtest_6.20251029_all.deb ... 112s Unpacking pybuild-plugin-autopkgtest (6.20251029) ... 112s Selecting previously unselected package python3-cachetools. 112s Preparing to unpack .../55-python3-cachetools_5.3.3-1_all.deb ... 112s Unpacking python3-cachetools (5.3.3-1) ... 112s Selecting previously unselected package python3-colorama. 112s Preparing to unpack .../56-python3-colorama_0.4.6-4_all.deb ... 112s Unpacking python3-colorama (0.4.6-4) ... 112s Selecting previously unselected package python3-distlib. 112s Preparing to unpack .../57-python3-distlib_0.4.0-1_all.deb ... 112s Unpacking python3-distlib (0.4.0-1) ... 112s Selecting previously unselected package python3-filelock. 112s Preparing to unpack .../58-python3-filelock_3.18.0-1_all.deb ... 112s Unpacking python3-filelock (3.18.0-1) ... 112s Selecting previously unselected package python3-pip-whl. 112s Preparing to unpack .../59-python3-pip-whl_25.1.1+dfsg-1ubuntu2_all.deb ... 112s Unpacking python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 112s Selecting previously unselected package python3-platformdirs. 112s Preparing to unpack .../60-python3-platformdirs_4.4.0-1_all.deb ... 112s Unpacking python3-platformdirs (4.4.0-1) ... 112s Selecting previously unselected package python3-pluggy. 112s Preparing to unpack .../61-python3-pluggy_1.6.0-1_all.deb ... 112s Unpacking python3-pluggy (1.6.0-1) ... 112s Selecting previously unselected package python3-pyproject-api. 112s Preparing to unpack .../62-python3-pyproject-api_1.9.1-1_all.deb ... 112s Unpacking python3-pyproject-api (1.9.1-1) ... 112s Selecting previously unselected package python3-setuptools-whl. 112s Preparing to unpack .../63-python3-setuptools-whl_78.1.1-0.1_all.deb ... 112s Unpacking python3-setuptools-whl (78.1.1-0.1) ... 112s Selecting previously unselected package python3-virtualenv. 112s Preparing to unpack .../64-python3-virtualenv_20.35.4+ds-1_all.deb ... 112s Unpacking python3-virtualenv (20.35.4+ds-1) ... 112s Selecting previously unselected package python3-wheel. 112s Preparing to unpack .../65-python3-wheel_0.46.1-2_all.deb ... 112s Unpacking python3-wheel (0.46.1-2) ... 112s Selecting previously unselected package tox. 112s Preparing to unpack .../66-tox_4.25.0-1_all.deb ... 112s Unpacking tox (4.25.0-1) ... 112s Setting up dh-python (6.20251029) ... 112s Setting up python3-setuptools-whl (78.1.1-0.1) ... 112s Setting up python3-filelock (3.18.0-1) ... 113s Setting up python3-cachetools (5.3.3-1) ... 113s Setting up python3-colorama (0.4.6-4) ... 113s Setting up python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 113s Setting up libarchive-zip-perl (1.68-1) ... 113s Setting up libdebhelper-perl (13.24.2ubuntu1) ... 113s Setting up m4 (1.4.20-2) ... 113s Setting up python3-distlib (0.4.0-1) ... 113s Setting up libgomp1:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up python3-wheel (0.46.1-2) ... 113s Setting up python3-platformdirs (4.4.0-1) ... 113s Setting up liberror-perl (0.17030-1) ... 113s Setting up autotools-dev (20240727.1) ... 113s Setting up libpkgconf3:ppc64el (1.8.1-4build1) ... 113s Setting up libquadmath0:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up libmpc3:ppc64el (1.3.1-2) ... 113s Setting up autopoint (0.23.2-1) ... 113s Setting up pkgconf-bin (1.8.1-4build1) ... 113s Setting up autoconf (2.72-3.1ubuntu1) ... 113s Setting up python3-pluggy (1.6.0-1) ... 113s Setting up libubsan1:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up dwz (0.16-2) ... 113s Setting up libasan8:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up debugedit (1:5.2-3) ... 113s Setting up git-man (1:2.51.0-1ubuntu1) ... 113s Setting up libtsan2:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 113s Setting up libisl23:ppc64el (0.27-1) ... 113s Setting up libcc1-0:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up liblsan0:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up libitm1:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 113s Setting up automake (1:1.18.1-3) ... 113s update-alternatives: using /usr/bin/automake-1.18 to provide /usr/bin/automake (automake) in auto mode 113s Setting up libfile-stripnondeterminism-perl (1.15.0-1) ... 113s Setting up gettext (0.23.2-1) ... 113s Setting up libgcc-15-dev:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up python3-virtualenv (20.35.4+ds-1) ... 113s Setting up pkgconf:ppc64el (1.8.1-4build1) ... 113s Setting up intltool-debian (0.35.0+20060710.6build1) ... 113s Setting up cpp-15-powerpc64le-linux-gnu (15.2.0-9ubuntu1) ... 113s Setting up libstdc++-15-dev:ppc64el (15.2.0-9ubuntu1) ... 113s Setting up pkg-config:ppc64el (1.8.1-4build1) ... 113s Setting up git (1:2.51.0-1ubuntu1) ... 113s Setting up libjs-sphinxdoc (8.2.3-1ubuntu2) ... 113s Setting up dh-strip-nondeterminism (1.15.0-1) ... 113s Setting up cpp-15 (15.2.0-9ubuntu1) ... 113s Setting up cpp-powerpc64le-linux-gnu (4:15.2.0-4ubuntu1) ... 113s Setting up gcc-15-powerpc64le-linux-gnu (15.2.0-9ubuntu1) ... 113s Setting up po-debconf (1.0.21+nmu1) ... 113s Setting up python3-pyproject-api (1.9.1-1) ... 113s Setting up git-imerge (1.2.0-5) ... 113s Setting up gcc-15 (15.2.0-9ubuntu1) ... 113s Setting up gcc-powerpc64le-linux-gnu (4:15.2.0-4ubuntu1) ... 113s Setting up cpp (4:15.2.0-4ubuntu1) ... 113s Setting up g++-15-powerpc64le-linux-gnu (15.2.0-9ubuntu1) ... 113s Setting up tox (4.25.0-1) ... 113s Setting up libtool (2.5.4-7) ... 113s Setting up gcc (4:15.2.0-4ubuntu1) ... 114s Setting up dh-autoreconf (21) ... 114s Setting up g++-15 (15.2.0-9ubuntu1) ... 114s Setting up g++-powerpc64le-linux-gnu (4:15.2.0-4ubuntu1) ... 114s Setting up debhelper (13.24.2ubuntu1) ... 114s Setting up g++ (4:15.2.0-4ubuntu1) ... 114s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 114s Setting up build-essential (12.12ubuntu2) ... 114s Setting up pybuild-plugin-autopkgtest (6.20251029) ... 114s Processing triggers for install-info (7.2-5) ... 114s Processing triggers for libc-bin (2.42-2ubuntu2) ... 114s Processing triggers for man-db (2.13.1-1) ... 117s autopkgtest [03:00:27]: test pybuild-autopkgtest: pybuild-autopkgtest 117s autopkgtest [03:00:27]: test pybuild-autopkgtest: [----------------------- 117s pybuild-autopkgtest 118s I: pybuild base:317: cd /tmp/autopkgtest.1QY9Oo/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.1QY9Oo/build.ZBk/src/tox.ini --sitepackages -e py313 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 118s py313: skip building and installing the package 118s py313: commands[0] /tmp/autopkgtest.1QY9Oo/build.ZBk/src> /bin/sh t/test-unconflicted 118s + dirname t/test-unconflicted 118s + cd t 118s + pwd 118s + dirname /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t 118s + BASE=/tmp/autopkgtest.1QY9Oo/build.ZBk/src 118s + . /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/test-lib.sh 118s + GIT_IMERGE=git-imerge 118s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s + DESCRIPTION=git-imerge test repository without conflicts 118s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted git-imerge test repository without conflicts 118s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s + local description=git-imerge test repository without conflicts 118s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted git-imerge test repository without conflicts 118s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s + local description=git-imerge test repository without conflicts 118s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s hint: Using 'master' as the name for the initial branch. This default branch name 118s hint: is subject to change. To configure the initial branch name to use in all 118s hint: of your new repositories, which will suppress this warning, call: 118s hint: 118s hint: git config --global init.defaultBranch 118s hint: 118s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 118s hint: 'development'. The just-created branch can be renamed via this command: 118s hint: 118s hint: git branch -m 118s hint: 118s hint: Disable this message with "git config set advice.defaultBranchName false" 118s + echo git-imerge test repository without conflicts 118s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted/.git/ 118s + printf %s\n /*.out /*.css /*.html 118s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted/.git config user.name Loú User 118s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted/.git config user.email luser@example.com 118s + TIME=1112911993 118s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/unconflicted 118s + modify a.txt 0 118s + filename=a.txt 118s + text=0 118s + echo 0 118s + git add a.txt 118s + modify b.txt 0 118s + filename=b.txt 118s + text=0 118s + echo 0 118s + git add b.txt 118s + commit -m m⇒0 118s + TIME=1112911994 118s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 118s + git checkout -b a -- 118s Switched to a new branch 'a' 118s + seq 8 118s + modify a.txt 1 118s + filename=a.txt 118s + text=1 118s + echo 1 118s + git add a.txt 118s + commit -m a⇒1 118s + TIME=1112911995 118s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 118s + modify a.txt 2 118s + filename=a.txt 118s + text=2 118s + echo 2 118s [master (root-commit) 780ddf5] m⇒0 118s 2 files changed, 2 insertions(+) 118s create mode 100644 a.txt 118s create mode 100644 b.txt 118s [a b862e30] a⇒1 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + git add a.txt 118s + commit -m a⇒2 118s + TIME=1112911996 118s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 118s [a dcbe282] a⇒2 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify a.txt 3 118s + filename=a.txt 118s + text=3 118s + echo 3 118s + git add a.txt 118s + commit -m a⇒3 118s + TIME=1112911997 118s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 118s [a ecd8647] a⇒3 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify a.txt 4 118s + filename=a.txt 118s + text=4 118s + echo 4 118s + git add a.txt 118s + commit -m a⇒4 118s + TIME=1112911998 118s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 118s [a 1634bab] a⇒4 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify a.txt 5 118s + filename=a.txt 118s + text=5 118s + echo 5 118s + git add a.txt 118s + commit -m a⇒5 118s + TIME=1112911999 118s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 118s [a 909ce12] a⇒5 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify a.txt 6 118s + filename=a.txt 118s + text=6 118s + echo 6 118s + git add a.txt 118s + commit -m a⇒6 118s + TIME=1112912000 118s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 118s [a f6520bf] a⇒6 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify a.txt 7 118s + filename=a.txt 118s + text=7 118s + echo 7 118s + git add a.txt 118s [a 6797186] a⇒7 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + commit -m a⇒7 118s + TIME=1112912001 118s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 118s + modify a.txt 8 118s + filename=a.txt 118s + text=8 118s + echo 8 118s + git add a.txt 118s + commit -m a⇒8 118s + TIME=1112912002 118s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 118s [a 49643dd] a⇒8 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + git checkout -b b master -- 118s Switched to a new branch 'b' 118s + seq 5 118s + modify b.txt 1 118s + filename=b.txt 118s + text=1 118s + echo 1 118s + git add b.txt 118s + commit -m b⇒1 118s + TIME=1112912003 118s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 118s [b d43305b] b⇒1 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify b.txt 2 118s + filename=b.txt 118s + text=2 118s + echo 2 118s + git add b.txt 118s + commit -m b⇒2 118s + TIME=1112912004 118s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 118s [b 853ee68] b⇒2 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify b.txt 3 118s + filename=b.txt 118s + text=3 118s + echo 3 118s + git add b.txt 118s + commit -m b⇒3 118s + TIME=1112912005 118s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 118s [b 03a2455] b⇒3 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify b.txt 4 118s + filename=b.txt 118s + text=4 118s + echo 4 118s + git add b.txt 118s + commit -m b⇒4 118s + TIME=1112912006 118s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 118s [b 484ea85] b⇒4 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + modify b.txt 5 118s + filename=b.txt 118s + text=5 118s + echo 5 118s + git add b.txt 118s + commit -m b⇒5 118s + TIME=1112912007 118s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 118s [b e22cd97] b⇒5 118s 1 file changed, 1 insertion(+), 1 deletion(-) 118s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 118s + git checkout a 118s Switched to branch 'a' 118s + 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 119s 0 5 8 119s | | | 119s 0 - ********* - a 119s *???????. 119s *???????. 119s *???????. 119s *???????. 119s 5 - *........ 119s | 119s b 119s 119s 0 5 8 119s | | | 119s 0 - ********* - a 119s *???????| 119s *???????| 119s *???????| 119s *???????| 119s 5 - *-------+ 119s | 119s b 119s 119s Key: 119s |,-,+ = rectangles forming current merge frontier 119s * = merge done manually 119s . = merge done automatically 119s # = conflict that is currently blocking progress 119s @ = merge was blocked but has been resolved 119s ? = no merge recorded 119s 119s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 119s Merge b into a (using imerge) 119s 119s # Please enter the commit message for your changes. Lines starting 119s # with '#' will be ignored, and an empty message aborts the commit. 119s # 119s # Date: Sat Dec 6 03:00:27 2025 +0000 119s # 119s # On branch a-b-merge 119s # Changes to be committed: 119s # modified: b.txt 119s # 119s [a-b-merge 187e970] Merge b into a (using imerge) 119s Date: Sat Dec 6 03:00:27 2025 +0000 119s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + local refname=a-b-merge 119s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git rev-parse a-b-merge^{tree} 119s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git-imerge simplify --goal=rebase --branch=a-b-rebase 119s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + local refname=a-b-rebase 119s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + git rev-parse a-b-rebase^{tree} 119s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 119s + 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 120s Attempting to merge 1-1...success. 120s Attempting to merge 1-2...success. 120s Attempting to merge 1-3...success. 120s Attempting to merge 1-4...success. 120s 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 120s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 120s + local refname=a-b-full 120s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 120s + git rev-parse a-b-full^{tree} 120s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 120s py313: commands[1] /tmp/autopkgtest.1QY9Oo/build.ZBk/src> /bin/sh t/test-conflicted 120s + dirname t/test-conflicted 120s + cd t 120s + pwd 120s + dirname /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t 120s + BASE=/tmp/autopkgtest.1QY9Oo/build.ZBk/src 120s + . /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/test-lib.sh 120s + GIT_IMERGE=git-imerge 120s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 120s + test_conflict 4-3 120s + local conflict=4-3 120s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s + DESCRIPTION=git-imerge test repository with conflict at 4-3 120s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 120s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s + local description=git-imerge test repository with conflict at 4-3 120s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 120s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s + local description=git-imerge test repository with conflict at 4-3 120s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s hint: Using 'master' as the name for the initial branch. This default branch name 120s hint: is subject to change. To configure the initial branch name to use in all 120s hint: of your new repositories, which will suppress this warning, call: 120s hint: 120s hint: git config --global init.defaultBranch 120s hint: 120s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 120s hint: 'development'. The just-created branch can be renamed via this command: 120s hint: 120s hint: git branch -m 120s hint: 120s hint: Disable this message with "git config set advice.defaultBranchName false" 120s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3/.git/ 120s + echo git-imerge test repository with conflict at 4-3 120s + printf %s\n /*.out /*.css /*.html 120s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3/.git config user.name Loú User 120s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 120s + TIME=1112911993 120s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-4-3 120s + modify c.txt 0 120s + filename=c.txt 120s + text=0 120s + echo 0 120s + git add c.txt 120s + modify d.txt 0 120s + filename=d.txt 120s + text=0 120s + echo 0 120s + git add d.txt 120s + modify conflict.txt original version 120s + filename=conflict.txt 120s + text=original version 120s + echo original version 120s + git add conflict.txt 120s + commit -m m⇒0 120s + TIME=1112911994 120s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 120s [master (root-commit) d70e04b] m⇒0 120s 3 files changed, 3 insertions(+) 120s create mode 100644 c.txt 120s create mode 100644 conflict.txt 120s create mode 100644 d.txt 120s + git checkout -b c master -- 120s Switched to a new branch 'c' 120s + seq 9 120s + modify c.txt 1 120s + filename=c.txt 120s + text=1 120s + echo 1 120s + git add c.txt 120s + commit -m c⇒1 120s + TIME=1112911995 120s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 120s [c 89e2141] c⇒1 120s 1 file changed, 1 insertion(+), 1 deletion(-) 120s + modify c.txt 2 120s + filename=c.txt 120s + text=2 120s + echo 2 120s + git add c.txt 120s + commit -m c⇒2 120s + TIME=1112911996 120s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 120s [c 7c431f2] c⇒2 120s 1 file changed, 1 insertion(+), 1 deletion(-) 120s + modify c.txt 3 120s + filename=c.txt 120s + text=3 120s + echo 3 120s + git add c.txt 120s + commit -m c⇒3 120s + TIME=1112911997 120s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 120s [c f02ab24] c⇒3 120s 1 file changed, 1 insertion(+), 1 deletion(-) 120s + modify c.txt 4 120s + filename=c.txt 120s + text=4 120s + echo 4 120s + git add c.txt 120s + modify conflict.txt c version 120s + filename=conflict.txt 120s + text=c version 120s + echo c version 120s + git add conflict.txt 120s + commit -m c⇒4 120s + TIME=1112911998 120s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 120s [c 3c091de] c⇒4 120s 2 files changed, 2 insertions(+), 2 deletions(-) 120s + modify c.txt 5 120s + filename=c.txt 120s + text=5 120s + echo 5 120s + git add c.txt 120s + commit -m c⇒5 120s + TIME=1112911999 120s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 120s [c a0ac37a] c⇒5 120s 1 file changed, 1 insertion(+), 1 deletion(-) 120s + modify c.txt 6 120s + filename=c.txt 120s + text=6 120s + echo 6 120s + git add c.txt 120s + commit -m c⇒6 120s + TIME=1112912000 120s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 120s [c ed9fdfa] c⇒6 120s 1 file changed, 1 insertion(+), 1 deletion(-) 120s + modify c.txt 7 120s + filename=c.txt 120s + text=7 120s + echo 7 120s + git add c.txt 120s + commit -m c⇒7 120s + TIME=1112912001 120s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 121s + modify c.txt 8 121s + filename=c.txt 121s + text=8 121s + echo 8 121s + git add c.txt 121s [c 1da7bf5] c⇒7 121s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c d8de99f] c⇒8 121s 1 file changed, 1 insertion(+), 1 deletion(-) 121s + modify c.txt 9 121s + filename=c.txt 121s + text=9 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 + commit -m d⇒1 121s + TIME=1112912004 121s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 121s [d bd5368a] d⇒1 121s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + git add d.txt 121s [d 81f9c80] d⇒4 121s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + tee autofill.out 121s + git-imerge autofill 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. 121s Attempting automerge of 3-6...success. 121s Attempting automerge of 4-6...failure. 121s Attempting automerge of 4-1...success. 121s Attempting automerge of 4-4...failure. 121s Attempting automerge of 4-3...failure. 121s Attempting automerge of 4-2...success. 121s Attempting automerge of 9-2...success. 121s Autofilling 1-6...success. 121s Autofilling 2-6...success. 121s Autofilling 3-1...success. 121s Autofilling 3-2...success. 121s Autofilling 3-3...success. 121s Autofilling 3-4...success. 121s Autofilling 3-5...success. 121s Autofilling 3-6 (first way)...success. 121s Autofilling 3-6 (second way)...success. 121s The two ways of autofilling 3-6 agree. 121s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 121s Autofilling 4-2...success. 121s Autofilling 5-2...success. 121s Autofilling 6-2...success. 121s Autofilling 7-2...success. 121s Autofilling 8-2...success. 121s Autofilling 9-1...success. 121s Autofilling 9-2 (first way)...success. 121s Autofilling 9-2 (second way)...success. 121s The two ways of autofilling 9-2 agree. 121s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 121s Attempting automerge of 9-6...failure. 121s Attempting automerge of 4-3...failure. 121s HEAD is now at 9cde605 c⇒9 121s Conflict; suggest manual merge of 4-3 121s + grep -q Traceback autofill.out 121s + grep -q suggest manual merge of 4-3 autofill.out 121s + git-imerge diagram --commits --frontier --html=imerge1.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 continue --edit 122s Switched to branch 'imerge/c-d' 122s Auto-merging conflict.txt 122s CONFLICT (content): Merge conflict in conflict.txt 122s Automatic merge failed; fix conflicts and then commit the result. 122s 122s Original first commit: 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 commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 122s Author: Loú User 122s Date: Thu Apr 7 22:13:26 2005 +0000 122s 122s d⇒3 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 + echo merged version 122s + git add conflict.txt 122s + git-imerge continue --no-edit 122s [imerge/c-d 5946f61] imerge 'c-d': manual merge 4-3 122s Merge has been recorded for merge 4-3. 122s Attempting automerge of 4-6...success. 122s Autofilling 4-4...success. 122s Autofilling 4-5...success. 122s Autofilling 4-6...success. 122s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 122s Attempting automerge of 9-6...success. 122s Autofilling 5-6...success. 122s Autofilling 6-6...success. 122s Autofilling 7-6...success. 122s Autofilling 8-6...success. 122s Autofilling 9-3...success. 122s Autofilling 9-4...success. 122s Autofilling 9-5...success. 122s Autofilling 9-6 (first way)...success. 122s Autofilling 9-6 (second way)...success. 122s The two ways of autofilling 9-6 agree. 122s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 122s Merge is complete! 122s + git-imerge diagram --commits --frontier --html=imerge2.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_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 122s Merge d into c (using imerge) 122s 122s # Please enter the commit message for your changes. Lines starting 122s # with '#' will be ignored, and an empty message aborts the commit. 122s # 122s # Date: Sat Dec 6 03:00:31 2025 +0000 122s # 122s # On branch c-d-merge 122s # Changes to be committed: 122s # modified: conflict.txt 122s # modified: d.txt 122s # 122s [c-d-merge 6a91e3b] Merge d into c (using imerge) 122s Date: Sat Dec 6 03:00:31 2025 +0000 122s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + local refname=c-d-merge 122s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + git rev-parse c-d-merge^{tree} 122s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + git-imerge simplify --goal=rebase --branch=c-d-rebase 122s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + local refname=c-d-rebase 122s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + git rev-parse c-d-rebase^{tree} 122s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 122s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + local refname=c-d-rebase-with-history 122s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + git rev-parse c-d-rebase-with-history^{tree} 122s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 122s + git-imerge simplify --goal=border --branch=c-d-border 123s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + local refname=c-d-border 123s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + git rev-parse c-d-border^{tree} 123s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 123s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + local refname=c-d-border-with-history 123s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + git rev-parse c-d-border-with-history^{tree} 123s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 123s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + local refname=c-d-border-with-history2 123s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + git rev-parse c-d-border-with-history2^{tree} 123s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 123s + git-imerge remove 123s + git checkout c 123s Switched to branch 'c' 123s + git-imerge+ tee start.out 123s start --goal=full --first-parent --name=c-d d 123s Attempting to merge 1-1...success. 123s Attempting to merge 1-2...success. 123s Attempting to merge 1-3...success. 123s Attempting to merge 1-4...success. 123s Attempting to merge 1-5...success. 123s Attempting to merge 1-6...success. 123s Attempting to merge 2-1...success. 123s Attempting to merge 2-2...success. 123s Attempting to merge 2-3...success. 123s Attempting to merge 2-4...success. 123s Attempting to merge 2-5...success. 123s Attempting to merge 2-6...success. 123s Attempting to merge 3-1...success. 123s Attempting to merge 3-2...success. 123s Attempting to merge 3-3...success. 123s Attempting to merge 3-4...success. 123s Attempting to merge 3-5...success. 123s Attempting to merge 3-6...success. 123s Attempting to merge 4-1...success. 123s Attempting to merge 4-2...success. 124s Attempting to merge 4-3...conflict. 124s Attempting to merge 5-1...success. 124s Attempting to merge 5-2...success. 124s Attempting to merge 6-1...success. 124s Attempting to merge 6-2...success. 124s Attempting to merge 7-1...success. 124s Attempting to merge 7-2...success. 124s Attempting to merge 8-1...success. 124s Attempting to merge 8-2...success. 124s Attempting to merge 9-1...success. 124s Attempting to merge 9-2...success. 124s Previous HEAD position was 536eab4 imerge 'c-d': automatic merge 9-2 124s Switched to branch 'imerge/c-d' 124s Auto-merging conflict.txt 124s CONFLICT (content): Merge conflict in conflict.txt 124s Automatic merge failed; fix conflicts and then commit the result. 124s 124s Original first commit: 124s commit 3c091ded129a5edf9061360bab867edade996c93 124s Author: Loú User 124s Date: Thu Apr 7 22:13:18 2005 +0000 124s 124s c⇒4 124s 124s Original second commit: 124s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 124s Author: Loú User 124s Date: Thu Apr 7 22:13:26 2005 +0000 124s 124s d⇒3 124s 124s There was a conflict merging commit 4-3, shown above. 124s Please resolve the conflict, commit the result, then type 124s 124s git-imerge continue 124s + grep -q Traceback start.out 124s + grep -q suggest manual merge of 4-3 autofill.out 124s + git-imerge diagram --commits --frontier --html=imerge3.html 124s 0 5 9 124s | | | 124s 0 - ********** - c 124s *......... 124s *......... 124s *...#????? 124s *...?????? 124s 5 - *...?????? 124s 6 - *...?????? 124s | 124s d 124s 124s 0 5 9 124s | | | 124s 0 - ********** - c 124s *........| 124s *...-----+ 124s *..|#????? 124s *..|?????? 124s 5 - *..|?????? 124s 6 - *--+?????? 124s | 124s d 124s 124s Key: 124s |,-,+ = rectangles forming current merge frontier 124s * = merge done manually 124s . = merge done automatically 124s # = conflict that is currently blocking progress 124s @ = merge was blocked but has been resolved 124s ? = no merge recorded 124s 124s + echo merged version 124s + git add conflict.txt 124s + GIT_EDITOR=cat git commit 124s imerge 'c-d': manual merge 4-3 124s 124s # Conflicts: 124s # conflict.txt 124s # 124s # It looks like you may be committing a merge. 124s # If this is not correct, please run 124s # git update-ref -d MERGE_HEAD 124s # and try again. 124s 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 # On branch imerge/c-d 124s # All conflicts fixed but you are still merging. 124s # 124s # Changes to be committed: 124s # modified: conflict.txt 124s # modified: d.txt 124s # 124s + git-imerge continue --edit 124s [imerge/c-d 6fc8669] imerge 'c-d': manual merge 4-3 124s Merge has been recorded for merge 4-3. 124s Attempting to merge 4-4...success. 124s Attempting to merge 4-5...success. 124s Attempting to merge 4-6...success. 124s Attempting to merge 5-3...success. 124s Attempting to merge 5-4...success. 124s Attempting to merge 5-5...success. 124s Attempting to merge 5-6...success. 124s Attempting to merge 6-3...success. 124s Attempting to merge 6-4...success. 124s Attempting to merge 6-5...success. 124s Attempting to merge 6-6...success. 124s Attempting to merge 7-3...success. 124s Attempting to merge 7-4...success. 124s Attempting to merge 7-5...success. 124s Attempting to merge 7-6...success. 124s Attempting to merge 8-3...success. 124s Attempting to merge 8-4...success. 124s Attempting to merge 8-5...success. 124s Attempting to merge 8-6...success. 124s Attempting to merge 9-3...success. 124s Attempting to merge 9-4...success. 124s Attempting to merge 9-5...success. 124s Attempting to merge 9-6...success. 124s Merge is complete! 124s + git-imerge diagram --commits --frontier --html=imerge4.html 124s 0 5 9 124s | | | 124s 0 - ********** - c 124s *......... 124s *......... 124s *...*..... 124s *......... 124s 5 - *......... 124s 6 - *......... 124s | 124s d 124s 124s 0 5 9 124s | | | 124s 0 - ********** - c 124s *........| 124s *........| 124s *...*....| 124s *........| 124s 5 - *........| 124s 6 - *--------+ 124s | 124s d 124s 124s Key: 124s |,-,+ = rectangles forming current merge frontier 124s * = merge done manually 124s . = merge done automatically 124s # = conflict that is currently blocking progress 124s @ = merge was blocked but has been resolved 124s ? = no merge recorded 124s 124s + git-imerge finish --branch=c-d-full 125s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + local refname=c-d-full 125s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + git rev-parse c-d-full^{tree} 125s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 125s + test_conflict 1-1 125s + local conflict=1-1 125s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s + DESCRIPTION=git-imerge test repository with conflict at 1-1 125s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 125s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s + local description=git-imerge test repository with conflict at 1-1 125s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 125s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s + local description=git-imerge test repository with conflict at 1-1 125s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s hint: Using 'master' as the name for the initial branch. This default branch name 125s hint: is subject to change. To configure the initial branch name to use in all 125s hint: of your new repositories, which will suppress this warning, call: 125s hint: 125s hint: git config --global init.defaultBranch 125s hint: 125s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 125s hint: 'development'. The just-created branch can be renamed via this command: 125s hint: 125s hint: git branch -m 125s hint: 125s hint: Disable this message with "git config set advice.defaultBranchName false" 125s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1/.git/ 125s + echo git-imerge test repository with conflict at 1-1 125s + printf %s\n /*.out /*.css /*.html 125s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1/.git config user.name Loú User 125s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 125s + TIME=1112911993 125s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-1 125s + modify c.txt 0 125s + filename=c.txt 125s + text=0 125s + echo 0 125s + git add c.txt 125s + modify d.txt 0 125s + filename=d.txt 125s + text=0 125s + echo 0 125s + git add d.txt 125s + modify conflict.txt original version 125s + filename=conflict.txt 125s + text=original version 125s + echo original version 125s + git add conflict.txt 125s + commit -m m⇒0 125s + TIME=1112911994 125s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 125s [master (root-commit) d70e04b] m⇒0 125s 3 files changed, 3 insertions(+) 125s create mode 100644 c.txt 125s create mode 100644 conflict.txt 125s create mode 100644 d.txt 125s + git checkout -b c master -- 125s Switched to a new branch 'c' 125s + seq 9 125s + modify c.txt 1 125s + filename=c.txt 125s + text=1 125s + echo 1 125s + git add c.txt 125s + modify conflict.txt c version 125s + filename=conflict.txt 125s + text=c version 125s + echo c version 125s + git add conflict.txt 125s + commit -m c⇒1 125s + TIME=1112911995 125s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 125s [c 2120f40] c⇒1 125s 2 files changed, 2 insertions(+), 2 deletions(-) 125s + modify c.txt 2 125s + filename=c.txt 125s + text=2 125s + echo 2 125s + git add c.txt 125s + commit -m c⇒2 125s + TIME=1112911996 125s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 125s [c 90cc7de] c⇒2 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify c.txt 3 125s + filename=c.txt 125s + text=3 125s + echo 3 125s + git add c.txt 125s + commit -m c⇒3 125s + TIME=1112911997 125s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 125s [c 2046ed2] c⇒3 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify c.txt 4 125s + filename=c.txt 125s + text=4 125s + echo 4 125s + git add c.txt 125s + commit -m c⇒4 125s + TIME=1112911998 125s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 125s [c 8a2cee9] c⇒4 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify c.txt 5 125s + filename=c.txt 125s + text=5 125s + echo 5 125s + git add c.txt 125s + commit -m c⇒5 125s + TIME=1112911999 125s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 125s [c ac16a05] c⇒5 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify c.txt 6 125s + filename=c.txt 125s + text=6 125s + echo 6 125s + git add c.txt 125s + commit -m c⇒6 125s + TIME=1112912000 125s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 125s [c 30dd2ae] c⇒6 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify c.txt 7 125s + filename=c.txt 125s + text=7 125s + echo 7 125s + git add c.txt 125s + commit -m c⇒7 125s + TIME=1112912001 125s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 125s [c 0883eb9] c⇒7 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify c.txt 8 125s + filename=c.txt 125s + text=8 125s + echo 8 125s + git add c.txt 125s + commit -m c⇒8 125s + TIME=1112912002 125s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 125s [c f661c06] c⇒8 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify c.txt 9 125s + filename=c.txt 125s + text=9 125s + echo 9 125s + git add c.txt 125s + commit -m c⇒9 125s + TIME=1112912003 125s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 125s [c 243e8ed] c⇒9 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + git checkout -b d master -- 125s Switched to a new branch 'd' 125s + seq 6 125s + modify d.txt 1 125s + filename=d.txt 125s + text=1 125s + echo 1 125s + git add d.txt 125s + modify conflict.txt d version 125s + filename=conflict.txt 125s + text=d version 125s + echo d version 125s + git add conflict.txt 125s + commit -m d⇒1 125s + TIME=1112912004 125s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 125s + modify d.txt 2 125s + filename=d.txt 125s + text=2 125s + echo 2 125s + git add d.txt 125s [d ac0427a] d⇒1 125s 2 files changed, 2 insertions(+), 2 deletions(-) 125s + commit -m d⇒2 125s + TIME=1112912005 125s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 125s [d 43c38c0] d⇒2 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify d.txt 3 125s + filename=d.txt 125s + text=3 125s + echo 3 125s + git add d.txt 125s + commit -m d⇒3 125s + TIME=1112912006 125s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 125s [d 0260058] d⇒3 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify d.txt 4 125s + filename=d.txt 125s + text=4 125s + echo 4 125s + git add d.txt 125s + commit -m d⇒4 125s + TIME=1112912007 125s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 125s [d 40fef44] d⇒4 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + modify d.txt 5 125s + filename=d.txt 125s + text=5 125s + echo 5 125s + git add d.txt 125s + commit -m d⇒5 125s + TIME=1112912008 125s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 125s + modify d.txt 6 125s + filename=d.txt 125s + text=6 125s + echo 6 125s [d b080a65] d⇒5 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + git add d.txt 125s + commit -m d⇒6 125s + TIME=1112912009 125s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 125s [d 200ce5c] d⇒6 125s 1 file changed, 1 insertion(+), 1 deletion(-) 125s + git checkout c 125s Switched to branch 'c' 125s + git-imerge init --name=c-d d 125s + git-imerge list 125s * c-d 125s + git-imerge diagram --commits --frontier --html=imerge0.html 125s 0 5 9 125s | | | 125s 0 - ********** - c 125s *????????? 125s *????????? 125s *????????? 125s *????????? 125s 5 - *????????? 125s 6 - *????????? 125s | 125s d 125s 125s 0 5 9 125s | | | 125s 0 - ********** - c 125s *????????? 125s *????????? 125s *????????? 125s *????????? 125s 5 - *????????? 125s 6 - *????????? 125s | 125s d 125s 125s Key: 125s |,-,+ = rectangles forming current merge frontier 125s * = merge done manually 125s . = merge done automatically 125s # = conflict that is currently blocking progress 125s @ = merge was blocked but has been resolved 125s ? = no merge recorded 125s 125s + git-imerge autofill 125s + tee autofill.out 125s Attempting automerge of 9-6...failure. 125s Attempting automerge of 1-1...failure. 125s HEAD is now at 243e8ed c⇒9 125s No progress was possible; suggest manual merge of 1-1 125s + grep -q Traceback autofill.out 125s + grep -q suggest manual merge of 1-1 autofill.out 125s + git-imerge diagram --commits --frontier --html=imerge1.html 125s 0 5 9 125s | | | 125s 0 - ********** - c 125s *#???????? 125s *????????? 125s *????????? 125s *????????? 125s 5 - *????????? 125s 6 - *????????? 125s | 125s d 125s 125s 0 5 9 125s | | | 125s 0 - ********** - c 125s *#???????? 125s *????????? 125s *????????? 125s *????????? 125s 5 - *????????? 125s 6 - *????????? 125s | 125s d 125s 125s Key: 125s |,-,+ = rectangles forming current merge frontier 125s * = merge done manually 125s . = merge done automatically 125s # = conflict that is currently blocking progress 125s @ = merge was blocked but has been resolved 125s ? = no merge recorded 125s 125s + git-imerge continue --edit 125s Switched to branch 'imerge/c-d' 125s Auto-merging conflict.txt 125s CONFLICT (content): Merge conflict in conflict.txt 125s Automatic merge failed; fix conflicts and then commit the result. 125s 125s Original first commit: 125s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 125s Author: Loú User 125s Date: Thu Apr 7 22:13:15 2005 +0000 125s 125s c⇒1 125s 125s Original second commit: 125s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 125s Author: Loú User 125s Date: Thu Apr 7 22:13:24 2005 +0000 125s 125s d⇒1 125s 125s There was a conflict merging commit 1-1, shown above. 125s Please resolve the conflict, commit the result, then type 125s 125s git-imerge continue 125s + echo merged version 125s + git add conflict.txt 125s + git-imerge continue --no-edit 125s [imerge/c-d fe57ecc] imerge 'c-d': manual merge 1-1 125s Merge has been recorded for merge 1-1. 125s Attempting automerge of 1-6...success. 125s Autofilling 1-2...success. 125s Autofilling 1-3...success. 125s Autofilling 1-4...success. 125s Autofilling 1-5...success. 125s Autofilling 1-6...success. 125s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 125s Attempting automerge of 9-6...success. 125s Autofilling 2-6...success. 125s Autofilling 3-6...success. 126s Autofilling 4-6...success. 126s Autofilling 5-6...success. 126s Autofilling 6-6...success. 126s Autofilling 7-6...success. 126s Autofilling 8-6...success. 126s Autofilling 9-1...success. 126s Autofilling 9-2...success. 126s Autofilling 9-3...success. 126s Autofilling 9-4...success. 126s Autofilling 9-5...success. 126s Autofilling 9-6 (first way)...success. 126s Autofilling 9-6 (second way)...success. 126s The two ways of autofilling 9-6 agree. 126s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 126s Merge is complete! 126s + git-imerge diagram --commits --frontier --html=imerge2.html 126s 0 5 9 126s | | | 126s 0 - ********** - c 126s **???????. 126s *.???????. 126s *.???????. 126s *.???????. 126s 5 - *.???????. 126s 6 - *......... 126s | 126s d 126s 126s 0 5 9 126s | | | 126s 0 - ********** - c 126s **???????| 126s *.???????| 126s *.???????| 126s *.???????| 126s 5 - *.???????| 126s 6 - *--------+ 126s | 126s d 126s 126s Key: 126s |,-,+ = rectangles forming current merge frontier 126s * = merge done manually 126s . = merge done automatically 126s # = conflict that is currently blocking progress 126s @ = merge was blocked but has been resolved 126s ? = no merge recorded 126s 126s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 126s Merge d into c (using imerge) 126s 126s # Please enter the commit message for your changes. Lines starting 126s # with '#' will be ignored, and an empty message aborts the commit. 126s # 126s # Date: Sat Dec 6 03:00:35 2025 +0000 126s # 126s # On branch c-d-merge 126s # Changes to be committed: 126s # modified: conflict.txt 126s # modified: d.txt 126s # 126s [c-d-merge d2d0c56] Merge d into c (using imerge) 126s Date: Sat Dec 6 03:00:35 2025 +0000 126s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + local refname=c-d-merge 126s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git rev-parse c-d-merge^{tree} 126s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git-imerge simplify --goal=rebase --branch=c-d-rebase 126s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + local refname=c-d-rebase 126s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git rev-parse c-d-rebase^{tree} 126s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 126s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + local refname=c-d-rebase-with-history 126s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git rev-parse c-d-rebase-with-history^{tree} 126s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git-imerge simplify --goal=border --branch=c-d-border 126s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + local refname=c-d-border 126s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git rev-parse c-d-border^{tree} 126s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 126s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 127s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 127s + local refname=c-d-border-with-history 127s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 127s + git rev-parse c-d-border-with-history^{tree} 127s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 127s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 127s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 127s + local refname=c-d-border-with-history2 127s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 127s + git rev-parse c-d-border-with-history2^{tree} 127s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 127s + git-imerge remove 127s + git checkout c 127s Switched to branch 'c' 127s + git-imerge start --goal=full --first-parent --name=c-d d 127s + tee start.out 127s Attempting to merge 1-1...conflict. 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 2120f40dc39d28052a5279b645124e8ed7e5de73 127s Author: Loú User 127s Date: Thu Apr 7 22:13:15 2005 +0000 127s 127s c⇒1 127s 127s Original second commit: 127s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 127s Author: Loú User 127s Date: Thu Apr 7 22:13:24 2005 +0000 127s 127s d⇒1 127s 127s There was a conflict merging commit 1-1, 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 1-1 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 1-1 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 215eef4] imerge 'c-d': manual merge 1-1 127s + git-imerge continue --edit 127s Merge has been recorded for merge 1-1. 127s Attempting to merge 1-2...success. 127s Attempting to merge 1-3...success. 127s Attempting to merge 1-4...success. 127s Attempting to merge 1-5...success. 127s Attempting to merge 1-6...success. 127s Attempting to merge 2-1...success. 127s Attempting to merge 2-2...success. 127s Attempting to merge 2-3...success. 127s Attempting to merge 2-4...success. 127s Attempting to merge 2-5...success. 127s Attempting to merge 2-6...success. 127s Attempting to merge 3-1...success. 127s 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...success. 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-1...success. 127s Attempting to merge 5-2...success. 127s Attempting to merge 5-3...success. 127s Attempting to merge 5-4...success. 127s Attempting to merge 5-5...success. 127s Attempting to merge 5-6...success. 128s Attempting to merge 6-1...success. 128s Attempting to merge 6-2...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-1...success. 128s Attempting to merge 7-2...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-1...success. 128s Attempting to merge 8-2...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-1...success. 128s Attempting to merge 9-2...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 9-1 128s + local conflict=9-1 128s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 128s + DESCRIPTION=git-imerge test repository with conflict at 9-1 128s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 128s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 128s + local description=git-imerge test repository with conflict at 9-1 128s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 128s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 128s + local description=git-imerge test repository with conflict at 9-1 128s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 128s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 128s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-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.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1/.git/ 128s + echo git-imerge test repository with conflict at 9-1 128s + printf %s\n /*.out /*.css /*.html 128s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1/.git config user.name Loú User 128s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 128s + TIME=1112911993 128s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-1 128s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-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 + 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 89e2141] c⇒1 128s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c 7c431f2] c⇒2 128s 1 file changed, 1 insertion(+), 1 deletion(-) 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 f02ab24] 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 ed9122f] 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 1d3bf09] 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 f999ecd] 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 7050a8a] 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 9732e77] 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 + 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⇒9 128s + TIME=1112912003 128s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 128s [c 73a5eed] c⇒9 128s 2 files changed, 2 insertions(+), 2 deletions(-) 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 128s + 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 129s Attempting automerge of 9-6...failure. 129s Attempting automerge of 1-1...success. 129s Attempting automerge of 1-4...success. 129s Attempting automerge of 1-6...success. 129s Attempting automerge of 9-6...failure. 129s Attempting automerge of 5-6...success. 129s Attempting automerge of 7-6...success. 129s Attempting automerge of 8-6...success. 129s Attempting automerge of 9-1...failure. 129s Autofilling 1-6...success. 129s Autofilling 2-6...success. 129s Autofilling 3-6...success. 129s Autofilling 4-6...success. 129s Autofilling 5-6...success. 129s Autofilling 6-6...success. 129s Autofilling 7-6...success. 129s Autofilling 8-1...success. 129s Autofilling 8-2...success. 129s Autofilling 8-3...success. 129s Autofilling 8-4...success. 129s Autofilling 8-5...success. 129s Autofilling 8-6 (first way)...success. 129s Autofilling 8-6 (second way)...success. 129s The two ways of autofilling 8-6 agree. 129s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 129s Attempting automerge of 9-6...failure. 129s Attempting automerge of 9-1...failure. 129s HEAD is now at 73a5eed c⇒9 129s Conflict; suggest manual merge of 9-1 129s + grep -q Traceback autofill.out 129s + grep -q suggest manual merge of 9-1 autofill.out 129s + git-imerge diagram --commits --frontier --html=imerge1.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 continue --edit 129s Switched to branch 'imerge/c-d' 129s Auto-merging conflict.txt 129s CONFLICT (content): Merge conflict in conflict.txt 129s Automatic merge failed; fix conflicts and then commit the result. 129s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 129s Author: Loú User 129s Date: Thu Apr 7 22:13:23 2005 +0000 129s 129s c⇒9 129s 129s Original first commit: 129s 129s Original second commit: 129s 129s There was a conflict merging commit 9-1, shown above. 129s Please resolve the conflict, commit the result, then type 129s 129s git-imerge continue 129s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 129s Author: Loú User 129s Date: Thu Apr 7 22:13:24 2005 +0000 129s 129s d⇒1 129s + echo merged version 129s + git add conflict.txt 129s + git-imerge continue --no-edit 129s [imerge/c-d dcec09f] imerge 'c-d': manual merge 9-1 129s Merge has been recorded for merge 9-1. 129s Attempting automerge of 9-6...success. 129s Autofilling 9-2...success. 129s Autofilling 9-3...success. 129s Autofilling 9-4...success. 129s Autofilling 9-5...success. 129s Autofilling 9-6...success. 129s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 129s Merge is complete! 130s + git-imerge diagram --commits --frontier --html=imerge2.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_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 130s Merge d into c (using imerge) 130s 130s # Please enter the commit message for your changes. Lines starting 130s # with '#' will be ignored, and an empty message aborts the commit. 130s # 130s # Date: Sat Dec 6 03:00:38 2025 +0000 130s # 130s # On branch c-d-merge 130s # Changes to be committed: 130s # modified: conflict.txt 130s # modified: d.txt 130s # 130s [c-d-merge 4cce64a] Merge d into c (using imerge) 130s Date: Sat Dec 6 03:00:38 2025 +0000 130s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + local refname=c-d-merge 130s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git rev-parse c-d-merge^{tree} 130s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git-imerge simplify --goal=rebase --branch=c-d-rebase 130s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + local refname=c-d-rebase 130s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git rev-parse c-d-rebase^{tree} 130s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 130s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + local refname=c-d-rebase-with-history 130s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git rev-parse c-d-rebase-with-history^{tree} 130s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git-imerge simplify --goal=border --branch=c-d-border 130s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + local refname=c-d-border 130s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git rev-parse c-d-border^{tree} 130s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 130s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + local refname=c-d-border-with-history 130s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git rev-parse c-d-border-with-history^{tree} 130s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 130s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 131s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 131s + local refname=c-d-border-with-history2 131s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 131s + git rev-parse c-d-border-with-history2^{tree} 131s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 131s + git-imerge remove 131s + git checkout c 131s Switched to branch 'c' 131s + git-imerge start --goal=full --first-parent --name=c-d d 131s + tee start.out 131s Attempting to merge 1-1...success. 131s Attempting to merge 1-2...success. 131s Attempting to merge 1-3...success. 131s Attempting to merge 1-4...success. 131s Attempting to merge 1-5...success. 131s Attempting to merge 1-6...success. 131s Attempting to merge 2-1...success. 131s Attempting to merge 2-2...success. 131s Attempting to merge 2-3...success. 131s Attempting to merge 2-4...success. 131s Attempting to merge 2-5...success. 131s Attempting to merge 2-6...success. 131s Attempting to merge 3-1...success. 131s Attempting to merge 3-2...success. 131s Attempting to merge 3-3...success. 131s Attempting to merge 3-4...success. 131s Attempting to merge 3-5...success. 131s Attempting to merge 3-6...success. 131s Attempting to merge 4-1...success. 131s Attempting to merge 4-2...success. 131s Attempting to merge 4-3...success. 131s Attempting to merge 4-4...success. 131s Attempting to merge 4-5...success. 131s Attempting to merge 4-6...success. 131s Attempting to merge 5-1...success. 131s Attempting to merge 5-2...success. 131s Attempting to merge 5-3...success. 131s Attempting to merge 5-4...success. 131s Attempting to merge 5-5...success. 131s Attempting to merge 5-6...success. 131s Attempting to merge 6-1...success. 131s Attempting to merge 6-2...success. 131s Attempting to merge 6-3...success. 131s Attempting to merge 6-4...success. 131s Attempting to merge 6-5...success. 131s Attempting to merge 6-6...success. 131s Attempting to merge 7-1...success. 131s Attempting to merge 7-2...success. 131s Attempting to merge 7-3...success. 131s Attempting to merge 7-4...success. 132s Attempting to merge 7-5...success. 132s Attempting to merge 7-6...success. 132s Attempting to merge 8-1...success. 132s Attempting to merge 8-2...success. 132s Attempting to merge 8-3...success. 132s Attempting to merge 8-4...success. 132s Attempting to merge 8-5...success. 132s Attempting to merge 8-6...success. 132s Attempting to merge 9-1...conflict. 132s Switched to branch 'imerge/c-d' 132s Auto-merging conflict.txt 132s CONFLICT (content): Merge conflict in conflict.txt 132s Automatic merge failed; fix conflicts and then commit the result. 132s 132s Original first commit: 132s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 132s Author: Loú User 132s Date: Thu Apr 7 22:13:23 2005 +0000 132s 132s c⇒9 132s 132s Original second commit: 132s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 132s Author: Loú User 132s Date: Thu Apr 7 22:13:24 2005 +0000 132s 132s d⇒1 132s 132s There was a conflict merging commit 9-1, shown above. 132s Please resolve the conflict, commit the result, then type 132s 132s git-imerge continue 132s + grep -q Traceback start.out 132s + grep -q suggest manual merge of 9-1 autofill.out 132s + git-imerge diagram --commits --frontier --html=imerge3.html 132s 0 5 9 132s | | | 132s 0 - ********** - c 132s *........# 132s *........? 132s *........? 132s *........? 132s 5 - *........? 132s 6 - *........? 132s | 132s d 132s 132s 0 5 9 132s | | | 132s 0 - ********** - c 132s *.......|# 132s *.......|? 132s *.......|? 132s *.......|? 132s 5 - *.......|? 132s 6 - *-------+? 132s | 132s d 132s 132s Key: 132s |,-,+ = rectangles forming current merge frontier 132s * = merge done manually 132s . = merge done automatically 132s # = conflict that is currently blocking progress 132s @ = merge was blocked but has been resolved 132s ? = no merge recorded 132s 132s + echo merged version 132s + git add conflict.txt 132s + GIT_EDITOR=cat git commit 132s imerge 'c-d': manual merge 9-1 132s 132s # Conflicts: 132s # conflict.txt 132s # 132s # It looks like you may be committing a merge. 132s # If this is not correct, please run 132s # git update-ref -d MERGE_HEAD 132s # and try again. 132s 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 # On branch imerge/c-d 132s # All conflicts fixed but you are still merging. 132s # 132s # Changes to be committed: 132s # modified: conflict.txt 132s # modified: d.txt 132s # 132s [imerge/c-d eefb037] imerge 'c-d': manual merge 9-1 132s + git-imerge continue --edit 132s Merge has been recorded for merge 9-1. 132s Attempting to merge 9-2...success. 132s Attempting to merge 9-3...success. 132s Attempting to merge 9-4...success. 132s Attempting to merge 9-5...success. 132s Attempting to merge 9-6...success. 132s Merge is complete! 132s + git-imerge diagram --commits --frontier --html=imerge4.html 132s 0 5 9 132s | | | 132s 0 - ********** - c 132s *........* 132s *......... 132s *......... 132s *......... 132s 5 - *......... 132s 6 - *......... 132s | 132s d 132s 132s 0 5 9 132s | | | 132s 0 - ********** - c 132s *........* 132s *........| 132s *........| 132s *........| 132s 5 - *........| 132s 6 - *--------+ 132s | 132s d 132s 132s Key: 132s |,-,+ = rectangles forming current merge frontier 132s * = merge done manually 132s . = merge done automatically 132s # = conflict that is currently blocking progress 132s @ = merge was blocked but has been resolved 132s ? = no merge recorded 132s 132s + git-imerge finish --branch=c-d-full 132s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + local refname=c-d-full 132s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + git rev-parse c-d-full^{tree} 132s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 132s + test_conflict 1-6 132s + local conflict=1-6 132s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s + DESCRIPTION=git-imerge test repository with conflict at 1-6 132s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 132s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s + local description=git-imerge test repository with conflict at 1-6 132s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 132s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s + local description=git-imerge test repository with conflict at 1-6 132s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s hint: Using 'master' as the name for the initial branch. This default branch name 132s hint: is subject to change. To configure the initial branch name to use in all 132s hint: of your new repositories, which will suppress this warning, call: 132s hint: 132s hint: git config --global init.defaultBranch 132s hint: 132s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 132s hint: 'development'. The just-created branch can be renamed via this command: 132s hint: 132s hint: git branch -m 132s hint: 132s hint: Disable this message with "git config set advice.defaultBranchName false" 132s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6/.git/ 132s + echo git-imerge test repository with conflict at 1-6 132s + printf %s\n /*.out /*.css /*.html 132s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6/.git config user.name Loú User 132s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 132s + TIME=1112911993 132s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-6 132s + modify c.txt 0 132s + filename=c.txt 132s + text=0 132s + echo 0 132s + git add c.txt 132s + modify d.txt 0 132s + filename=d.txt 132s + text=0 132s + echo 0 132s + git add d.txt 132s + modify conflict.txt original version 132s + filename=conflict.txt 132s + text=original version 132s + echo original version 132s + git add conflict.txt 132s + commit -m m⇒0 132s + TIME=1112911994 132s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 132s [master (root-commit) d70e04b] m⇒0 132s 3 files changed, 3 insertions(+) 132s create mode 100644 c.txt 132s create mode 100644 conflict.txt 132s create mode 100644 d.txt 132s + git checkout -b c master -- 132s Switched to a new branch 'c' 132s + seq 9 132s + modify c.txt 1 132s + filename=c.txt 132s + text=1 132s + echo 1 132s + git add c.txt 132s + modify conflict.txt c version 132s + filename=conflict.txt 132s + text=c version 132s + echo c version 132s + git add conflict.txt 132s + commit -m c⇒1 132s + TIME=1112911995 132s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 132s [c 2120f40] c⇒1 132s 2 files changed, 2 insertions(+), 2 deletions(-) 132s + modify c.txt 2 132s + filename=c.txt 132s + text=2 132s + echo 2 132s + git add c.txt 132s + commit -m c⇒2 132s + TIME=1112911996 132s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 132s [c 90cc7de] c⇒2 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify c.txt 3 132s + filename=c.txt 132s + text=3 132s + echo 3 132s + git add c.txt 132s + commit -m c⇒3 132s + TIME=1112911997 132s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 132s [c 2046ed2] c⇒3 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify c.txt 4 132s + filename=c.txt 132s + text=4 132s + echo 4 132s + git add c.txt 132s + commit -m c⇒4 132s + TIME=1112911998 132s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 132s [c 8a2cee9] c⇒4 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify c.txt 5 132s + filename=c.txt 132s + text=5 132s + echo 5 132s + git add c.txt 132s + commit -m c⇒5 132s + TIME=1112911999 132s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 132s [c ac16a05] c⇒5 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify c.txt 6 132s + filename=c.txt 132s + text=6 132s + echo 6 132s + git add c.txt 132s + commit -m c⇒6 132s + TIME=1112912000 132s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 132s + modify c.txt 7 132s + filename=c.txt 132s + text=7 132s + echo 7 132s + git add c.txt 132s [c 30dd2ae] c⇒6 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + commit -m c⇒7 132s + TIME=1112912001 132s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 132s [c 0883eb9] c⇒7 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify c.txt 8 132s + filename=c.txt 132s + text=8 132s + echo 8 132s + git add c.txt 132s + commit -m c⇒8 132s + TIME=1112912002 132s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 132s [c f661c06] c⇒8 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify c.txt 9 132s + filename=c.txt 132s + text=9 132s + echo 9 132s + git add c.txt 132s + commit -m c⇒9 132s + TIME=1112912003 132s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 132s [c 243e8ed] c⇒9 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + git checkout -b d master -- 132s Switched to a new branch 'd' 132s + seq 6 132s + modify d.txt 1 132s + filename=d.txt 132s + text=1 132s + echo 1 132s + git add d.txt 132s + commit -m d⇒1 132s + TIME=1112912004 132s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 132s [d bd5368a] d⇒1 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify d.txt 2 132s + filename=d.txt 132s + text=2 132s + echo 2 132s + git add d.txt 132s + commit -m d⇒2 132s + TIME=1112912005 132s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 132s [d 93e27e6] d⇒2 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify d.txt 3 132s + filename=d.txt 132s + text=3 132s + echo 3 132s + git add d.txt 132s + commit -m d⇒3 132s + TIME=1112912006 132s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 132s [d 133f385] d⇒3 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify d.txt 4 132s + filename=d.txt 132s + text=4 132s + echo 4 132s + git add d.txt 132s + commit -m d⇒4 132s + TIME=1112912007 132s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 132s [d 586472a] d⇒4 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify d.txt 5 132s + filename=d.txt 132s + text=5 132s + echo 5 132s + git add d.txt 132s + commit -m d⇒5 132s + TIME=1112912008 132s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 132s [d 9522207] d⇒5 132s 1 file changed, 1 insertion(+), 1 deletion(-) 132s + modify d.txt 6 132s + filename=d.txt 132s + text=6 132s + echo 6 132s + git add d.txt 132s + modify conflict.txt d version 132s + filename=conflict.txt 132s + text=d version 132s + echo d version 132s + git add conflict.txt 132s + commit -m d⇒6 132s + TIME=1112912009 132s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 132s [d f7e451a] d⇒6 132s 2 files changed, 2 insertions(+), 2 deletions(-) 132s + git checkout c 132s Switched to branch 'c' 132s + git-imerge init --name=c-d d 133s + git-imerge list 133s * c-d 133s + git-imerge diagram --commits --frontier --html=imerge0.html 133s 0 5 9 133s | | | 133s 0 - ********** - c 133s *????????? 133s *????????? 133s *????????? 133s *????????? 133s 5 - *????????? 133s 6 - *????????? 133s | 133s d 133s 133s 0 5 9 133s | | | 133s 0 - ********** - c 133s *????????? 133s *????????? 133s *????????? 133s *????????? 133s 5 - *????????? 133s 6 - *????????? 133s | 133s d 133s 133s Key: 133s |,-,+ = rectangles forming current merge frontier 133s * = merge done manually 133s . = merge done automatically 133s # = conflict that is currently blocking progress 133s @ = merge was blocked but has been resolved 133s ? = no merge recorded 133s 133s + tee autofill.out 133s + git-imerge autofill 133s Attempting automerge of 9-6...failure. 133s Attempting automerge of 1-1...success. 133s Attempting automerge of 1-4...success. 133s Attempting automerge of 1-6...failure. 133s Attempting automerge of 1-5...success. 133s Attempting automerge of 9-5...success. 133s Autofilling 1-5...success. 133s Autofilling 2-5...success. 133s Autofilling 3-5...success. 133s Autofilling 4-5...success. 133s Autofilling 5-5...success. 133s Autofilling 6-5...success. 133s Autofilling 7-5...success. 133s Autofilling 8-5...success. 133s Autofilling 9-1...success. 133s Autofilling 9-2...success. 133s Autofilling 9-3...success. 133s Autofilling 9-4...success. 133s Autofilling 9-5 (first way)...success. 133s Autofilling 9-5 (second way)...success. 133s The two ways of autofilling 9-5 agree. 133s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 133s Attempting automerge of 9-6...failure. 133s Attempting automerge of 1-6...failure. 133s HEAD is now at 243e8ed c⇒9 133s Conflict; suggest manual merge of 1-6 133s + grep -q Traceback autofill.out 133s + grep -q suggest manual merge of 1-6 autofill.out 133s + git-imerge diagram --commits --frontier --html=imerge1.html 133s 0 5 9 133s | | | 133s 0 - ********** - c 133s *????????. 133s *????????. 133s *????????. 133s *????????. 133s 5 - *......... 133s 6 - *#???????? 133s | 133s d 133s 133s 0 5 9 133s | | | 133s 0 - ********** - c 133s *????????| 133s *????????| 133s *????????| 133s *????????| 133s 5 - *--------+ 133s 6 - *#???????? 133s | 133s d 133s 133s Key: 133s |,-,+ = rectangles forming current merge frontier 133s * = merge done manually 133s . = merge done automatically 133s # = conflict that is currently blocking progress 133s @ = merge was blocked but has been resolved 133s ? = no merge recorded 133s 133s + git-imerge continue --edit 133s Switched to branch 'imerge/c-d' 133s Auto-merging conflict.txt 133s CONFLICT (content): Merge conflict in conflict.txt 133s Automatic merge failed; fix conflicts and then commit the result. 133s 133s Original first commit: 133s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 133s Author: Loú User 133s Date: Thu Apr 7 22:13:15 2005 +0000 133s 133s c⇒1 133s 133s Original second commit: 133s commit f7e451a6c9656dda15641a9fbc591a602f158692 133s Author: Loú User 133s Date: Thu Apr 7 22:13:29 2005 +0000 133s 133s d⇒6 133s 133s There was a conflict merging commit 1-6, shown above. 133s Please resolve the conflict, commit the result, then type 133s 133s git-imerge continue 133s + echo merged version 133s + git add conflict.txt 133s + git-imerge continue --no-edit 133s [imerge/c-d ce067c4] imerge 'c-d': manual merge 1-6 133s Merge has been recorded for merge 1-6. 133s Attempting automerge of 9-6...success. 133s Autofilling 2-6...success. 133s Autofilling 3-6...success. 133s Autofilling 4-6...success. 133s Autofilling 5-6...success. 134s Autofilling 6-6...success. 134s Autofilling 7-6...success. 134s Autofilling 8-6...success. 134s Autofilling 9-6...success. 134s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 134s Merge is complete! 134s + git-imerge diagram --commits --frontier --html=imerge2.html 134s 0 5 9 134s | | | 134s 0 - ********** - c 134s *????????. 134s *????????. 134s *????????. 134s *????????. 134s 5 - *......... 134s 6 - **........ 134s | 134s d 134s 134s 0 5 9 134s | | | 134s 0 - ********** - c 134s *????????| 134s *????????| 134s *????????| 134s *????????| 134s 5 - *........| 134s 6 - **-------+ 134s | 134s d 134s 134s Key: 134s |,-,+ = rectangles forming current merge frontier 134s * = merge done manually 134s . = merge done automatically 134s # = conflict that is currently blocking progress 134s @ = merge was blocked but has been resolved 134s ? = no merge recorded 134s 134s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 134s Merge d into c (using imerge) 134s 134s # Please enter the commit message for your changes. Lines starting 134s # with '#' will be ignored, and an empty message aborts the commit. 134s # 134s # Date: Sat Dec 6 03:00:42 2025 +0000 134s # 134s # On branch c-d-merge 134s # Changes to be committed: 134s # modified: conflict.txt 134s # modified: d.txt 134s # 134s [c-d-merge 07124f7] Merge d into c (using imerge) 134s Date: Sat Dec 6 03:00:42 2025 +0000 134s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + local refname=c-d-merge 134s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git rev-parse c-d-merge^{tree} 134s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git-imerge simplify --goal=rebase --branch=c-d-rebase 134s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + local refname=c-d-rebase 134s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git rev-parse c-d-rebase^{tree} 134s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 134s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + local refname=c-d-rebase-with-history 134s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git rev-parse c-d-rebase-with-history^{tree} 134s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git-imerge simplify --goal=border --branch=c-d-border 134s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + local refname=c-d-border 134s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + git rev-parse c-d-border^{tree} 134s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 134s + 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 135s + git checkout c 135s Switched to branch 'c' 135s + + git-imerge start --goal=full --first-parenttee --name=c-d start.out d 135s 135s Attempting to merge 1-1...success. 135s Attempting to merge 1-2...success. 135s Attempting to merge 1-3...success. 135s Attempting to merge 1-4...success. 135s Attempting to merge 1-5...success. 135s Attempting to merge 1-6...conflict. 135s Attempting to merge 2-1...success. 135s Attempting to merge 2-2...success. 135s Attempting to merge 2-3...success. 135s Attempting to merge 2-4...success. 135s Attempting to merge 2-5...success. 135s Attempting to merge 3-1...success. 135s Attempting to merge 3-2...success. 135s Attempting to merge 3-3...success. 135s Attempting to merge 3-4...success. 135s Attempting to merge 3-5...success. 135s Attempting to merge 4-1...success. 135s Attempting to merge 4-2...success. 135s Attempting to merge 4-3...success. 135s Attempting to merge 4-4...success. 135s Attempting to merge 4-5...success. 135s Attempting to merge 5-1...success. 135s Attempting to merge 5-2...success. 135s Attempting to merge 5-3...success. 135s Attempting to merge 5-4...success. 135s Attempting to merge 5-5...success. 135s Attempting to merge 6-1...success. 135s Attempting to merge 6-2...success. 135s Attempting to merge 6-3...success. 135s Attempting to merge 6-4...success. 135s Attempting to merge 6-5...success. 135s Attempting to merge 7-1...success. 135s Attempting to merge 7-2...success. 135s Attempting to merge 7-3...success. 135s Attempting to merge 7-4...success. 135s Attempting to merge 7-5...success. 135s Attempting to merge 8-1...success. 135s Attempting to merge 8-2...success. 135s Attempting to merge 8-3...success. 135s Attempting to merge 8-4...success. 135s Attempting to merge 8-5...success. 135s Attempting to merge 9-1...success. 135s Attempting to merge 9-2...success. 135s Attempting to merge 9-3...success. 136s Attempting to merge 9-4...success. 136s Attempting to merge 9-5...success. 136s Previous HEAD position was 03ab303 imerge 'c-d': automatic merge 9-5 136s Switched to branch 'imerge/c-d' 136s Auto-merging conflict.txt 136s CONFLICT (content): Merge conflict in conflict.txt 136s Automatic merge failed; fix conflicts and then commit the result. 136s 136s Original first commit: 136s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 136s Author: Loú User 136s Date: Thu Apr 7 22:13:15 2005 +0000 136s 136s c⇒1 136s 136s Original second commit: 136s commit f7e451a6c9656dda15641a9fbc591a602f158692 136s Author: Loú User 136s Date: Thu Apr 7 22:13:29 2005 +0000 136s 136s d⇒6 136s 136s There was a conflict merging commit 1-6, shown above. 136s Please resolve the conflict, commit the result, then type 136s 136s git-imerge continue 136s + grep -q Traceback start.out 136s + grep -q suggest manual merge of 1-6 autofill.out 136s + 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-6 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 1244bac] imerge 'c-d': manual merge 1-6 136s + git-imerge continue --edit 136s Merge has been recorded for merge 1-6. 136s Attempting to merge 2-6...success. 136s Attempting to merge 3-6...success. 136s Attempting to merge 4-6...success. 136s Attempting to merge 5-6...success. 136s Attempting to merge 6-6...success. 136s Attempting to merge 7-6...success. 136s Attempting to merge 8-6...success. 136s Attempting to merge 9-6...success. 136s Merge is complete! 136s + git-imerge diagram --commits --frontier --html=imerge4.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 + git-imerge finish --branch=c-d-full 136s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 136s + local refname=c-d-full 136s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 136s + git rev-parse c-d-full^{tree} 136s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 136s + test_conflict 9-6 136s + local conflict=9-6 136s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s + DESCRIPTION=git-imerge test repository with conflict at 9-6 136s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 136s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s + local description=git-imerge test repository with conflict at 9-6 136s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 136s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s + local description=git-imerge test repository with conflict at 9-6 136s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s hint: Using 'master' as the name for the initial branch. This default branch name 136s hint: is subject to change. To configure the initial branch name to use in all 136s hint: of your new repositories, which will suppress this warning, call: 136s hint: 136s hint: git config --global init.defaultBranch 136s hint: 136s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 136s hint: 'development'. The just-created branch can be renamed via this command: 136s hint: 136s hint: git branch -m 136s hint: 136s hint: Disable this message with "git config set advice.defaultBranchName false" 136s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6/.git/ 136s + echo git-imerge test repository with conflict at 9-6 136s + printf %s\n /*.out /*.css /*.html 136s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6/.git config user.name Loú User 136s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 136s + TIME=1112911993 136s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-6 136s + modify c.txt 0 136s + filename=c.txt 136s + text=0 136s + echo 0 136s + git add c.txt 136s + modify d.txt 0 136s + filename=d.txt 136s + text=0 136s + echo 0 136s + git add d.txt 136s + modify conflict.txt original version 136s + filename=conflict.txt 136s + text=original version 136s + echo original version 136s + git add conflict.txt 136s + commit -m m⇒0 136s + TIME=1112911994 136s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 136s [master (root-commit) d70e04b] m⇒0 136s 3 files changed, 3 insertions(+) 136s create mode 100644 c.txt 136s create mode 100644 conflict.txt 136s create mode 100644 d.txt 136s + git checkout -b c master -- 136s Switched to a new branch 'c' 136s + seq 9 136s + modify c.txt 1 136s + filename=c.txt 136s + text=1 136s + echo 1 136s + git add c.txt 136s + commit -m c⇒1 136s + TIME=1112911995 136s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 136s + modify c.txt 2 136s + filename=c.txt 136s + text=2 136s + echo 2 136s + git add c.txt 136s [c 89e2141] c⇒1 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + commit -m c⇒2 136s + TIME=1112911996 136s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 136s [c 7c431f2] c⇒2 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify c.txt 3 136s + filename=c.txt 136s + text=3 136s + echo 3 136s + git add c.txt 136s + commit -m c⇒3 136s + TIME=1112911997 136s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 136s [c f02ab24] c⇒3 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify c.txt 4 136s + filename=c.txt 136s + text=4 136s + echo 4 136s + git add c.txt 136s + commit -m c⇒4 136s + TIME=1112911998 136s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 136s [c ed9122f] c⇒4 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify c.txt 5 136s + filename=c.txt 136s + text=5 136s + echo 5 136s + git add c.txt 136s + commit -m c⇒5 136s + TIME=1112911999 136s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 136s [c 1d3bf09] c⇒5 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify c.txt 6 136s + filename=c.txt 136s + text=6 136s + echo 6 136s + git add c.txt 136s + commit -m c⇒6 136s + TIME=1112912000 136s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 136s [c f999ecd] c⇒6 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify c.txt 7 136s + filename=c.txt 136s + text=7 136s + echo 7 136s + git add c.txt 136s + commit -m c⇒7 136s + TIME=1112912001 136s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 136s [c 7050a8a] c⇒7 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify c.txt 8 136s + filename=c.txt 136s + text=8 136s + echo 8 136s + git add c.txt 136s + commit -m c⇒8 136s + TIME=1112912002 136s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 136s [c 9732e77] c⇒8 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify c.txt 9 136s + filename=c.txt 136s + text=9 136s + echo 9 136s + git add c.txt 136s + modify conflict.txt c version 136s + filename=conflict.txt 136s + text=c version 136s + echo c version 136s + git add conflict.txt 136s + commit -m c⇒9 136s + TIME=1112912003 136s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 136s [c 73a5eed] c⇒9 136s 2 files changed, 2 insertions(+), 2 deletions(-) 136s + git checkout -b d master -- 136s Switched to a new branch 'd' 136s + seq 6 136s + modify d.txt 1 136s + filename=d.txt 136s + text=1 136s + echo 1 136s + git add d.txt 136s + commit -m d⇒1 136s + TIME=1112912004 136s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 136s [d bd5368a] d⇒1 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify d.txt 2 136s + filename=d.txt 136s + text=2 136s + echo 2 136s + git add d.txt 136s + commit -m d⇒2 136s + TIME=1112912005 136s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 136s [d 93e27e6] d⇒2 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify d.txt 3 136s + filename=d.txt 136s + text=3 136s + echo 3 136s + git add d.txt 136s + commit -m d⇒3 136s + TIME=1112912006 136s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 136s [d 133f385] d⇒3 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify d.txt 4 136s + filename=d.txt 136s + text=4 136s + echo 4 136s + git add d.txt 136s + commit -m d⇒4 136s + TIME=1112912007 136s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 136s [d 586472a] d⇒4 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify d.txt 5 136s + filename=d.txt 136s + text=5 136s + echo 5 136s + git add d.txt 136s + commit -m d⇒5 136s + TIME=1112912008 136s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 136s + modify d.txt 6 136s + filename=d.txt 136s + text=6 136s + echo 6 136s + git add d.txt 136s [d 9522207] d⇒5 136s 1 file changed, 1 insertion(+), 1 deletion(-) 136s + modify conflict.txt d version 136s + filename=conflict.txt 136s + text=d version 136s + echo d version 136s + git add conflict.txt 136s + commit -m d⇒6 136s + TIME=1112912009 136s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 136s [d f7e451a] d⇒6 136s 2 files changed, 2 insertions(+), 2 deletions(-) 136s + git checkout c 136s Switched to branch 'c' 136s + git-imerge init --name=c-d d 136s + git-imerge list 136s * c-d 136s + git-imerge diagram --commits --frontier --html=imerge0.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 + git-imerge autofill 136s + tee autofill.out 137s Attempting automerge of 9-6...failure. 137s Attempting automerge of 1-1...success. 137s Attempting automerge of 1-4...success. 137s Attempting automerge of 1-6...success. 137s Attempting automerge of 9-6...failure. 137s Attempting automerge of 5-6...success. 137s Attempting automerge of 7-6...success. 137s Attempting automerge of 8-6...success. 137s Attempting automerge of 9-1...success. 137s Attempting automerge of 9-4...success. 137s Attempting automerge of 9-5...success. 137s Autofilling 1-6...success. 137s Autofilling 2-6...success. 137s Autofilling 3-6...success. 137s Autofilling 4-6...success. 137s Autofilling 5-6...success. 137s Autofilling 6-6...success. 137s Autofilling 7-6...success. 137s Autofilling 8-1...success. 137s Autofilling 8-2...success. 137s Autofilling 8-3...success. 137s Autofilling 8-4...success. 137s Autofilling 8-5...success. 137s Autofilling 8-6 (first way)...success. 137s Autofilling 8-6 (second way)...success. 137s The two ways of autofilling 8-6 agree. 137s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 137s Autofilling 9-1...success. 137s Autofilling 9-2...success. 137s Autofilling 9-3...success. 137s Autofilling 9-4...success. 137s Autofilling 9-5...success. 137s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 137s Attempting automerge of 9-6...failure. 137s Attempting automerge of 9-6...failure. 137s HEAD is now at 73a5eed c⇒9 137s Conflict; suggest manual merge of 9-6 137s + grep -q Traceback autofill.out 137s + grep -q suggest manual merge of 9-6 autofill.out 137s + git-imerge diagram --commits --frontier --html=imerge1.html 137s 0 5 9 137s | | | 137s 0 - ********** - c 137s *???????.. 137s *???????.. 137s *???????.. 137s *???????.. 137s 5 - *???????.. 137s 6 - *........# 137s | 137s d 137s 137s 0 5 9 137s | | | 137s 0 - ********** - c 137s *???????.| 137s *???????.| 137s *???????.| 137s *???????.| 137s 5 - *???????.+ 137s 6 - *-------+# 137s | 137s d 137s 137s Key: 137s |,-,+ = rectangles forming current merge frontier 137s * = merge done manually 137s . = merge done automatically 137s # = conflict that is currently blocking progress 137s @ = merge was blocked but has been resolved 137s ? = no merge recorded 137s 137s + git-imerge continue --edit 137s Switched to branch 'imerge/c-d' 137s Auto-merging conflict.txt 137s CONFLICT (content): Merge conflict in conflict.txt 137s Automatic merge failed; fix conflicts and then commit the result. 137s 137s Original first commit: 137s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 137s Author: Loú User 137s Date: Thu Apr 7 22:13:23 2005 +0000 137s 137s c⇒9 137s 137s Original second commit: 137s commit f7e451a6c9656dda15641a9fbc591a602f158692 137s Author: Loú User 137s Date: Thu Apr 7 22:13:29 2005 +0000 137s 137s d⇒6 137s 137s There was a conflict merging commit 9-6, shown above. 137s Please resolve the conflict, commit the result, then type 137s 137s git-imerge continue 137s + echo merged version 137s + git add conflict.txt 138s + git-imerge continue --no-edit 138s [imerge/c-d 3308fc7] imerge 'c-d': manual merge 9-6 138s Merge has been recorded for merge 9-6. 138s Merge is complete! 138s + git-imerge diagram --commits --frontier --html=imerge2.html 138s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 138s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + local refname=c-d-merge 138s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git rev-parse c-d-merge^{tree} 138s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git-imerge simplify --goal=rebase --branch=c-d-rebase 138s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + local refname=c-d-rebase 138s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git rev-parse c-d-rebase^{tree} 138s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 138s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + local refname=c-d-rebase-with-history 138s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git rev-parse c-d-rebase-with-history^{tree} 138s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git-imerge simplify --goal=border --branch=c-d-border 138s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + local refname=c-d-border 138s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git rev-parse c-d-border^{tree} 138s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 138s 0 5 9 138s | | | 138s 0 - ********** - c 138s *???????.. 138s *???????.. 138s *???????.. 138s *???????.. 138s 5 - *???????.. 138s 6 - *........* 138s | 138s d 138s 138s 0 5 9 138s | | | 138s 0 - ********** - c 138s *???????.| 138s *???????.| 138s *???????.| 138s *???????.| 138s 5 - *???????.| 138s 6 - *--------* 138s | 138s d 138s 138s Key: 138s |,-,+ = rectangles forming current merge frontier 138s * = merge done manually 138s . = merge done automatically 138s # = conflict that is currently blocking progress 138s @ = merge was blocked but has been resolved 138s ? = no merge recorded 138s 138s Merge d into c (using imerge) 138s 138s # Please enter the commit message for your changes. Lines starting 138s # with '#' will be ignored, and an empty message aborts the commit. 138s # 138s # Date: Sat Dec 6 03:00:46 2025 +0000 138s # 138s # On branch c-d-merge 138s # Changes to be committed: 138s # modified: conflict.txt 138s # modified: d.txt 138s # 138s [c-d-merge 7239776] Merge d into c (using imerge) 138s Date: Sat Dec 6 03:00:46 2025 +0000 138s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + local refname=c-d-border-with-history 138s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git rev-parse c-d-border-with-history^{tree} 138s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 138s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + local refname=c-d-border-with-history2 138s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git rev-parse c-d-border-with-history2^{tree} 138s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 138s + git-imerge remove 138s + git checkout c 138s Switched to branch 'c' 138s + tee start.out 138s + git-imerge start --goal=full --first-parent --name=c-d d 139s Attempting to merge 1-1...success. 139s Attempting to merge 1-2...success. 139s Attempting to merge 1-3...success. 139s Attempting to merge 1-4...success. 139s Attempting to merge 1-5...success. 139s Attempting to merge 1-6...success. 139s Attempting to merge 2-1...success. 139s Attempting to merge 2-2...success. 139s Attempting to merge 2-3...success. 139s Attempting to merge 2-4...success. 139s Attempting to merge 2-5...success. 139s Attempting to merge 2-6...success. 139s Attempting to merge 3-1...success. 139s Attempting to merge 3-2...success. 139s Attempting to merge 3-3...success. 139s Attempting to merge 3-4...success. 139s Attempting to merge 3-5...success. 139s Attempting to merge 3-6...success. 139s Attempting to merge 4-1...success. 139s Attempting to merge 4-2...success. 139s Attempting to merge 4-3...success. 139s Attempting to merge 4-4...success. 139s Attempting to merge 4-5...success. 139s Attempting to merge 4-6...success. 139s Attempting to merge 5-1...success. 139s Attempting to merge 5-2...success. 139s Attempting to merge 5-3...success. 139s Attempting to merge 5-4...success. 139s Attempting to merge 5-5...success. 139s Attempting to merge 5-6...success. 139s Attempting to merge 6-1...success. 139s Attempting to merge 6-2...success. 139s Attempting to merge 6-3...success. 139s Attempting to merge 6-4...success. 139s Attempting to merge 6-5...success. 139s Attempting to merge 6-6...success. 139s Attempting to merge 7-1...success. 139s Attempting to merge 7-2...success. 139s 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...conflict. 139s Switched to branch 'imerge/c-d' 139s Auto-merging conflict.txt 139s CONFLICT (content): Merge conflict in conflict.txt 139s Automatic merge failed; fix conflicts and then commit the result. 139s 139s Original first commit: 139s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 139s Author: Loú User 139s Date: Thu Apr 7 22:13:23 2005 +0000 139s 139s c⇒9 139s 139s Original second commit: 139s commit f7e451a6c9656dda15641a9fbc591a602f158692 139s Author: Loú User 139s Date: Thu Apr 7 22:13:29 2005 +0000 139s 139s d⇒6 139s 139s There was a conflict merging commit 9-6, shown above. 139s Please resolve the conflict, commit the result, then type 139s 139s git-imerge continue 139s + grep -q Traceback start.out 139s + grep -q suggest manual merge of 9-6 autofill.out 139s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 139s + git add conflict.txt 139s + GIT_EDITOR=cat git commit 139s imerge 'c-d': manual merge 9-6 139s 139s # Conflicts: 139s # conflict.txt 139s # 139s # It looks like you may be committing a merge. 139s # If this is not correct, please run 139s # git update-ref -d MERGE_HEAD 139s # and try again. 139s 139s 139s # Please enter the commit message for your changes. Lines starting 139s # with '#' will be ignored, and an empty message aborts the commit. 139s # 139s # On branch imerge/c-d 139s # All conflicts fixed but you are still merging. 139s # 139s # Changes to be committed: 139s # modified: conflict.txt 139s # modified: d.txt 139s # 139s [imerge/c-d d14cfb3] imerge 'c-d': manual merge 9-6 139s + git-imerge continue --edit 140s Merge has been recorded for merge 9-6. 140s Merge is complete! 140s + git-imerge diagram --commits --frontier --html=imerge4.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 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 1-2 140s + local conflict=1-2 140s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 140s + DESCRIPTION=git-imerge test repository with conflict at 1-2 140s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 140s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 140s + local description=git-imerge test repository with conflict at 1-2 140s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 140s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 140s + local description=git-imerge test repository with conflict at 1-2 140s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 140s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 140s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 140s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2/.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 1-2 140s + printf %s\n /*.out /*.css /*.html 140s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2/.git config user.name Loú User 140s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 140s + TIME=1112911993 140s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 140s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-1-2 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 [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 + 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 + 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⇒1 140s + TIME=1112911995 140s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 140s [c 2120f40] c⇒1 140s 2 files changed, 2 insertions(+), 2 deletions(-) 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 90cc7de] c⇒2 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 [c 2046ed2] c⇒3 140s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c 8a2cee9] c⇒4 140s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c ac16a05] c⇒5 140s 1 file changed, 1 insertion(+), 1 deletion(-) 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 30dd2ae] 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 0883eb9] 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 f661c06] 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 + 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 243e8ed] c⇒9 140s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + commit -m d⇒1 140s + TIME=1112912004 140s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 140s [d bd5368a] d⇒1 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + modify d.txt 2 140s + filename=d.txt 140s + text=2 140s + echo 2 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⇒2 140s + TIME=1112912005 140s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 140s [d 69efde8] d⇒2 140s 2 files changed, 2 insertions(+), 2 deletions(-) 140s + modify d.txt 3 140s + filename=d.txt 140s + text=3 140s + echo 3 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 [d 3169557] d⇒3 140s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d 86c8052] d⇒4 140s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d 1700773] d⇒5 140s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d df2e493] d⇒6 140s 1 file changed, 1 insertion(+), 1 deletion(-) 140s + git checkout c 140s Switched to branch 'c' 140s + git-imerge init --name=c-d d 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. 140s Attempting automerge of 1-1...success. 140s Attempting automerge of 1-4...failure. 140s Attempting automerge of 1-3...failure. 140s Attempting automerge of 1-2...failure. 140s Attempting automerge of 9-1...success. 140s Autofilling 1-1...success. 140s Autofilling 2-1...success. 140s Autofilling 3-1...success. 140s Autofilling 4-1...success. 140s Autofilling 5-1...success. 140s Autofilling 6-1...success. 140s Autofilling 7-1...success. 140s Autofilling 8-1...success. 140s Autofilling 9-1...success. 140s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 140s Attempting automerge of 9-6...failure. 140s Attempting automerge of 1-2...failure. 140s HEAD is now at 243e8ed c⇒9 140s Conflict; suggest manual merge of 1-2 140s + grep -q Traceback autofill.out 140s + grep -q suggest manual merge of 1-2 autofill.out 140s + git-imerge diagram --commits --frontier --html=imerge1.html 141s 0 5 9 141s | | | 141s 0 - ********** - c 141s *......... 141s *#???????? 141s *????????? 141s *????????? 141s 5 - *????????? 141s 6 - *????????? 141s | 141s d 141s 141s 0 5 9 141s | | | 141s 0 - ********** - c 141s *--------+ 141s *#???????? 141s *????????? 141s *????????? 141s 5 - *????????? 141s 6 - *????????? 141s | 141s d 141s 141s Key: 141s |,-,+ = rectangles forming current merge frontier 141s * = merge done manually 141s . = merge done automatically 141s # = conflict that is currently blocking progress 141s @ = merge was blocked but has been resolved 141s ? = no merge recorded 141s 141s + git-imerge continue --edit 141s Switched to branch 'imerge/c-d' 141s Auto-merging conflict.txt 141s CONFLICT (content): Merge conflict in conflict.txt 141s Automatic merge failed; fix conflicts and then commit the result. 141s 141s Original first commit: 141s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 141s Author: Loú User 141s Date: Thu Apr 7 22:13:15 2005 +0000 141s 141s c⇒1 141s 141s Original second commit: 141s 141s There was a conflict merging commit 1-2, shown above. 141s Please resolve the conflict, commit the result, then type 141s 141s git-imerge continue 141s commit 69efde8f66d581a765a3909ffacb9f895f95c345 141s Author: Loú User 141s Date: Thu Apr 7 22:13:25 2005 +0000 141s 141s d⇒2 141s + echo merged version 141s + git add conflict.txt 141s + git-imerge continue --no-edit 141s [imerge/c-d 071b539] imerge 'c-d': manual merge 1-2 141s Merge has been recorded for merge 1-2. 141s Attempting automerge of 1-6...success. 141s Autofilling 1-3...success. 141s Autofilling 1-4...success. 141s Autofilling 1-5...success. 141s Autofilling 1-6...success. 141s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 141s Attempting automerge of 9-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-6...success. 141s Autofilling 9-2...success. 141s Autofilling 9-3...success. 141s Autofilling 9-4...success. 141s Autofilling 9-5...success. 141s Autofilling 9-6 (first way)...success. 141s Autofilling 9-6 (second way)...success. 141s The two ways of autofilling 9-6 agree. 141s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 141s Merge is complete! 141s + git-imerge diagram --commits --frontier --html=imerge2.html 141s 0 5 9 141s | | | 141s 0 - ********** - c 141s *......... 141s **???????. 141s *.???????. 141s *.???????. 141s 5 - *.???????. 141s 6 - *......... 141s | 141s d 141s 141s 0 5 9 141s | | | 141s 0 - ********** - c 141s *........| 141s **???????| 141s *.???????| 141s *.???????| 141s 5 - *.???????| 141s 6 - *--------+ 141s | 141s d 141s 141s Key: 141s |,-,+ = rectangles forming current merge frontier 141s * = merge done manually 141s . = merge done automatically 141s # = conflict that is currently blocking progress 141s @ = merge was blocked but has been resolved 141s ? = no merge recorded 141s 141s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 141s Merge d into c (using imerge) 141s 141s # Please enter the commit message for your changes. Lines starting 141s # with '#' will be ignored, and an empty message aborts the commit. 141s # 141s # Date: Sat Dec 6 03:00:50 2025 +0000 141s # 141s # On branch c-d-merge 141s # Changes to be committed: 141s # modified: conflict.txt 141s # modified: d.txt 141s # 141s [c-d-merge ed3bbc3] Merge d into c (using imerge) 141s Date: Sat Dec 6 03:00:50 2025 +0000 141s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 141s + local refname=c-d-merge 141s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 141s + git rev-parse c-d-merge^{tree} 141s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 141s + git-imerge simplify --goal=rebase --branch=c-d-rebase 141s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 141s + local refname=c-d-rebase 141s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 141s + git rev-parse c-d-rebase^{tree} 141s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 141s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 142s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + local refname=c-d-rebase-with-history 142s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git rev-parse c-d-rebase-with-history^{tree} 142s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git-imerge simplify --goal=border --branch=c-d-border 142s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + local refname=c-d-border 142s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git rev-parse c-d-border^{tree} 142s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 142s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + local refname=c-d-border-with-history 142s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git rev-parse c-d-border-with-history^{tree} 142s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 142s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + local refname=c-d-border-with-history2 142s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git rev-parse c-d-border-with-history2^{tree} 142s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 142s + git-imerge remove 142s + git checkout c 142s Switched to branch 'c' 142s + git-imerge start --goal=full --first-parent --name=c-d d 142s + tee start.out 142s Attempting to merge 1-1...success. 142s Attempting to merge 1-2...conflict. 142s Attempting to merge 2-1...success. 142s Attempting to merge 3-1...success. 142s Attempting to merge 4-1...success. 142s Attempting to merge 5-1...success. 142s Attempting to merge 6-1...success. 142s Attempting to merge 7-1...success. 142s Attempting to merge 8-1...success. 142s Attempting to merge 9-1...success. 142s Previous HEAD position was 23d6644 imerge 'c-d': automatic merge 9-1 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 2120f40dc39d28052a5279b645124e8ed7e5de73 142s Author: Loú User 142s Date: Thu Apr 7 22:13:15 2005 +0000 142s 142s c⇒1 142s 142s Original second commit: 142s commit 69efde8f66d581a765a3909ffacb9f895f95c345 142s Author: Loú User 142s Date: Thu Apr 7 22:13:25 2005 +0000 142s 142s d⇒2 142s 142s There was a conflict merging commit 1-2, shown above. 142s Please resolve the conflict, commit the result, then type 142s 142s git-imerge continue 142s + grep -q Traceback start.out 142s + grep -q suggest manual merge of 1-2 autofill.out 142s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 142s + git add conflict.txt 142s + GIT_EDITOR=cat git commit 142s imerge 'c-d': manual merge 1-2 142s 142s # Conflicts: 142s # conflict.txt 142s # 142s # It looks like you may be committing a merge. 142s # If this is not correct, please run 142s # git update-ref -d MERGE_HEAD 142s # and try again. 142s 142s 142s # Please enter the commit message for your changes. Lines starting 142s # with '#' will be ignored, and an empty message aborts the commit. 142s # 142s # On branch imerge/c-d 142s # All conflicts fixed but you are still merging. 142s # 142s # Changes to be committed: 142s # modified: conflict.txt 142s # modified: d.txt 142s # 142s [imerge/c-d 2037643] imerge 'c-d': manual merge 1-2 142s + git-imerge continue --edit 143s Merge has been recorded for merge 1-2. 143s Attempting to merge 1-3...success. 143s Attempting to merge 1-4...success. 143s Attempting to merge 1-5...success. 143s Attempting to merge 1-6...success. 143s Attempting to merge 2-2...success. 143s Attempting to merge 2-3...success. 143s Attempting to merge 2-4...success. 143s Attempting to merge 2-5...success. 143s Attempting to merge 2-6...success. 143s Attempting to merge 3-2...success. 143s Attempting to merge 3-3...success. 143s Attempting to merge 3-4...success. 143s Attempting to merge 3-5...success. 143s Attempting to merge 3-6...success. 143s Attempting to merge 4-2...success. 143s Attempting to merge 4-3...success. 143s Attempting to merge 4-4...success. 143s Attempting to merge 4-5...success. 143s Attempting to merge 4-6...success. 143s Attempting to merge 5-2...success. 143s Attempting to merge 5-3...success. 143s Attempting to merge 5-4...success. 143s Attempting to merge 5-5...success. 143s Attempting to merge 5-6...success. 143s Attempting to merge 6-2...success. 143s Attempting to merge 6-3...success. 143s Attempting to merge 6-4...success. 143s Attempting to merge 6-5...success. 143s Attempting to merge 6-6...success. 143s Attempting to merge 7-2...success. 143s Attempting to merge 7-3...success. 143s Attempting to merge 7-4...success. 143s Attempting to merge 7-5...success. 143s Attempting to merge 7-6...success. 143s Attempting to merge 8-2...success. 144s Attempting to merge 8-3...success. 144s Attempting to merge 8-4...success. 144s Attempting to merge 8-5...success. 144s Attempting to merge 8-6...success. 144s Attempting to merge 9-2...success. 144s Attempting to merge 9-3...success. 144s Attempting to merge 9-4...success. 144s Attempting to merge 9-5...success. 144s Attempting to merge 9-6...success. 144s Merge is complete! 144s + git-imerge diagram --commits --frontier --html=imerge4.html 144s 0 5 9 144s | | | 144s 0 - ********** - c 144s *......... 144s **........ 144s *......... 144s *......... 144s 5 - *......... 144s 6 - *......... 144s | 144s d 144s 144s 0 5 9 144s | | | 144s 0 - ********** - c 144s *........| 144s **.......| 144s *........| 144s *........| 144s 5 - *........| 144s 6 - *--------+ 144s | 144s d 144s 144s Key: 144s |,-,+ = rectangles forming current merge frontier 144s * = merge done manually 144s . = merge done automatically 144s # = conflict that is currently blocking progress 144s @ = merge was blocked but has been resolved 144s ? = no merge recorded 144s 144s + git-imerge finish --branch=c-d-full 144s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 144s + local refname=c-d-full 144s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 144s + git rev-parse c-d-full^{tree} 144s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 144s + test_conflict 9-5 144s + local conflict=9-5 144s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s + DESCRIPTION=git-imerge test repository with conflict at 9-5 144s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 144s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s + local description=git-imerge test repository with conflict at 9-5 144s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 144s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s + local description=git-imerge test repository with conflict at 9-5 144s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s hint: Using 'master' as the name for the initial branch. This default branch name 144s hint: is subject to change. To configure the initial branch name to use in all 144s hint: of your new repositories, which will suppress this warning, call: 144s hint: 144s hint: git config --global init.defaultBranch 144s hint: 144s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 144s hint: 'development'. The just-created branch can be renamed via this command: 144s hint: 144s hint: git branch -m 144s hint: 144s hint: Disable this message with "git config set advice.defaultBranchName false" 144s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5/.git/ 144s + echo git-imerge test repository with conflict at 9-5 144s + printf %s\n /*.out /*.css /*.html 144s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5/.git config user.name Loú User 144s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 144s + TIME=1112911993 144s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-9-5 144s + modify c.txt 0 144s + filename=c.txt 144s + text=0 144s + echo 0 144s + git add c.txt 144s + modify d.txt 0 144s + filename=d.txt 144s + text=0 144s + echo 0 144s + git add d.txt 144s + modify conflict.txt original version 144s + filename=conflict.txt 144s + text=original version 144s + echo original version 144s + git add conflict.txt 144s + commit -m m⇒0 144s + TIME=1112911994 144s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 144s [master (root-commit) d70e04b] m⇒0 144s 3 files changed, 3 insertions(+) 144s create mode 100644 c.txt 144s create mode 100644 conflict.txt 144s create mode 100644 d.txt 144s + git checkout -b c master -- 144s Switched to a new branch 'c' 144s + seq 9 144s + modify c.txt 1 144s + filename=c.txt 144s + text=1 144s + echo 1 144s + git add c.txt 144s + commit -m c⇒1 144s + TIME=1112911995 144s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 144s [c 89e2141] c⇒1 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify c.txt 2 144s + filename=c.txt 144s + text=2 144s + echo 2 144s + git add c.txt 144s + commit -m c⇒2 144s + TIME=1112911996 144s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 144s [c 7c431f2] c⇒2 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify c.txt 3 144s + filename=c.txt 144s + text=3 144s + echo 3 144s + git add c.txt 144s + commit -m c⇒3 144s + TIME=1112911997 144s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 144s [c f02ab24] c⇒3 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify c.txt 4 144s + filename=c.txt 144s + text=4 144s + echo 4 144s + git add c.txt 144s + commit -m c⇒4 144s + TIME=1112911998 144s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 144s [c ed9122f] c⇒4 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify c.txt 5 144s + filename=c.txt 144s + text=5 144s + echo 5 144s + git add c.txt 144s + commit -m c⇒5 144s + TIME=1112911999 144s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 144s [c 1d3bf09] c⇒5 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify c.txt 6 144s + filename=c.txt 144s + text=6 144s + echo 6 144s + git add c.txt 144s + commit -m c⇒6 144s + TIME=1112912000 144s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 144s [c f999ecd] c⇒6 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify c.txt 7 144s + filename=c.txt 144s + text=7 144s + echo 7 144s + git add c.txt 144s + commit -m c⇒7 144s + TIME=1112912001 144s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 144s [c 7050a8a] c⇒7 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify c.txt 8 144s + filename=c.txt 144s + text=8 144s + echo 8 144s + git add c.txt 144s + commit -m c⇒8 144s [c 9732e77] c⇒8 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + TIME=1112912002 144s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 144s + modify c.txt 9 144s + filename=c.txt 144s + text=9 144s + echo 9 144s + git add c.txt 144s + modify conflict.txt c version 144s + filename=conflict.txt 144s + text=c version 144s + echo c version 144s + git add conflict.txt 144s + commit -m c⇒9 144s + TIME=1112912003 144s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 144s [c 73a5eed] c⇒9 144s 2 files changed, 2 insertions(+), 2 deletions(-) 144s + git checkout -b d master -- 144s Switched to a new branch 'd' 144s + seq 6 144s + modify d.txt 1 144s + filename=d.txt 144s + text=1 144s + echo 1 144s + git add d.txt 144s + commit -m d⇒1 144s + TIME=1112912004 144s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 144s [d bd5368a] d⇒1 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify d.txt 2 144s + filename=d.txt 144s + text=2 144s + echo 2 144s + git add d.txt 144s + commit -m d⇒2 144s + TIME=1112912005 144s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 144s + modify d.txt 3 144s + filename=d.txt 144s + text=3 144s + echo 3 144s + git add d.txt 144s + commit -m d⇒3 144s + TIME=1112912006 144s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 144s [d 93e27e6] d⇒2 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s [d 133f385] d⇒3 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify d.txt 4 144s + filename=d.txt 144s + text=4 144s + echo 4 144s + git add d.txt 144s + commit -m d⇒4 144s + TIME=1112912007 144s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 144s [d 586472a] d⇒4 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + modify d.txt 5 144s + filename=d.txt 144s + text=5 144s + echo 5 144s + git add d.txt 144s + modify conflict.txt d version 144s + filename=conflict.txt 144s + text=d version 144s + echo d version 144s + git add conflict.txt 144s + commit -m d⇒5 144s + TIME=1112912008 144s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 144s [d 0a6f956] d⇒5 144s 2 files changed, 2 insertions(+), 2 deletions(-) 144s + modify d.txt 6 144s + filename=d.txt 144s + text=6 144s + echo 6 144s + git add d.txt 144s + commit -m d⇒6 144s + TIME=1112912009 144s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 144s [d bfb30f0] d⇒6 144s 1 file changed, 1 insertion(+), 1 deletion(-) 144s + git checkout c 144s Switched to branch 'c' 144s + git-imerge init --name=c-d d 144s + git-imerge list 144s * c-d 144s + git-imerge diagram --commits --frontier --html=imerge0.html 144s 0 5 9 144s | | | 144s 0 - ********** - c 144s *????????? 144s *????????? 144s *????????? 144s *????????? 144s 5 - *????????? 144s 6 - *????????? 144s | 144s d 144s 144s 0 5 9 144s | | | 144s 0 - ********** - c 144s *????????? 144s *????????? 144s *????????? 144s *????????? 144s 5 - *????????? 144s 6 - *????????? 144s | 144s d 144s 144s Key: 144s |,-,+ = rectangles forming current merge frontier 144s * = merge done manually 144s . = merge done automatically 144s # = conflict that is currently blocking progress 144s @ = merge was blocked but has been resolved 144s ? = no merge recorded 144s 144s + git-imerge autofill 144s + tee autofill.out 144s Attempting automerge of 9-6...failure. 144s Attempting automerge of 1-1...success. 145s Attempting automerge of 1-4...success. 145s Attempting automerge of 1-6...success. 145s Attempting automerge of 9-6...failure. 145s Attempting automerge of 5-6...success. 145s Attempting automerge of 7-6...success. 145s Attempting automerge of 8-6...success. 145s Attempting automerge of 9-1...success. 145s Attempting automerge of 9-4...success. 145s Attempting automerge of 9-5...failure. 145s Autofilling 1-6...success. 145s Autofilling 2-6...success. 145s Autofilling 3-6...success. 145s Autofilling 4-6...success. 145s Autofilling 5-6...success. 145s Autofilling 6-6...success. 145s Autofilling 7-6...success. 145s Autofilling 8-1...success. 145s Autofilling 8-2...success. 145s Autofilling 8-3...success. 145s Autofilling 8-4...success. 145s Autofilling 8-5...success. 145s Autofilling 8-6 (first way)...success. 145s Autofilling 8-6 (second way)...success. 145s The two ways of autofilling 8-6 agree. 145s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 145s Autofilling 9-1...success. 145s Autofilling 9-2...success. 145s Autofilling 9-3...success. 145s Autofilling 9-4...success. 145s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 145s Attempting automerge of 9-6...failure. 145s Attempting automerge of 9-5...failure. 145s HEAD is now at 73a5eed c⇒9 145s Conflict; suggest manual merge of 9-5 145s + grep -q Traceback autofill.out 145s + grep -q suggest manual merge of 9-5 autofill.out 145s + git-imerge diagram --commits --frontier --html=imerge1.html 145s 0 5 9 145s | | | 145s 0 - ********** - c 145s *???????.. 145s *???????.. 145s *???????.. 145s *???????.. 145s 5 - *???????.# 145s 6 - *........? 145s | 145s d 145s 145s 0 5 9 145s | | | 145s 0 - ********** - c 145s *???????.| 145s *???????.| 145s *???????.| 145s *???????.+ 145s 5 - *???????|# 145s 6 - *-------+? 145s | 145s d 145s 145s Key: 145s |,-,+ = rectangles forming current merge frontier 145s * = merge done manually 145s . = merge done automatically 145s # = conflict that is currently blocking progress 145s @ = merge was blocked but has been resolved 145s ? = no merge recorded 145s 145s + git-imerge continue --edit 145s Switched to branch 'imerge/c-d' 145s Auto-merging conflict.txt 145s CONFLICT (content): Merge conflict in conflict.txt 145s 145s Original first commit: 145s Automatic merge failed; fix conflicts and then commit the result. 145s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 145s Author: Loú User 145s Date: Thu Apr 7 22:13:23 2005 +0000 145s 145s c⇒9 145s 145s Original second commit: 145s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 145s Author: Loú User 145s Date: Thu Apr 7 22:13:28 2005 +0000 145s 145s d⇒5 145s 145s There was a conflict merging commit 9-5, shown above. 145s Please resolve the conflict, commit the result, then type 145s 145s git-imerge continue 145s + echo merged version 145s + git add conflict.txt 145s + git-imerge continue --no-edit 145s [imerge/c-d 897ba10] imerge 'c-d': manual merge 9-5 145s Merge has been recorded for merge 9-5. 145s Attempting automerge of 9-6...success. 145s Autofilling 9-6...success. 145s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 145s Merge is complete! 145s + git-imerge diagram --commits --frontier --html=imerge2.html 145s 0 5 9 145s | | | 145s 0 - ********** - c 145s *???????.. 145s *???????.. 145s *???????.. 145s *???????.. 145s 5 - *???????.* 145s 6 - *......... 145s | 145s d 145s 145s 0 5 9 145s | | | 145s 0 - ********** - c 145s *???????.| 145s *???????.| 145s *???????.| 145s *???????.| 145s 5 - *???????.* 145s 6 - *--------+ 145s | 145s d 145s 145s Key: 145s |,-,+ = rectangles forming current merge frontier 145s * = merge done manually 145s . = merge done automatically 145s # = conflict that is currently blocking progress 145s @ = merge was blocked but has been resolved 145s ? = no merge recorded 145s 145s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 145s Merge d into c (using imerge) 145s 145s # Please enter the commit message for your changes. Lines starting 145s # with '#' will be ignored, and an empty message aborts the commit. 145s # 145s # Date: Sat Dec 6 03:00:54 2025 +0000 145s # 145s # On branch c-d-merge 145s # Changes to be committed: 145s # modified: conflict.txt 145s # modified: d.txt 145s # 145s [c-d-merge 6e1f92b] Merge d into c (using imerge) 145s Date: Sat Dec 6 03:00:54 2025 +0000 145s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + local refname=c-d-merge 145s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git rev-parse c-d-merge^{tree} 145s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git-imerge simplify --goal=rebase --branch=c-d-rebase 145s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + local refname=c-d-rebase 145s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git rev-parse c-d-rebase^{tree} 145s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 145s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 146s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + local refname=c-d-rebase-with-history 146s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git rev-parse c-d-rebase-with-history^{tree} 146s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git-imerge simplify --goal=border --branch=c-d-border 146s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + local refname=c-d-border 146s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git rev-parse c-d-border^{tree} 146s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 146s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + local refname=c-d-border-with-history 146s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git rev-parse c-d-border-with-history^{tree} 146s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 146s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + local refname=c-d-border-with-history2 146s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git rev-parse c-d-border-with-history2^{tree} 146s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 146s + git-imerge remove 146s + git checkout c 146s Switched to branch 'c' 146s + git-imerge start --goal=full --first-parent --name=c-d d 146s + 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. 147s Attempting to merge 2-1...success. 147s Attempting to merge 2-2...success. 147s Attempting to merge 2-3...success. 147s Attempting to merge 2-4...success. 147s Attempting to merge 2-5...success. 147s Attempting to merge 2-6...success. 147s Attempting to merge 3-1...success. 147s Attempting to merge 3-2...success. 147s Attempting to merge 3-3...success. 147s Attempting to merge 3-4...success. 147s Attempting to merge 3-5...success. 147s Attempting to merge 3-6...success. 147s Attempting to merge 4-1...success. 147s Attempting to merge 4-2...success. 147s Attempting to merge 4-3...success. 147s Attempting to merge 4-4...success. 147s Attempting to merge 4-5...success. 147s Attempting to merge 4-6...success. 147s Attempting to merge 5-1...success. 147s Attempting to merge 5-2...success. 147s Attempting to merge 5-3...success. 147s Attempting to merge 5-4...success. 147s 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. 148s Attempting to merge 8-5...success. 148s Attempting to merge 8-6...success. 148s Attempting to merge 9-1...success. 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...conflict. 148s Switched to branch 'imerge/c-d' 148s Auto-merging conflict.txt 148s CONFLICT (content): Merge conflict in conflict.txt 148s Automatic merge failed; fix conflicts and then commit the result. 148s 148s Original first commit: 148s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 148s Author: Loú User 148s Date: Thu Apr 7 22:13:23 2005 +0000 148s 148s c⇒9 148s 148s Original second commit: 148s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 148s Author: Loú User 148s Date: Thu Apr 7 22:13:28 2005 +0000 148s 148s d⇒5 148s 148s There was a conflict merging commit 9-5, shown above. 148s Please resolve the conflict, commit the result, then type 148s 148s git-imerge continue 148s + grep -q Traceback start.out 148s + grep -q suggest manual merge of 9-5 autofill.out 148s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 148s + git add conflict.txt 148s + GIT_EDITOR=cat git commit 148s imerge 'c-d': manual merge 9-5 148s 148s # Conflicts: 148s # conflict.txt 148s # 148s # It looks like you may be committing a merge. 148s # If this is not correct, please run 148s # git update-ref -d MERGE_HEAD 148s # and try again. 148s 148s 148s # Please enter the commit message for your changes. Lines starting 148s # with '#' will be ignored, and an empty message aborts the commit. 148s # 148s # On branch imerge/c-d 148s # All conflicts fixed but you are still merging. 148s # 148s # Changes to be committed: 148s # modified: conflict.txt 148s # modified: d.txt 148s # 148s [imerge/c-d 76b2ec2] imerge 'c-d': manual merge 9-5 148s + git-imerge continue --edit 148s Merge has been recorded for merge 9-5. 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 Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1/.git/ 148s + git rev-parse c-d-full^{tree} 148s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 148s + test_conflict 5-1 148s + local conflict=5-1 148s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 148s + DESCRIPTION=git-imerge test repository with conflict at 5-1 148s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 148s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 148s + local description=git-imerge test repository with conflict at 5-1 148s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 148s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 148s + local description=git-imerge test repository with conflict at 5-1 148s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 148s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 148s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 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 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 5-1 148s + printf %s\n /*.out /*.css /*.html 148s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1/.git config user.name Loú User 148s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 148s + TIME=1112911993 148s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 148s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-5-1 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 148s [master (root-commit) d70e04b] m⇒0 148s 3 files changed, 3 insertions(+) 148s create mode 100644 c.txt 148s create mode 100644 conflict.txt 148s create mode 100644 d.txt 148s + git checkout -b c master -- 148s Switched to a new branch 'c' 148s + seq 9 148s + modify c.txt 1 148s + filename=c.txt 148s + text=1 148s + echo 1 148s + git add c.txt 148s + commit -m c⇒1 148s + TIME=1112911995 148s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 148s + modify c.txt 2 148s + filename=c.txt 148s + text=2 148s + echo 2 148s + git add c.txt 148s [c 89e2141] c⇒1 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + commit -m c⇒2 148s + TIME=1112911996 148s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 148s [c 7c431f2] c⇒2 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify c.txt 3 148s + filename=c.txt 148s + text=3 148s + echo 3 148s + git add c.txt 148s + commit -m c⇒3 148s + TIME=1112911997 148s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 148s [c f02ab24] c⇒3 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify c.txt 4 148s + filename=c.txt 148s + text=4 148s + echo 4 148s + git add c.txt 148s + commit -m c⇒4 148s + TIME=1112911998 148s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 148s [c ed9122f] c⇒4 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify c.txt 5 148s + filename=c.txt 148s + text=5 148s + echo 5 148s + git add c.txt 148s + modify conflict.txt c version 148s + filename=conflict.txt 148s + text=c version 148s + echo c version 148s + git add conflict.txt 148s + commit -m c⇒5 148s + TIME=1112911999 148s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 148s [c 7e31f25] c⇒5 148s 2 files changed, 2 insertions(+), 2 deletions(-) 148s + modify c.txt 6 148s + filename=c.txt 148s + text=6 148s + echo 6 148s + git add c.txt 148s + commit -m c⇒6 148s + TIME=1112912000 148s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 148s [c df3c57a] c⇒6 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify c.txt 7 148s + filename=c.txt 148s + text=7 148s + echo 7 148s + git add c.txt 148s + commit -m c⇒7 148s + TIME=1112912001 148s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 148s [c ea32d81] c⇒7 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify c.txt 8 148s + filename=c.txt 148s + text=8 148s + echo 8 148s + git add c.txt 148s + commit -m c⇒8 148s + TIME=1112912002 148s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 148s [c 44473d6] c⇒8 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify c.txt 9 148s + filename=c.txt 148s + text=9 148s + echo 9 148s + git add c.txt 148s + commit -m c⇒9 148s + TIME=1112912003 148s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 148s [c d8d80cf] c⇒9 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + git checkout -b d master -- 148s Switched to a new branch 'd' 148s + seq 6 148s + modify d.txt 1 148s + filename=d.txt 148s + text=1 148s + echo 1 148s + git add d.txt 148s + modify conflict.txt d version 148s + filename=conflict.txt 148s + text=d version 148s + echo d version 148s + git add conflict.txt 148s + commit -m d⇒1 148s + TIME=1112912004 148s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 148s [d ac0427a] d⇒1 148s 2 files changed, 2 insertions(+), 2 deletions(-) 148s + modify d.txt 2 148s + filename=d.txt 148s + text=2 148s + echo 2 148s + git add d.txt 148s + commit -m d⇒2 148s + TIME=1112912005 148s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 148s [d 43c38c0] d⇒2 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify d.txt 3 148s + filename=d.txt 148s + text=3 148s + echo 3 148s + git add d.txt 148s + commit -m d⇒3 148s + TIME=1112912006 148s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 148s [d 0260058] d⇒3 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify d.txt 4 148s + filename=d.txt 148s + text=4 148s + echo 4 148s + git add d.txt 148s + commit -m d⇒4 148s + TIME=1112912007 148s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 148s [d 40fef44] d⇒4 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify d.txt 5 148s + filename=d.txt 148s + text=5 148s + echo 5 148s + git add d.txt 148s + commit -m d⇒5 148s + TIME=1112912008 148s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 148s [d b080a65] d⇒5 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + modify d.txt 6 148s + filename=d.txt 148s + text=6 148s + echo 6 148s + git add d.txt 148s + commit -m d⇒6 148s + TIME=1112912009 148s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 148s [d 200ce5c] d⇒6 148s 1 file changed, 1 insertion(+), 1 deletion(-) 148s + git checkout c 148s Switched to branch 'c' 148s + git-imerge init --name=c-d d 148s + git-imerge list 148s * c-d 148s + git-imerge diagram --commits --frontier --html=imerge0.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 autofill 148s + tee autofill.out 149s Attempting automerge of 9-6...failure. 149s Attempting automerge of 1-1...success. 149s Attempting automerge of 1-4...success. 149s Attempting automerge of 1-6...success. 149s Attempting automerge of 9-6...failure. 149s Attempting automerge of 5-6...failure. 149s Attempting automerge of 3-6...success. 149s Attempting automerge of 4-6...success. 149s Attempting automerge of 5-1...failure. 149s Autofilling 1-6...success. 149s Autofilling 2-6...success. 149s Autofilling 3-6...success. 149s Autofilling 4-1...success. 149s Autofilling 4-2...success. 149s Autofilling 4-3...success. 149s Autofilling 4-4...success. 149s Autofilling 4-5...success. 149s Autofilling 4-6 (first way)...success. 149s Autofilling 4-6 (second way)...success. 149s The two ways of autofilling 4-6 agree. 149s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 149s Attempting automerge of 9-6...failure. 149s Attempting automerge of 5-1...failure. 149s HEAD is now at d8d80cf c⇒9 149s Conflict; suggest manual merge of 5-1 149s + grep -q Traceback autofill.out 149s + grep -q suggest manual merge of 5-1 autofill.out 149s + git-imerge diagram --commits --frontier --html=imerge1.html 149s 0 5 9 149s | | | 149s 0 - ********** - c 149s *???.#???? 149s *???.????? 149s *???.????? 149s *???.????? 149s 5 - *???.????? 149s 6 - *....????? 149s | 149s d 149s 149s 0 5 9 149s | | | 149s 0 - ********** - c 149s *???|#???? 149s *???|????? 149s *???|????? 149s *???|????? 149s 5 - *???|????? 149s 6 - *---+????? 149s | 149s d 149s 149s Key: 149s |,-,+ = rectangles forming current merge frontier 149s * = merge done manually 149s . = merge done automatically 149s # = conflict that is currently blocking progress 149s @ = merge was blocked but has been resolved 149s ? = no merge recorded 149s 149s + git-imerge continue --edit 149s Switched to branch 'imerge/c-d' 149s Auto-merging conflict.txt 149s CONFLICT (content): Merge conflict in conflict.txt 149s Automatic merge failed; fix conflicts and then commit the result. 149s 149s Original first commit: 149s commit 7e31f254c318decc434628f023dac0703f3d2b9e 149s Author: Loú User 149s Date: Thu Apr 7 22:13:19 2005 +0000 149s 149s c⇒5 149s 149s Original second commit: 149s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 149s Author: Loú User 149s Date: Thu Apr 7 22:13:24 2005 +0000 149s 149s d⇒1 149s 149s There was a conflict merging commit 5-1, shown above. 149s Please resolve the conflict, commit the result, then type 149s 149s git-imerge continue 149s + echo merged version 149s + git add conflict.txt 149s + git-imerge continue --no-edit 149s [imerge/c-d de33aba] imerge 'c-d': manual merge 5-1 149s Merge has been recorded for merge 5-1. 149s Attempting automerge of 5-6...success. 149s Autofilling 5-2...success. 149s Autofilling 5-3...success. 149s Autofilling 5-4...success. 149s Autofilling 5-5...success. 149s Autofilling 5-6...success. 149s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 149s Attempting automerge of 9-6...success. 149s Autofilling 6-6...success. 149s Autofilling 7-6...success. 149s Autofilling 8-6...success. 149s Autofilling 9-1...success. 149s Autofilling 9-2...success. 149s Autofilling 9-3...success. 149s Autofilling 9-4...success. 149s Autofilling 9-5...success. 149s Autofilling 9-6 (first way)...success. 149s Autofilling 9-6 (second way)...success. 149s The two ways of autofilling 9-6 agree. 149s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 149s Merge is complete! 149s + git-imerge diagram --commits --frontier --html=imerge2.html 149s 0 5 9 149s | | | 149s 0 - ********** - c 149s *???.*???. 149s *???..???. 149s *???..???. 149s *???..???. 149s 5 - *???..???. 149s 6 - *......... 149s | 149s d 149s 149s 0 5 9 149s | | | 149s 0 - ********** - c 149s *???.*???| 149s *???..???| 149s *???..???| 149s *???..???| 149s 5 - *???..???| 149s 6 - *--------+ 149s | 149s d 149s 149s Key: 149s |,-,+ = rectangles forming current merge frontier 149s * = merge done manually 149s . = merge done automatically 149s # = conflict that is currently blocking progress 149s @ = merge was blocked but has been resolved 149s ? = no merge recorded 149s 149s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 149s Merge d into c (using imerge) 149s 149s # Please enter the commit message for your changes. Lines starting 149s # with '#' will be ignored, and an empty message aborts the commit. 149s # 149s # Date: Sat Dec 6 03:00:58 2025 +0000 149s # 149s # On branch c-d-merge 149s # Changes to be committed: 149s # modified: conflict.txt 149s # modified: d.txt 149s # 149s [c-d-merge 2d690c8] Merge d into c (using imerge) 149s Date: Sat Dec 6 03:00:58 2025 +0000 149s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 149s + local refname=c-d-merge 149s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 149s + git rev-parse c-d-merge^{tree} 149s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 149s + git-imerge simplify --goal=rebase --branch=c-d-rebase 150s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + local refname=c-d-rebase 150s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git rev-parse c-d-rebase^{tree} 150s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 150s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + local refname=c-d-rebase-with-history 150s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git rev-parse c-d-rebase-with-history^{tree} 150s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git-imerge simplify --goal=border --branch=c-d-border 150s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + local refname=c-d-border 150s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git rev-parse c-d-border^{tree} 150s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 150s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + local refname=c-d-border-with-history 150s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git rev-parse c-d-border-with-history^{tree} 150s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 150s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + local refname=c-d-border-with-history2 150s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git rev-parse c-d-border-with-history2^{tree} 150s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 150s + git-imerge remove 150s + git checkout c 150s Switched to branch 'c' 150s + + tee start.out 150s git-imerge start --goal=full --first-parent --name=c-d d 150s Attempting to merge 1-1...success. 150s Attempting to merge 1-2...success. 150s Attempting to merge 1-3...success. 150s Attempting to merge 1-4...success. 150s Attempting to merge 1-5...success. 150s Attempting to merge 1-6...success. 150s Attempting to merge 2-1...success. 150s Attempting to merge 2-2...success. 150s Attempting to merge 2-3...success. 151s Attempting to merge 2-4...success. 151s Attempting to merge 2-5...success. 151s Attempting to merge 2-6...success. 151s Attempting to merge 3-1...success. 151s Attempting to merge 3-2...success. 151s Attempting to merge 3-3...success. 151s Attempting to merge 3-4...success. 151s Attempting to merge 3-5...success. 151s Attempting to merge 3-6...success. 151s Attempting to merge 4-1...success. 151s Attempting to merge 4-2...success. 151s Attempting to merge 4-3...success. 151s Attempting to merge 4-4...success. 151s Attempting to merge 4-5...success. 151s Attempting to merge 4-6...success. 151s Attempting to merge 5-1...conflict. 151s Switched to branch 'imerge/c-d' 151s Auto-merging conflict.txt 151s CONFLICT (content): Merge conflict in conflict.txt 151s Automatic merge failed; fix conflicts and then commit the result. 151s 151s Original first commit: 151s commit 7e31f254c318decc434628f023dac0703f3d2b9e 151s Author: Loú User 151s Date: Thu Apr 7 22:13:19 2005 +0000 151s 151s c⇒5 151s 151s Original second commit: 151s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 151s Author: Loú User 151s Date: Thu Apr 7 22:13:24 2005 +0000 151s 151s d⇒1 151s 151s There was a conflict merging commit 5-1, shown above. 151s Please resolve the conflict, commit the result, then type 151s 151s git-imerge continue 151s + grep -q Traceback start.out 151s + grep -q suggest manual merge of 5-1 autofill.out 151s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 151s + git add conflict.txt 151s + GIT_EDITOR=cat git commit 151s imerge 'c-d': manual merge 5-1 151s 151s # Conflicts: 151s # conflict.txt 151s # 151s # It looks like you may be committing a merge. 151s # If this is not correct, please run 151s # git update-ref -d MERGE_HEAD 151s # and try again. 151s 151s 151s # Please enter the commit message for your changes. Lines starting 151s # with '#' will be ignored, and an empty message aborts the commit. 151s # 151s # On branch imerge/c-d 151s # All conflicts fixed but you are still merging. 151s # 151s # Changes to be committed: 151s # modified: conflict.txt 151s # modified: d.txt 151s # 151s [imerge/c-d 66dc67c] imerge 'c-d': manual merge 5-1 151s + git-imerge continue --edit 151s Merge has been recorded for merge 5-1. 151s Attempting to merge 5-2...success. 151s Attempting to merge 5-3...success. 151s Attempting to merge 5-4...success. 151s Attempting to merge 5-5...success. 151s Attempting to merge 5-6...success. 151s Attempting to merge 6-1...success. 151s Attempting to merge 6-2...success. 151s Attempting to merge 6-3...success. 151s Attempting to merge 6-4...success. 151s Attempting to merge 6-5...success. 151s Attempting to merge 6-6...success. 151s Attempting to merge 7-1...success. 151s Attempting to merge 7-2...success. 151s Attempting to merge 7-3...success. 151s Attempting to merge 7-4...success. 151s Attempting to merge 7-5...success. 151s Attempting to merge 7-6...success. 151s Attempting to merge 8-1...success. 151s Attempting to merge 8-2...success. 151s Attempting to merge 8-3...success. 151s Attempting to merge 8-4...success. 151s Attempting to merge 8-5...success. 151s Attempting to merge 8-6...success. 151s Attempting to merge 9-1...success. 151s Attempting to merge 9-2...success. 151s Attempting to merge 9-3...success. 151s Attempting to merge 9-4...success. 151s Attempting to merge 9-5...success. 151s Attempting to merge 9-6...success. 151s Merge is complete! 151s + git-imerge diagram --commits --frontier --html=imerge4.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 finish --branch=c-d-full 152s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 152s + local refname=c-d-full 152s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 152s + git rev-parse c-d-full^{tree} 152s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 152s + test_conflict 6-6 152s + local conflict=6-6 152s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s + DESCRIPTION=git-imerge test repository with conflict at 6-6 152s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 152s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s + local description=git-imerge test repository with conflict at 6-6 152s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 152s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s + local description=git-imerge test repository with conflict at 6-6 152s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s hint: Using 'master' as the name for the initial branch. This default branch name 152s hint: is subject to change. To configure the initial branch name to use in all 152s hint: of your new repositories, which will suppress this warning, call: 152s hint: 152s hint: git config --global init.defaultBranch 152s hint: 152s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 152s hint: 'development'. The just-created branch can be renamed via this command: 152s hint: 152s hint: git branch -m 152s hint: 152s hint: Disable this message with "git config set advice.defaultBranchName false" 152s + echo git-imerge test repository with conflict at 6-6 152s + printf %s\n /*.out /*.css /*.html 152s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6/.git/ 152s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6/.git config user.name Loú User 152s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 152s + TIME=1112911993 152s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/conflicted-6-6 152s + modify c.txt 0 152s + filename=c.txt 152s + text=0 152s + echo 0 152s + git add c.txt 152s + modify d.txt 0 152s + filename=d.txt 152s + text=0 152s + echo 0 152s + git add d.txt 152s + modify conflict.txt original version 152s + filename=conflict.txt 152s + text=original version 152s + echo original version 152s + git add conflict.txt 152s + commit -m m⇒0 152s + TIME=1112911994 152s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 152s [master (root-commit) d70e04b] m⇒0 152s 3 files changed, 3 insertions(+) 152s create mode 100644 c.txt 152s create mode 100644 conflict.txt 152s create mode 100644 d.txt 152s + git checkout -b c master -- 152s Switched to a new branch 'c' 152s + seq 9 152s + modify c.txt 1 152s + filename=c.txt 152s + text=1 152s + echo 1 152s + git add c.txt 152s + commit -m c⇒1 152s + TIME=1112911995 152s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 152s [c 89e2141] c⇒1 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify c.txt 2 152s + filename=c.txt 152s + text=2 152s + echo 2 152s + git add c.txt 152s + commit -m c⇒2 152s + TIME=1112911996 152s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 152s [c 7c431f2] c⇒2 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify c.txt 3 152s + filename=c.txt 152s + text=3 152s + echo 3 152s + git add c.txt 152s + commit -m c⇒3 152s + TIME=1112911997 152s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 152s [c f02ab24] c⇒3 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify c.txt 4 152s + filename=c.txt 152s + text=4 152s + echo 4 152s + git add c.txt 152s + commit -m c⇒4 152s + TIME=1112911998 152s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 152s [c ed9122f] c⇒4 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify c.txt 5 152s + filename=c.txt 152s + text=5 152s + echo 5 152s + git add c.txt 152s + commit -m c⇒5 152s + TIME=1112911999 152s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 152s [c 1d3bf09] c⇒5 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s [c fe4fed8] c⇒6 152s 2 files changed, 2 insertions(+), 2 deletions(-) 152s + modify c.txt 6 152s + filename=c.txt 152s + text=6 152s + echo 6 152s + git add c.txt 152s + modify conflict.txt c version 152s + filename=conflict.txt 152s + text=c version 152s + echo c version 152s + git add conflict.txt 152s + commit -m c⇒6 152s + TIME=1112912000 152s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 152s + modify c.txt 7 152s + filename=c.txt 152s + text=7 152s + echo 7 152s + git add c.txt 152s + commit -m c⇒7 152s + TIME=1112912001 152s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 152s [c ec255ea] c⇒7 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify c.txt 8 152s + filename=c.txt 152s + text=8 152s + echo 8 152s + git add c.txt 152s + commit -m c⇒8 152s + TIME=1112912002 152s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 152s [c 7459ac3] c⇒8 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify c.txt 9 152s + filename=c.txt 152s + text=9 152s + echo 9 152s + git add c.txt 152s + commit -m c⇒9 152s + TIME=1112912003 152s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 152s [c 70408c8] c⇒9 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + git checkout -b d master -- 152s Switched to a new branch 'd' 152s + seq 6 152s + modify d.txt 1 152s + filename=d.txt 152s + text=1 152s + echo 1 152s + git add d.txt 152s + commit -m d⇒1 152s + TIME=1112912004 152s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 152s [d bd5368a] d⇒1 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify d.txt 2 152s + filename=d.txt 152s + text=2 152s + echo 2 152s + git add d.txt 152s + commit -m d⇒2 152s + TIME=1112912005 152s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 152s [d 93e27e6] d⇒2 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify d.txt 3 152s + filename=d.txt 152s + text=3 152s + echo 3 152s + git add d.txt 152s + commit -m d⇒3 152s + TIME=1112912006 152s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 152s [d 133f385] d⇒3 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify d.txt 4 152s + filename=d.txt 152s + text=4 152s + echo 4 152s + git add d.txt 152s + commit -m d⇒4 152s + TIME=1112912007 152s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 152s [d 586472a] d⇒4 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify d.txt 5 152s + filename=d.txt 152s + text=5 152s + echo 5 152s + git add d.txt 152s + commit -m d⇒5 152s + TIME=1112912008 152s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 152s [d 9522207] d⇒5 152s 1 file changed, 1 insertion(+), 1 deletion(-) 152s + modify d.txt 6 152s + filename=d.txt 152s + text=6 152s + echo 6 152s + git add d.txt 152s + modify conflict.txt d version 152s + filename=conflict.txt 152s + text=d version 152s + echo d version 152s + git add conflict.txt 152s + commit -m d⇒6 152s + TIME=1112912009 152s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 152s [d f7e451a] d⇒6 152s 2 files changed, 2 insertions(+), 2 deletions(-) 152s + git checkout c 152s Switched to branch 'c' 152s + git-imerge init --name=c-d d 152s + git-imerge list 152s * c-d 152s + git-imerge diagram --commits --frontier --html=imerge0.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-imerge autofill 152s + tee autofill.out 152s Attempting automerge of 9-6...failure. 152s Attempting automerge of 1-1...success. 152s Attempting automerge of 1-4...success. 152s Attempting automerge of 1-6...success. 152s Attempting automerge of 9-6...failure. 152s Attempting automerge of 5-6...success. 152s Attempting automerge of 7-6...failure. 152s Attempting automerge of 6-6...failure. 152s Attempting automerge of 6-1...success. 152s Attempting automerge of 6-4...success. 152s Attempting automerge of 6-5...success. 152s Attempting automerge of 9-5...success. 152s Autofilling 1-6...success. 152s Autofilling 2-6...success. 152s Autofilling 3-6...success. 152s Autofilling 4-6...success. 152s Autofilling 5-1...success. 152s Autofilling 5-2...success. 152s Autofilling 5-3...success. 152s Autofilling 5-4...success. 152s Autofilling 5-5...success. 152s Autofilling 5-6 (first way)...success. 152s Autofilling 5-6 (second way)...success. 152s The two ways of autofilling 5-6 agree. 152s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 152s Autofilling 6-5...success. 152s Autofilling 7-5...success. 152s Autofilling 8-5...success. 152s Autofilling 9-1...success. 152s Autofilling 9-2...success. 152s Autofilling 9-3...success. 152s Autofilling 9-4...success. 152s Autofilling 9-5 (first way)...success. 152s Autofilling 9-5 (second way)...success. 152s The two ways of autofilling 9-5 agree. 152s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 152s Attempting automerge of 9-6...failure. 152s Attempting automerge of 6-6...failure. 152s HEAD is now at 70408c8 c⇒9 152s Conflict; suggest manual merge of 6-6 152s + grep -q Traceback autofill.out 152s + grep -q suggest manual merge of 6-6 autofill.out 152s + git-imerge diagram --commits --frontier --html=imerge1.html 153s 0 5 9 153s | | | 153s 0 - ********** - c 153s *????.???. 153s *????.???. 153s *????.???. 153s *????.???. 153s 5 - *????..... 153s 6 - *.....#??? 153s | 153s d 153s 153s 0 5 9 153s | | | 153s 0 - ********** - c 153s *????.???| 153s *????.???| 153s *????.???| 153s *????.???| 153s 5 - *????.---+ 153s 6 - *----+#??? 153s | 153s d 153s 153s Key: 153s |,-,+ = rectangles forming current merge frontier 153s * = merge done manually 153s . = merge done automatically 153s # = conflict that is currently blocking progress 153s @ = merge was blocked but has been resolved 153s ? = no merge recorded 153s 153s + git-imerge continue --edit 153s Switched to branch 'imerge/c-d' 153s Auto-merging conflict.txt 153s CONFLICT (content): Merge conflict in conflict.txt 153s Automatic merge failed; fix conflicts and then commit the result. 153s 153s Original first commit: 153s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 153s Author: Loú User 153s Date: Thu Apr 7 22:13:20 2005 +0000 153s 153s c⇒6 153s 153s Original second commit: 153s commit f7e451a6c9656dda15641a9fbc591a602f158692 153s Author: Loú User 153s Date: Thu Apr 7 22:13:29 2005 +0000 153s 153s d⇒6 153s 153s There was a conflict merging commit 6-6, shown above. 153s Please resolve the conflict, commit the result, then type 153s 153s git-imerge continue 153s + echo merged version 153s + git add conflict.txt 153s + git-imerge continue --no-edit 153s [imerge/c-d 1974861] imerge 'c-d': manual merge 6-6 153s Merge has been recorded for merge 6-6. 153s Attempting automerge of 9-6...success. 153s Autofilling 7-6...success. 153s Autofilling 8-6...success. 153s Autofilling 9-6...success. 153s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 153s Merge is complete! 153s + git-imerge diagram --commits --frontier --html=imerge2.html 153s 0 5 9 153s | | | 153s 0 - ********** - c 153s *????.???. 153s *????.???. 153s *????.???. 153s *????.???. 153s 5 - *????..... 153s 6 - *.....*... 153s | 153s d 153s 153s 0 5 9 153s | | | 153s 0 - ********** - c 153s *????.???| 153s *????.???| 153s *????.???| 153s *????.???| 153s 5 - *????....| 153s 6 - *-----*--+ 153s | 153s d 153s 153s Key: 153s |,-,+ = rectangles forming current merge frontier 153s * = merge done manually 153s . = merge done automatically 153s # = conflict that is currently blocking progress 153s @ = merge was blocked but has been resolved 153s ? = no merge recorded 153s 153s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 153s Merge d into c (using imerge) 153s 153s # Please enter the commit message for your changes. Lines starting 153s # with '#' will be ignored, and an empty message aborts the commit. 153s # 153s # Date: Sat Dec 6 03:01:02 2025 +0000 153s # 153s # On branch c-d-merge 153s # Changes to be committed: 153s # modified: conflict.txt 153s # modified: d.txt 153s # 153s [c-d-merge d37a5a6] Merge d into c (using imerge) 153s Date: Sat Dec 6 03:01:02 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 153s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + local refname=c-d-border 153s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git rev-parse c-d-border^{tree} 153s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 153s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + local refname=c-d-border-with-history 153s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git rev-parse c-d-border-with-history^{tree} 153s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 153s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 154s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + local refname=c-d-border-with-history2 154s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + git rev-parse c-d-border-with-history2^{tree} 154s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 154s + git-imerge remove 154s + git checkout c 154s Switched to branch 'c' 154s + git-imerge start --goal=full --first-parent --name=c-d d 154s + tee start.out 154s Attempting to merge 1-1...success. 154s Attempting to merge 1-2...success. 154s Attempting to merge 1-3...success. 154s Attempting to merge 1-4...success. 154s Attempting to merge 1-5...success. 154s Attempting to merge 1-6...success. 154s Attempting to merge 2-1...success. 154s Attempting to merge 2-2...success. 154s Attempting to merge 2-3...success. 154s Attempting to merge 2-4...success. 154s Attempting to merge 2-5...success. 154s Attempting to merge 2-6...success. 154s Attempting to merge 3-1...success. 154s Attempting to merge 3-2...success. 154s Attempting to merge 3-3...success. 154s Attempting to merge 3-4...success. 154s Attempting to merge 3-5...success. 154s Attempting to merge 3-6...success. 154s Attempting to merge 4-1...success. 154s Attempting to merge 4-2...success. 154s Attempting to merge 4-3...success. 154s Attempting to merge 4-4...success. 154s Attempting to merge 4-5...success. 154s Attempting to merge 4-6...success. 154s Attempting to merge 5-1...success. 154s Attempting to merge 5-2...success. 154s Attempting to merge 5-3...success. 154s Attempting to merge 5-4...success. 154s Attempting to merge 5-5...success. 154s Attempting to merge 5-6...success. 154s Attempting to merge 6-1...success. 154s Attempting to merge 6-2...success. 154s Attempting to merge 6-3...success. 154s Attempting to merge 6-4...success. 154s Attempting to merge 6-5...success. 154s Attempting to merge 6-6...conflict. 154s Attempting to merge 7-1...success. 154s Attempting to merge 7-2...success. 154s Attempting to merge 7-3...success. 154s Attempting to merge 7-4...success. 154s Attempting to merge 7-5...success. 155s Attempting to merge 8-1...success. 155s Attempting to merge 8-2...success. 155s Attempting to merge 8-3...success. 155s Attempting to merge 8-4...success. 155s Attempting to merge 8-5...success. 155s Attempting to merge 9-1...success. 155s Attempting to merge 9-2...success. 155s Attempting to merge 9-3...success. 155s Attempting to merge 9-4...success. 155s Attempting to merge 9-5...success. 155s Previous HEAD position was 6a1b187 imerge 'c-d': automatic merge 9-5 155s Switched to branch 'imerge/c-d' 155s Auto-merging conflict.txt 155s CONFLICT (content): Merge conflict in conflict.txt 155s Automatic merge failed; fix conflicts and then commit the result. 155s 155s Original first commit: 155s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 155s Author: Loú User 155s Date: Thu Apr 7 22:13:20 2005 +0000 155s 155s c⇒6 155s 155s Original second commit: 155s commit f7e451a6c9656dda15641a9fbc591a602f158692 155s Author: Loú User 155s Date: Thu Apr 7 22:13:29 2005 +0000 155s 155s d⇒6 155s 155s There was a conflict merging commit 6-6, shown above. 155s Please resolve the conflict, commit the result, then type 155s 155s git-imerge continue 155s + grep -q Traceback start.out 155s + grep -q suggest manual merge of 6-6 autofill.out 155s + git-imerge diagram --commits --frontier --html=imerge3.html 155s 0 5 9 155s | | | 155s 0 - ********** - c 155s *......... 155s *......... 155s *......... 155s *......... 155s 5 - *......... 155s 6 - *.....#??? 155s | 155s d 155s 155s 0 5 9 155s | | | 155s 0 - ********** - c 155s *........| 155s *........| 155s *........| 155s *........| 155s 5 - *.....---+ 155s 6 - *----+#??? 155s | 155s d 155s 155s Key: 155s |,-,+ = rectangles forming current merge frontier 155s * = merge done manually 155s . = merge done automatically 155s # = conflict that is currently blocking progress 155s @ = merge was blocked but has been resolved 155s ? = no merge recorded 155s 155s + echo merged version 155s + git add conflict.txt 155s + GIT_EDITOR=cat git commit 155s imerge 'c-d': manual merge 6-6 155s 155s # Conflicts: 155s # conflict.txt 155s # 155s # It looks like you may be committing a merge. 155s # If this is not correct, please run 155s # git update-ref -d MERGE_HEAD 155s # and try again. 155s 155s 155s # Please enter the commit message for your changes. Lines starting 155s # with '#' will be ignored, and an empty message aborts the commit. 155s # 155s # On branch imerge/c-d 155s # All conflicts fixed but you are still merging. 155s # 155s # Changes to be committed: 155s # modified: conflict.txt 155s # modified: d.txt 155s # 155s [imerge/c-d 2d0504a] imerge 'c-d': manual merge 6-6 155s + git-imerge continue --edit 155s Merge has been recorded for merge 6-6. 155s Attempting to merge 7-6...success. 155s Attempting to merge 8-6...success. 155s Attempting to merge 9-6...success. 155s Merge is complete! 155s + git-imerge diagram --commits --frontier --html=imerge4.html 155s 0 5 9 155s | | | 155s 0 - ********** - c 155s *......... 155s *......... 155s *......... 155s *......... 155s 5 - *......... 155s 6 - *.....*... 155s | 155s d 155s 155s 0 5 9 155s | | | 155s 0 - ********** - c 155s *........| 155s *........| 155s *........| 155s *........| 155s 5 - *........| 155s 6 - *-----*--+ 155s | 155s d 155s 155s Key: 155s |,-,+ = rectangles forming current merge frontier 155s * = merge done manually 155s . = merge done automatically 155s # = conflict that is currently blocking progress 155s @ = merge was blocked but has been resolved 155s ? = no merge recorded 155s 155s + git-imerge finish --branch=c-d-full 155s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 155s + local refname=c-d-full 155s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 155s + git rev-parse c-d-full^{tree} 155s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 155s py313: commands[2] /tmp/autopkgtest.1QY9Oo/build.ZBk/src> /bin/sh t/test-really-conflicted 155s + dirname t/test-really-conflicted 155s + cd t 155s + pwd 155s + dirname /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t 155s + BASE=/tmp/autopkgtest.1QY9Oo/build.ZBk/src 155s + . /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/test-lib.sh 155s + GIT_IMERGE=git-imerge 155s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s + DESCRIPTION=git-imerge test repository with multiple conflicts 155s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 155s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s + local description=git-imerge test repository with multiple conflicts 155s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 155s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s + local description=git-imerge test repository with multiple conflicts 155s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s hint: Using 'master' as the name for the initial branch. This default branch name 155s hint: is subject to change. To configure the initial branch name to use in all 155s hint: of your new repositories, which will suppress this warning, call: 155s hint: 155s hint: git config --global init.defaultBranch 155s hint: 155s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 155s hint: 'development'. The just-created branch can be renamed via this command: 155s hint: 155s hint: git branch -m 155s hint: 155s hint: Disable this message with "git config set advice.defaultBranchName false" 155s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted/.git/ 155s + echo git-imerge test repository with multiple conflicts 155s + printf %s\n /*.out /*.css /*.html 155s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted/.git config user.name Loú User 155s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted/.git config user.email luser@example.com 155s + TIME=1112911993 155s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/really-conflicted 155s + modify c.txt 0 155s + filename=c.txt 155s + text=0 155s + echo 0 155s + git add c.txt 155s + modify d.txt 0 155s + filename=d.txt 155s + text=0 155s + echo 0 155s + git add d.txt 155s + seq 0 7 155s + modify conflict0.txt original version 155s + filename=conflict0.txt 155s + text=original version 155s + echo original version 155s + git add conflict0.txt 155s + modify conflict1.txt original version 155s + filename=conflict1.txt 155s + text=original version 155s + echo original version 155s + git add conflict1.txt 155s + modify conflict2.txt original version 155s + filename=conflict2.txt 155s + text=original version 155s + echo original version 155s + git add conflict2.txt 155s + modify conflict3.txt original version 155s + filename=conflict3.txt 155s + text=original version 155s + echo original version 155s + git add conflict3.txt 155s + modify conflict4.txt original version 155s + filename=conflict4.txt 155s + text=original version 155s + echo original version 155s + git add conflict4.txt 155s + modify conflict5.txt original version 155s + filename=conflict5.txt 155s + text=original version 155s + echo original version 155s + git add conflict5.txt 155s + modify conflict6.txt original version 155s + filename=conflict6.txt 155s + text=original version 155s + echo original version 155s + git add conflict6.txt 155s + modify conflict7.txt original version 155s + filename=conflict7.txt 155s + text=original version 155s + echo original version 155s + git add conflict7.txt 155s + commit -m m⇒0 155s + TIME=1112911994 155s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 155s [master (root-commit) 8e21fbd] m⇒0 155s 10 files changed, 10 insertions(+) 155s create mode 100644 c.txt 155s create mode 100644 conflict0.txt 155s create mode 100644 conflict1.txt 155s create mode 100644 conflict2.txt 155s create mode 100644 conflict3.txt 155s create mode 100644 conflict4.txt 155s create mode 100644 conflict5.txt 155s create mode 100644 conflict6.txt 155s create mode 100644 conflict7.txt 155s create mode 100644 d.txt 155s + git checkout -b c master -- 155s Switched to a new branch 'c' 155s + modify c.txt 1 155s + filename=c.txt 155s + text=1 155s + echo 1 155s + git add c.txt 155s + modify conflict0.txt c version 155s + filename=conflict0.txt 155s + text=c version 155s + echo c version 155s + git add conflict0.txt 155s + modify conflict4.txt c version 155s + filename=conflict4.txt 155s + text=c version 155s + echo c version 155s + git add conflict4.txt 155s + commit -m c⇒1 155s + TIME=1112911995 155s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 155s [c 4e6007a] c⇒1 155s 3 files changed, 3 insertions(+), 3 deletions(-) 155s + modify c.txt 2 155s + filename=c.txt 155s + text=2 155s + echo 2 155s + git add c.txt 155s + commit -m c⇒2 155s + TIME=1112911996 155s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 155s [c c2b7c49] c⇒2 155s 1 file changed, 1 insertion(+), 1 deletion(-) 155s + modify c.txt 3 155s + filename=c.txt 155s + text=3 155s + echo 3 155s + git add c.txt 155s + commit -m c⇒3 155s + TIME=1112911997 155s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 155s [c 42ad55a] c⇒3 155s 1 file changed, 1 insertion(+), 1 deletion(-) 155s + modify c.txt 4 155s + filename=c.txt 155s + text=4 155s + echo 4 155s + git add c.txt 155s + modify conflict1.txt c version 155s + filename=conflict1.txt 155s + text=c version 155s + echo c version 155s + git add conflict1.txt 155s + commit -m c⇒4 155s + TIME=1112911998 155s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 155s [c a891793] c⇒4 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + modify c.txt 5 155s + filename=c.txt 155s + text=5 155s + echo 5 155s + git add c.txt 155s + modify conflict3.txt c version 155s + filename=conflict3.txt 155s + text=c version 155s + echo c version 155s + git add conflict3.txt 155s + modify conflict6.txt c version 155s + filename=conflict6.txt 155s + text=c version 155s + echo c version 155s + git add conflict6.txt 155s + commit -m c⇒5 155s + TIME=1112911999 155s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 155s [c c21441d] c⇒5 155s 3 files changed, 3 insertions(+), 3 deletions(-) 155s + modify c.txt 6 155s + filename=c.txt 155s + text=6 155s + echo 6 155s + git add c.txt 155s + modify conflict5.txt c version 155s + filename=conflict5.txt 155s + text=c version 155s + echo c version 155s + git add conflict5.txt 155s + commit -m c⇒6 155s + TIME=1112912000 155s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 155s [c a797a66] c⇒6 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + modify c.txt 7 155s + filename=c.txt 155s + text=7 155s + echo 7 155s + git add c.txt 155s + modify conflict2.txt c version 155s + filename=conflict2.txt 155s + text=c version 155s + echo c version 155s + git add conflict2.txt 155s + commit -m c⇒7 155s + TIME=1112912001 155s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 155s [c c0e1537] c⇒7 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + modify c.txt 8 155s + filename=c.txt 155s + text=8 155s + echo 8 155s + git add c.txt 155s + commit -m c⇒8 155s + TIME=1112912002 155s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 155s [c 9f3e7c8] c⇒8 155s 1 file changed, 1 insertion(+), 1 deletion(-) 155s + modify c.txt 9 155s + filename=c.txt 155s + text=9 155s + echo 9 155s + git add c.txt 155s + modify conflict7.txt c version 155s + filename=conflict7.txt 155s + text=c version 155s + echo c version 155s + git add conflict7.txt 155s + commit -m c⇒9 155s + TIME=1112912003 155s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 155s [c ccbfccb] c⇒9 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + git checkout -b d master -- 155s Switched to a new branch 'd' 155s + modify d.txt 1 155s + filename=d.txt 155s + text=1 155s + echo 1 155s + git add d.txt 155s + modify conflict0.txt d version 155s + filename=conflict0.txt 155s + text=d version 155s + echo d version 155s + git add conflict0.txt 155s + modify conflict6.txt d version 155s + filename=conflict6.txt 155s + text=d version 155s + echo d version 155s + git add conflict6.txt 155s + commit -m d⇒1 155s + TIME=1112912004 155s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 155s + modify d.txt 2 155s + filename=d.txt 155s + text=2 155s + echo 2 155s + git add d.txt 155s [d 8c3c065] d⇒1 155s 3 files changed, 3 insertions(+), 3 deletions(-) 155s + modify conflict1.txt d version 155s + filename=conflict1.txt 155s + text=d version 155s + echo d version 155s + git add conflict1.txt 155s + modify conflict2.txt d version 155s + filename=conflict2.txt 155s + text=d version 155s + echo d version 155s + git add conflict2.txt 155s + commit -m d⇒2 155s + TIME=1112912005 155s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 155s [d 820b787] d⇒2 155s 3 files changed, 3 insertions(+), 3 deletions(-) 155s + modify d.txt 3 155s + filename=d.txt 155s + text=3 155s + echo 3 155s + git add d.txt 155s + commit -m d⇒3 155s + TIME=1112912006 155s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 155s [d 821c792] d⇒3 155s 1 file changed, 1 insertion(+), 1 deletion(-) 155s + modify d.txt 4 155s + filename=d.txt 155s + text=4 155s + echo 4 155s + git add d.txt 155s + commit -m d⇒4 155s + TIME=1112912007 155s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 155s [d c2a1456] d⇒4 155s 1 file changed, 1 insertion(+), 1 deletion(-) 155s + modify d.txt 5 155s + filename=d.txt 155s + text=5 155s + echo 5 155s + git add d.txt 155s + modify conflict3.txt d version 155s + filename=conflict3.txt 155s + text=d version 155s + echo d version 155s + git add conflict3.txt 155s + commit -m d⇒5 155s + TIME=1112912008 155s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 155s [d c3e3890] d⇒5 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + modify d.txt 6 155s + filename=d.txt 155s + text=6 155s + echo 6 155s + git add d.txt 155s + modify conflict4.txt d version 155s + filename=conflict4.txt 155s + text=d version 155s + echo d version 155s + git add conflict4.txt 155s + commit -m d⇒6 155s + TIME=1112912009 155s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 155s [d b2f5c5e] d⇒6 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + modify d.txt 7 155s + filename=d.txt 155s + text=7 155s + echo 7 155s + git add d.txt 155s + modify conflict5.txt d version 155s + filename=conflict5.txt 155s + text=d version 155s + echo d version 155s + git add conflict5.txt 155s + commit -m d⇒7 155s + TIME=1112912010 155s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 155s [d 892af56] d⇒7 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + modify d.txt 8 155s + filename=d.txt 155s + text=8 155s + echo 8 155s + git add d.txt 155s + modify conflict7.txt d version 155s + filename=conflict7.txt 155s + text=d version 155s + echo d version 155s + git add conflict7.txt 155s + commit -m d⇒8 155s + TIME=1112912011 155s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 155s [d 67099d0] d⇒8 155s 2 files changed, 2 insertions(+), 2 deletions(-) 155s + git checkout c 155s Switched to branch 'c' 155s + git-imerge init --name=c-d d 155s + git-imerge diagram --commits --frontier 156s 0 5 9 156s | | | 156s 0 - ********** - c 156s *????????? 156s *????????? 156s *????????? 156s *????????? 156s 5 - *????????? 156s *????????? 156s *????????? 156s 8 - *????????? 156s | 156s d 156s 156s 0 5 9 156s | | | 156s 0 - ********** - c 156s *????????? 156s *????????? 156s *????????? 156s *????????? 156s 5 - *????????? 156s *????????? 156s *????????? 156s 8 - *????????? 156s | 156s d 156s 156s Key: 156s |,-,+ = rectangles forming current merge frontier 156s * = merge done manually 156s . = merge done automatically 156s # = conflict that is currently blocking progress 156s @ = merge was blocked but has been resolved 156s ? = no merge recorded 156s 156s + conflict_count=0 156s + true 156s + git-imerge continue --no-edit 156s + tee autofill.out 156s Attempting automerge of 9-8...failure. 156s Attempting automerge of 1-1...failure. 156s Switched to branch 'imerge/c-d' 156s Auto-merging conflict0.txt 156s CONFLICT (content): Merge conflict in conflict0.txt 156s Automatic merge failed; fix conflicts and then commit the result. 156s 156s Original first commit: 156s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 156s Author: Loú User 156s Date: Thu Apr 7 22:13:15 2005 +0000 156s 156s c⇒1 156s 156s Original second commit: 156s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 156s Author: Loú User 156s Date: Thu Apr 7 22:13:24 2005 +0000 156s 156s d⇒1 156s 156s There was a conflict merging commit 1-1, shown above. 156s Please resolve the conflict, commit the result, then type 156s 156s git-imerge continue 156s + grep -q Traceback autofill.out 156s + git-imerge diagram --frontier 156s 0 5 9 156s | | | 156s 0 - ********** - c 156s *#???????? 156s *????????? 156s *????????? 156s *????????? 156s 5 - *????????? 156s *????????? 156s *????????? 156s 8 - *????????? 156s | 156s d 156s 156s Key: 156s |,-,+ = rectangles forming current merge frontier 156s * = merge done manually 156s . = merge done automatically 156s # = conflict that is currently blocking progress 156s @ = merge was blocked but has been resolved 156s ? = no merge recorded 156s 156s + grep -q There was a conflict merging autofill.out 156s + seq 0 7 156s + grep -q ==== conflict0.txt 156s + modify conflict0.txt merged version 156s + filename=conflict0.txt 156s + text=merged version 156s + echo merged version 156s + git add conflict0.txt 156s + conflict_count=1 156s + grep -q ==== conflict1.txt 156s + grep -q ==== conflict2.txt 156s + grep -q ==== conflict3.txt 156s + grep -q ==== conflict4.txt 156s + grep -q ==== conflict5.txt 156s + grep -q ==== conflict6.txt 156s + grep -q ==== conflict7.txt 156s + true 156s + git-imerge continue --no-edit 156s + tee autofill.out 156s [imerge/c-d c47e80e] imerge 'c-d': manual merge 1-1 156s Merge has been recorded for merge 1-1. 156s Attempting automerge of 1-8...failure. 156s Attempting automerge of 1-2...success. 156s Attempting automerge of 1-6...failure. 156s Attempting automerge of 1-4...success. 156s Attempting automerge of 1-5...success. 156s Autofilling 1-2...success. 156s Autofilling 1-3...success. 156s Autofilling 1-4...success. 156s Autofilling 1-5...success. 156s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 156s Attempting automerge of 1-8...failure. 156s Attempting automerge of 1-6...failure. 156s Attempting automerge of 9-5...failure. 156s Attempting automerge of 2-1...success. 156s Attempting automerge of 2-4...success. 156s Attempting automerge of 2-5...success. 156s Attempting automerge of 9-5...failure. 156s Attempting automerge of 6-5...failure. 156s Attempting automerge of 4-5...failure. 156s Attempting automerge of 3-5...success. 156s Attempting automerge of 4-1...success. 156s Attempting automerge of 4-3...failure. 156s Attempting automerge of 4-2...failure. 156s Attempting automerge of 9-1...failure. 156s Attempting automerge of 7-1...failure. 156s Attempting automerge of 6-1...failure. 156s Attempting automerge of 5-1...failure. 156s Autofilling 2-5...success. 156s Autofilling 3-1...success. 156s Autofilling 3-2...success. 156s Autofilling 3-3...success. 156s Autofilling 3-4...success. 156s Autofilling 3-5 (first way)...success. 156s Autofilling 3-5 (second way)...success. 156s The two ways of autofilling 3-5 agree. 156s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 156s Autofilling 4-1...success. 156s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 156s Attempting automerge of 4-5...failure. 156s Attempting automerge of 4-2...failure. 156s Attempting automerge of 9-1...failure. 156s Attempting automerge of 5-1...failure. 156s Previous HEAD position was c21441d c⇒5 156s Switched to branch 'imerge/c-d' 156s Auto-merging conflict4.txt 156s CONFLICT (content): Merge conflict in conflict4.txt 156s Automatic merge failed; fix conflicts and then commit the result. 156s 156s Original first commit: 156s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 156s Author: Loú User 156s Date: Thu Apr 7 22:13:15 2005 +0000 156s 156s c⇒1 156s 156s Original second commit: 156s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 156s Author: Loú User 156s Date: Thu Apr 7 22:13:29 2005 +0000 156s 156s d⇒6 156s 156s There was a conflict merging commit 1-6, shown above. 156s Please resolve the conflict, commit the result, then type 156s 156s git-imerge continue 156s + grep -q Traceback autofill.out 156s + git-imerge diagram --frontier 156s 0 5 9 156s | | | 156s 0 - ********** - c 156s **?.+#???? 156s *.?|#????? 156s *.?|?????? 156s *.?|?????? 156s 5 - *--+?????? 156s *#???????? 156s *????????? 156s 8 - *????????? 156s | 156s d 156s 156s Key: 156s |,-,+ = rectangles forming current merge frontier 156s * = merge done manually 156s . = merge done automatically 156s # = conflict that is currently blocking progress 156s @ = merge was blocked but has been resolved 156s ? = no merge recorded 156s 156s + grep -q There was a conflict merging autofill.out 156s + seq 0 7 156s + grep -q ==== conflict0.txt 156s + grep -q ==== conflict1.txt 156s + grep -q ==== conflict2.txt 156s + grep -q ==== conflict3.txt 156s + grep -q ==== conflict4.txt 156s + modify conflict4.txt merged version 156s + filename=conflict4.txt 156s + text=merged version 156s + echo merged version 156s + git add conflict4.txt 156s + conflict_count=2 156s + grep -q ==== conflict5.txt 156s + grep -q ==== conflict6.txt 156s + grep -q ==== conflict7.txt 156s + true 156s + git-imerge continue --no-edit 156s + tee autofill.out 157s [imerge/c-d 65f6007] imerge 'c-d': manual merge 1-6 157s Merge has been recorded for merge 1-6. 157s Attempting automerge of 1-8...success. 157s Autofilling 1-7...success. 157s Autofilling 1-8...success. 157s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 157s Attempting automerge of 3-8...success. 157s Autofilling 2-8...success. 157s Autofilling 3-6...success. 157s Autofilling 3-7...success. 157s Autofilling 3-8 (first way)...success. 157s Autofilling 3-8 (second way)...success. 157s The two ways of autofilling 3-8 agree. 157s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 157s Warning: you are leaving 1 commit behind, not connected to 157s any of your branches: 157s 157s 1542c8c imerge 'c-d': automatic merge 3-8 157s 157s If you want to keep it by creating a new branch, this may be a good time 157s to do so with: 157s 157s git branch 1542c8c 157s 157s Switched to branch 'imerge/c-d' 157s Auto-merging conflict1.txt 157s CONFLICT (content): Merge conflict in conflict1.txt 157s Automatic merge failed; fix conflicts and then commit the result. 157s 157s Original first commit: 157s commit a89179336bb40a4ca90903425239a9ef3ce659bd 157s Author: Loú User 157s Date: Thu Apr 7 22:13:18 2005 +0000 157s 157s c⇒4 157s 157s Original second commit: 157s commit 820b787e86e22612af7a061db842dc95e9f1d49f 157s Author: Loú User 157s Date: Thu Apr 7 22:13:25 2005 +0000 157s 157s d⇒2 157s 157s There was a conflict merging commit 4-2, shown above. 157s Please resolve the conflict, commit the result, then type 157s 157s git-imerge continue 157s + grep -q Traceback autofill.out 157s + git-imerge diagram --frontier 157s 0 5 9 157s | | | 157s 0 - ********** - c 157s **?.+#???? 157s *.?|#????? 157s *.?|?????? 157s *.?|?????? 157s 5 - *..|?????? 157s **?|?????? 157s *.?|?????? 157s 8 - *--+?????? 157s | 157s d 157s 157s Key: 157s |,-,+ = rectangles forming current merge frontier 157s * = merge done manually 157s . = merge done automatically 157s # = conflict that is currently blocking progress 157s @ = merge was blocked but has been resolved 157s ? = no merge recorded 157s 157s + grep -q There was a conflict merging autofill.out 157s + seq 0 7 157s + grep -q ==== conflict0.txt 157s + grep -q ==== conflict1.txt 157s + modify conflict1.txt merged version 157s + filename=conflict1.txt 157s + text=merged version 157s + echo merged version 157s + git add conflict1.txt 157s + conflict_count=3 157s + grep -q ==== conflict2.txt 157s + grep -q ==== conflict3.txt 157s + grep -q ==== conflict4.txt 157s + grep -q ==== conflict5.txt 157s + grep -q ==== conflict6.txt 157s + grep -q ==== conflict7.txt 157s + true 157s + git-imerge continue --no-edit 157s + tee autofill.out 157s [imerge/c-d 1e4961b] imerge 'c-d': manual merge 4-2 157s Merge has been recorded for merge 4-2. 157s Attempting automerge of 4-8...success. 157s Autofilling 4-3...success. 157s Autofilling 4-4...success. 157s Autofilling 4-5...success. 157s Autofilling 4-6...success. 157s Autofilling 4-7...success. 157s Autofilling 4-8...success. 157s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 157s Previous HEAD position was 7894551 imerge 'c-d': automatic merge 4-8 157s Switched to branch 'imerge/c-d' 157s Auto-merging conflict6.txt 157s CONFLICT (content): Merge conflict in conflict6.txt 157s Automatic merge failed; fix conflicts and then commit the result. 157s 157s Original first commit: 157s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 157s Author: Loú User 157s Date: Thu Apr 7 22:13:19 2005 +0000 157s 157s c⇒5 157s 157s Original second commit: 157s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 157s Author: Loú User 157s Date: Thu Apr 7 22:13:24 2005 +0000 157s 157s d⇒1 157s 157s There was a conflict merging commit 5-1, shown above. 157s Please resolve the conflict, commit the result, then type 157s 157s git-imerge continue 157s + grep -q Traceback autofill.out 157s + git-imerge diagram --frontier 157s 0 5 9 157s | | | 157s 0 - ********** - c 157s **?.|#???? 157s *.?.*????? 157s *.?.|????? 157s *.?.|????? 157s 5 - *...|????? 157s **?.|????? 157s *.?.|????? 157s 8 - *---+????? 157s | 157s d 157s 157s Key: 157s |,-,+ = rectangles forming current merge frontier 157s * = merge done manually 157s . = merge done automatically 157s # = conflict that is currently blocking progress 157s @ = merge was blocked but has been resolved 157s ? = no merge recorded 157s 157s + grep -q There was a conflict merging autofill.out 157s + seq 0 7 157s + grep -q ==== conflict0.txt 157s + grep -q ==== conflict1.txt 157s + grep -q ==== conflict2.txt 157s + grep -q ==== conflict3.txt 157s + grep -q ==== conflict4.txt 157s + grep -q ==== conflict5.txt 157s + grep -q ==== conflict6.txt 157s + modify conflict6.txt merged version 157s + filename=conflict6.txt 157s + text=merged version 157s + echo merged version 157s + git add conflict6.txt 157s + conflict_count=4 157s + grep -q ==== conflict7.txt 157s + true 157s + git-imerge continue --no-edit 157s + tee autofill.out 157s [imerge/c-d e2d61be] imerge 'c-d': manual merge 5-1 157s Merge has been recorded for merge 5-1. 157s Attempting automerge of 5-8...failure. 157s Attempting automerge of 5-2...success. 157s Attempting automerge of 5-6...failure. 157s Attempting automerge of 5-4...success. 157s Attempting automerge of 5-5...failure. 157s Autofilling 5-2...success. 157s Autofilling 5-3...success. 157s Autofilling 5-4...success. 157s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 157s Attempting automerge of 5-8...failure. 157s Attempting automerge of 5-5...failure. 157s Attempting automerge of 9-4...failure. 157s Attempting automerge of 6-1...success. 157s Attempting automerge of 6-3...success. 157s Attempting automerge of 6-4...success. 157s Attempting automerge of 9-4...failure. 157s Attempting automerge of 8-4...failure. 157s Attempting automerge of 7-4...failure. 157s Attempting automerge of 7-1...success. 157s Attempting automerge of 7-3...failure. 158s Attempting automerge of 7-2...failure. 158s Attempting automerge of 9-1...success. 158s Autofilling 6-1...success. 158s Autofilling 6-2...success. 158s Autofilling 6-3...success. 158s Autofilling 6-4...success. 158s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 158s Autofilling 7-1...success. 158s Autofilling 8-1...success. 158s Autofilling 9-1...success. 158s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 158s Attempting automerge of 9-4...failure. 158s Attempting automerge of 7-2...failure. 158s Previous HEAD position was 1e2496b imerge 'c-d': automatic merge 7-1 158s Switched to branch 'imerge/c-d' 158s Auto-merging conflict3.txt 158s CONFLICT (content): Merge conflict in conflict3.txt 158s Automatic merge failed; fix conflicts and then commit the result. 158s 158s Original first commit: 158s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 158s Author: Loú User 158s Date: Thu Apr 7 22:13:19 2005 +0000 158s 158s c⇒5 158s 158s Original second commit: 158s commit c3e3890b9e3c756c1d8f7e345184d576739be079 158s Author: Loú User 158s Date: Thu Apr 7 22:13:28 2005 +0000 158s 158s d⇒5 158s 158s There was a conflict merging commit 5-5, shown above. 158s Please resolve the conflict, commit the result, then type 158s 158s git-imerge continue 158s + grep -q Traceback autofill.out 158s + git-imerge diagram --frontier 158s 0 5 9 158s | | | 158s 0 - ********** - c 158s **?..*.--+ 158s *.?.*.|#?? 158s *.?...|??? 158s *.?..-+??? 158s 5 - *...|#???? 158s **?.|????? 158s *.?.|????? 158s 8 - *---+????? 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 + grep -q There was a conflict merging autofill.out 158s + seq 0 7 158s + grep -q ==== conflict0.txt 158s + grep -q ==== conflict1.txt 158s + grep -q ==== conflict2.txt 158s + grep -q ==== conflict3.txt 158s + modify conflict3.txt merged version 158s + filename=conflict3.txt 158s + text=merged version 158s + echo merged version 158s + git add conflict3.txt 158s + conflict_count=5 158s + grep -q ==== conflict4.txt 158s + grep -q ==== conflict5.txt 158s + grep -q ==== conflict6.txt 158s + grep -q ==== conflict7.txt 158s + true 158s + git-imerge continue --no-edit 158s + tee autofill.out 158s [imerge/c-d 8374262] imerge 'c-d': manual merge 5-5 158s Merge has been recorded for merge 5-5. 158s Attempting automerge of 5-8...success. 158s Autofilling 5-6...success. 158s Autofilling 5-7...success. 158s Autofilling 5-8...success. 158s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 158s Attempting automerge of 6-8...failure. 158s Attempting automerge of 6-5...success. 158s Attempting automerge of 6-7...failure. 158s Attempting automerge of 6-6...success. 158s Autofilling 6-5...success. 158s Autofilling 6-6...success. 158s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 158s Attempting automerge of 6-8...failure. 158s Attempting automerge of 6-7...failure. 158s Switched to branch 'imerge/c-d' 158s Auto-merging conflict5.txt 158s CONFLICT (content): Merge conflict in conflict5.txt 158s Automatic merge failed; fix conflicts and then commit the result. 158s 158s Original first commit: 158s commit a797a66a0e4b89690099557280641efeac302bcf 158s Author: Loú User 158s Date: Thu Apr 7 22:13:20 2005 +0000 158s 158s c⇒6 158s 158s Original second commit: 158s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 158s Author: Loú User 158s Date: Thu Apr 7 22:13:30 2005 +0000 158s 158s d⇒7 158s 158s There was a conflict merging commit 6-7, shown above. 158s Please resolve the conflict, commit the result, then type 158s 158s git-imerge continue 158s + grep -q Traceback autofill.out 158s + git-imerge diagram --frontier 158s 0 5 9 158s | | | 158s 0 - ********** - c 158s **?..*.--+ 158s *.?.*.|#?? 158s *.?...|??? 158s *.?...|??? 158s 5 - *....*|??? 158s **?...+??? 158s *.?..|#??? 158s 8 - *----+???? 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 + grep -q There was a conflict merging autofill.out 158s + seq 0 7 158s + grep -q ==== conflict0.txt 158s + grep -q ==== conflict1.txt 158s + grep -q ==== conflict2.txt 158s + grep -q ==== conflict3.txt 158s + grep -q ==== conflict4.txt 158s + grep -q ==== conflict5.txt 158s + modify conflict5.txt merged version 158s + filename=conflict5.txt 158s + text=merged version 158s + echo merged version 158s + git add conflict5.txt 158s + conflict_count=6 158s + grep -q ==== conflict6.txt 158s + grep -q ==== conflict7.txt 158s + true 158s + git-imerge continue --no-edit 158s + tee autofill.out 158s [imerge/c-d aa200dd] imerge 'c-d': manual merge 6-7 158s Merge has been recorded for merge 6-7. 158s Attempting automerge of 6-8...success. 158s Autofilling 6-8...success. 158s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 158s Previous HEAD position was c013205 imerge 'c-d': automatic merge 6-8 158s Switched to branch 'imerge/c-d' 158s Auto-merging conflict2.txt 158s CONFLICT (content): Merge conflict in conflict2.txt 158s Automatic merge failed; fix conflicts and then commit the result. 158s 158s Original first commit: 158s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 158s Author: Loú User 158s Date: Thu Apr 7 22:13:21 2005 +0000 158s 158s c⇒7 158s 158s Original second commit: 158s commit 820b787e86e22612af7a061db842dc95e9f1d49f 158s Author: Loú User 158s Date: Thu Apr 7 22:13:25 2005 +0000 158s 158s d⇒2 158s 158s There was a conflict merging commit 7-2, shown above. 158s Please resolve the conflict, commit the result, then type 158s 158s git-imerge continue 158s + grep -q Traceback autofill.out 158s + git-imerge diagram --frontier 158s 0 5 9 158s | | | 158s 0 - ********** - c 158s **?..*.--+ 158s *.?.*.|#?? 158s *.?...|??? 158s *.?...|??? 158s 5 - *....*|??? 158s **?...|??? 158s *.?...*??? 158s 8 - *-----+??? 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 + grep -q There was a conflict merging autofill.out 158s + seq 0 7 158s + grep -q ==== conflict0.txt 158s + grep -q ==== conflict1.txt 158s + grep -q ==== conflict2.txt 158s + modify conflict2.txt merged version 158s + filename=conflict2.txt 158s + text=merged version 158s + echo merged version 158s + git add conflict2.txt 158s + conflict_count=7 158s + grep -q ==== conflict3.txt 158s + grep -q ==== conflict4.txt 158s + grep -q ==== conflict5.txt 158s + grep -q ==== conflict6.txt 158s + grep -q ==== conflict7.txt 158s + true 158s + git-imerge continue+ --no-edit 158s tee autofill.out 158s [imerge/c-d 9cdd194] imerge 'c-d': manual merge 7-2 158s Merge has been recorded for merge 7-2. 159s Attempting automerge of 7-8...success. 159s Autofilling 7-3...success. 159s Autofilling 7-4...success. 159s Autofilling 7-5...success. 159s Autofilling 7-6...success. 159s Autofilling 7-7...success. 159s Autofilling 7-8...success. 159s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 159s Attempting automerge of 9-8...failure. 159s Attempting automerge of 8-2...success. 159s Attempting automerge of 8-6...success. 159s Attempting automerge of 8-8...success. 159s Attempting automerge of 9-8...failure. 159s Attempting automerge of 9-2...success. 159s Attempting automerge of 9-5...success. 159s Attempting automerge of 9-7...success. 159s Autofilling 8-2...success. 159s Autofilling 8-3...success. 159s Autofilling 8-4...success. 159s Autofilling 8-5...success. 159s Autofilling 8-6...success. 159s Autofilling 8-7...success. 159s Autofilling 8-8...success. 159s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 159s Autofilling 9-2...success. 159s Autofilling 9-3...success. 159s Autofilling 9-4...success. 159s Autofilling 9-5...success. 159s Autofilling 9-6...success. 159s Autofilling 9-7...success. 159s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 159s Attempting automerge of 9-8...failure. 159s Attempting automerge of 9-8...failure. 159s Switched to branch 'imerge/c-d' 159s Auto-merging conflict7.txt 159s CONFLICT (content): Merge conflict in conflict7.txt 159s Automatic merge failed; fix conflicts and then commit the result. 159s 159s Original first commit: 159s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 159s Author: Loú User 159s Date: Thu Apr 7 22:13:23 2005 +0000 159s 159s c⇒9 159s 159s Original second commit: 159s commit 67099d078100141fbe4063d46a6408200f4ff311 159s Author: Loú User 159s Date: Thu Apr 7 22:13:31 2005 +0000 159s 159s d⇒8 159s 159s There was a conflict merging commit 9-8, shown above. 159s Please resolve the conflict, commit the result, then type 159s 159s git-imerge continue 159s + grep -q Traceback autofill.out 159s + git-imerge diagram --frontier 159s 0 5 9 159s | | | 159s 0 - ********** - c 159s **?..*...| 159s *.?.*..*.| 159s *.?......| 159s *.?......| 159s 5 - *....*...| 159s **?......| 159s *.?...*..+ 159s 8 - *-------+# 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 + grep -q There was a conflict merging autofill.out 159s + seq 0 7 159s + grep -q ==== conflict0.txt 159s + grep -q ==== conflict1.txt 159s + grep -q ==== conflict2.txt 159s + grep -q ==== conflict3.txt 159s + grep -q ==== conflict4.txt 159s + grep -q ==== conflict5.txt 159s + grep -q ==== conflict6.txt 159s + grep -q ==== conflict7.txt 159s + modify conflict7.txt merged version 159s + filename=conflict7.txt 159s + text=merged version 159s + echo merged version 159s + git add conflict7.txt 159s + conflict_count=8 159s + true 159s + git-imerge continue --no-edit 159s + tee autofill.out 159s [imerge/c-d dd180e4] imerge 'c-d': manual merge 9-8 159s Merge has been recorded for merge 9-8. 159s Merge is complete! 159s + grep -q Traceback autofill.out 159s + git-imerge diagram --frontier 159s 0 5 9 159s | | | 159s 0 - ********** - c 159s **?..*...| 159s *.?.*..*.| 159s *.?......| 159s *.?......| 159s 5 - *....*...| 159s **?......| 159s *.?...*..| 159s 8 - *--------* 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 + grep -q There was a conflict merging autofill.out 159s + break 159s + test 8 -ne 8 159s + git-imerge diagram --commits 159s + cat 159s + diff -u - diagram.out 159s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 159s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 159s Merge d into c (using imerge) 159s 159s # Please enter the commit message for your changes. Lines starting 159s # with '#' will be ignored, and an empty message aborts the commit. 159s # 159s # Date: Sat Dec 6 03:01:08 2025 +0000 159s # 159s # On branch c-d-merge 159s # Changes to be committed: 159s # modified: conflict0.txt 159s # modified: conflict1.txt 159s # modified: conflict2.txt 159s # modified: conflict3.txt 159s # modified: conflict4.txt 159s # modified: conflict5.txt 159s # modified: conflict6.txt 159s # modified: conflict7.txt 159s # modified: d.txt 159s # 159s [c-d-merge 7aaf86f] Merge d into c (using imerge) 159s Date: Sat Dec 6 03:01:08 2025 +0000 159s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 159s + local refname=c-d-merge 159s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 159s + git rev-parse c-d-merge^{tree} 159s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 159s + git-imerge simplify --goal=rebase --branch=c-d-rebase 160s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + local refname=c-d-rebase 160s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git rev-parse c-d-rebase^{tree} 160s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 160s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + local refname=c-d-rebase-with-history 160s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git rev-parse c-d-rebase-with-history^{tree} 160s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git-imerge simplify --goal=border --branch=c-d-border 160s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + local refname=c-d-border 160s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git rev-parse c-d-border^{tree} 160s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 160s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + local refname=c-d-border-with-history 160s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git rev-parse c-d-border-with-history^{tree} 160s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 160s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + local refname=c-d-border-with-history2 160s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git rev-parse c-d-border-with-history2^{tree} 160s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 160s + git-imerge remove 160s py313: commands[3] /tmp/autopkgtest.1QY9Oo/build.ZBk/src> /bin/sh t/test-duplicated 160s + dirname t/test-duplicated 160s + cd t 160s + pwd 160s + dirname /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t 160s + BASE=/tmp/autopkgtest.1QY9Oo/build.ZBk/src 160s + . /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/test-lib.sh 160s + GIT_IMERGE=git-imerge 160s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s + DESCRIPTION=git-imerge test repository with duplicate commits 160s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated git-imerge test repository with duplicate commits 160s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s + local description=git-imerge test repository with duplicate commits 160s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated git-imerge test repository with duplicate commits 160s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s + local description=git-imerge test repository with duplicate commits 160s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated/.git/ 160s hint: Using 'master' as the name for the initial branch. This default branch name 160s hint: is subject to change. To configure the initial branch name to use in all 160s hint: of your new repositories, which will suppress this warning, call: 160s hint: 160s hint: git config --global init.defaultBranch 160s hint: 160s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 160s hint: 'development'. The just-created branch can be renamed via this command: 160s hint: 160s hint: git branch -m 160s hint: 160s hint: Disable this message with "git config set advice.defaultBranchName false" 160s + echo git-imerge test repository with duplicate commits 160s + printf %s\n /*.out /*.css /*.html 160s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated/.git config user.name Loú User 160s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated/.git config user.email luser@example.com 160s + TIME=1112911993 160s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/duplicated 160s + modify a.txt 0 160s + filename=a.txt 160s + text=0 160s + echo 0 160s + git add a.txt 160s + commit -m m⇒0 160s + TIME=1112911994 160s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 160s [master (root-commit) a733afa] m⇒0 160s 1 file changed, 1 insertion(+) 160s create mode 100644 a.txt 160s + git checkout -b a -- 160s Switched to a new branch 'a' 160s + seq 3 160s + modify a.txt 1 160s + filename=a.txt 160s + text=1 160s + echo 1 160s + git add a.txt 160s + commit -m a⇒1 on branch a 160s + TIME=1112911995 160s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 160s [a 2f1f75a] a⇒1 on branch a 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + modify a.txt 2 160s + filename=a.txt 160s + text=2 160s + echo 2 160s + git add a.txt 160s + commit -m a⇒2 on branch a 160s + TIME=1112911996 160s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 160s [a 4700669] a⇒2 on branch a 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + modify a.txt 3 160s + filename=a.txt 160s + text=3 160s + echo 3 160s + git add a.txt 160s + commit -m a⇒3 on branch a 160s + TIME=1112911997 160s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 160s [a 621c381] a⇒3 on branch a 160s 1 file changed, 1 insertion(+), 1 deletion(-) 160s + git checkout -b b master -- 160s Switched to a new branch 'b' 160s + seq 4 160s + modify a.txt 1 160s + filename=a.txt 160s + text=1 160s + echo 1 160s + git add a.txt 160s + commit -m a⇒1 on branch b 160s + TIME=1112911998 160s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 161s [b 62a5c56] a⇒1 on branch b 161s 1 file changed, 1 insertion(+), 1 deletion(-) 161s + modify a.txt 2 161s + filename=a.txt 161s + text=2 161s + echo 2 161s + git add a.txt 161s + commit -m a⇒2 on branch b 161s + TIME=1112911999 161s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 161s [b f846281] a⇒2 on branch b 161s 1 file changed, 1 insertion(+), 1 deletion(-) 161s + modify a.txt 3 161s + filename=a.txt 161s + text=3 161s + echo 3 161s + git add a.txt 161s + commit -m a⇒3 on branch b 161s + TIME=1112912000 161s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 161s [b a4b2c2b] a⇒3 on branch b 161s 1 file changed, 1 insertion(+), 1 deletion(-) 161s + modify a.txt 4 161s + filename=a.txt 161s + text=4 161s + echo 4 161s + git add a.txt 161s + commit -m a⇒4 on branch b 161s + TIME=1112912001 161s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 161s [b 5b24553] a⇒4 on branch b 161s 1 file changed, 1 insertion(+), 1 deletion(-) 161s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 161s + git checkout a 161s Switched to branch 'a' 161s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 161s Attempting automerge of 3-4...failure. 161s Attempting automerge of 1-1...success. 161s Attempting automerge of 1-3...failure. 161s Attempting automerge of 1-2...failure. 161s Attempting automerge of 3-1...failure. 161s Attempting automerge of 2-1...failure. 161s Autofilling 1-1...success. 161s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 161s Attempting automerge of 1-4...success. 161s Autofilling 1-2...success. 161s Autofilling 1-3...success. 161s Autofilling 1-4...success. 161s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 161s Attempting automerge of 3-4...failure. 161s Attempting automerge of 2-1...success. 161s Attempting automerge of 2-3...failure. 161s Attempting automerge of 2-2...success. 161s Attempting automerge of 3-2...failure. 161s Attempting automerge of 3-1...success. 161s Autofilling 2-1...success. 161s Autofilling 2-2...success. 161s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 161s Autofilling 3-1...success. 161s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 161s Attempting automerge of 2-4...success. 161s Autofilling 2-3...success. 161s Autofilling 2-4...success. 161s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 161s Attempting automerge of 3-4...failure. 161s Attempting automerge of 3-2...success. 161s Attempting automerge of 3-4...failure. 161s Attempting automerge of 3-3...success. 161s Autofilling 3-2...success. 161s Autofilling 3-3...success. 161s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 161s Attempting automerge of 3-4...success. 161s Autofilling 3-4...success. 161s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 161s Merge is complete! 161s + git-imerge diagram --commits --frontier --html=imerge5.html 161s 0 3 161s | | 161s 0 - **** - a 161s *... 161s *... 161s *... 161s 4 - *... 161s | 161s b 161s 161s 0 3 161s | | 161s 0 - **** - a 161s *..| 161s *..| 161s *..| 161s 4 - *--+ 161s | 161s b 161s 161s Key: 161s |,-,+ = rectangles forming current merge frontier 161s * = merge done manually 161s . = merge done automatically 161s # = conflict that is currently blocking progress 161s @ = merge was blocked but has been resolved 161s ? = no merge recorded 161s 161s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 161s Merge b into a (using imerge) 161s 161s # Please enter the commit message for your changes. Lines starting 161s # with '#' will be ignored, and an empty message aborts the commit. 161s # 161s # Date: Sat Dec 6 03:01:10 2025 +0000 161s # 161s # On branch a-b-merge 161s # Changes to be committed: 161s # modified: a.txt 161s # 161s [a-b-merge afbb4f3] Merge b into a (using imerge) 161s Date: Sat Dec 6 03:01:10 2025 +0000 161s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 161s + local refname=a-b-merge 161s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 161s + git rev-parse a-b-merge^{tree} 161s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 161s + git-imerge simplify --goal=rebase --branch=a-b-rebase 162s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + local refname=a-b-rebase 162s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git rev-parse a-b-rebase^{tree} 162s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 162s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + local refname=a-b-rebase-with-history 162s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git rev-parse a-b-rebase-with-history^{tree} 162s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git-imerge simplify --goal=border --branch=a-b-border 162s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + local refname=a-b-border 162s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git rev-parse a-b-border^{tree} 162s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 162s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + local refname=a-b-border-with-history 162s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git rev-parse a-b-border-with-history^{tree} 162s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 162s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + local refname=a-b-border-with-history2 162s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git rev-parse a-b-border-with-history2^{tree} 162s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 162s + git checkout a 162s Switched to branch 'a' 162s + git-imerge start --goal=full --name=a-b b 162s Attempting to merge 1-1...success. 162s Attempting to merge 1-2...success. 162s Attempting to merge 1-3...success. 162s Attempting to merge 1-4...success. 162s Attempting to merge 2-1...success. 162s Attempting to merge 2-2...success. 162s Attempting to merge 2-3...success. 162s Attempting to merge 2-4...success. 162s Attempting to merge 3-1...success. 162s Attempting to merge 3-2...success. 162s Attempting to merge 3-3...success. 162s Attempting to merge 3-4...success. 162s Merge is complete! 162s + git-imerge list 162s * a-b 162s + git-imerge diagram --commits --frontier --html=imerge6.html 162s 0 3 162s | | 162s 0 - **** - a 162s *... 162s *... 162s *... 162s 4 - *... 162s | 162s b 162s 162s 0 3 162s | | 162s 0 - **** - a 162s *..| 162s *..| 162s *..| 162s 4 - *--+ 162s | 162s b 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 finish --branch=a-b-full 163s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 163s + local refname=a-b-full 163s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 163s + git rev-parse a-b-full^{tree} 163s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 163s py313: commands[4] /tmp/autopkgtest.1QY9Oo/build.ZBk/src> /bin/sh t/test-flip-flop 163s + dirname t/test-flip-flop 163s + cd t 163s + pwd 163s + dirname /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t 163s + BASE=/tmp/autopkgtest.1QY9Oo/build.ZBk/src 163s + . /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/test-lib.sh 163s + GIT_IMERGE=git-imerge 163s + flip_flop_test 1 163s + local n=1 163s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 163s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 163s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s + local description=git-imerge test repository with a commit and its revert at n=1 163s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 163s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s + local description=git-imerge test repository with a commit and its revert at n=1 163s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s hint: Using 'master' as the name for the initial branch. This default branch name 163s hint: is subject to change. To configure the initial branch name to use in all 163s hint: of your new repositories, which will suppress this warning, call: 163s hint: 163s hint: git config --global init.defaultBranch 163s hint: 163s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 163s hint: 'development'. The just-created branch can be renamed via this command: 163s hint: 163s hint: git branch -m 163s hint: 163s hint: Disable this message with "git config set advice.defaultBranchName false" 163s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1/.git/ 163s + echo git-imerge test repository with a commit and its revert at n=1 163s + printf %s\n /*.out /*.css /*.html 163s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1/.git config user.name Loú User 163s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 163s + TIME=1112911993 163s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-1 163s + modify a.txt 0 163s + filename=a.txt 163s + text=0 163s + echo 0 163s + git add a.txt 163s + commit -m m⇒0 163s + TIME=1112911994 163s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 163s [master (root-commit) a733afa] m⇒0 163s 1 file changed, 1 insertion(+) 163s create mode 100644 a.txt 163s + git checkout -b a -- 163s Switched to a new branch 'a' 163s + modify a.txt 1 163s + filename=a.txt 163s + text=1 163s + echo 1 163s + git add a.txt 163s + commit -m a⇒1 on branch a 163s + TIME=1112911995 163s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 163s [a 2f1f75a] a⇒1 on branch a 163s 1 file changed, 1 insertion(+), 1 deletion(-) 163s [a 4700669] a⇒2 on branch a 163s 1 file changed, 1 insertion(+), 1 deletion(-) 163s [a 621c381] a⇒3 on branch a 163s 1 file changed, 1 insertion(+), 1 deletion(-) 163s [b 044a3fa] b⇒1 and a⇒X on branch b 163s 2 files changed, 2 insertions(+), 1 deletion(-) 163s create mode 100644 b.txt 163s + modify a.txt 2 163s + filename=a.txt 163s + text=2 163s + echo 2 163s + git add a.txt 163s + commit -m a⇒2 on branch a 163s + TIME=1112911996 163s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 163s + modify a.txt 3 163s + filename=a.txt 163s + text=3 163s + echo 3 163s + git add a.txt 163s + commit -m a⇒3 on branch a 163s + TIME=1112911997 163s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 163s + git checkout -b b master -- 163s Switched to a new branch 'b' 163s + modify b.txt 1 163s + filename=b.txt 163s + text=1 163s + echo 1 163s + git add b.txt 163s + msg=b⇒1 163s + test 1 = 1 163s + modify a.txt X 163s + filename=a.txt 163s + text=X 163s + echo X 163s + git add a.txt 163s + msg=b⇒1 and a⇒X 163s + test 1 = 2 163s + commit -m b⇒1 and a⇒X on branch b 163s + TIME=1112911998 163s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 163s + modify b.txt 2 163s + filename=b.txt 163s + text=2 163s + echo 2 163s + git add b.txt 163s + msg=b⇒2 163s + test 2 = 1 163s + test 2 = 2 163s + modify a.txt 0 163s + filename=a.txt 163s + text=0 163s + echo 0 163s + git add a.txt 163s [b 7851975] b⇒2 and a⇒0 on branch b 163s 2 files changed, 2 insertions(+), 2 deletions(-) 163s + msg=b⇒2 and a⇒0 163s + commit -m b⇒2 and a⇒0 on branch b 163s + TIME=1112911999 163s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 163s + modify b.txt 3 163s + filename=b.txt 163s + text=3 163s + echo 3 163s + git add b.txt 163s + msg=b⇒3 163s + test 3 = 1 163s + test 3 = 2 163s + commit -m b⇒3 on branch b 163s + TIME=1112912000 163s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 163s [b 6fe24f0] b⇒3 on branch b 163s 1 file changed, 1 insertion(+), 1 deletion(-) 163s + modify b.txt 4 163s + filename=b.txt 163s + text=4 163s + echo 4 163s + git add b.txt 163s + msg=b⇒4 163s + test 4 = 1 163s + test 4 = 2 163s + commit -m b⇒4 on branch b 163s + TIME=1112912001 163s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 163s [b 2dc5eb7] b⇒4 on branch b 163s 1 file changed, 1 insertion(+), 1 deletion(-) 163s + test_merge b-into-a-1 a b 1-1 1-2 163s + local name=b-into-a-1 163s + local dst=a 163s + local src=b 163s + local conflict1=1-1 163s + local conflict2=1-2 163s + git checkout a 163s Switched to branch 'a' 163s + git-imerge merge --branch=b-into-a-1 b 163s + tee imerge-b-into-a-1-1.out 163s Attempting automerge of 3-4...success. 163s Autofilling 1-4...success. 163s Autofilling 2-4...success. 163s Autofilling 3-1...unexpected conflict. Backtracking... 163s Autofilling 1-4...success. 163s Autofilling 2-1...unexpected conflict. Backtracking... 163s Autofilling 1-1...unexpected conflict. Backtracking... 163s Switched to branch 'imerge/b' 163s Auto-merging a.txt 163s CONFLICT (content): Merge conflict in a.txt 163s Automatic merge failed; fix conflicts and then commit the result. 163s 163s Original first commit: 163s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 163s Author: Loú User 163s Date: Thu Apr 7 22:13:15 2005 +0000 163s 163s a⇒1 on branch a 163s 163s Original second commit: 163s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 163s Author: Loú User 163s Date: Thu Apr 7 22:13:18 2005 +0000 163s 163s b⇒1 and a⇒X on branch b 163s 163s There was a conflict merging commit 1-1, shown above. 163s Please resolve the conflict, commit the result, then type 163s 163s git-imerge continue 163s + git-imerge diagram --commits --frontier 163s 0 3 163s | | 163s 0 - **** - a 163s *#?? 163s *??? 163s *??? 163s 4 - *??? 163s | 163s b 163s 163s 0 3 163s | | 163s 0 - **** - a 163s *#?? 163s *??? 163s *??? 163s 4 - *??? 163s | 163s b 163s 163s Key: 163s |,-,+ = rectangles forming current merge frontier 163s * = merge done manually 163s . = merge done automatically 163s # = conflict that is currently blocking progress 163s @ = merge was blocked but has been resolved 163s ? = no merge recorded 163s 163s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 163s + echo 1 163s + git add a.txt 163s + git-imerge continue --no-edit 163s + tee imerge-b-into-a-1-2.out 163s [imerge/b 6475b5d] imerge 'b': manual merge 1-1 163s Merge has been recorded for merge 1-1. 163s Attempting automerge of 1-4...failure. 163s Attempting automerge of 1-2...failure. 163s Attempting automerge of 3-1...success. 163s Autofilling 2-1...success. 163s Autofilling 3-1...success. 163s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 163s Previous HEAD position was e334787 imerge 'b': automatic merge 3-1 163s Switched to branch 'imerge/b' 163s Auto-merging a.txt 163s CONFLICT (content): Merge conflict in a.txt 163s Automatic merge failed; fix conflicts and then commit the result. 163s 163s Original first commit: 163s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 163s Author: Loú User 163s Date: Thu Apr 7 22:13:15 2005 +0000 163s 163s a⇒1 on branch a 163s 163s Original second commit: 163s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 163s Author: Loú User 163s Date: Thu Apr 7 22:13:19 2005 +0000 163s 163s b⇒2 and a⇒0 on branch b 163s 163s There was a conflict merging commit 1-2, shown above. 163s Please resolve the conflict, commit the result, then type 163s 163s git-imerge continue 163s + git-imerge diagram --commits --frontier 163s 0 3 163s | | 163s 0 - **** - a 163s **.. 163s *#?? 163s *??? 163s 4 - *??? 163s | 163s b 163s 163s 0 3 163s | | 163s 0 - **** - a 163s **-+ 163s *#?? 163s *??? 163s 4 - *??? 163s | 163s b 163s 163s Key: 163s |,-,+ = rectangles forming current merge frontier 163s * = merge done manually 163s . = merge done automatically 163s # = conflict that is currently blocking progress 163s @ = merge was blocked but has been resolved 163s ? = no merge recorded 163s 163s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 163s + echo 1 163s + git add a.txt 163s + git-imerge continue --no-edit 163s + tee imerge-b-into-a-1-3.out 163s [imerge/b a05a45a] imerge 'b': manual merge 1-2 163s Merge has been recorded for merge 1-2. 163s Attempting automerge of 1-4...success. 163s Autofilling 1-3...success. 163s Autofilling 1-4...success. 163s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 163s Attempting automerge of 3-4...success. 163s Autofilling 2-4...success. 163s Autofilling 3-2...success. 163s Autofilling 3-3...success. 163s Autofilling 3-4 (first way)...success. 164s Autofilling 3-4 (second way)...success. 164s The two ways of autofilling 3-4 agree. 164s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 164s Merge is complete! 164s + grep -q Merge is complete imerge-b-into-a-1-3.out 164s + git-imerge diagram --commits --frontier 164s 0 3 164s | | 164s 0 - **** - a 164s **.. 164s **?. 164s *.?. 164s 4 - *... 164s | 164s b 164s 164s 0 3 164s | | 164s 0 - **** - a 164s **.| 164s **?| 164s *.?| 164s 4 - *--+ 164s | 164s b 164s 164s Key: 164s |,-,+ = rectangles forming current merge frontier 164s * = merge done manually 164s . = merge done automatically 164s # = conflict that is currently blocking progress 164s @ = merge was blocked but has been resolved 164s ? = no merge recorded 164s 164s + GIT_EDITOR=cat git-imerge finish 164s Merge b into a (using imerge) 164s 164s # Please enter the commit message for your changes. Lines starting 164s # with '#' will be ignored, and an empty message aborts the commit. 164s # 164s # Date: Sat Dec 6 03:01:12 2025 +0000 164s # 164s # On branch b-into-a-1 164s # Changes to be committed: 164s # new file: b.txt 164s # 164s [b-into-a-1 2678dad] Merge b into a (using imerge) 164s Date: Sat Dec 6 03:01:12 2025 +0000 164s + test_merge a-into-b-1 b a 1-1 2-1 164s + local name=a-into-b-1 164s + local dst=b 164s + local src=a 164s + local conflict1=1-1 164s + local conflict2=2-1 164s + git checkout b 164s Switched to branch 'b' 164s + git-imerge merge --branch=a-into-b-1 a 164s + tee imerge-a-into-b-1-1.out 164s Attempting automerge of 4-3...success. 164s Autofilling 1-3...unexpected conflict. Backtracking... 164s Autofilling 1-2...unexpected conflict. Backtracking... 164s Autofilling 1-1...unexpected conflict. Backtracking... 164s Switched to branch 'imerge/a' 164s Auto-merging a.txt 164s CONFLICT (content): Merge conflict in a.txt 164s Automatic merge failed; fix conflicts and then commit the result. 164s 164s Original first commit: 164s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 164s Author: Loú User 164s Date: Thu Apr 7 22:13:18 2005 +0000 164s 164s b⇒1 and a⇒X on branch b 164s 164s Original second commit: 164s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 164s Author: Loú User 164s Date: Thu Apr 7 22:13:15 2005 +0000 164s 164s a⇒1 on branch a 164s 164s There was a conflict merging commit 1-1, shown above. 164s Please resolve the conflict, commit the result, then type 164s 164s git-imerge continue 164s + git-imerge diagram --commits --frontier 164s 0 4 164s | | 164s 0 - ***** - b 164s *#??? 164s *???? 164s 3 - *???? 164s | 164s a 164s 164s 0 4 164s | | 164s 0 - ***** - b 164s *#??? 164s *???? 164s 3 - *???? 164s | 164s a 164s 164s Key: 164s |,-,+ = rectangles forming current merge frontier 164s * = merge done manually 164s . = merge done automatically 164s # = conflict that is currently blocking progress 164s @ = merge was blocked but has been resolved 164s ? = no merge recorded 164s 164s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 164s + echo 1 164s + git add a.txt 164s + git-imerge continue --no-edit 164s + tee imerge-a-into-b-1-2.out 164s [imerge/a 458058b] imerge 'a': manual merge 1-1 164s Merge has been recorded for merge 1-1. 164s Attempting automerge of 1-3...success. 164s Autofilling 1-2...success. 164s Autofilling 1-3...success. 164s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 164s Attempting automerge of 4-3...failure. 164s Attempting automerge of 2-1...failure. 164s Switched to branch 'imerge/a' 164s Auto-merging a.txt 164s CONFLICT (content): Merge conflict in a.txt 164s Automatic merge failed; fix conflicts and then commit the result. 164s 164s Original first commit: 164s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 164s Author: Loú User 164s Date: Thu Apr 7 22:13:19 2005 +0000 164s 164s b⇒2 and a⇒0 on branch b 164s 164s Original second commit: 164s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 164s Author: Loú User 164s Date: Thu Apr 7 22:13:15 2005 +0000 164s 164s a⇒1 on branch a 164s 164s There was a conflict merging commit 2-1, shown above. 164s Please resolve the conflict, commit the result, then type 164s 164s git-imerge continue 164s + git-imerge diagram --commits --frontier 164s 0 4 164s | | 164s 0 - ***** - b 164s **#?? 164s *.??? 164s 3 - *.??? 164s | 164s a 164s 164s 0 4 164s | | 164s 0 - ***** - b 164s **#?? 164s *|??? 164s 3 - *+??? 164s | 164s a 164s 164s Key: 164s |,-,+ = rectangles forming current merge frontier 164s * = merge done manually 164s . = merge done automatically 164s # = conflict that is currently blocking progress 164s @ = merge was blocked but has been resolved 164s ? = no merge recorded 164s 164s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 164s + echo 1 164s + git add a.txt 164s + git-imerge continue --no-edit 164s + tee imerge-a-into-b-1-3.out 164s [imerge/a 8ea0017] imerge 'a': manual merge 2-1 164s Merge has been recorded for merge 2-1. 164s Attempting automerge of 2-3...success. 164s Autofilling 2-2...success. 164s Autofilling 2-3...success. 164s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 164s Attempting automerge of 4-3...success. 164s Autofilling 3-3...success. 164s Autofilling 4-1...success. 164s Autofilling 4-2...success. 165s Autofilling 4-3 (first way)...success. 165s Autofilling 4-3 (second way)...success. 165s The two ways of autofilling 4-3 agree. 165s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 165s Merge is complete! 165s + grep -q Merge is complete imerge-a-into-b-1-3.out 165s + git-imerge diagram --commits --frontier 165s 0 4 165s | | 165s 0 - ***** - b 165s ***?. 165s *..?. 165s 3 - *.... 165s | 165s a 165s 165s 0 4 165s | | 165s 0 - ***** - b 165s ***?| 165s *..?| 165s 3 - *---+ 165s | 165s a 165s 165s Key: 165s |,-,+ = rectangles forming current merge frontier 165s * = merge done manually 165s . = merge done automatically 165s # = conflict that is currently blocking progress 165s @ = merge was blocked but has been resolved 165s ? = no merge recorded 165s 165s + GIT_EDITOR=cat git-imerge finish 165s Merge a into b (using imerge) 165s 165s # Please enter the commit message for your changes. Lines starting 165s # with '#' will be ignored, and an empty message aborts the commit. 165s # 165s # Date: Sat Dec 6 03:01:13 2025 +0000 165s # 165s # On branch a-into-b-1 165s # Changes to be committed: 165s # modified: a.txt 165s # 165s [a-into-b-1 f33e514] Merge a into b (using imerge) 165s Date: Sat Dec 6 03:01:13 2025 +0000 165s + flip_flop_test 2 165s + local n=2 165s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 165s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 165s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s + local description=git-imerge test repository with a commit and its revert at n=2 165s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 165s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s + local description=git-imerge test repository with a commit and its revert at n=2 165s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2/.git/ 165s hint: Using 'master' as the name for the initial branch. This default branch name 165s hint: is subject to change. To configure the initial branch name to use in all 165s hint: of your new repositories, which will suppress this warning, call: 165s hint: 165s hint: git config --global init.defaultBranch 165s hint: 165s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 165s hint: 'development'. The just-created branch can be renamed via this command: 165s hint: 165s hint: git branch -m 165s hint: 165s hint: Disable this message with "git config set advice.defaultBranchName false" 165s + echo git-imerge test repository with a commit and its revert at n=2 165s + printf %s\n /*.out /*.css /*.html 165s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2/.git config user.name Loú User 165s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 165s + TIME=1112911993 165s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-2 165s + modify a.txt 0 165s + filename=a.txt 165s + text=0 165s + echo 0 165s + git add a.txt 165s + commit -m m⇒0 165s + TIME=1112911994 165s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 165s [master (root-commit) a733afa] m⇒0 165s 1 file changed, 1 insertion(+) 165s create mode 100644 a.txt 165s + git checkout -b a -- 165s Switched to a new branch 'a' 165s + modify a.txt 1 165s + filename=a.txt 165s + text=1 165s + echo 1 165s + git add a.txt 165s + commit -m a⇒1 on branch a 165s + TIME=1112911995 165s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 165s [a 2f1f75a] a⇒1 on branch a 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + modify a.txt 2 165s + filename=a.txt 165s + text=2 165s + echo 2 165s + git add a.txt 165s + commit -m a⇒2 on branch a 165s + TIME=1112911996 165s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 165s + modify a.txt 3 165s + filename=a.txt 165s + text=3 165s + echo 3 165s + git add a.txt 165s [a 4700669] a⇒2 on branch a 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + commit -m a⇒3 on branch a 165s + TIME=1112911997 165s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 165s [a 621c381] a⇒3 on branch a 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + git checkout -b b master -- 165s Switched to a new branch 'b' 165s + modify b.txt 1 165s + filename=b.txt 165s + text=1 165s + echo 1 165s + git add b.txt 165s + msg=b⇒1 165s + test 1 = 2 165s + test 1 = 3 165s + commit -m b⇒1 on branch b 165s + TIME=1112911998 165s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 165s [b 1f7d097] b⇒1 on branch b 165s 1 file changed, 1 insertion(+) 165s create mode 100644 b.txt 165s + modify b.txt 2 165s + filename=b.txt 165s + text=2 165s + echo 2 165s + git add b.txt 165s + msg=b⇒2 165s + test 2 = 2 165s + modify a.txt X 165s + filename=a.txt 165s + text=X 165s + echo X 165s + git add a.txt 165s + msg=b⇒2 and a⇒X 165s + test 2 = 3 165s + commit -m b⇒2 and a⇒X on branch b 165s + TIME=1112911999 165s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 165s [b 48df77d] b⇒2 and a⇒X on branch b 165s 2 files changed, 2 insertions(+), 2 deletions(-) 165s + modify b.txt 3 165s + filename=b.txt 165s + text=3 165s + echo 3 165s + git add b.txt 165s + msg=b⇒3 165s + test 3 = 2 165s + test 3 = 3 165s + modify a.txt 0 165s + filename=a.txt 165s + text=0 165s + echo 0 165s + git add a.txt 165s + msg=b⇒3 and a⇒0 165s + commit -m b⇒3 and a⇒0 on branch b 165s + TIME=1112912000 165s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 165s [b f3ef019] b⇒3 and a⇒0 on branch b 165s 2 files changed, 2 insertions(+), 2 deletions(-) 165s + modify b.txt 4 165s + filename=b.txt 165s + text=4 165s + echo 4 165s + git add b.txt 165s + msg=b⇒4 165s + test 4 = 2 165s + test 4 = 3 165s + commit -m b⇒4 on branch b 165s + TIME=1112912001 165s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 165s [b 69d0c21] b⇒4 on branch b 165s 1 file changed, 1 insertion(+), 1 deletion(-) 165s + test_merge b-into-a-2 a b 1-2 1-3 165s + local name=b-into-a-2 165s + local dst=a 165s + local src=b 165s + local conflict1=1-2 165s + local conflict2=1-3 165s + git checkout a 165s Switched to branch 'a' 165s + git-imerge merge --branch=b-into-a-2 b 165s + tee imerge-b-into-a-2-1.out 165s Attempting automerge of 3-4...success. 165s Autofilling 1-4...success. 165s Autofilling 2-4...success. 165s Autofilling 3-1...success. 165s Autofilling 3-2...unexpected conflict. Backtracking... 165s Autofilling 1-4...success. 165s Autofilling 2-1...success. 165s Autofilling 2-2...unexpected conflict. Backtracking... 165s Autofilling 1-1...success. 165s Autofilling 1-2...unexpected conflict. Backtracking... 165s Autofilling 1-1...success. 165s Autofilling 2-1...success. 165s Autofilling 3-1...success. 165s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 165s Attempting automerge of 3-4...success. 165s Autofilling 1-4...success. 165s Autofilling 2-4...success. 165s Autofilling 3-2...unexpected conflict. Backtracking... 165s Autofilling 1-4...success. 165s Autofilling 2-2...unexpected conflict. Backtracking... 165s Autofilling 1-2...unexpected conflict. Backtracking... 165s Switched to branch 'imerge/b' 165s Auto-merging a.txt 165s CONFLICT (content): Merge conflict in a.txt 165s Automatic merge failed; fix conflicts and then commit the result. 165s 165s Original first commit: 165s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 165s Author: Loú User 165s Date: Thu Apr 7 22:13:15 2005 +0000 165s 165s a⇒1 on branch a 165s 165s Original second commit: 165s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 165s Author: Loú User 165s Date: Thu Apr 7 22:13:19 2005 +0000 165s 165s b⇒2 and a⇒X on branch b 165s 165s There was a conflict merging commit 1-2, shown above. 165s Please resolve the conflict, commit the result, then type 165s 165s git-imerge continue 165s + git-imerge diagram --commits --frontier 165s 0 3 165s | | 165s 0 - **** - a 165s *... 165s *#?? 165s *??? 165s 4 - *??? 165s | 165s b 165s 165s 0 3 165s | | 165s 0 - **** - a 165s *--+ 165s *#?? 165s *??? 165s 4 - *??? 165s | 165s b 165s 165s Key: 165s |,-,+ = rectangles forming current merge frontier 165s * = merge done manually 165s . = merge done automatically 165s # = conflict that is currently blocking progress 165s @ = merge was blocked but has been resolved 165s ? = no merge recorded 165s 165s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 165s + echo 1 165s + git add a.txt 165s + git-imerge continue --no-edit 165s + tee imerge-b-into-a-2-2.out 165s [imerge/b 17bc86c] imerge 'b': manual merge 1-2 165s Merge has been recorded for merge 1-2. 165s Attempting automerge of 1-4...failure. 165s Attempting automerge of 1-3...failure. 165s Attempting automerge of 3-2...success. 165s Autofilling 2-2...success. 165s Autofilling 3-2...success. 165s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 165s Previous HEAD position was c6ee20c imerge 'b': automatic merge 3-2 165s Switched to branch 'imerge/b' 165s Auto-merging a.txt 165s CONFLICT (content): Merge conflict in a.txt 165s Automatic merge failed; fix conflicts and then commit the result. 165s 165s Original first commit: 165s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 165s Author: Loú User 165s Date: Thu Apr 7 22:13:15 2005 +0000 165s 165s a⇒1 on branch a 165s 165s Original second commit: 165s commit f3ef01986be02ef5e40589b283c0385471ecca7d 165s Author: Loú User 165s Date: Thu Apr 7 22:13:20 2005 +0000 165s 165s b⇒3 and a⇒0 on branch b 165s 165s There was a conflict merging commit 1-3, shown above. 165s Please resolve the conflict, commit the result, then type 165s 165s git-imerge continue 165s + git-imerge diagram --commits --frontier 165s 0 3 165s | | 165s 0 - **** - a 165s *... 165s **.. 165s *#?? 165s 4 - *??? 165s | 165s b 165s 165s 0 3 165s | | 165s 0 - **** - a 165s *..| 165s **-+ 165s *#?? 165s 4 - *??? 165s | 165s b 165s 165s Key: 165s |,-,+ = rectangles forming current merge frontier 165s * = merge done manually 165s . = merge done automatically 165s # = conflict that is currently blocking progress 165s @ = merge was blocked but has been resolved 165s ? = no merge recorded 165s 165s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 165s + echo 1 165s + git add a.txt 165s + git-imerge continue --no-edit 165s + tee imerge-b-into-a-2-3.out 166s [imerge/b 4e3fd6f] imerge 'b': manual merge 1-3 166s Merge has been recorded for merge 1-3. 166s Attempting automerge of 1-4...success. 166s Autofilling 1-4...success. 166s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 166s Attempting automerge of 3-4...success. 166s Autofilling 2-4...success. 166s Autofilling 3-3...success. 166s Autofilling 3-4 (first way)...success. 166s Autofilling 3-4 (second way)...success. 166s The two ways of autofilling 3-4 agree. 166s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 166s Merge is complete! 166s + grep -q Merge is complete imerge-b-into-a-2-3.out 166s + git-imerge diagram --commits --frontier 166s 0 3 166s | | 166s 0 - **** - a 166s *... 166s **.. 166s **?. 166s 4 - *... 166s | 166s b 166s 166s 0 3 166s | | 166s 0 - **** - a 166s *..| 166s **.| 166s **?| 166s 4 - *--+ 166s | 166s b 166s 166s Key: 166s |,-,+ = rectangles forming current merge frontier 166s * = merge done manually 166s . = merge done automatically 166s # = conflict that is currently blocking progress 166s @ = merge was blocked but has been resolved 166s ? = no merge recorded 166s 166s + GIT_EDITOR=cat git-imerge finish 166s Merge b into a (using imerge) 166s 166s # Please enter the commit message for your changes. Lines starting 166s # with '#' will be ignored, and an empty message aborts the commit. 166s # 166s # Date: Sat Dec 6 03:01:14 2025 +0000 166s # 166s # On branch b-into-a-2 166s # Changes to be committed: 166s # new file: b.txt 166s # 166s [b-into-a-2 ae47886] Merge b into a (using imerge) 166s Date: Sat Dec 6 03:01:14 2025 +0000 166s + test_merge a-into-b-2 b a 2-1 3-1 166s + local name=a-into-b-2 166s + local dst=b 166s + local src=a 166s + local conflict1=2-1 166s + local conflict2=3-1 166s + git checkout b 166s Switched to branch 'b' 166s + git-imerge merge --branch=a-into-b-2 a 166s + tee imerge-a-into-b-2-1.out 166s Attempting automerge of 4-3...success. 166s Autofilling 1-3...success. 166s Autofilling 2-3...unexpected conflict. Backtracking... 166s Autofilling 1-1...success. 166s Autofilling 1-2...success. 166s Autofilling 1-3...success. 166s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 166s Autofilling 2-2...unexpected conflict. Backtracking... 166s Autofilling 2-1...unexpected conflict. Backtracking... 166s Switched to branch 'imerge/a' 166s Auto-merging a.txt 166s CONFLICT (content): Merge conflict in a.txt 166s Automatic merge failed; fix conflicts and then commit the result. 166s 166s Original first commit: 166s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 166s Author: Loú User 166s Date: Thu Apr 7 22:13:19 2005 +0000 166s 166s b⇒2 and a⇒X on branch b 166s 166s Original second commit: 166s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 166s Author: Loú User 166s Date: Thu Apr 7 22:13:15 2005 +0000 166s 166s a⇒1 on branch a 166s 166s There was a conflict merging commit 2-1, shown above. 166s Please resolve the conflict, commit the result, then type 166s 166s git-imerge continue 166s + git-imerge diagram --commits --frontier 166s 0 4 166s | | 166s 0 - ***** - b 166s *.#?? 166s *.??? 166s 3 - *.??? 166s | 166s a 166s 166s 0 4 166s | | 166s 0 - ***** - b 166s *|#?? 166s *|??? 166s 3 - *+??? 166s | 166s a 166s 166s Key: 166s |,-,+ = rectangles forming current merge frontier 166s * = merge done manually 166s . = merge done automatically 166s # = conflict that is currently blocking progress 166s @ = merge was blocked but has been resolved 166s ? = no merge recorded 166s 166s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 166s + echo 1 166s + git add a.txt 166s + git-imerge continue --no-edit 166s + tee imerge-a-into-b-2-2.out 166s [imerge/a d1340a9] imerge 'a': manual merge 2-1 166s Merge has been recorded for merge 2-1. 166s Attempting automerge of 2-3...success. 166s Autofilling 2-2...success. 166s Autofilling 2-3...success. 166s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 166s Attempting automerge of 4-3...failure. 166s Attempting automerge of 3-1...failure. 166s Switched to branch 'imerge/a' 166s Auto-merging a.txt 166s CONFLICT (content): Merge conflict in a.txt 166s Automatic merge failed; fix conflicts and then commit the result. 166s 166s Original first commit: 166s commit f3ef01986be02ef5e40589b283c0385471ecca7d 166s Author: Loú User 166s Date: Thu Apr 7 22:13:20 2005 +0000 166s 166s b⇒3 and a⇒0 on branch b 166s 166s Original second commit: 166s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 166s Author: Loú User 166s Date: Thu Apr 7 22:13:15 2005 +0000 166s 166s a⇒1 on branch a 166s 166s There was a conflict merging commit 3-1, shown above. 166s Please resolve the conflict, commit the result, then type 166s 166s git-imerge continue 166s + git-imerge diagram --commits --frontier 166s 0 4 166s | | 166s 0 - ***** - b 166s *.*#? 166s *..?? 166s 3 - *..?? 166s | 166s a 166s 166s 0 4 166s | | 166s 0 - ***** - b 166s *.*#? 166s *.|?? 166s 3 - *-+?? 166s | 166s a 166s 166s Key: 166s |,-,+ = rectangles forming current merge frontier 166s * = merge done manually 166s . = merge done automatically 166s # = conflict that is currently blocking progress 166s @ = merge was blocked but has been resolved 166s ? = no merge recorded 166s 166s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 166s + echo 1 166s + git add a.txt 166s + git-imerge continue --no-edit 166s + tee imerge-a-into-b-2-3.out 166s [imerge/a 0d0a8eb] imerge 'a': manual merge 3-1 166s Merge has been recorded for merge 3-1. 166s Attempting automerge of 3-3...success. 166s Autofilling 3-2...success. 166s Autofilling 3-3...success. 166s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 166s Attempting automerge of 4-3...success. 166s Autofilling 4-1...success. 166s Autofilling 4-2...success. 167s Autofilling 4-3...success. 167s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 167s Merge is complete! 167s + grep -q Merge is complete imerge-a-into-b-2-3.out 167s + git-imerge diagram --commits --frontier 167s 0 4 167s | | 167s 0 - ***** - b 167s *.**. 167s *.... 167s 3 - *.... 167s | 167s a 167s 167s 0 4 167s | | 167s 0 - ***** - b 167s *.**| 167s *...| 167s 3 - *---+ 167s | 167s a 167s 167s Key: 167s |,-,+ = rectangles forming current merge frontier 167s * = merge done manually 167s . = merge done automatically 167s # = conflict that is currently blocking progress 167s @ = merge was blocked but has been resolved 167s ? = no merge recorded 167s 167s + GIT_EDITOR=cat git-imerge finish 167s Merge a into b (using imerge) 167s 167s # Please enter the commit message for your changes. Lines starting 167s # with '#' will be ignored, and an empty message aborts the commit. 167s # 167s # Date: Sat Dec 6 03:01:15 2025 +0000 167s # 167s # On branch a-into-b-2 167s # Changes to be committed: 167s # modified: a.txt 167s # 167s [a-into-b-2 f3e49ee] Merge a into b (using imerge) 167s Date: Sat Dec 6 03:01:15 2025 +0000 167s + flip_flop_test 3 167s + local n=3 167s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 167s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 167s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s + local description=git-imerge test repository with a commit and its revert at n=3 167s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 167s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s + local description=git-imerge test repository with a commit and its revert at n=3 167s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3/.git/ 167s hint: Using 'master' as the name for the initial branch. This default branch name 167s hint: is subject to change. To configure the initial branch name to use in all 167s hint: of your new repositories, which will suppress this warning, call: 167s hint: 167s hint: git config --global init.defaultBranch 167s hint: 167s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 167s hint: 'development'. The just-created branch can be renamed via this command: 167s hint: 167s hint: git branch -m 167s hint: 167s hint: Disable this message with "git config set advice.defaultBranchName false" 167s + echo git-imerge test repository with a commit and its revert at n=3 167s + printf %s\n /*.out /*.css /*.html 167s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3/.git config user.name Loú User 167s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 167s + TIME=1112911993 167s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/flip-flop-3 167s + modify a.txt 0 167s + filename=a.txt 167s + text=0 167s + echo 0 167s + git add a.txt 167s + commit -m m⇒0 167s + TIME=1112911994 167s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 167s [master (root-commit) a733afa] m⇒0 167s 1 file changed, 1 insertion(+) 167s create mode 100644 a.txt 167s + git checkout -b a -- 167s Switched to a new branch 'a' 167s + modify a.txt 1 167s + filename=a.txt 167s + text=1 167s + echo 1 167s + git add a.txt 167s + commit -m a⇒1 on branch a 167s + TIME=1112911995 167s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 167s [a 2f1f75a] a⇒1 on branch a 167s 1 file changed, 1 insertion(+), 1 deletion(-) 167s + modify a.txt 2 167s + filename=a.txt 167s + text=2 167s + echo 2 167s + git add a.txt 167s + commit -m a⇒2 on branch a 167s + TIME=1112911996 167s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 167s + modify a.txt 3 167s + filename=a.txt 167s + text=3 167s + echo 3 167s [a 4700669] a⇒2 on branch a 167s 1 file changed, 1 insertion(+), 1 deletion(-) 167s + git add a.txt 167s + commit -m a⇒3 on branch a 167s + TIME=1112911997 167s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 167s [a 621c381] a⇒3 on branch a 167s 1 file changed, 1 insertion(+), 1 deletion(-) 167s + git checkout -b b master -- 167s Switched to a new branch 'b' 167s + modify b.txt 1 167s + filename=b.txt 167s + text=1 167s + echo 1 167s + git add b.txt 167s + msg=b⇒1 167s + test 1 = 3 167s + test 1 = 4 167s + commit -m b⇒1 on branch b 167s + TIME=1112911998 167s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 167s [b 1f7d097] b⇒1 on branch b 167s 1 file changed, 1 insertion(+) 167s create mode 100644 b.txt 167s + modify b.txt 2 167s + filename=b.txt 167s + text=2 167s + echo 2 167s + git add b.txt 167s + msg=b⇒2 167s + test 2 = 3 167s + test 2 = 4 167s + commit -m b⇒2 on branch b 167s + TIME=1112911999 167s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 167s [b ce671e9] b⇒2 on branch b 167s 1 file changed, 1 insertion(+), 1 deletion(-) 167s + modify b.txt 3 167s + filename=b.txt 167s + text=3 167s + echo 3 167s + git add b.txt 167s + msg=b⇒3 167s + test 3 = 3 167s + modify a.txt X 167s + filename=a.txt 167s + text=X 167s + echo X 167s + git add a.txt 167s + msg=b⇒3 and a⇒X 167s + test 3 = 4 167s + commit -m b⇒3 and a⇒X on branch b 167s + TIME=1112912000 167s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 167s [b d40495e] b⇒3 and a⇒X on branch b 167s 2 files changed, 2 insertions(+), 2 deletions(-) 167s + modify b.txt 4 167s + filename=b.txt 167s + text=4 167s + echo 4 167s + git add b.txt 167s + msg=b⇒4 167s + test 4 = 3 167s + test 4 = 4 167s + modify a.txt 0 167s + filename=a.txt 167s + text=0 167s + echo 0 167s + git add a.txt 167s + msg=b⇒4 and a⇒0 167s + commit -m b⇒4 and a⇒0 on branch b 167s + TIME=1112912001 167s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 167s + test_merge b-into-a-3 a b 1-3 1-4 167s + local name=b-into-a-3 167s + local dst=a 167s + local src=b 167s + local conflict1=1-3 167s + local conflict2=1-4 167s + git checkout a 167s [b eb736f2] b⇒4 and a⇒0 on branch b 167s 2 files changed, 2 insertions(+), 2 deletions(-) 167s Switched to branch 'a' 167s + git-imerge merge --branch=b-into-a-3 b 167s + tee imerge-b-into-a-3-1.out 167s Attempting automerge of 3-4...success. 167s Autofilling 1-4...success. 167s Autofilling 2-4...success. 167s Autofilling 3-1...success. 167s Autofilling 3-2...success. 167s Autofilling 3-3...unexpected conflict. Backtracking... 167s Autofilling 1-4...success. 167s Autofilling 2-1...success. 167s Autofilling 2-2...success. 167s Autofilling 2-3...unexpected conflict. Backtracking... 167s Autofilling 1-1...success. 167s Autofilling 1-2...success. 167s Autofilling 1-3...unexpected conflict. Backtracking... 167s Autofilling 1-2...success. 167s Autofilling 2-2...success. 167s Autofilling 3-1...success. 167s Autofilling 3-2 (first way)...success. 167s Autofilling 3-2 (second way)...success. 167s The two ways of autofilling 3-2 agree. 167s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 167s Attempting automerge of 3-4...success. 167s Autofilling 1-4...success. 167s Autofilling 2-4...success. 167s Autofilling 3-3...unexpected conflict. Backtracking... 167s Autofilling 1-4...success. 167s Autofilling 2-3...unexpected conflict. Backtracking... 167s Autofilling 1-3...unexpected conflict. Backtracking... 167s Switched to branch 'imerge/b' 167s Auto-merging a.txt 167s CONFLICT (content): Merge conflict in a.txt 167s Automatic merge failed; fix conflicts and then commit the result. 167s 167s Original first commit: 167s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 167s Author: Loú User 167s Date: Thu Apr 7 22:13:15 2005 +0000 167s 167s a⇒1 on branch a 167s 167s Original second commit: 167s commit d40495ed379f376841e517047f90b663e8c7c7e1 167s Author: Loú User 167s Date: Thu Apr 7 22:13:20 2005 +0000 167s 167s b⇒3 and a⇒X on branch b 167s 167s There was a conflict merging commit 1-3, shown above. 167s Please resolve the conflict, commit the result, then type 167s 167s git-imerge continue 167s + git-imerge diagram --commits --frontier 167s 0 3 167s | | 167s 0 - **** - a 167s *??. 167s *... 167s *#?? 167s 4 - *??? 167s | 167s b 167s 167s 0 3 167s | | 167s 0 - **** - a 167s *??| 167s *--+ 167s *#?? 167s 4 - *??? 167s | 167s b 167s 167s Key: 167s |,-,+ = rectangles forming current merge frontier 167s * = merge done manually 167s . = merge done automatically 167s # = conflict that is currently blocking progress 167s @ = merge was blocked but has been resolved 167s ? = no merge recorded 167s 167s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 167s + echo 1 167s + git add a.txt 167s + git-imerge continue --no-edit 167s + tee imerge-b-into-a-3-2.out 167s [imerge/b 998d688] imerge 'b': manual merge 1-3 167s Merge has been recorded for merge 1-3. 167s Attempting automerge of 1-4...failure. 167s Attempting automerge of 1-4...failure. 167s Attempting automerge of 3-3...success. 167s Autofilling 2-3...success. 167s Autofilling 3-3...success. 167s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 167s Previous HEAD position was 01f152d imerge 'b': automatic merge 3-3 167s Switched to branch 'imerge/b' 167s Auto-merging a.txt 167s CONFLICT (content): Merge conflict in a.txt 167s Automatic merge failed; fix conflicts and then commit the result. 167s 167s Original first commit: 167s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 167s Author: Loú User 167s Date: Thu Apr 7 22:13:15 2005 +0000 167s 167s a⇒1 on branch a 167s 167s Original second commit: 167s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 167s Author: Loú User 167s Date: Thu Apr 7 22:13:21 2005 +0000 167s 167s b⇒4 and a⇒0 on branch b 167s 167s There was a conflict merging commit 1-4, shown above. 167s Please resolve the conflict, commit the result, then type 167s 167s git-imerge continue 167s + git-imerge diagram --commits --frontier 167s 0 3 167s | | 167s 0 - **** - a 167s *??. 167s *... 167s **.. 167s 4 - *#?? 167s | 167s b 167s 167s 0 3 167s | | 167s 0 - **** - a 167s *??| 167s *..| 167s **-+ 167s 4 - *#?? 167s | 167s b 167s 167s Key: 167s |,-,+ = rectangles forming current merge frontier 167s * = merge done manually 167s . = merge done automatically 167s # = conflict that is currently blocking progress 167s @ = merge was blocked but has been resolved 167s ? = no merge recorded 167s 167s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 167s + echo 1 167s + git add a.txt 167s + git-imerge continue --no-edit 167s + tee imerge-b-into-a-3-3.out 168s [imerge/b 670bb0a] imerge 'b': manual merge 1-4 168s Merge has been recorded for merge 1-4. 168s Attempting automerge of 3-4...success. 168s Autofilling 2-4...success. 168s Autofilling 3-4...success. 168s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 168s Merge is complete! 168s + grep -q Merge is complete imerge-b-into-a-3-3.out 168s + git-imerge diagram --commits --frontier 168s 0 3 168s | | 168s 0 - **** - a 168s *??. 168s *... 168s **.. 168s 4 - **.. 168s | 168s b 168s 168s 0 3 168s | | 168s 0 - **** - a 168s *??| 168s *..| 168s **.| 168s 4 - **-+ 168s | 168s b 168s 168s Key: 168s |,-,+ = rectangles forming current merge frontier 168s * = merge done manually 168s . = merge done automatically 168s # = conflict that is currently blocking progress 168s @ = merge was blocked but has been resolved 168s ? = no merge recorded 168s 168s + GIT_EDITOR=cat git-imerge finish 168s Merge b into a (using imerge) 168s 168s # Please enter the commit message for your changes. Lines starting 168s # with '#' will be ignored, and an empty message aborts the commit. 168s # 168s # Date: Sat Dec 6 03:01:16 2025 +0000 168s # 168s # On branch b-into-a-3 168s # Changes to be committed: 168s # new file: b.txt 168s # 168s [b-into-a-3 1207cb6] Merge b into a (using imerge) 168s Date: Sat Dec 6 03:01:16 2025 +0000 168s + test_merge a-into-b-3 b a 3-1 4-1 168s + local name=a-into-b-3 168s + local dst=b 168s + local src=a 168s + local conflict1=3-1 168s + local conflict2=4-1 168s + git checkout b 168s Switched to branch 'b' 168s + git-imerge merge --branch=a-into-b-3 a 168s + tee imerge-a-into-b-3-1.out 168s Attempting automerge of 4-3...success. 168s Autofilling 1-3...success. 168s Autofilling 2-3...success. 168s Autofilling 3-3...unexpected conflict. Backtracking... 168s Autofilling 1-3...success. 168s Autofilling 2-1...success. 168s Autofilling 2-2...success. 168s Autofilling 2-3 (first way)...success. 168s Autofilling 2-3 (second way)...success. 168s The two ways of autofilling 2-3 agree. 168s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 168s Autofilling 3-2...unexpected conflict. Backtracking... 168s Autofilling 3-1...unexpected conflict. Backtracking... 168s Switched to branch 'imerge/a' 168s Auto-merging a.txt 168s CONFLICT (content): Merge conflict in a.txt 168s Automatic merge failed; fix conflicts and then commit the result. 168s 168s Original first commit: 168s commit d40495ed379f376841e517047f90b663e8c7c7e1 168s Author: Loú User 168s Date: Thu Apr 7 22:13:20 2005 +0000 168s 168s b⇒3 and a⇒X on branch b 168s 168s Original second commit: 168s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 168s Author: Loú User 168s Date: Thu Apr 7 22:13:15 2005 +0000 168s 168s a⇒1 on branch a 168s 168s There was a conflict merging commit 3-1, shown above. 168s Please resolve the conflict, commit the result, then type 168s 168s git-imerge continue 168s + git-imerge diagram --commits --frontier 168s 0 4 168s | | 168s 0 - ***** - b 168s *?.#? 168s *?.?? 168s 3 - *..?? 168s | 168s a 168s 168s 0 4 168s | | 168s 0 - ***** - b 168s *?|#? 168s *?|?? 168s 3 - *-+?? 168s | 168s a 168s 168s Key: 168s |,-,+ = rectangles forming current merge frontier 168s * = merge done manually 168s . = merge done automatically 168s # = conflict that is currently blocking progress 168s @ = merge was blocked but has been resolved 168s ? = no merge recorded 168s 168s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 168s + echo 1 168s + git add a.txt 168s + git-imerge continue --no-edit 168s + tee imerge-a-into-b-3-2.out 168s [imerge/a 8d28f17] imerge 'a': manual merge 3-1 168s Merge has been recorded for merge 3-1. 168s Attempting automerge of 3-3...success. 168s Autofilling 3-2...success. 168s Autofilling 3-3...success. 168s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 168s Attempting automerge of 4-3...failure. 168s Attempting automerge of 4-1...failure. 168s Switched to branch 'imerge/a' 168s Auto-merging a.txt 168s CONFLICT (content): Merge conflict in a.txt 168s Automatic merge failed; fix conflicts and then commit the result. 168s 168s Original first commit: 168s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 168s Author: Loú User 168s Date: Thu Apr 7 22:13:21 2005 +0000 168s 168s b⇒4 and a⇒0 on branch b 168s 168s Original second commit: 168s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 168s Author: Loú User 168s Date: Thu Apr 7 22:13:15 2005 +0000 168s 168s a⇒1 on branch a 168s 168s There was a conflict merging commit 4-1, shown above. 168s Please resolve the conflict, commit the result, then type 168s 168s git-imerge continue 168s + git-imerge diagram --commits --frontier 168s 0 4 168s | | 168s 0 - ***** - b 168s *?.*# 168s *?..? 168s 3 - *...? 168s | 168s a 168s 168s 0 4 168s | | 168s 0 - ***** - b 168s *?.*# 168s *?.|? 168s 3 - *--+? 168s | 168s a 168s 168s Key: 168s |,-,+ = rectangles forming current merge frontier 168s * = merge done manually 168s . = merge done automatically 168s # = conflict that is currently blocking progress 168s @ = merge was blocked but has been resolved 168s ? = no merge recorded 168s 168s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 168s + echo 1 168s + git add a.txt 168s + git-imerge continue --no-edit 168s + tee imerge-a-into-b-3-3.out 168s [imerge/a 7e7e201] imerge 'a': manual merge 4-1 168s Merge has been recorded for merge 4-1. 169s Attempting automerge of 4-3...success. 169s Autofilling 4-2...success. 169s Autofilling 4-3...success. 169s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 169s Merge is complete! 169s + grep -q Merge is complete imerge-a-into-b-3-3.out 169s + git-imerge diagram --commits --frontier 169s 0 4 169s | | 169s 0 - ***** - b 169s *?.** 169s *?... 169s 3 - *.... 169s | 169s a 169s 169s 0 4 169s | | 169s 0 - ***** - b 169s *?.** 169s *?..| 169s 3 - *---+ 169s | 169s a 169s 169s Key: 169s |,-,+ = rectangles forming current merge frontier 169s * = merge done manually 169s . = merge done automatically 169s # = conflict that is currently blocking progress 169s @ = merge was blocked but has been resolved 169s ? = no merge recorded 169s 169s + GIT_EDITOR=cat git-imerge finish 169s Merge a into b (using imerge) 169s 169s # Please enter the commit message for your changes. Lines starting 169s # with '#' will be ignored, and an empty message aborts the commit. 169s # 169s # Date: Sat Dec 6 03:01:17 2025 +0000 169s # 169s # On branch a-into-b-3 169s # Changes to be committed: 169s # modified: a.txt 169s # 169s [a-into-b-3 f16dfc4] Merge a into b (using imerge) 169s Date: Sat Dec 6 03:01:17 2025 +0000 169s py313: commands[5] /tmp/autopkgtest.1QY9Oo/build.ZBk/src> /bin/sh t/test-drop 169s + dirname t/test-drop 169s + cd t 169s + pwd 169s + dirname /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t 169s + BASE=/tmp/autopkgtest.1QY9Oo/build.ZBk/src 169s + . /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/test-lib.sh 169s + GIT_IMERGE=git-imerge 169s + TMP=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s + DESCRIPTION=git-imerge drop test repository 169s + init_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop git-imerge drop test repository 169s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s + local description=git-imerge drop test repository 169s + delete_test_repo /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop git-imerge drop test repository 169s + local path=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s + local description=git-imerge drop test repository 169s + test -d /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s + mkdir -p /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s + git init /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s hint: Using 'master' as the name for the initial branch. This default branch name 169s hint: is subject to change. To configure the initial branch name to use in all 169s hint: of your new repositories, which will suppress this warning, call: 169s hint: 169s hint: git config --global init.defaultBranch 169s hint: 169s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 169s hint: 'development'. The just-created branch can be renamed via this command: 169s hint: 169s hint: git branch -m 169s hint: 169s hint: Disable this message with "git config set advice.defaultBranchName false" 169s Initialized empty Git repository in /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop/.git/ 169s + echo git-imerge drop test repository 169s + printf %s\n /*.out /*.css /*.html 169s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop/.git config user.name Loú User 169s + git --git-dir=/tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop/.git config user.email luser@example.com 169s + TIME=1112911993 169s + ln -s /tmp/autopkgtest.1QY9Oo/build.ZBk/src/imerge.css /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s + cd /tmp/autopkgtest.1QY9Oo/build.ZBk/src/t/tmp/drop 169s + modify a.txt 0 169s + filename=a.txt 169s + text=0 169s + echo 0 169s + git add a.txt 169s + commit -m m⇒0 169s + TIME=1112911994 169s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 169s [master (root-commit) a733afa] m⇒0 169s 1 file changed, 1 insertion(+) 169s create mode 100644 a.txt 169s + seq 6 169s + modify a1.txt 1 169s + filename=a1.txt 169s + text=1 169s + echo 1 169s + git add a1.txt 169s + commit -m a1⇒1 169s + TIME=1112911995 169s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 169s [master 389a4ba] a1⇒1 169s 1 file changed, 1 insertion(+) 169s create mode 100644 a1.txt 169s + modify a2.txt 2 169s + filename=a2.txt 169s + text=2 169s + echo 2 169s + git add a2.txt 169s + commit -m a2⇒2 169s + TIME=1112911996 169s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 169s [master 4785218] a2⇒2 169s 1 file changed, 1 insertion(+) 169s create mode 100644 a2.txt 169s + modify a3.txt 3 169s + filename=a3.txt 169s + text=3 169s + echo 3 169s + git add a3.txt 169s [master 34bdde3] a3⇒3 169s 1 file changed, 1 insertion(+) 169s create mode 100644 a3.txt 169s + commit -m a3⇒3 169s + TIME=1112911997 169s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 169s + modify a4.txt 4 169s + filename=a4.txt 169s + text=4 169s + echo 4 169s + git add a4.txt 169s + commit -m a4⇒4 169s + TIME=1112911998 169s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 169s [master c793a5a] a4⇒4 169s 1 file changed, 1 insertion(+) 169s create mode 100644 a4.txt 169s + modify a5.txt 5 169s + filename=a5.txt 169s + text=5 169s + echo 5 169s + git add a5.txt 169s + commit -m a5⇒5 169s + TIME=1112911999 169s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 169s [master b42f60c] a5⇒5 169s 1 file changed, 1 insertion(+) 169s create mode 100644 a5.txt 169s + modify a6.txt 6 169s + filename=a6.txt 169s + text=6 169s + echo 6 169s + git add a6.txt 169s + commit -m a6⇒6 169s + TIME=1112912000 169s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 169s [master 9d6aec5] a6⇒6 169s 1 file changed, 1 insertion(+) 169s create mode 100644 a6.txt 169s + git checkout -b dropped master 169s Switched to a new branch 'dropped' 169s + git-imerge drop HEAD~5..HEAD~3 169s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 169s 169s You are in 'detached HEAD' state. You can look around, make experimental 169s changes and commit them, and you can discard any commits you make in this 169s state without impacting any branches by switching back to a branch. 169s 169s If you want to create a new branch to retain commits you create, you may 169s do so (now or later) by using -c with the switch command. Example: 169s 169s git switch -c 169s 169s Or undo this operation with: 169s 169s git switch - 169s 169s Turn off this advice by setting config variable advice.detachedHead to false 169s 169s HEAD is now at 34bdde3 a3⇒3 169s [detached HEAD 97ae431] Revert "a3⇒3" 169s Date: Sat Dec 6 03:01:18 2025 +0000 169s 1 file changed, 1 deletion(-) 169s delete mode 100644 a3.txt 169s [detached HEAD 0b03d62] Revert "a2⇒2" 169s Date: Sat Dec 6 03:01:18 2025 +0000 169s 1 file changed, 1 deletion(-) 169s delete mode 100644 a2.txt 169s Attempting automerge of 3-2...success. 169s Autofilling 1-2...success. 169s Autofilling 2-2...success. 169s Autofilling 3-1...success. 169s Autofilling 3-2 (first way)...success. 169s Autofilling 3-2 (second way)...success. 169s The two ways of autofilling 3-2 agree. 169s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='0b03d6298d6b704c33d6487c6822cb82a55dcba3', goal='drop')[0:4,0:3]. 169s Merge is complete! 169s + git-imerge diagram --commits --frontier --html=imerge-drop.html 169s 0 3 169s | | 169s 0 - **** - dropped 169s *??. 169s 2 - *... 169s | 169s 0b03d6298d6b704c33d6487c6822cb82a55dcba3 169s 169s 0 3 169s | | 169s 0 - **** - dropped 169s *??| 169s 2 - *--+ 169s | 169s 0b03d6298d6b704c33d6487c6822cb82a55dcba3 169s 169s Key: 169s |,-,+ = rectangles forming current merge frontier 169s * = merge done manually 169s . = merge done automatically 169s # = conflict that is currently blocking progress 169s @ = merge was blocked but has been resolved 169s ? = no merge recorded 169s 169s + git-imerge finish 169s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 169s + local refname=dropped 169s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 169s + git rev-parse dropped^{tree} 169s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 169s + git checkout -b reverted master 169s Switched to a new branch 'reverted' 169s + git-imerge revert HEAD~5..HEAD~3 169s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 169s 169s You are in 'detached HEAD' state. You can look around, make experimental 169s changes and commit them, and you can discard any commits you make in this 169s state without impacting any branches by switching back to a branch. 169s 169s If you want to create a new branch to retain commits you create, you may 169s do so (now or later) by using -c with the switch command. Example: 169s 169s git switch -c 169s 169s Or undo this operation with: 169s 169s git switch - 169s 169s Turn off this advice by setting config variable advice.detachedHead to false 169s 169s HEAD is now at 34bdde3 a3⇒3 169s [detached HEAD 97ae431] Revert "a3⇒3" 169s Date: Sat Dec 6 03:01:18 2025 +0000 169s 1 file changed, 1 deletion(-) 169s delete mode 100644 a3.txt 169s [detached HEAD 0b03d62] Revert "a2⇒2" 169s Date: Sat Dec 6 03:01:18 2025 +0000 169s 1 file changed, 1 deletion(-) 169s delete mode 100644 a2.txt 169s Attempting automerge of 3-2...success. 169s Autofilling 1-2...success. 169s Autofilling 2-2...success. 169s Autofilling 3-1...success. 169s Autofilling 3-2 (first way)...success. 169s Autofilling 3-2 (second way)...success. 169s The two ways of autofilling 3-2 agree. 169s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='0b03d6298d6b704c33d6487c6822cb82a55dcba3', goal='revert')[0:4,0:3]. 169s Merge is complete! 169s + git-imerge diagram --commits --frontier --html=imerge-revert.html 169s 0 3 169s | | 169s 0 - **** - reverted 169s *??. 169s 2 - *... 169s | 169s 0b03d6298d6b704c33d6487c6822cb82a55dcba3 169s 169s 0 3 169s | | 169s 0 - **** - reverted 169s *??| 169s 2 - *--+ 169s | 169s 0b03d6298d6b704c33d6487c6822cb82a55dcba3 169s 169s Key: 169s |,-,+ = rectangles forming current merge frontier 169s * = merge done manually 169s . = merge done automatically 169s # = conflict that is currently blocking progress 169s @ = merge was blocked but has been resolved 169s ? = no merge recorded 169s 169s + git-imerge finish 170s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 170s + local refname=reverted 170s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 170s + git rev-parse reverted^{tree} 170s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 170s py313: OK (51.69=setup[0.19]+cmd[2.40,34.69,5.21,2.18,6.21,0.81] seconds) 170s congratulations :) (51.81 seconds) 170s autopkgtest [03:01:20]: test pybuild-autopkgtest: -----------------------] 170s autopkgtest [03:01:20]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 170s pybuild-autopkgtest PASS 171s autopkgtest [03:01:21]: @@@@@@@@@@@@@@@@@@@@ summary 171s pybuild-autopkgtest PASS