0s autopkgtest [08:22:32]: starting date and time: 2025-12-05 08:22:32+0000 0s autopkgtest [08:22:32]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [08:22:32]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.45o0y7bf/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 --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@bos03-arm64-19.secgroup --name adt-resolute-arm64-git-imerge-20251205-082232-juju-7f2275-prod-proposed-migration-environment-15-77117936-a46a-4014-8965-bd32fb62e66c --image adt/ubuntu-resolute-arm64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-proposed-migration -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 3s Creating nova instance adt-resolute-arm64-git-imerge-20251205-082232-juju-7f2275-prod-proposed-migration-environment-15-77117936-a46a-4014-8965-bd32fb62e66c from image adt/ubuntu-resolute-arm64-server-20251204.img (UUID d10d485b-270b-4b77-bdc2-f40c1cd474cf)... 159s autopkgtest [08:25:11]: testbed dpkg architecture: arm64 159s autopkgtest [08:25:11]: testbed apt version: 3.1.12 159s autopkgtest [08:25:11]: @@@@@@@@@@@@@@@@@@@@ test bed setup 159s autopkgtest [08:25:11]: testbed release detected to be: None 161s autopkgtest [08:25:13]: updating testbed package index (apt update) 161s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 161s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 162s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 162s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 162s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [148 kB] 162s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [23.5 kB] 162s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [881 kB] 162s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 Packages [197 kB] 162s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 c-n-f Metadata [7472 B] 162s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/restricted arm64 c-n-f Metadata [120 B] 162s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 Packages [710 kB] 162s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 c-n-f Metadata [21.3 kB] 162s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 Packages [8208 B] 162s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 c-n-f Metadata [588 B] 165s Fetched 2122 kB in 1s (1551 kB/s) 166s Reading package lists... 174s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 174s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 179s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 179s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 180s Reading package lists... 180s Reading package lists... 180s Building dependency tree... 180s Reading state information... 180s Calculating upgrade... 181s The following packages will be upgraded: 181s ftp groff-base libpython3-stdlib python3 python3-gdbm python3-mdurl 181s python3-minimal tnftp 181s 8 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 181s Need to get 1178 kB of archives. 181s After this operation, 4096 B of additional disk space will be used. 181s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 python3-minimal arm64 3.13.9-2 [28.1 kB] 181s Get:2 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 python3 arm64 3.13.9-2 [23.0 kB] 181s Get:3 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 libpython3-stdlib arm64 3.13.9-2 [10.8 kB] 181s Get:4 http://ftpmaster.internal/ubuntu resolute/main arm64 python3-mdurl all 0.1.2-1build1 [9328 B] 181s Get:5 http://ftpmaster.internal/ubuntu resolute/main arm64 tnftp arm64 20230507-2build4 [101 kB] 182s Get:6 http://ftpmaster.internal/ubuntu resolute/main arm64 ftp all 20230507-2build4 [4736 B] 182s Get:7 http://ftpmaster.internal/ubuntu resolute/main arm64 groff-base arm64 1.23.0-10 [990 kB] 183s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 python3-gdbm arm64 3.13.9-2 [11.0 kB] 184s dpkg-preconfigure: unable to re-open stdin: No such file or directory 184s Fetched 1178 kB in 3s (429 kB/s) 184s (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 ... 88300 files and directories currently installed.) 184s Preparing to unpack .../python3-minimal_3.13.9-2_arm64.deb ... 184s Unpacking python3-minimal (3.13.9-2) over (3.13.7-1) ... 184s Setting up python3-minimal (3.13.9-2) ... 184s (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 ... 88300 files and directories currently installed.) 184s Preparing to unpack .../0-python3_3.13.9-2_arm64.deb ... 184s running python pre-rtupdate hooks for python3.13... 184s Unpacking python3 (3.13.9-2) over (3.13.7-1) ... 185s Preparing to unpack .../1-libpython3-stdlib_3.13.9-2_arm64.deb ... 185s Unpacking libpython3-stdlib:arm64 (3.13.9-2) over (3.13.7-1) ... 185s Preparing to unpack .../2-python3-mdurl_0.1.2-1build1_all.deb ... 185s Unpacking python3-mdurl (0.1.2-1build1) over (0.1.2-1) ... 185s Preparing to unpack .../3-tnftp_20230507-2build4_arm64.deb ... 185s Unpacking tnftp (20230507-2build4) over (20230507-2build3) ... 185s Preparing to unpack .../4-ftp_20230507-2build4_all.deb ... 185s Unpacking ftp (20230507-2build4) over (20230507-2build3) ... 185s Preparing to unpack .../5-groff-base_1.23.0-10_arm64.deb ... 185s Unpacking groff-base (1.23.0-10) over (1.23.0-9) ... 185s Preparing to unpack .../6-python3-gdbm_3.13.9-2_arm64.deb ... 185s Unpacking python3-gdbm (3.13.9-2) over (3.13.9-1) ... 185s Setting up python3-gdbm (3.13.9-2) ... 185s Setting up groff-base (1.23.0-10) ... 185s Setting up tnftp (20230507-2build4) ... 185s Setting up libpython3-stdlib:arm64 (3.13.9-2) ... 185s Setting up python3 (3.13.9-2) ... 185s running python rtupdate hooks for python3.13... 185s running python post-rtupdate hooks for python3.13... 185s Setting up python3-mdurl (0.1.2-1build1) ... 185s Setting up ftp (20230507-2build4) ... 185s Processing triggers for man-db (2.13.1-1) ... 186s autopkgtest [08:25:38]: upgrading testbed (apt dist-upgrade and autopurge) 186s Reading package lists... 187s Building dependency tree... 187s Reading state information... 187s Calculating upgrade... 187s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 188s Reading package lists... 189s Building dependency tree... 189s Reading state information... 189s Solving dependencies... 189s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 192s autopkgtest [08:25:44]: testbed running kernel: Linux 6.17.0-6-generic #6-Ubuntu SMP PREEMPT_DYNAMIC Tue Oct 7 14:22:06 UTC 2025 192s autopkgtest [08:25:44]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 195s Get:1 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (dsc) [1896 B] 195s Get:2 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 195s Get:3 http://ftpmaster.internal/ubuntu resolute/universe git-imerge 1.2.0-5 (diff) [3144 B] 196s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 196s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 196s gpgv: Can't check signature: No public key 196s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 196s autopkgtest [08:25:48]: testing package git-imerge version 1.2.0-5 196s autopkgtest [08:25:48]: build not needed 198s autopkgtest [08:25:50]: test pybuild-autopkgtest: preparing testbed 198s Reading package lists... 198s Building dependency tree... 198s Reading state information... 198s Solving dependencies... 198s The following NEW packages will be installed: 198s autoconf automake autopoint autotools-dev build-essential cpp cpp-15 198s cpp-15-aarch64-linux-gnu cpp-aarch64-linux-gnu debhelper debugedit 198s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-15 198s g++-15-aarch64-linux-gnu g++-aarch64-linux-gnu gcc gcc-15 198s gcc-15-aarch64-linux-gnu gcc-aarch64-linux-gnu gettext git git-imerge 198s git-man intltool-debian libarchive-zip-perl libasan8 libcc1-0 198s libdebhelper-perl liberror-perl libfile-stripnondeterminism-perl 198s libgcc-15-dev libgomp1 libhwasan0 libisl23 libitm1 libjs-jquery 198s libjs-sphinxdoc libjs-underscore liblsan0 libmpc3 libpkgconf3 198s libstdc++-15-dev libtool libtsan2 libubsan1 m4 pkg-config pkgconf 198s pkgconf-bin po-debconf pybuild-plugin-autopkgtest python3-cachetools 198s python3-colorama python3-distlib python3-filelock python3-pip-whl 198s python3-platformdirs python3-pluggy python3-pyproject-api 198s python3-setuptools-whl python3-virtualenv python3-wheel tox 199s 0 upgraded, 67 newly installed, 0 to remove and 0 not upgraded. 199s Need to get 78.8 MB of archives. 199s After this operation, 277 MB of additional disk space will be used. 199s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 m4 arm64 1.4.20-2 [213 kB] 201s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 autoconf all 2.72-3.1ubuntu1 [384 kB] 202s Get:3 http://ftpmaster.internal/ubuntu resolute/main arm64 autotools-dev all 20240727.1 [43.4 kB] 203s Get:4 http://ftpmaster.internal/ubuntu resolute/main arm64 automake all 1:1.18.1-3 [582 kB] 203s Get:5 http://ftpmaster.internal/ubuntu resolute/main arm64 autopoint all 0.23.2-1 [620 kB] 204s Get:6 http://ftpmaster.internal/ubuntu resolute/main arm64 libisl23 arm64 0.27-1 [676 kB] 204s Get:7 http://ftpmaster.internal/ubuntu resolute/main arm64 libmpc3 arm64 1.3.1-2 [55.6 kB] 204s Get:8 http://ftpmaster.internal/ubuntu resolute/main arm64 cpp-15-aarch64-linux-gnu arm64 15.2.0-9ubuntu1 [11.7 MB] 207s Get:9 http://ftpmaster.internal/ubuntu resolute/main arm64 cpp-15 arm64 15.2.0-9ubuntu1 [1030 B] 207s Get:10 http://ftpmaster.internal/ubuntu resolute/main arm64 cpp-aarch64-linux-gnu arm64 4:15.2.0-4ubuntu1 [5736 B] 207s Get:11 http://ftpmaster.internal/ubuntu resolute/main arm64 cpp arm64 4:15.2.0-4ubuntu1 [22.4 kB] 207s Get:12 http://ftpmaster.internal/ubuntu resolute/main arm64 libcc1-0 arm64 15.2.0-9ubuntu1 [49.0 kB] 207s Get:13 http://ftpmaster.internal/ubuntu resolute/main arm64 libgomp1 arm64 15.2.0-9ubuntu1 [147 kB] 207s Get:14 http://ftpmaster.internal/ubuntu resolute/main arm64 libitm1 arm64 15.2.0-9ubuntu1 [28.0 kB] 207s Get:15 http://ftpmaster.internal/ubuntu resolute/main arm64 libasan8 arm64 15.2.0-9ubuntu1 [2922 kB] 207s Get:16 http://ftpmaster.internal/ubuntu resolute/main arm64 liblsan0 arm64 15.2.0-9ubuntu1 [1316 kB] 207s Get:17 http://ftpmaster.internal/ubuntu resolute/main arm64 libtsan2 arm64 15.2.0-9ubuntu1 [2689 kB] 207s Get:18 http://ftpmaster.internal/ubuntu resolute/main arm64 libubsan1 arm64 15.2.0-9ubuntu1 [1175 kB] 208s Get:19 http://ftpmaster.internal/ubuntu resolute/main arm64 libhwasan0 arm64 15.2.0-9ubuntu1 [1638 kB] 208s Get:20 http://ftpmaster.internal/ubuntu resolute/main arm64 libgcc-15-dev arm64 15.2.0-9ubuntu1 [2601 kB] 208s Get:21 http://ftpmaster.internal/ubuntu resolute/main arm64 gcc-15-aarch64-linux-gnu arm64 15.2.0-9ubuntu1 [23.1 MB] 212s Get:22 http://ftpmaster.internal/ubuntu resolute/main arm64 gcc-15 arm64 15.2.0-9ubuntu1 [516 kB] 212s Get:23 http://ftpmaster.internal/ubuntu resolute/main arm64 gcc-aarch64-linux-gnu arm64 4:15.2.0-4ubuntu1 [1206 B] 212s Get:24 http://ftpmaster.internal/ubuntu resolute/main arm64 gcc arm64 4:15.2.0-4ubuntu1 [5016 B] 212s Get:25 http://ftpmaster.internal/ubuntu resolute/main arm64 libstdc++-15-dev arm64 15.2.0-9ubuntu1 [2547 kB] 213s Get:26 http://ftpmaster.internal/ubuntu resolute/main arm64 g++-15-aarch64-linux-gnu arm64 15.2.0-9ubuntu1 [13.2 MB] 213s Get:27 http://ftpmaster.internal/ubuntu resolute/main arm64 g++-15 arm64 15.2.0-9ubuntu1 [24.3 kB] 213s Get:28 http://ftpmaster.internal/ubuntu resolute/main arm64 g++-aarch64-linux-gnu arm64 4:15.2.0-4ubuntu1 [956 B] 213s Get:29 http://ftpmaster.internal/ubuntu resolute/main arm64 g++ arm64 4:15.2.0-4ubuntu1 [1080 B] 213s Get:30 http://ftpmaster.internal/ubuntu resolute/main arm64 build-essential arm64 12.12ubuntu2 [5254 B] 213s Get:31 http://ftpmaster.internal/ubuntu resolute/main arm64 libdebhelper-perl all 13.24.2ubuntu1 [95.7 kB] 213s Get:32 http://ftpmaster.internal/ubuntu resolute/main arm64 libtool all 2.5.4-7 [169 kB] 213s Get:33 http://ftpmaster.internal/ubuntu resolute/main arm64 dh-autoreconf all 21 [12.5 kB] 213s Get:34 http://ftpmaster.internal/ubuntu resolute/main arm64 libarchive-zip-perl all 1.68-1 [90.2 kB] 213s Get:35 http://ftpmaster.internal/ubuntu resolute/main arm64 libfile-stripnondeterminism-perl all 1.15.0-1 [20.5 kB] 213s Get:36 http://ftpmaster.internal/ubuntu resolute/main arm64 dh-strip-nondeterminism all 1.15.0-1 [5090 B] 213s Get:37 http://ftpmaster.internal/ubuntu resolute/main arm64 debugedit arm64 1:5.2-3 [49.1 kB] 213s Get:38 http://ftpmaster.internal/ubuntu resolute/main arm64 dwz arm64 0.16-2 [113 kB] 213s Get:39 http://ftpmaster.internal/ubuntu resolute/main arm64 gettext arm64 0.23.2-1 [998 kB] 213s Get:40 http://ftpmaster.internal/ubuntu resolute/main arm64 intltool-debian all 0.35.0+20060710.6build1 [24.1 kB] 213s Get:41 http://ftpmaster.internal/ubuntu resolute/main arm64 po-debconf all 1.0.21+nmu1 [233 kB] 213s Get:42 http://ftpmaster.internal/ubuntu resolute/main arm64 debhelper all 13.24.2ubuntu1 [896 kB] 214s Get:43 http://ftpmaster.internal/ubuntu resolute/universe arm64 dh-python all 6.20251029 [120 kB] 214s Get:44 http://ftpmaster.internal/ubuntu resolute/main arm64 liberror-perl all 0.17030-1 [23.5 kB] 214s Get:45 http://ftpmaster.internal/ubuntu resolute/main arm64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 214s Get:46 http://ftpmaster.internal/ubuntu resolute/main arm64 git arm64 1:2.51.0-1ubuntu1 [4431 kB] 214s Get:47 http://ftpmaster.internal/ubuntu resolute/universe arm64 git-imerge all 1.2.0-5 [49.5 kB] 214s Get:48 http://ftpmaster.internal/ubuntu resolute/main arm64 libjs-jquery all 3.7.1+dfsg+~3.5.33-1build1 [321 kB] 214s Get:49 http://ftpmaster.internal/ubuntu resolute/main arm64 libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 214s Get:50 http://ftpmaster.internal/ubuntu resolute/main arm64 libjs-sphinxdoc all 8.2.3-1ubuntu2 [28.0 kB] 214s Get:51 http://ftpmaster.internal/ubuntu resolute/main arm64 libpkgconf3 arm64 1.8.1-4build1 [33.7 kB] 214s Get:52 http://ftpmaster.internal/ubuntu resolute/main arm64 pkgconf-bin arm64 1.8.1-4build1 [21.7 kB] 214s Get:53 http://ftpmaster.internal/ubuntu resolute/main arm64 pkgconf arm64 1.8.1-4build1 [16.8 kB] 214s Get:54 http://ftpmaster.internal/ubuntu resolute/main arm64 pkg-config arm64 1.8.1-4build1 [7494 B] 214s Get:55 http://ftpmaster.internal/ubuntu resolute/universe arm64 pybuild-plugin-autopkgtest all 6.20251029 [1746 B] 214s Get:56 http://ftpmaster.internal/ubuntu resolute/main arm64 python3-cachetools all 5.3.3-1 [10.3 kB] 214s Get:57 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-colorama all 0.4.6-4 [32.1 kB] 214s Get:58 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-distlib all 0.4.0-1 [267 kB] 214s Get:59 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-filelock all 3.18.0-1 [13.0 kB] 214s Get:60 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-pip-whl all 25.1.1+dfsg-1ubuntu2 [1430 kB] 214s Get:61 http://ftpmaster.internal/ubuntu resolute/main arm64 python3-platformdirs all 4.4.0-1 [16.9 kB] 214s Get:62 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-pluggy all 1.6.0-1 [21.0 kB] 214s Get:63 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-pyproject-api all 1.9.1-1 [52.9 kB] 214s Get:64 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-setuptools-whl all 78.1.1-0.1 [1174 kB] 214s Get:65 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-virtualenv all 20.35.4+ds-1 [76.1 kB] 214s Get:66 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-wheel all 0.46.1-2 [22.1 kB] 214s Get:67 http://ftpmaster.internal/ubuntu resolute/universe arm64 tox all 4.25.0-1 [323 kB] 214s Fetched 78.8 MB in 16s (5055 kB/s) 214s Selecting previously unselected package m4. 214s (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 ... 88300 files and directories currently installed.) 214s Preparing to unpack .../00-m4_1.4.20-2_arm64.deb ... 214s Unpacking m4 (1.4.20-2) ... 214s Selecting previously unselected package autoconf. 214s Preparing to unpack .../01-autoconf_2.72-3.1ubuntu1_all.deb ... 214s Unpacking autoconf (2.72-3.1ubuntu1) ... 214s Selecting previously unselected package autotools-dev. 214s Preparing to unpack .../02-autotools-dev_20240727.1_all.deb ... 214s Unpacking autotools-dev (20240727.1) ... 214s Selecting previously unselected package automake. 214s Preparing to unpack .../03-automake_1%3a1.18.1-3_all.deb ... 214s Unpacking automake (1:1.18.1-3) ... 215s Selecting previously unselected package autopoint. 215s Preparing to unpack .../04-autopoint_0.23.2-1_all.deb ... 215s Unpacking autopoint (0.23.2-1) ... 215s Selecting previously unselected package libisl23:arm64. 215s Preparing to unpack .../05-libisl23_0.27-1_arm64.deb ... 215s Unpacking libisl23:arm64 (0.27-1) ... 215s Selecting previously unselected package libmpc3:arm64. 215s Preparing to unpack .../06-libmpc3_1.3.1-2_arm64.deb ... 215s Unpacking libmpc3:arm64 (1.3.1-2) ... 215s Selecting previously unselected package cpp-15-aarch64-linux-gnu. 215s Preparing to unpack .../07-cpp-15-aarch64-linux-gnu_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking cpp-15-aarch64-linux-gnu (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package cpp-15. 215s Preparing to unpack .../08-cpp-15_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking cpp-15 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package cpp-aarch64-linux-gnu. 215s Preparing to unpack .../09-cpp-aarch64-linux-gnu_4%3a15.2.0-4ubuntu1_arm64.deb ... 215s Unpacking cpp-aarch64-linux-gnu (4:15.2.0-4ubuntu1) ... 215s Selecting previously unselected package cpp. 215s Preparing to unpack .../10-cpp_4%3a15.2.0-4ubuntu1_arm64.deb ... 215s Unpacking cpp (4:15.2.0-4ubuntu1) ... 215s Selecting previously unselected package libcc1-0:arm64. 215s Preparing to unpack .../11-libcc1-0_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libcc1-0:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package libgomp1:arm64. 215s Preparing to unpack .../12-libgomp1_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libgomp1:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package libitm1:arm64. 215s Preparing to unpack .../13-libitm1_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libitm1:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package libasan8:arm64. 215s Preparing to unpack .../14-libasan8_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libasan8:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package liblsan0:arm64. 215s Preparing to unpack .../15-liblsan0_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking liblsan0:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package libtsan2:arm64. 215s Preparing to unpack .../16-libtsan2_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libtsan2:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package libubsan1:arm64. 215s Preparing to unpack .../17-libubsan1_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libubsan1:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package libhwasan0:arm64. 215s Preparing to unpack .../18-libhwasan0_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libhwasan0:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package libgcc-15-dev:arm64. 215s Preparing to unpack .../19-libgcc-15-dev_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking libgcc-15-dev:arm64 (15.2.0-9ubuntu1) ... 215s Selecting previously unselected package gcc-15-aarch64-linux-gnu. 215s Preparing to unpack .../20-gcc-15-aarch64-linux-gnu_15.2.0-9ubuntu1_arm64.deb ... 215s Unpacking gcc-15-aarch64-linux-gnu (15.2.0-9ubuntu1) ... 216s Selecting previously unselected package gcc-15. 216s Preparing to unpack .../21-gcc-15_15.2.0-9ubuntu1_arm64.deb ... 216s Unpacking gcc-15 (15.2.0-9ubuntu1) ... 216s Selecting previously unselected package gcc-aarch64-linux-gnu. 216s Preparing to unpack .../22-gcc-aarch64-linux-gnu_4%3a15.2.0-4ubuntu1_arm64.deb ... 216s Unpacking gcc-aarch64-linux-gnu (4:15.2.0-4ubuntu1) ... 216s Selecting previously unselected package gcc. 216s Preparing to unpack .../23-gcc_4%3a15.2.0-4ubuntu1_arm64.deb ... 216s Unpacking gcc (4:15.2.0-4ubuntu1) ... 216s Selecting previously unselected package libstdc++-15-dev:arm64. 216s Preparing to unpack .../24-libstdc++-15-dev_15.2.0-9ubuntu1_arm64.deb ... 216s Unpacking libstdc++-15-dev:arm64 (15.2.0-9ubuntu1) ... 216s Selecting previously unselected package g++-15-aarch64-linux-gnu. 216s Preparing to unpack .../25-g++-15-aarch64-linux-gnu_15.2.0-9ubuntu1_arm64.deb ... 216s Unpacking g++-15-aarch64-linux-gnu (15.2.0-9ubuntu1) ... 216s Selecting previously unselected package g++-15. 216s Preparing to unpack .../26-g++-15_15.2.0-9ubuntu1_arm64.deb ... 216s Unpacking g++-15 (15.2.0-9ubuntu1) ... 216s Selecting previously unselected package g++-aarch64-linux-gnu. 216s Preparing to unpack .../27-g++-aarch64-linux-gnu_4%3a15.2.0-4ubuntu1_arm64.deb ... 216s Unpacking g++-aarch64-linux-gnu (4:15.2.0-4ubuntu1) ... 216s Selecting previously unselected package g++. 216s Preparing to unpack .../28-g++_4%3a15.2.0-4ubuntu1_arm64.deb ... 216s Unpacking g++ (4:15.2.0-4ubuntu1) ... 216s Selecting previously unselected package build-essential. 216s Preparing to unpack .../29-build-essential_12.12ubuntu2_arm64.deb ... 216s Unpacking build-essential (12.12ubuntu2) ... 216s Selecting previously unselected package libdebhelper-perl. 216s Preparing to unpack .../30-libdebhelper-perl_13.24.2ubuntu1_all.deb ... 216s Unpacking libdebhelper-perl (13.24.2ubuntu1) ... 216s Selecting previously unselected package libtool. 216s Preparing to unpack .../31-libtool_2.5.4-7_all.deb ... 216s Unpacking libtool (2.5.4-7) ... 217s Selecting previously unselected package dh-autoreconf. 217s Preparing to unpack .../32-dh-autoreconf_21_all.deb ... 217s Unpacking dh-autoreconf (21) ... 217s Selecting previously unselected package libarchive-zip-perl. 217s Preparing to unpack .../33-libarchive-zip-perl_1.68-1_all.deb ... 217s Unpacking libarchive-zip-perl (1.68-1) ... 217s Selecting previously unselected package libfile-stripnondeterminism-perl. 217s Preparing to unpack .../34-libfile-stripnondeterminism-perl_1.15.0-1_all.deb ... 217s Unpacking libfile-stripnondeterminism-perl (1.15.0-1) ... 217s Selecting previously unselected package dh-strip-nondeterminism. 217s Preparing to unpack .../35-dh-strip-nondeterminism_1.15.0-1_all.deb ... 217s Unpacking dh-strip-nondeterminism (1.15.0-1) ... 217s Selecting previously unselected package debugedit. 217s Preparing to unpack .../36-debugedit_1%3a5.2-3_arm64.deb ... 217s Unpacking debugedit (1:5.2-3) ... 217s Selecting previously unselected package dwz. 217s Preparing to unpack .../37-dwz_0.16-2_arm64.deb ... 217s Unpacking dwz (0.16-2) ... 217s Selecting previously unselected package gettext. 217s Preparing to unpack .../38-gettext_0.23.2-1_arm64.deb ... 217s Unpacking gettext (0.23.2-1) ... 217s Selecting previously unselected package intltool-debian. 217s Preparing to unpack .../39-intltool-debian_0.35.0+20060710.6build1_all.deb ... 217s Unpacking intltool-debian (0.35.0+20060710.6build1) ... 217s Selecting previously unselected package po-debconf. 217s Preparing to unpack .../40-po-debconf_1.0.21+nmu1_all.deb ... 217s Unpacking po-debconf (1.0.21+nmu1) ... 217s Selecting previously unselected package debhelper. 217s Preparing to unpack .../41-debhelper_13.24.2ubuntu1_all.deb ... 217s Unpacking debhelper (13.24.2ubuntu1) ... 217s Selecting previously unselected package dh-python. 217s Preparing to unpack .../42-dh-python_6.20251029_all.deb ... 217s Unpacking dh-python (6.20251029) ... 217s Selecting previously unselected package liberror-perl. 217s Preparing to unpack .../43-liberror-perl_0.17030-1_all.deb ... 217s Unpacking liberror-perl (0.17030-1) ... 217s Selecting previously unselected package git-man. 217s Preparing to unpack .../44-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 217s Unpacking git-man (1:2.51.0-1ubuntu1) ... 217s Selecting previously unselected package git. 217s Preparing to unpack .../45-git_1%3a2.51.0-1ubuntu1_arm64.deb ... 217s Unpacking git (1:2.51.0-1ubuntu1) ... 217s Selecting previously unselected package git-imerge. 217s Preparing to unpack .../46-git-imerge_1.2.0-5_all.deb ... 217s Unpacking git-imerge (1.2.0-5) ... 217s Selecting previously unselected package libjs-jquery. 217s Preparing to unpack .../47-libjs-jquery_3.7.1+dfsg+~3.5.33-1build1_all.deb ... 217s Unpacking libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 217s Selecting previously unselected package libjs-underscore. 217s Preparing to unpack .../48-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 217s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 217s Selecting previously unselected package libjs-sphinxdoc. 217s Preparing to unpack .../49-libjs-sphinxdoc_8.2.3-1ubuntu2_all.deb ... 217s Unpacking libjs-sphinxdoc (8.2.3-1ubuntu2) ... 217s Selecting previously unselected package libpkgconf3:arm64. 217s Preparing to unpack .../50-libpkgconf3_1.8.1-4build1_arm64.deb ... 217s Unpacking libpkgconf3:arm64 (1.8.1-4build1) ... 217s Selecting previously unselected package pkgconf-bin. 217s Preparing to unpack .../51-pkgconf-bin_1.8.1-4build1_arm64.deb ... 217s Unpacking pkgconf-bin (1.8.1-4build1) ... 217s Selecting previously unselected package pkgconf:arm64. 217s Preparing to unpack .../52-pkgconf_1.8.1-4build1_arm64.deb ... 217s Unpacking pkgconf:arm64 (1.8.1-4build1) ... 217s Selecting previously unselected package pkg-config:arm64. 217s Preparing to unpack .../53-pkg-config_1.8.1-4build1_arm64.deb ... 217s Unpacking pkg-config:arm64 (1.8.1-4build1) ... 217s Selecting previously unselected package pybuild-plugin-autopkgtest. 217s Preparing to unpack .../54-pybuild-plugin-autopkgtest_6.20251029_all.deb ... 217s Unpacking pybuild-plugin-autopkgtest (6.20251029) ... 217s Selecting previously unselected package python3-cachetools. 217s Preparing to unpack .../55-python3-cachetools_5.3.3-1_all.deb ... 217s Unpacking python3-cachetools (5.3.3-1) ... 217s Selecting previously unselected package python3-colorama. 218s Preparing to unpack .../56-python3-colorama_0.4.6-4_all.deb ... 218s Unpacking python3-colorama (0.4.6-4) ... 218s Selecting previously unselected package python3-distlib. 218s Preparing to unpack .../57-python3-distlib_0.4.0-1_all.deb ... 218s Unpacking python3-distlib (0.4.0-1) ... 218s Selecting previously unselected package python3-filelock. 218s Preparing to unpack .../58-python3-filelock_3.18.0-1_all.deb ... 218s Unpacking python3-filelock (3.18.0-1) ... 218s Selecting previously unselected package python3-pip-whl. 218s Preparing to unpack .../59-python3-pip-whl_25.1.1+dfsg-1ubuntu2_all.deb ... 218s Unpacking python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 218s Selecting previously unselected package python3-platformdirs. 218s Preparing to unpack .../60-python3-platformdirs_4.4.0-1_all.deb ... 218s Unpacking python3-platformdirs (4.4.0-1) ... 218s Selecting previously unselected package python3-pluggy. 218s Preparing to unpack .../61-python3-pluggy_1.6.0-1_all.deb ... 218s Unpacking python3-pluggy (1.6.0-1) ... 218s Selecting previously unselected package python3-pyproject-api. 218s Preparing to unpack .../62-python3-pyproject-api_1.9.1-1_all.deb ... 218s Unpacking python3-pyproject-api (1.9.1-1) ... 218s Selecting previously unselected package python3-setuptools-whl. 218s Preparing to unpack .../63-python3-setuptools-whl_78.1.1-0.1_all.deb ... 218s Unpacking python3-setuptools-whl (78.1.1-0.1) ... 218s Selecting previously unselected package python3-virtualenv. 218s Preparing to unpack .../64-python3-virtualenv_20.35.4+ds-1_all.deb ... 218s Unpacking python3-virtualenv (20.35.4+ds-1) ... 218s Selecting previously unselected package python3-wheel. 218s Preparing to unpack .../65-python3-wheel_0.46.1-2_all.deb ... 218s Unpacking python3-wheel (0.46.1-2) ... 218s Selecting previously unselected package tox. 218s Preparing to unpack .../66-tox_4.25.0-1_all.deb ... 218s Unpacking tox (4.25.0-1) ... 218s Setting up dh-python (6.20251029) ... 218s Setting up python3-setuptools-whl (78.1.1-0.1) ... 218s Setting up python3-filelock (3.18.0-1) ... 218s Setting up python3-cachetools (5.3.3-1) ... 218s Setting up python3-colorama (0.4.6-4) ... 218s Setting up python3-pip-whl (25.1.1+dfsg-1ubuntu2) ... 218s Setting up libarchive-zip-perl (1.68-1) ... 218s Setting up libdebhelper-perl (13.24.2ubuntu1) ... 218s Setting up m4 (1.4.20-2) ... 218s Setting up python3-distlib (0.4.0-1) ... 219s Setting up libgomp1:arm64 (15.2.0-9ubuntu1) ... 219s Setting up python3-wheel (0.46.1-2) ... 219s Setting up python3-platformdirs (4.4.0-1) ... 219s Setting up liberror-perl (0.17030-1) ... 219s Setting up autotools-dev (20240727.1) ... 219s Setting up libpkgconf3:arm64 (1.8.1-4build1) ... 219s Setting up libmpc3:arm64 (1.3.1-2) ... 219s Setting up autopoint (0.23.2-1) ... 219s Setting up pkgconf-bin (1.8.1-4build1) ... 219s Setting up autoconf (2.72-3.1ubuntu1) ... 219s Setting up python3-pluggy (1.6.0-1) ... 219s Setting up libubsan1:arm64 (15.2.0-9ubuntu1) ... 219s Setting up dwz (0.16-2) ... 219s Setting up libhwasan0:arm64 (15.2.0-9ubuntu1) ... 219s Setting up libasan8:arm64 (15.2.0-9ubuntu1) ... 219s Setting up debugedit (1:5.2-3) ... 219s Setting up git-man (1:2.51.0-1ubuntu1) ... 219s Setting up libtsan2:arm64 (15.2.0-9ubuntu1) ... 219s Setting up libjs-jquery (3.7.1+dfsg+~3.5.33-1build1) ... 219s Setting up libisl23:arm64 (0.27-1) ... 219s Setting up libcc1-0:arm64 (15.2.0-9ubuntu1) ... 219s Setting up liblsan0:arm64 (15.2.0-9ubuntu1) ... 219s Setting up libitm1:arm64 (15.2.0-9ubuntu1) ... 219s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 219s Setting up automake (1:1.18.1-3) ... 219s update-alternatives: using /usr/bin/automake-1.18 to provide /usr/bin/automake (automake) in auto mode 219s Setting up libfile-stripnondeterminism-perl (1.15.0-1) ... 219s Setting up cpp-15-aarch64-linux-gnu (15.2.0-9ubuntu1) ... 219s Setting up gettext (0.23.2-1) ... 219s Setting up libgcc-15-dev:arm64 (15.2.0-9ubuntu1) ... 219s Setting up python3-virtualenv (20.35.4+ds-1) ... 219s Setting up pkgconf:arm64 (1.8.1-4build1) ... 219s Setting up intltool-debian (0.35.0+20060710.6build1) ... 219s Setting up cpp-aarch64-linux-gnu (4:15.2.0-4ubuntu1) ... 219s Setting up libstdc++-15-dev:arm64 (15.2.0-9ubuntu1) ... 219s Setting up pkg-config:arm64 (1.8.1-4build1) ... 219s Setting up git (1:2.51.0-1ubuntu1) ... 219s Setting up libjs-sphinxdoc (8.2.3-1ubuntu2) ... 219s Setting up dh-strip-nondeterminism (1.15.0-1) ... 219s Setting up cpp-15 (15.2.0-9ubuntu1) ... 219s Setting up cpp (4:15.2.0-4ubuntu1) ... 219s Setting up gcc-15-aarch64-linux-gnu (15.2.0-9ubuntu1) ... 219s Setting up po-debconf (1.0.21+nmu1) ... 219s Setting up python3-pyproject-api (1.9.1-1) ... 219s Setting up git-imerge (1.2.0-5) ... 219s Setting up gcc-15 (15.2.0-9ubuntu1) ... 219s Setting up g++-15-aarch64-linux-gnu (15.2.0-9ubuntu1) ... 219s Setting up g++-15 (15.2.0-9ubuntu1) ... 219s Setting up gcc-aarch64-linux-gnu (4:15.2.0-4ubuntu1) ... 219s Setting up tox (4.25.0-1) ... 219s Setting up libtool (2.5.4-7) ... 219s Setting up gcc (4:15.2.0-4ubuntu1) ... 219s Setting up dh-autoreconf (21) ... 219s Setting up g++-aarch64-linux-gnu (4:15.2.0-4ubuntu1) ... 219s Setting up debhelper (13.24.2ubuntu1) ... 219s Setting up g++ (4:15.2.0-4ubuntu1) ... 219s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 219s Setting up build-essential (12.12ubuntu2) ... 219s Setting up pybuild-plugin-autopkgtest (6.20251029) ... 219s Processing triggers for install-info (7.2-5) ... 220s Processing triggers for libc-bin (2.42-2ubuntu2) ... 220s Processing triggers for man-db (2.13.1-1) ... 222s autopkgtest [08:26:14]: test pybuild-autopkgtest: pybuild-autopkgtest 222s autopkgtest [08:26:14]: test pybuild-autopkgtest: [----------------------- 222s pybuild-autopkgtest 223s I: pybuild base:317: cd /tmp/autopkgtest.NNLTRo/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.NNLTRo/build.brh/src/tox.ini --sitepackages -e py313 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 223s py313: skip building and installing the package 223s py313: commands[0] /tmp/autopkgtest.NNLTRo/build.brh/src> /bin/sh t/test-unconflicted 223s + dirname t/test-unconflicted 223s + cd t 223s + pwd 223s + dirname /tmp/autopkgtest.NNLTRo/build.brh/src/t 223s + BASE=/tmp/autopkgtest.NNLTRo/build.brh/src 223s + . /tmp/autopkgtest.NNLTRo/build.brh/src/t/test-lib.sh 223s + GIT_IMERGE=git-imerge 223s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s + DESCRIPTION=git-imerge test repository without conflicts 223s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted git-imerge test repository without conflicts 223s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s + local description=git-imerge test repository without conflicts 223s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted git-imerge test repository without conflicts 223s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s + local description=git-imerge test repository without conflicts 223s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted/.git/ 223s [master (root-commit) 780ddf5] m⇒0 223s 2 files changed, 2 insertions(+) 223s create mode 100644 a.txt 223s create mode 100644 b.txt 223s [a b862e30] a⇒1 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [a dcbe282] a⇒2 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [a ecd8647] a⇒3 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [a 1634bab] a⇒4 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [a 909ce12] a⇒5 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s hint: Using 'master' as the name for the initial branch. This default branch name 223s hint: is subject to change. To configure the initial branch name to use in all 223s hint: of your new repositories, which will suppress this warning, call: 223s hint: 223s hint: git config --global init.defaultBranch 223s hint: 223s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 223s hint: 'development'. The just-created branch can be renamed via this command: 223s hint: 223s hint: git branch -m 223s hint: 223s hint: Disable this message with "git config set advice.defaultBranchName false" 223s + echo git-imerge test repository without conflicts 223s + printf %s\n /*.out /*.css /*.html 223s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted/.git config user.name Loú User 223s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted/.git config user.email luser@example.com 223s + TIME=1112911993 223s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/unconflicted 223s + modify a.txt 0 223s + filename=a.txt 223s + text=0 223s + echo 0 223s + git add a.txt 223s + modify b.txt 0 223s + filename=b.txt 223s + text=0 223s + echo 0 223s + git add b.txt 223s + commit -m m⇒0 223s + TIME=1112911994 223s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 223s + git checkout -b a -- 223s Switched to a new branch 'a' 223s + seq 8 223s + modify a.txt 1 223s + filename=a.txt 223s + text=1 223s + echo 1 223s + git add a.txt 223s + commit -m a⇒1 223s + TIME=1112911995 223s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 223s + modify a.txt 2 223s + filename=a.txt 223s + text=2 223s + echo 2 223s + git add a.txt 223s + commit -m a⇒2 223s + TIME=1112911996 223s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 223s + modify a.txt 3 223s + filename=a.txt 223s + text=3 223s + echo 3 223s + git add a.txt 223s + commit -m a⇒3 223s + TIME=1112911997 223s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 223s + modify a.txt 4 223s + filename=a.txt 223s + text=4 223s + echo 4 223s + git add a.txt 223s + commit -m a⇒4 223s + TIME=1112911998 223s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 223s + modify a.txt 5 223s + filename=a.txt 223s + text=5 223s + echo 5 223s + git add a.txt 223s + commit -m a⇒5 223s + TIME=1112911999 223s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 223s + modify a.txt 6 223s + filename=a.txt 223s + text=6 223s + echo 6 223s + git add a.txt 223s + commit -m a⇒6 223s + TIME=1112912000 223s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 223s + modify a.txt 7 223s + filename=a.txt 223s + text=7 223s + echo 7 223s + git add a.txt 223s + commit -m a⇒7 223s + TIME=1112912001 223s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 223s + modify a.txt 8 223s + filename=a.txt 223s + text=8 223s + echo 8 223s + git add a.txt 223s + commit -m a⇒8 223s + TIME=1112912002 223s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 223s + git checkout -b b master -- 223s Switched to a new branch 'b' 223s + seq 5 223s [a f6520bf] a⇒6 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [a 6797186] a⇒7 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [a 49643dd] a⇒8 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify b.txt 1 223s + filename=b.txt 223s + text=1 223s + echo 1 223s + git add b.txt 223s + commit -m b⇒1 223s + TIME=1112912003 223s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 223s [b d43305b] b⇒1 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify b.txt 2 223s + filename=b.txt 223s + text=2 223s + echo 2 223s + git add b.txt 223s [b 853ee68] b⇒2 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [b 03a2455] b⇒3 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [b 484ea85] b⇒4 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s [b e22cd97] b⇒5 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + commit -m b⇒2 223s + TIME=1112912004 223s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 223s + modify b.txt 3 223s + filename=b.txt 223s + text=3 223s + echo 3 223s + git add b.txt 223s + commit -m b⇒3 223s + TIME=1112912005 223s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 223s + modify b.txt 4 223s + filename=b.txt 223s + text=4 223s + echo 4 223s + git add b.txt 223s + commit -m b⇒4 223s + TIME=1112912006 223s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 223s + modify b.txt 5 223s + filename=b.txt 223s + text=5 223s + echo 5 223s + git add b.txt 223s + commit -m b⇒5 223s + TIME=1112912007 223s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 223s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 223s + git checkout a 223s Switched to branch 'a' 223s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 223s Attempting automerge of 8-5...success. 223s Autofilling 1-5...success. 223s Autofilling 2-5...success. 223s Autofilling 3-5...success. 223s Autofilling 4-5...success. 223s Autofilling 5-5...success. 223s Autofilling 6-5...success. 223s Autofilling 7-5...success. 223s Autofilling 8-1...success. 223s Autofilling 8-2...success. 223s Autofilling 8-3...success. 223s Autofilling 8-4...success. 223s Autofilling 8-5 (first way)...success. 223s Autofilling 8-5 (second way)...success. 223s The two ways of autofilling 8-5 agree. 223s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 223s Merge is complete! 223s + git-imerge list 223s * a-b 223s + git-imerge diagram --commits --frontier --html=imerge3.html 223s 0 5 8 223s | | | 223s 0 - ********* - a 223s *???????. 223s *???????. 223s *???????. 223s *???????. 223s 5 - *........ 223s | 223s b 223s 223s 0 5 8 223s | | | 223s 0 - ********* - a 223s *???????| 223s *???????| 223s *???????| 223s *???????| 223s 5 - *-------+ 223s | 223s b 223s 223s Key: 223s |,-,+ = rectangles forming current merge frontier 223s * = merge done manually 223s . = merge done automatically 223s # = conflict that is currently blocking progress 223s @ = merge was blocked but has been resolved 223s ? = no merge recorded 223s 223s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 224s Merge b into a (using imerge) 224s 224s # Please enter the commit message for your changes. Lines starting 224s # with '#' will be ignored, and an empty message aborts the commit. 224s # 224s # Date: Fri Dec 5 08:26:16 2025 +0000 224s # 224s # On branch a-b-merge 224s # Changes to be committed: 224s # modified: b.txt 224s # 224s [a-b-merge 0e822a4] Merge b into a (using imerge) 224s Date: Fri Dec 5 08:26:16 2025 +0000 224s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + local refname=a-b-merge 224s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git rev-parse a-b-merge^{tree} 224s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git-imerge simplify --goal=rebase --branch=a-b-rebase 224s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + local refname=a-b-rebase 224s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git rev-parse a-b-rebase^{tree} 224s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 224s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + local refname=a-b-rebase-with-history 224s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git rev-parse a-b-rebase-with-history^{tree} 224s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git-imerge simplify --goal=border --branch=a-b-border 224s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + local refname=a-b-border 224s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git rev-parse a-b-border^{tree} 224s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 224s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + local refname=a-b-border-with-history 224s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git rev-parse a-b-border-with-history^{tree} 224s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 224s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + local refname=a-b-border-with-history2 224s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git rev-parse a-b-border-with-history2^{tree} 224s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 224s + git-imerge remove 224s + git checkout a 224s Switched to branch 'a' 224s + git-imerge start --goal=full --name=a-b b 224s Attempting to merge 1-1...success. 224s Attempting to merge 1-2...success. 225s Attempting to merge 1-3...success. 225s Attempting to merge 1-4...success. 225s Attempting to merge 1-5...success. 225s Attempting to merge 2-1...success. 225s Attempting to merge 2-2...success. 225s Attempting to merge 2-3...success. 225s Attempting to merge 2-4...success. 225s Attempting to merge 2-5...success. 225s Attempting to merge 3-1...success. 225s Attempting to merge 3-2...success. 225s Attempting to merge 3-3...success. 225s Attempting to merge 3-4...success. 225s Attempting to merge 3-5...success. 225s Attempting to merge 4-1...success. 225s Attempting to merge 4-2...success. 225s Attempting to merge 4-3...success. 225s Attempting to merge 4-4...success. 225s Attempting to merge 4-5...success. 225s Attempting to merge 5-1...success. 225s Attempting to merge 5-2...success. 225s Attempting to merge 5-3...success. 225s Attempting to merge 5-4...success. 225s Attempting to merge 5-5...success. 225s Attempting to merge 6-1...success. 225s Attempting to merge 6-2...success. 225s Attempting to merge 6-3...success. 225s Attempting to merge 6-4...success. 225s Attempting to merge 6-5...success. 225s Attempting to merge 7-1...success. 225s Attempting to merge 7-2...success. 225s Attempting to merge 7-3...success. 225s Attempting to merge 7-4...success. 225s Attempting to merge 7-5...success. 225s Attempting to merge 8-1...success. 225s Attempting to merge 8-2...success. 225s Attempting to merge 8-3...success. 225s Attempting to merge 8-4...success. 225s Attempting to merge 8-5...success. 225s Merge is complete! 225s + git-imerge list 225s * a-b 225s + git-imerge diagram --commits --frontier --html=imerge4.html 225s 0 5 8 225s | | | 225s 0 - ********* - a 225s *........ 225s *........ 225s *........ 225s *........ 225s 5 - *........ 225s | 225s b 225s 225s 0 5 8 225s | | | 225s 0 - ********* - a 225s *.......| 225s *.......| 225s *.......| 225s *.......| 225s 5 - *-------+ 225s | 225s b 225s 225s Key: 225s |,-,+ = rectangles forming current merge frontier 225s * = merge done manually 225s . = merge done automatically 225s # = conflict that is currently blocking progress 225s @ = merge was blocked but has been resolved 225s ? = no merge recorded 225s 225s + git-imerge finish --branch=a-b-full 225s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 225s + local refname=a-b-full 225s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 225s + git rev-parse a-b-full^{tree} 225s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 225s py313: commands[1] /tmp/autopkgtest.NNLTRo/build.brh/src> /bin/sh t/test-conflicted 225s + dirname t/test-conflicted 225s + cd t 225s + pwd 225s + dirname /tmp/autopkgtest.NNLTRo/build.brh/src/t 225s + BASE=/tmp/autopkgtest.NNLTRo/build.brh/src 225s + . /tmp/autopkgtest.NNLTRo/build.brh/src/t/test-lib.sh 225s + GIT_IMERGE=git-imerge 225s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 225s + test_conflict 4-3 225s + local conflict=4-3 225s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s + DESCRIPTION=git-imerge test repository with conflict at 4-3 225s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 225s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s + local description=git-imerge test repository with conflict at 4-3 225s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 225s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s + local description=git-imerge test repository with conflict at 4-3 225s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s hint: Using 'master' as the name for the initial branch. This default branch name 225s hint: is subject to change. To configure the initial branch name to use in all 225s hint: of your new repositories, which will suppress this warning, call: 225s hint: 225s hint: git config --global init.defaultBranch 225s hint: 225s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 225s hint: 'development'. The just-created branch can be renamed via this command: 225s hint: 225s hint: git branch -m 225s hint: 225s hint: Disable this message with "git config set advice.defaultBranchName false" 225s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3/.git/ 225s + echo git-imerge test repository with conflict at 4-3 225s + printf %s\n /*.out /*.css /*.html 225s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3/.git config user.name Loú User 225s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 225s + TIME=1112911993 225s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-4-3 225s + modify c.txt 0 225s + filename=c.txt 225s + text=0 225s + echo 0 225s + git add c.txt 225s + modify d.txt 0 225s + filename=d.txt 225s + text=0 225s + echo 0 225s + git add d.txt 225s + modify conflict.txt original version 225s + filename=conflict.txt 225s + text=original version 225s + echo original version 225s + git add conflict.txt 225s + commit -m m⇒0 225s + TIME=1112911994 225s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 225s [master (root-commit) d70e04b] m⇒0 225s 3 files changed, 3 insertions(+) 225s create mode 100644 c.txt 225s create mode 100644 conflict.txt 225s create mode 100644 d.txt 225s + git checkout -b c master -- 225s Switched to a new branch 'c' 225s + seq 9 225s + modify c.txt 1 225s + filename=c.txt 225s + text=1 225s + echo 1 225s + git add c.txt 225s + commit -m c⇒1 225s + TIME=1112911995 225s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 225s [c 89e2141] c⇒1 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify c.txt 2 225s + filename=c.txt 225s + text=2 225s + echo 2 225s + git add c.txt 225s + commit -m c⇒2 225s + TIME=1112911996 225s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 225s [c 7c431f2] c⇒2 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify c.txt 3 225s + filename=c.txt 225s + text=3 225s + echo 3 225s + git add c.txt 225s + commit -m c⇒3 225s + TIME=1112911997 225s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 225s + modify c.txt 4 225s + filename=c.txt 225s + text=4 225s + echo 4 225s + git add c.txt 225s [c f02ab24] c⇒3 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify conflict.txt c version 225s + filename=conflict.txt 225s + text=c version 225s + echo c version 225s + git add conflict.txt 225s + commit -m c⇒4 225s + TIME=1112911998 225s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 225s + modify c.txt 5 225s + filename=c.txt 225s + text=5 225s + echo 5 225s + git add c.txt 225s + commit -m c⇒5 225s + TIME=1112911999 225s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 225s + modify c.txt 6 225s + filename=c.txt 225s + text=6 225s + echo 6 225s + git add c.txt 225s + commit -m c⇒6 225s + TIME=1112912000 225s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 225s [c 3c091de] c⇒4 225s 2 files changed, 2 insertions(+), 2 deletions(-) 225s [c a0ac37a] c⇒5 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s [c ed9fdfa] c⇒6 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify c.txt 7 225s + filename=c.txt 225s + text=7 225s + echo 7 225s + git add c.txt 225s + commit -m c⇒7 225s + TIME=1112912001 225s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 225s [c 1da7bf5] c⇒7 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify c.txt 8 225s + filename=c.txt 225s + text=8 225s + echo 8 225s + git add c.txt 225s + commit -m c⇒8 225s + TIME=1112912002 225s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 225s [c d8de99f] c⇒8 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify c.txt 9 225s + filename=c.txt 225s + text=9 225s + echo 9 225s + git add c.txt 225s + commit -m c⇒9 225s + TIME=1112912003 225s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 225s [c 9cde605] c⇒9 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + git checkout -b d master -- 225s Switched to a new branch 'd' 225s + seq 6 225s + modify d.txt 1 225s + filename=d.txt 225s + text=1 225s + echo 1 225s + git add d.txt 225s + commit -m d⇒1 225s + TIME=1112912004 225s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 225s [d bd5368a] d⇒1 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify d.txt 2 225s + filename=d.txt 225s + text=2 225s + echo 2 225s + git add d.txt 225s + commit -m d⇒2 225s + TIME=1112912005 225s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 225s [d 93e27e6] d⇒2 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify d.txt 3 225s + filename=d.txt 225s + text=3 225s + echo 3 225s + git add d.txt 225s + modify conflict.txt d version 225s + filename=conflict.txt 225s + text=d version 225s + echo d version 225s + git add conflict.txt 225s + commit -m d⇒3 225s + TIME=1112912006 225s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 225s [d 2bb1a7e] d⇒3 225s 2 files changed, 2 insertions(+), 2 deletions(-) 225s + modify d.txt 4 225s + filename=d.txt 225s + text=4 225s + echo 4 225s + git add d.txt 225s + commit -m d⇒4 225s + TIME=1112912007 225s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 225s [d 81f9c80] d⇒4 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify d.txt 5 225s + filename=d.txt 225s + text=5 225s + echo 5 225s + git add d.txt 225s + commit -m d⇒5 225s + TIME=1112912008 225s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 225s [d 3690dde] d⇒5 225s 1 file changed, 1 insertion(+), 1 deletion(-) 225s + modify d.txt 6 225s + filename=d.txt 225s + text=6 225s + echo 6 225s + git add d.txt 225s + commit -m d⇒6 225s + TIME=1112912009 225s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 226s [d 8085853] d⇒6 226s 1 file changed, 1 insertion(+), 1 deletion(-) 226s + git checkout c 226s Switched to branch 'c' 226s + git-imerge init --name=c-d d 226s + git-imerge list 226s * c-d 226s + git-imerge diagram --commits --frontier --html=imerge0.html 226s 0 5 9 226s | | | 226s 0 - ********** - c 226s *????????? 226s *????????? 226s *????????? 226s *????????? 226s 5 - *????????? 226s 6 - *????????? 226s | 226s d 226s 226s 0 5 9 226s | | | 226s 0 - ********** - c 226s *????????? 226s *????????? 226s *????????? 226s *????????? 226s 5 - *????????? 226s 6 - *????????? 226s | 226s d 226s 226s Key: 226s |,-,+ = rectangles forming current merge frontier 226s * = merge done manually 226s . = merge done automatically 226s # = conflict that is currently blocking progress 226s @ = merge was blocked but has been resolved 226s ? = no merge recorded 226s 226s + git-imerge autofill 226s + tee autofill.out 226s Attempting automerge of 9-6...failure. 226s Attempting automerge of 1-1...success. 226s Attempting automerge of 1-4...success. 226s Attempting automerge of 1-6...success. 226s Attempting automerge of 9-6...failure. 226s Attempting automerge of 5-6...failure. 226s Attempting automerge of 3-6...success. 226s Attempting automerge of 4-6...failure. 226s Attempting automerge of 4-1...success. 226s Attempting automerge of 4-4...failure. 226s Attempting automerge of 4-3...failure. 226s Attempting automerge of 4-2...success. 226s Attempting automerge of 9-2...success. 226s Autofilling 1-6...success. 226s Autofilling 2-6...success. 226s Autofilling 3-1...success. 226s Autofilling 3-2...success. 226s Autofilling 3-3...success. 226s Autofilling 3-4...success. 226s Autofilling 3-5...success. 226s Autofilling 3-6 (first way)...success. 226s Autofilling 3-6 (second way)...success. 226s The two ways of autofilling 3-6 agree. 226s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 226s Autofilling 4-2...success. 226s Autofilling 5-2...success. 226s Autofilling 6-2...success. 226s Autofilling 7-2...success. 226s Autofilling 8-2...success. 226s Autofilling 9-1...success. 226s Autofilling 9-2 (first way)...success. 226s Autofilling 9-2 (second way)...success. 226s The two ways of autofilling 9-2 agree. 226s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 226s Attempting automerge of 9-6...failure. 226s Attempting automerge of 4-3...failure. 226s HEAD is now at 9cde605 c⇒9 226s Conflict; suggest manual merge of 4-3 227s + grep -q Traceback autofill.out 227s + grep -q suggest manual merge of 4-3 autofill.out 227s + git-imerge diagram --commits --frontier --html=imerge1.html 227s 0 5 9 227s | | | 227s 0 - ********** - c 227s *??.?????. 227s *??....... 227s *??.#????? 227s *??.?????? 227s 5 - *??.?????? 227s 6 - *...?????? 227s | 227s d 227s 227s 0 5 9 227s | | | 227s 0 - ********** - c 227s *??.?????| 227s *??.-----+ 227s *??|#????? 227s *??|?????? 227s 5 - *??|?????? 227s 6 - *--+?????? 227s | 227s d 227s 227s Key: 227s |,-,+ = rectangles forming current merge frontier 227s * = merge done manually 227s . = merge done automatically 227s # = conflict that is currently blocking progress 227s @ = merge was blocked but has been resolved 227s ? = no merge recorded 227s 227s + git-imerge continue --edit 227s Switched to branch 'imerge/c-d' 227s 227s Original first commit: 227s 227s Original second commit: 227s Auto-merging conflict.txt 227s CONFLICT (content): Merge conflict in conflict.txt 227s Automatic merge failed; fix conflicts and then commit the result. 227s commit 3c091ded129a5edf9061360bab867edade996c93 227s Author: Loú User 227s Date: Thu Apr 7 22:13:18 2005 +0000 227s 227s c⇒4 227s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 227s Author: Loú User 227s Date: Thu Apr 7 22:13:26 2005 +0000 227s 227s d⇒3 227s 227s There was a conflict merging commit 4-3, shown above. 227s Please resolve the conflict, commit the result, then type 227s 227s git-imerge continue 227s + echo merged version 227s + git add conflict.txt 227s + git-imerge continue --no-edit 227s [imerge/c-d fb30ce2] imerge 'c-d': manual merge 4-3 227s Merge has been recorded for merge 4-3. 227s Attempting automerge of 4-6...success. 227s Autofilling 4-4...success. 227s Autofilling 4-5...success. 227s Autofilling 4-6...success. 227s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 227s Attempting automerge of 9-6...success. 227s Autofilling 5-6...success. 227s Autofilling 6-6...success. 227s Autofilling 7-6...success. 227s Autofilling 8-6...success. 227s Autofilling 9-3...success. 227s Autofilling 9-4...success. 227s Autofilling 9-5...success. 227s Autofilling 9-6 (first way)...success. 227s Autofilling 9-6 (second way)...success. 227s The two ways of autofilling 9-6 agree. 227s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 227s Merge is complete! 227s + git-imerge diagram --commits --frontier --html=imerge2.html 227s 0 5 9 227s | | | 227s 0 - ********** - c 227s *??.?????. 227s *??....... 227s *??.*????. 227s *??..????. 227s 5 - *??..????. 227s 6 - *......... 227s | 227s d 227s 227s 0 5 9 227s | | | 227s 0 - ********** - c 227s *??.?????| 227s *??......| 227s *??.*????| 227s *??..????| 227s 5 - *??..????| 227s 6 - *--------+ 227s | 227s d 227s 227s Key: 227s |,-,+ = rectangles forming current merge frontier 227s * = merge done manually 227s . = merge done automatically 227s # = conflict that is currently blocking progress 227s @ = merge was blocked but has been resolved 227s ? = no merge recorded 227s 227s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 228s Merge d into c (using imerge) 228s 228s # Please enter the commit message for your changes. Lines starting 228s # with '#' will be ignored, and an empty message aborts the commit. 228s # 228s # Date: Fri Dec 5 08:26:19 2025 +0000 228s # 228s # On branch c-d-merge 228s # Changes to be committed: 228s # modified: conflict.txt 228s # modified: d.txt 228s # 228s [c-d-merge fa6be5d] Merge d into c (using imerge) 228s Date: Fri Dec 5 08:26:19 2025 +0000 228s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + local refname=c-d-merge 228s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + git rev-parse c-d-merge^{tree} 228s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + git-imerge simplify --goal=rebase --branch=c-d-rebase 228s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + local refname=c-d-rebase 228s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + git rev-parse c-d-rebase^{tree} 228s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 228s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + local refname=c-d-rebase-with-history 228s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + git rev-parse c-d-rebase-with-history^{tree} 228s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + git-imerge simplify --goal=border --branch=c-d-border 228s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 228s + local refname=c-d-border 228s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + git rev-parse c-d-border^{tree} 229s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 229s Attempting to merge 1-1...success. 229s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + local refname=c-d-border-with-history 229s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + git rev-parse c-d-border-with-history^{tree} 229s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 229s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + local refname=c-d-border-with-history2 229s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + git rev-parse c-d-border-with-history2^{tree} 229s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 229s + git-imerge remove 229s + git checkout c 229s Switched to branch 'c' 229s + git-imerge start --goal=full --first-parent --name=c-d d 229s + tee start.out 229s Attempting to merge 1-2...success. 229s Attempting to merge 1-3...success. 229s Attempting to merge 1-4...success. 229s Attempting to merge 1-5...success. 229s Attempting to merge 1-6...success. 229s Attempting to merge 2-1...success. 229s Attempting to merge 2-2...success. 229s Attempting to merge 2-3...success. 229s Attempting to merge 2-4...success. 229s Attempting to merge 2-5...success. 229s Attempting to merge 2-6...success. 229s Attempting to merge 3-1...success. 229s Attempting to merge 3-2...success. 229s Attempting to merge 3-3...success. 229s Attempting to merge 3-4...success. 229s Attempting to merge 3-5...success. 229s Attempting to merge 3-6...success. 229s Attempting to merge 4-1...success. 229s Attempting to merge 4-2...success. 229s Attempting to merge 4-3...conflict. 229s Attempting to merge 5-1...success. 229s Attempting to merge 5-2...success. 229s Attempting to merge 6-1...success. 229s Attempting to merge 6-2...success. 229s Attempting to merge 7-1...success. 229s Attempting to merge 7-2...success. 229s Attempting to merge 8-1...success. 229s Attempting to merge 8-2...success. 229s Attempting to merge 9-1...success. 229s Attempting to merge 9-2...success. 229s Previous HEAD position was 28412cb imerge 'c-d': automatic merge 9-2 229s Switched to branch 'imerge/c-d' 229s Auto-merging conflict.txt 229s CONFLICT (content): Merge conflict in conflict.txt 229s Automatic merge failed; fix conflicts and then commit the result. 229s 229s Original first commit: 229s commit 3c091ded129a5edf9061360bab867edade996c93 229s Author: Loú User 229s Date: Thu Apr 7 22:13:18 2005 +0000 229s 229s c⇒4 229s 229s Original second commit: 229s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 229s Author: Loú User 229s Date: Thu Apr 7 22:13:26 2005 +0000 229s 229s d⇒3 229s 229s There was a conflict merging commit 4-3, shown above. 229s Please resolve the conflict, commit the result, then type 229s 229s git-imerge continue 229s + grep -q Traceback start.out 229s + grep -q suggest manual merge of 4-3 autofill.out 229s + git-imerge diagram --commits --frontier --html=imerge3.html 229s 0 5 9 229s | | | 229s 0 - ********** - c 229s *......... 229s *......... 229s *...#????? 229s *...?????? 229s 5 - *...?????? 229s 6 - *...?????? 229s | 229s d 229s 229s 0 5 9 229s | | | 229s 0 - ********** - c 229s *........| 229s *...-----+ 229s *..|#????? 229s *..|?????? 229s 5 - *..|?????? 229s 6 - *--+?????? 229s | 229s d 229s 229s Key: 229s |,-,+ = rectangles forming current merge frontier 229s * = merge done manually 229s . = merge done automatically 229s # = conflict that is currently blocking progress 229s @ = merge was blocked but has been resolved 229s ? = no merge recorded 229s 229s + echo merged version 229s + git add conflict.txt 229s + GIT_EDITOR=cat git commit 229s imerge 'c-d': manual merge 4-3 229s 229s # Conflicts: 229s # conflict.txt 229s # 229s # It looks like you may be committing a merge. 229s # If this is not correct, please run 229s # git update-ref -d MERGE_HEAD 229s # and try again. 229s 229s 229s # Please enter the commit message for your changes. Lines starting 229s # with '#' will be ignored, and an empty message aborts the commit. 229s # 229s # On branch imerge/c-d 229s # All conflicts fixed but you are still merging. 229s # 229s # Changes to be committed: 229s # modified: conflict.txt 229s # modified: d.txt 229s # 229s [imerge/c-d b6dbe04] imerge 'c-d': manual merge 4-3 229s + git-imerge continue --edit 229s Merge has been recorded for merge 4-3. 229s Attempting to merge 4-4...success. 229s Attempting to merge 4-5...success. 229s Attempting to merge 4-6...success. 229s Attempting to merge 5-3...success. 229s Attempting to merge 5-4...success. 230s Attempting to merge 5-5...success. 230s Attempting to merge 5-6...success. 230s Attempting to merge 6-3...success. 230s Attempting to merge 6-4...success. 230s Attempting to merge 6-5...success. 230s Attempting to merge 6-6...success. 230s Attempting to merge 7-3...success. 230s Attempting to merge 7-4...success. 230s Attempting to merge 7-5...success. 230s Attempting to merge 7-6...success. 230s Attempting to merge 8-3...success. 230s Attempting to merge 8-4...success. 230s Attempting to merge 8-5...success. 230s Attempting to merge 8-6...success. 230s Attempting to merge 9-3...success. 230s Attempting to merge 9-4...success. 230s Attempting to merge 9-5...success. 230s Attempting to merge 9-6...success. 230s Merge is complete! 230s + git-imerge diagram --commits --frontier --html=imerge4.html 230s 0 5 9 230s | | | 230s 0 - ********** - c 230s *......... 230s *......... 230s *...*..... 230s *......... 230s 5 - *......... 230s 6 - *......... 230s | 230s d 230s 230s 0 5 9 230s | | | 230s 0 - ********** - c 230s *........| 230s *........| 230s *...*....| 230s *........| 230s 5 - *........| 230s 6 - *--------+ 230s | 230s d 230s 230s Key: 230s |,-,+ = rectangles forming current merge frontier 230s * = merge done manually 230s . = merge done automatically 230s # = conflict that is currently blocking progress 230s @ = merge was blocked but has been resolved 230s ? = no merge recorded 230s 230s + git-imerge finish --branch=c-d-full 230s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 230s + local refname=c-d-full 230s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 230s + git rev-parse c-d-full^{tree} 230s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 230s + test_conflict 1-1 230s + local conflict=1-1 230s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s + DESCRIPTION=git-imerge test repository with conflict at 1-1 230s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 230s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s + local description=git-imerge test repository with conflict at 1-1 230s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 230s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s + local description=git-imerge test repository with conflict at 1-1 230s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s hint: Using 'master' as the name for the initial branch. This default branch name 230s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1/.git/ 230s hint: is subject to change. To configure the initial branch name to use in all 230s hint: of your new repositories, which will suppress this warning, call: 230s hint: 230s hint: git config --global init.defaultBranch 230s hint: 230s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 230s hint: 'development'. The just-created branch can be renamed via this command: 230s hint: 230s hint: git branch -m 230s hint: 230s hint: Disable this message with "git config set advice.defaultBranchName false" 230s + echo git-imerge test repository with conflict at 1-1 230s + printf %s\n /*.out /*.css /*.html 230s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1/.git config user.name Loú User 230s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 230s + TIME=1112911993 230s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-1 230s + modify c.txt 0 230s + filename=c.txt 230s + text=0 230s + echo 0 230s + git add c.txt 230s [master (root-commit) d70e04b] m⇒0 230s 3 files changed, 3 insertions(+) 230s create mode 100644 c.txt 230s create mode 100644 conflict.txt 230s create mode 100644 d.txt 230s + modify d.txt 0 230s + filename=d.txt 230s + text=0 230s + echo 0 230s + git add d.txt 230s + modify conflict.txt original version 230s + filename=conflict.txt 230s + text=original version 230s + echo original version 230s + git add conflict.txt 230s + commit -m m⇒0 230s + TIME=1112911994 230s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 230s + git checkout -b c master -- 230s Switched to a new branch 'c' 230s + seq 9 230s + modify c.txt 1 230s + filename=c.txt 230s + text=1 230s + echo 1 230s + git add c.txt 230s + modify conflict.txt c version 230s + filename=conflict.txt 230s + text=c version 230s + echo c version 230s + git add conflict.txt 230s + commit -m c⇒1 230s + TIME=1112911995 230s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 230s + modify c.txt 2 230s + filename=c.txt 230s + text=2 230s + echo 2 230s + git add c.txt 230s + commit -m c⇒2 230s + TIME=1112911996 230s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 230s + modify c.txt 3 230s + filename=c.txt 230s + text=3 230s + echo 3 230s + git add c.txt 230s + commit -m c⇒3 230s + TIME=1112911997 230s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 230s + modify c.txt 4 230s + filename=c.txt 230s + text=4 230s + echo 4 230s + git add c.txt 230s [c 2120f40] c⇒1 230s 2 files changed, 2 insertions(+), 2 deletions(-) 230s [c 90cc7de] c⇒2 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [c 2046ed2] c⇒3 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [c 8a2cee9] c⇒4 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [c ac16a05] c⇒5 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [c 30dd2ae] c⇒6 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s + commit -m c⇒4 230s + TIME=1112911998 230s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 230s + modify c.txt 5 230s + filename=c.txt 230s + text=5 230s + echo 5 230s + git add c.txt 230s + commit -m c⇒5 230s + TIME=1112911999 230s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 230s + modify c.txt 6 230s + filename=c.txt 230s + text=6 230s + echo 6 230s + git add c.txt 230s + commit -m c⇒6 230s + TIME=1112912000 230s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 230s + modify c.txt 7 230s + filename=c.txt 230s + text=7 230s + echo 7 230s + git add c.txt 230s + commit -m c⇒7 230s + TIME=1112912001 230s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 230s [c 0883eb9] c⇒7 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [c f661c06] c⇒8 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [c 243e8ed] c⇒9 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [d ac0427a] d⇒1 230s 2 files changed, 2 insertions(+), 2 deletions(-) 230s [d 43c38c0] d⇒2 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [d 0260058] d⇒3 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s + modify c.txt 8 230s + filename=c.txt 230s + text=8 230s + echo 8 230s + git add c.txt 230s + commit -m c⇒8 230s + TIME=1112912002 230s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 230s + modify c.txt 9 230s + filename=c.txt 230s + text=9 230s + echo 9 230s + git add c.txt 230s + commit -m c⇒9 230s + TIME=1112912003 230s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 230s + git checkout -b d master -- 230s Switched to a new branch 'd' 230s + seq 6 230s + modify d.txt 1 230s + filename=d.txt 230s + text=1 230s + echo 1 230s + git add d.txt 230s + modify conflict.txt d version 230s + filename=conflict.txt 230s + text=d version 230s + echo d version 230s + git add conflict.txt 230s + commit -m d⇒1 230s + TIME=1112912004 230s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 230s + modify d.txt 2 230s + filename=d.txt 230s + text=2 230s + echo 2 230s + git add d.txt 230s + commit -m d⇒2 230s + TIME=1112912005 230s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 230s + modify d.txt 3 230s + filename=d.txt 230s + text=3 230s + echo 3 230s + git add d.txt 230s + commit -m d⇒3 230s + TIME=1112912006 230s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 230s + modify d.txt 4 230s + filename=d.txt 230s + text=4 230s + echo 4 230s + git add d.txt 230s + commit -m d⇒4 230s + TIME=1112912007 230s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 230s + modify d.txt 5 230s + filename=d.txt 230s + text=5 230s + echo 5 230s + git add d.txt 230s + commit -m d⇒5 230s + TIME=1112912008 230s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 230s + modify d.txt 6 230s + filename=d.txt 230s + text=6 230s + echo 6 230s + git add d.txt 230s + commit -m d⇒6 230s + TIME=1112912009 230s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 230s + git checkout c 230s Switched to branch 'c' 230s + git-imerge init --name=c-d d 230s [d 40fef44] d⇒4 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [d b080a65] d⇒5 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s [d 200ce5c] d⇒6 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s + git-imerge list 230s * c-d 230s + git-imerge diagram --commits --frontier --html=imerge0.html 230s 0 5 9 230s | | | 230s 0 - ********** - c 230s *????????? 230s *????????? 230s *????????? 230s *????????? 230s 5 - *????????? 230s 6 - *????????? 230s | 230s d 230s 230s 0 5 9 230s | | | 230s 0 - ********** - c 230s *????????? 230s *????????? 230s *????????? 230s *????????? 230s 5 - *????????? 230s 6 - *????????? 230s | 230s d 230s 230s Key: 230s |,-,+ = rectangles forming current merge frontier 230s * = merge done manually 230s . = merge done automatically 230s # = conflict that is currently blocking progress 230s @ = merge was blocked but has been resolved 230s ? = no merge recorded 230s 230s + git-imerge autofill 230s + tee autofill.out 230s Attempting automerge of 9-6...failure. 230s Attempting automerge of 1-1...failure. 230s HEAD is now at 243e8ed c⇒9 230s No progress was possible; suggest manual merge of 1-1 230s + grep -q Traceback autofill.out 230s + grep -q suggest manual merge of 1-1 autofill.out 230s + git-imerge diagram --commits --frontier --html=imerge1.html 231s 0 5 9 231s | | | 231s 0 - ********** - c 231s *#???????? 231s *????????? 231s *????????? 231s *????????? 231s 5 - *????????? 231s 6 - *????????? 231s | 231s d 231s 231s 0 5 9 231s | | | 231s 0 - ********** - c 231s *#???????? 231s *????????? 231s *????????? 231s *????????? 231s 5 - *????????? 231s 6 - *????????? 231s | 231s d 231s 231s Key: 231s |,-,+ = rectangles forming current merge frontier 231s * = merge done manually 231s . = merge done automatically 231s # = conflict that is currently blocking progress 231s @ = merge was blocked but has been resolved 231s ? = no merge recorded 231s 231s + git-imerge continue --edit 231s Switched to branch 'imerge/c-d' 231s Auto-merging conflict.txt 231s CONFLICT (content): Merge conflict in conflict.txt 231s Automatic merge failed; fix conflicts and then commit the result. 231s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 231s Author: Loú User 231s Date: Thu Apr 7 22:13:15 2005 +0000 231s 231s c⇒1 231s 231s Original first commit: 231s 231s Original second commit: 231s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 231s Author: Loú User 231s Date: Thu Apr 7 22:13:24 2005 +0000 231s 231s d⇒1 231s 231s There was a conflict merging commit 1-1, shown above. 231s Please resolve the conflict, commit the result, then type 231s 231s git-imerge continue 231s + echo merged version 231s + git add conflict.txt 231s + git-imerge continue --no-edit 231s [imerge/c-d 31fd5e1] imerge 'c-d': manual merge 1-1 231s Merge has been recorded for merge 1-1. 231s Attempting automerge of 1-6...success. 231s Autofilling 1-2...success. 231s Autofilling 1-3...success. 231s Autofilling 1-4...success. 231s Autofilling 1-5...success. 231s Autofilling 1-6...success. 231s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 231s Attempting automerge of 9-6...success. 231s Autofilling 2-6...success. 231s Autofilling 3-6...success. 231s Autofilling 4-6...success. 231s Autofilling 5-6...success. 231s Autofilling 6-6...success. 231s Autofilling 7-6...success. 231s Autofilling 8-6...success. 231s Autofilling 9-1...success. 231s Autofilling 9-2...success. 231s Autofilling 9-3...success. 231s Autofilling 9-4...success. 231s Autofilling 9-5...success. 231s Autofilling 9-6 (first way)...success. 231s Autofilling 9-6 (second way)...success. 231s The two ways of autofilling 9-6 agree. 231s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 231s Merge is complete! 231s + git-imerge diagram --commits --frontier --html=imerge2.html 231s 0 5 9 231s | | | 231s 0 - ********** - c 231s **???????. 231s *.???????. 231s *.???????. 231s *.???????. 231s 5 - *.???????. 231s 6 - *......... 231s | 231s d 231s 231s 0 5 9 231s | | | 231s 0 - ********** - c 231s **???????| 231s *.???????| 231s *.???????| 231s *.???????| 231s 5 - *.???????| 231s 6 - *--------+ 231s | 231s d 231s 231s Key: 231s |,-,+ = rectangles forming current merge frontier 231s * = merge done manually 231s . = merge done automatically 231s # = conflict that is currently blocking progress 231s @ = merge was blocked but has been resolved 231s ? = no merge recorded 231s 231s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 231s Merge d into c (using imerge) 231s 231s # Please enter the commit message for your changes. Lines starting 231s # with '#' will be ignored, and an empty message aborts the commit. 231s # 231s # Date: Fri Dec 5 08:26:23 2025 +0000 231s # 231s # On branch c-d-merge 231s # Changes to be committed: 231s # modified: conflict.txt 231s # modified: d.txt 231s # 231s [c-d-merge 2ee7de4] Merge d into c (using imerge) 231s Date: Fri Dec 5 08:26:23 2025 +0000 231s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + local refname=c-d-merge 231s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git rev-parse c-d-merge^{tree} 231s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git-imerge simplify --goal=rebase --branch=c-d-rebase 231s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + local refname=c-d-rebase 231s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git rev-parse c-d-rebase^{tree} 231s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 231s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + local refname=c-d-rebase-with-history 231s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git rev-parse c-d-rebase-with-history^{tree} 231s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 231s + git-imerge simplify --goal=border --branch=c-d-border 232s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + local refname=c-d-border 232s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git rev-parse c-d-border^{tree} 232s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 232s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + local refname=c-d-border-with-history 232s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git rev-parse c-d-border-with-history^{tree} 232s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 232s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + local refname=c-d-border-with-history2 232s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git rev-parse c-d-border-with-history2^{tree} 232s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 232s + git-imerge remove 232s + git checkout c 232s Switched to branch 'c' 232s + git-imerge start --goal=full --first-parent --name=c-d d 232s + tee start.out 232s Attempting to merge 1-1...conflict. 232s Switched to branch 'imerge/c-d' 232s Auto-merging conflict.txt 232s CONFLICT (content): Merge conflict in conflict.txt 232s Automatic merge failed; fix conflicts and then commit the result. 232s 232s Original first commit: 232s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 232s Author: Loú User 232s Date: Thu Apr 7 22:13:15 2005 +0000 232s 232s c⇒1 232s 232s Original second commit: 232s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 232s Author: Loú User 232s Date: Thu Apr 7 22:13:24 2005 +0000 232s 232s d⇒1 232s 232s There was a conflict merging commit 1-1, shown above. 232s Please resolve the conflict, commit the result, then type 232s 232s git-imerge continue 232s + grep -q Traceback start.out 232s + grep -q suggest manual merge of 1-1 autofill.out 232s + git-imerge diagram --commits --frontier --html=imerge3.html 232s 0 5 9 232s | | | 232s 0 - ********** - c 232s *#???????? 232s *????????? 232s *????????? 232s *????????? 232s 5 - *????????? 232s 6 - *????????? 232s | 232s d 232s 232s 0 5 9 232s | | | 232s 0 - ********** - c 232s *#???????? 232s *????????? 232s *????????? 232s *????????? 232s 5 - *????????? 232s 6 - *????????? 232s | 232s d 232s 232s Key: 232s |,-,+ = rectangles forming current merge frontier 232s * = merge done manually 232s . = merge done automatically 232s # = conflict that is currently blocking progress 232s @ = merge was blocked but has been resolved 232s ? = no merge recorded 232s 232s + echo merged version 232s + git add conflict.txt 232s + GIT_EDITOR=cat git commit 232s + git-imerge continue --edit 232s imerge 'c-d': manual merge 1-1 232s 232s # Conflicts: 232s # conflict.txt 232s # 232s # It looks like you may be committing a merge. 232s # If this is not correct, please run 232s # git update-ref -d MERGE_HEAD 232s # and try again. 232s 232s 232s # Please enter the commit message for your changes. Lines starting 232s # with '#' will be ignored, and an empty message aborts the commit. 232s # 232s # On branch imerge/c-d 232s # All conflicts fixed but you are still merging. 232s # 232s # Changes to be committed: 232s # modified: conflict.txt 232s # modified: d.txt 232s # 232s [imerge/c-d d70e0ff] imerge 'c-d': manual merge 1-1 232s Merge has been recorded for merge 1-1. 232s Attempting to merge 1-2...success. 232s Attempting to merge 1-3...success. 232s Attempting to merge 1-4...success. 232s Attempting to merge 1-5...success. 232s Attempting to merge 1-6...success. 232s Attempting to merge 2-1...success. 232s Attempting to merge 2-2...success. 232s Attempting to merge 2-3...success. 232s Attempting to merge 2-4...success. 232s Attempting to merge 2-5...success. 232s Attempting to merge 2-6...success. 232s Attempting to merge 3-1...success. 233s Attempting to merge 3-2...success. 233s Attempting to merge 3-3...success. 233s Attempting to merge 3-4...success. 233s Attempting to merge 3-5...success. 233s Attempting to merge 3-6...success. 233s Attempting to merge 4-1...success. 233s Attempting to merge 4-2...success. 233s Attempting to merge 4-3...success. 233s Attempting to merge 4-4...success. 233s Attempting to merge 4-5...success. 233s Attempting to merge 4-6...success. 233s Attempting to merge 5-1...success. 233s Attempting to merge 5-2...success. 233s Attempting to merge 5-3...success. 233s Attempting to merge 5-4...success. 233s Attempting to merge 5-5...success. 233s Attempting to merge 5-6...success. 233s Attempting to merge 6-1...success. 233s Attempting to merge 6-2...success. 233s Attempting to merge 6-3...success. 233s Attempting to merge 6-4...success. 233s Attempting to merge 6-5...success. 233s Attempting to merge 6-6...success. 233s Attempting to merge 7-1...success. 233s Attempting to merge 7-2...success. 233s Attempting to merge 7-3...success. 233s Attempting to merge 7-4...success. 233s Attempting to merge 7-5...success. 233s Attempting to merge 7-6...success. 233s Attempting to merge 8-1...success. 233s Attempting to merge 8-2...success. 233s Attempting to merge 8-3...success. 233s Attempting to merge 8-4...success. 233s Attempting to merge 8-5...success. 233s Attempting to merge 8-6...success. 233s Attempting to merge 9-1...success. 233s Attempting to merge 9-2...success. 233s Attempting to merge 9-3...success. 233s Attempting to merge 9-4...success. 233s Attempting to merge 9-5...success. 233s Attempting to merge 9-6...success. 233s Merge is complete! 233s + git-imerge diagram --commits --frontier --html=imerge4.html 233s 0 5 9 233s | | | 233s 0 - ********** - c 233s **........ 233s *......... 233s *......... 233s *......... 233s 5 - *......... 233s 6 - *......... 233s | 233s d 233s 233s 0 5 9 233s | | | 233s 0 - ********** - c 233s **.......| 233s *........| 233s *........| 233s *........| 233s 5 - *........| 233s 6 - *--------+ 233s | 233s d 233s 233s Key: 233s |,-,+ = rectangles forming current merge frontier 233s * = merge done manually 233s . = merge done automatically 233s # = conflict that is currently blocking progress 233s @ = merge was blocked but has been resolved 233s ? = no merge recorded 233s 233s + git-imerge finish --branch=c-d-full 233s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + local refname=c-d-full 233s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git rev-parse c-d-full^{tree} 233s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + test_conflict 9-1 233s + local conflict=9-1 233s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s + DESCRIPTION=git-imerge test repository with conflict at 9-1 233s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 233s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s + local description=git-imerge test repository with conflict at 9-1 233s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 233s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s + local description=git-imerge test repository with conflict at 9-1 233s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1/.git/ 233s hint: Using 'master' as the name for the initial branch. This default branch name 233s hint: is subject to change. To configure the initial branch name to use in all 233s hint: of your new repositories, which will suppress this warning, call: 233s hint: 233s hint: git config --global init.defaultBranch 233s hint: 233s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 233s hint: 'development'. The just-created branch can be renamed via this command: 233s hint: 233s hint: git branch -m 233s hint: 233s hint: Disable this message with "git config set advice.defaultBranchName false" 233s + echo git-imerge test repository with conflict at 9-1 233s + printf %s\n /*.out /*.css /*.html 233s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1/.git config user.name Loú User 233s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 233s + TIME=1112911993 233s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-1 233s + modify c.txt 0 233s + filename=c.txt 233s + text=0 233s + echo 0 233s + git add c.txt 233s + modify d.txt 0 233s + filename=d.txt 233s + text=0 233s + echo 0 233s + git add d.txt 233s + modify conflict.txt original version 233s + filename=conflict.txt 233s + text=original version 233s + echo original version 233s + git add conflict.txt 233s + commit -m m⇒0 233s + TIME=1112911994 233s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 233s [master (root-commit) d70e04b] m⇒0 233s 3 files changed, 3 insertions(+) 233s create mode 100644 c.txt 233s create mode 100644 conflict.txt 233s create mode 100644 d.txt 233s + git checkout -b c master -- 233s Switched to a new branch 'c' 233s + seq 9 233s + modify c.txt 1 233s + filename=c.txt 233s + text=1 233s + echo 1 233s + git add c.txt 233s + commit -m c⇒1 233s + TIME=1112911995 233s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 233s [c 89e2141] c⇒1 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 2 233s + filename=c.txt 233s + text=2 233s + echo 2 233s + git add c.txt 233s + commit -m c⇒2 233s + TIME=1112911996 233s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 233s [c 7c431f2] c⇒2 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 3 233s + filename=c.txt 233s + text=3 233s + echo 3 233s + git add c.txt 233s + commit -m c⇒3 233s + TIME=1112911997 233s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 233s [c f02ab24] c⇒3 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 4 233s + filename=c.txt 233s + text=4 233s + echo 4 233s + git add c.txt 233s + commit -m c⇒4 233s + TIME=1112911998 233s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 233s [c ed9122f] c⇒4 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 5 233s + filename=c.txt 233s + text=5 233s + echo 5 233s + git add c.txt 233s + commit -m c⇒5 233s + TIME=1112911999 233s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 233s [c 1d3bf09] c⇒5 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 6 233s + filename=c.txt 233s + text=6 233s + echo 6 233s + git add c.txt 233s + commit -m c⇒6 233s + TIME=1112912000 233s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 233s [c f999ecd] c⇒6 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 7 233s + filename=c.txt 233s + text=7 233s + echo 7 233s + git add c.txt 233s + commit -m c⇒7 233s + TIME=1112912001 233s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 233s [c 7050a8a] c⇒7 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 8 233s + filename=c.txt 233s + text=8 233s + echo 8 233s + git add c.txt 233s + commit -m c⇒8 233s + TIME=1112912002 233s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 233s [c 9732e77] c⇒8 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify c.txt 9 233s + filename=c.txt 233s + text=9 233s + echo 9 233s + git add c.txt 233s + modify conflict.txt c version 233s + filename=conflict.txt 233s + text=c version 233s + echo c version 233s + git add conflict.txt 233s + commit -m c⇒9 233s + TIME=1112912003 233s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 233s [c 73a5eed] c⇒9 233s 2 files changed, 2 insertions(+), 2 deletions(-) 233s + git checkout -b d master -- 233s Switched to a new branch 'd' 233s + seq 6 233s + modify d.txt 1 233s + filename=d.txt 233s + text=1 233s + echo 1 233s + git add d.txt 233s + modify conflict.txt d version 233s + filename=conflict.txt 233s + text=d version 233s + echo d version 233s + git add conflict.txt 233s + commit -m d⇒1 233s + TIME=1112912004 233s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 233s [d ac0427a] d⇒1 233s 2 files changed, 2 insertions(+), 2 deletions(-) 233s + modify d.txt 2 233s + filename=d.txt 233s + text=2 233s + echo 2 233s + git add d.txt 233s + commit -m d⇒2 233s + TIME=1112912005 233s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 233s [d 43c38c0] d⇒2 233s 1 file changed, 1 insertion(+), 1 deletion(-) 233s + modify d.txt 3 233s + filename=d.txt 233s + text=3 233s + echo 3 233s + git add d.txt 234s + commit -m d⇒3 234s + TIME=1112912006 234s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 234s [d 0260058] d⇒3 234s 1 file changed, 1 insertion(+), 1 deletion(-) 234s + modify d.txt 4 234s + filename=d.txt 234s + text=4 234s + echo 4 234s + git add d.txt 234s + commit -m d⇒4 234s + TIME=1112912007 234s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 234s [d 40fef44] d⇒4 234s 1 file changed, 1 insertion(+), 1 deletion(-) 234s + modify d.txt 5 234s + filename=d.txt 234s + text=5 234s + echo 5 234s + git add d.txt 234s + commit -m d⇒5 234s + TIME=1112912008 234s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 234s [d b080a65] d⇒5 234s 1 file changed, 1 insertion(+), 1 deletion(-) 234s + modify d.txt 6 234s + filename=d.txt 234s + text=6 234s + echo 6 234s + git add d.txt 234s + commit -m d⇒6 234s + TIME=1112912009 234s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 234s [d 200ce5c] d⇒6 234s 1 file changed, 1 insertion(+), 1 deletion(-) 234s + git checkout c 234s Switched to branch 'c' 234s + git-imerge init --name=c-d d 234s + git-imerge list 234s * c-d 234s + git-imerge diagram --commits --frontier --html=imerge0.html 234s 0 5 9 234s | | | 234s 0 - ********** - c 234s *????????? 234s *????????? 234s *????????? 234s *????????? 234s 5 - *????????? 234s 6 - *????????? 234s | 234s d 234s 234s 0 5 9 234s | | | 234s 0 - ********** - c 234s *????????? 234s *????????? 234s *????????? 234s *????????? 234s 5 - *????????? 234s 6 - *????????? 234s | 234s d 234s 234s Key: 234s |,-,+ = rectangles forming current merge frontier 234s * = merge done manually 234s . = merge done automatically 234s # = conflict that is currently blocking progress 234s @ = merge was blocked but has been resolved 234s ? = no merge recorded 234s 234s + git-imerge autofill 234s + tee autofill.out 234s Attempting automerge of 9-6...failure. 234s Attempting automerge of 1-1...success. 234s Attempting automerge of 1-4...success. 234s Attempting automerge of 1-6...success. 234s Attempting automerge of 9-6...failure. 234s Attempting automerge of 5-6...success. 234s Attempting automerge of 7-6...success. 234s Attempting automerge of 8-6...success. 234s Attempting automerge of 9-1...failure. 234s Autofilling 1-6...success. 234s Autofilling 2-6...success. 234s Autofilling 3-6...success. 234s Autofilling 4-6...success. 234s Autofilling 5-6...success. 234s Autofilling 6-6...success. 234s Autofilling 7-6...success. 234s Autofilling 8-1...success. 234s Autofilling 8-2...success. 234s Autofilling 8-3...success. 234s Autofilling 8-4...success. 234s Autofilling 8-5...success. 234s Autofilling 8-6 (first way)...success. 234s Autofilling 8-6 (second way)...success. 234s The two ways of autofilling 8-6 agree. 234s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 234s Attempting automerge of 9-6...failure. 234s Attempting automerge of 9-1...failure. 234s HEAD is now at 73a5eed c⇒9 234s Conflict; suggest manual merge of 9-1 234s + grep -q Traceback autofill.out 234s + grep -q suggest manual merge of 9-1 autofill.out 234s + git-imerge diagram --commits --frontier --html=imerge1.html 234s 0 5 9 234s | | | 234s 0 - ********** - c 234s *???????.# 234s *???????.? 234s *???????.? 234s *???????.? 234s 5 - *???????.? 234s 6 - *........? 234s | 234s d 234s 234s 0 5 9 234s | | | 234s 0 - ********** - c 234s *???????|# 234s *???????|? 234s *???????|? 234s *???????|? 234s 5 - *???????|? 234s 6 - *-------+? 234s | 234s d 234s 234s Key: 234s |,-,+ = rectangles forming current merge frontier 234s * = merge done manually 234s . = merge done automatically 234s # = conflict that is currently blocking progress 234s @ = merge was blocked but has been resolved 234s ? = no merge recorded 234s 234s + git-imerge continue --edit 234s Switched to branch 'imerge/c-d' 234s Auto-merging conflict.txt 234s CONFLICT (content): Merge conflict in conflict.txt 234s Automatic merge failed; fix conflicts and then commit the result. 234s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 234s Author: Loú User 234s Date: Thu Apr 7 22:13:23 2005 +0000 234s 234s c⇒9 234s 234s Original first commit: 234s 234s Original second commit: 234s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 234s Author: Loú User 234s Date: Thu Apr 7 22:13:24 2005 +0000 234s 234s d⇒1 234s 234s There was a conflict merging commit 9-1, shown above. 234s Please resolve the conflict, commit the result, then type 234s 234s git-imerge continue 235s + echo merged version 235s + git add conflict.txt 235s + git-imerge continue --no-edit 235s [imerge/c-d aa5ee29] imerge 'c-d': manual merge 9-1 235s Merge has been recorded for merge 9-1. 235s Attempting automerge of 9-6...success. 235s Autofilling 9-2...success. 235s Autofilling 9-3...success. 235s Autofilling 9-4...success. 235s Autofilling 9-5...success. 235s Autofilling 9-6...success. 235s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 235s Merge is complete! 235s + git-imerge diagram --commits --frontier --html=imerge2.html 235s 0 5 9 235s | | | 235s 0 - ********** - c 235s *???????.* 235s *???????.. 235s *???????.. 235s *???????.. 235s 5 - *???????.. 235s 6 - *......... 235s | 235s d 235s 235s 0 5 9 235s | | | 235s 0 - ********** - c 235s *???????.* 235s *???????.| 235s *???????.| 235s *???????.| 235s 5 - *???????.| 235s 6 - *--------+ 235s | 235s d 235s 235s Key: 235s |,-,+ = rectangles forming current merge frontier 235s * = merge done manually 235s . = merge done automatically 235s # = conflict that is currently blocking progress 235s @ = merge was blocked but has been resolved 235s ? = no merge recorded 235s 235s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 235s Merge d into c (using imerge) 235s 235s # Please enter the commit message for your changes. Lines starting 235s # with '#' will be ignored, and an empty message aborts the commit. 235s # 235s # Date: Fri Dec 5 08:26:27 2025 +0000 235s # 235s # On branch c-d-merge 235s # Changes to be committed: 235s # modified: conflict.txt 235s # modified: d.txt 235s # 235s [c-d-merge 79dbee0] Merge d into c (using imerge) 235s Date: Fri Dec 5 08:26:27 2025 +0000 235s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + local refname=c-d-merge 235s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git rev-parse c-d-merge^{tree} 235s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git-imerge simplify --goal=rebase --branch=c-d-rebase 235s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + local refname=c-d-rebase 235s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git rev-parse c-d-rebase^{tree} 235s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 235s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + local refname=c-d-rebase-with-history 235s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git rev-parse c-d-rebase-with-history^{tree} 235s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git-imerge simplify --goal=border --branch=c-d-border 235s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + local refname=c-d-border 235s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git rev-parse c-d-border^{tree} 235s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 235s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 236s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + local refname=c-d-border-with-history 236s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + git rev-parse c-d-border-with-history^{tree} 236s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 236s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + local refname=c-d-border-with-history2 236s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + git rev-parse c-d-border-with-history2^{tree} 236s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 236s + git-imerge remove 236s + git checkout c 236s Switched to branch 'c' 236s + git-imerge start --goal=full --first-parent --name=c-d d+ 236s tee start.out 236s Attempting to merge 1-1...success. 236s Attempting to merge 1-2...success. 236s Attempting to merge 1-3...success. 236s Attempting to merge 1-4...success. 236s Attempting to merge 1-5...success. 236s Attempting to merge 1-6...success. 236s Attempting to merge 2-1...success. 236s Attempting to merge 2-2...success. 236s Attempting to merge 2-3...success. 236s Attempting to merge 2-4...success. 236s Attempting to merge 2-5...success. 236s Attempting to merge 2-6...success. 236s Attempting to merge 3-1...success. 236s Attempting to merge 3-2...success. 236s Attempting to merge 3-3...success. 236s Attempting to merge 3-4...success. 236s Attempting to merge 3-5...success. 236s Attempting to merge 3-6...success. 236s Attempting to merge 4-1...success. 236s Attempting to merge 4-2...success. 236s Attempting to merge 4-3...success. 236s Attempting to merge 4-4...success. 236s Attempting to merge 4-5...success. 236s Attempting to merge 4-6...success. 236s Attempting to merge 5-1...success. 236s Attempting to merge 5-2...success. 236s Attempting to merge 5-3...success. 236s Attempting to merge 5-4...success. 236s Attempting to merge 5-5...success. 236s Attempting to merge 5-6...success. 236s Attempting to merge 6-1...success. 236s Attempting to merge 6-2...success. 236s Attempting to merge 6-3...success. 236s Attempting to merge 6-4...success. 236s Attempting to merge 6-5...success. 236s Attempting to merge 6-6...success. 236s Attempting to merge 7-1...success. 236s Attempting to merge 7-2...success. 236s Attempting to merge 7-3...success. 236s Attempting to merge 7-4...success. 236s Attempting to merge 7-5...success. 236s Attempting to merge 7-6...success. 236s Attempting to merge 8-1...success. 236s Attempting to merge 8-2...success. 237s Attempting to merge 8-3...success. 237s Attempting to merge 8-4...success. 237s Attempting to merge 8-5...success. 237s Attempting to merge 8-6...success. 237s Attempting to merge 9-1...conflict. 237s Switched to branch 'imerge/c-d' 237s Auto-merging conflict.txt 237s CONFLICT (content): Merge conflict in conflict.txt 237s Automatic merge failed; fix conflicts and then commit the result. 237s 237s Original first commit: 237s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 237s Author: Loú User 237s Date: Thu Apr 7 22:13:23 2005 +0000 237s 237s c⇒9 237s 237s Original second commit: 237s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 237s Author: Loú User 237s Date: Thu Apr 7 22:13:24 2005 +0000 237s 237s d⇒1 237s 237s There was a conflict merging commit 9-1, shown above. 237s Please resolve the conflict, commit the result, then type 237s 237s git-imerge continue 237s + grep -q Traceback start.out 237s + grep -q suggest manual merge of 9-1 autofill.out 237s + git-imerge diagram --commits --frontier --html=imerge3.html 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *........# 237s *........? 237s *........? 237s *........? 237s 5 - *........? 237s 6 - *........? 237s | 237s d 237s 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *.......|# 237s *.......|? 237s *.......|? 237s *.......|? 237s 5 - *.......|? 237s 6 - *-------+? 237s | 237s d 237s 237s Key: 237s |,-,+ = rectangles forming current merge frontier 237s * = merge done manually 237s . = merge done automatically 237s # = conflict that is currently blocking progress 237s @ = merge was blocked but has been resolved 237s ? = no merge recorded 237s 237s + echo merged version 237s + git add conflict.txt 237s + GIT_EDITOR=cat git commit 237s imerge 'c-d': manual merge 9-1 237s 237s # Conflicts: 237s # conflict.txt 237s # 237s # It looks like you may be committing a merge. 237s # If this is not correct, please run 237s # git update-ref -d MERGE_HEAD 237s # and try again. 237s 237s 237s # Please enter the commit message for your changes. Lines starting 237s # with '#' will be ignored, and an empty message aborts the commit. 237s # 237s # On branch imerge/c-d 237s # All conflicts fixed but you are still merging. 237s # 237s # Changes to be committed: 237s # modified: conflict.txt 237s # modified: d.txt 237s # 237s + git-imerge continue --edit 237s [imerge/c-d 1fdea76] imerge 'c-d': manual merge 9-1 237s Merge has been recorded for merge 9-1. 237s Attempting to merge 9-2...success. 237s Attempting to merge 9-3...success. 237s Attempting to merge 9-4...success. 237s Attempting to merge 9-5...success. 237s Attempting to merge 9-6...success. 237s Merge is complete! 237s + git-imerge diagram --commits --frontier --html=imerge4.html 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *........* 237s *......... 237s *......... 237s *......... 237s 5 - *......... 237s 6 - *......... 237s | 237s d 237s 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *........* 237s *........| 237s *........| 237s *........| 237s 5 - *........| 237s 6 - *--------+ 237s | 237s d 237s 237s Key: 237s |,-,+ = rectangles forming current merge frontier 237s * = merge done manually 237s . = merge done automatically 237s # = conflict that is currently blocking progress 237s @ = merge was blocked but has been resolved 237s ? = no merge recorded 237s 237s + git-imerge finish --branch=c-d-full 237s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 237s + local refname=c-d-full 237s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 237s + git rev-parse c-d-full^{tree} 237s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 237s + test_conflict 1-6 237s + local conflict=1-6 237s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s + DESCRIPTION=git-imerge test repository with conflict at 1-6 237s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 237s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s + local description=git-imerge test repository with conflict at 1-6 237s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 237s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s + local description=git-imerge test repository with conflict at 1-6 237s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6/.git/ 237s hint: Using 'master' as the name for the initial branch. This default branch name 237s hint: is subject to change. To configure the initial branch name to use in all 237s hint: of your new repositories, which will suppress this warning, call: 237s hint: 237s hint: git config --global init.defaultBranch 237s hint: 237s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 237s hint: 'development'. The just-created branch can be renamed via this command: 237s hint: 237s hint: git branch -m 237s hint: 237s hint: Disable this message with "git config set advice.defaultBranchName false" 237s + echo git-imerge test repository with conflict at 1-6 237s + printf %s\n /*.out /*.css /*.html 237s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6/.git config user.name Loú User 237s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 237s + TIME=1112911993 237s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-6 237s + modify c.txt 0 237s + filename=c.txt 237s + text=0 237s + echo 0 237s + git add c.txt 237s + modify d.txt 0 237s + filename=d.txt 237s + text=0 237s + echo 0 237s + git add d.txt 237s + modify conflict.txt original version 237s + filename=conflict.txt 237s + text=original version 237s + echo original version 237s + git add conflict.txt 237s + commit -m m⇒0 237s + TIME=1112911994 237s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 237s [master (root-commit) d70e04b] m⇒0 237s 3 files changed, 3 insertions(+) 237s create mode 100644 c.txt 237s create mode 100644 conflict.txt 237s create mode 100644 d.txt 237s + git checkout -b c master -- 237s Switched to a new branch 'c' 237s + seq 9 237s + modify c.txt 1 237s + filename=c.txt 237s + text=1 237s + echo 1 237s + git add c.txt 237s + modify conflict.txt c version 237s + filename=conflict.txt 237s + text=c version 237s + echo c version 237s + git add conflict.txt 237s + commit -m c⇒1 237s + TIME=1112911995 237s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 237s [c 2120f40] c⇒1 237s 2 files changed, 2 insertions(+), 2 deletions(-) 237s + modify c.txt 2 237s + filename=c.txt 237s + text=2 237s + echo 2 237s + git add c.txt 237s [c 90cc7de] c⇒2 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + commit -m c⇒2 237s + TIME=1112911996 237s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 237s + modify c.txt 3 237s + filename=c.txt 237s + text=3 237s + echo 3 237s + git add c.txt 237s [c 2046ed2] c⇒3 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + commit -m c⇒3 237s + TIME=1112911997 237s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 237s + modify c.txt 4 237s + filename=c.txt 237s + text=4 237s + echo 4 237s + git add c.txt 237s + commit -m c⇒4 237s + TIME=1112911998 237s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 237s [c 8a2cee9] c⇒4 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 5 237s + filename=c.txt 237s + text=5 237s + echo 5 237s + git add c.txt 237s + commit -m c⇒5 237s + TIME=1112911999 237s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 237s [c ac16a05] c⇒5 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 6 237s + filename=c.txt 237s + text=6 237s + echo 6 237s + git add c.txt 237s + commit -m c⇒6 237s + TIME=1112912000 237s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 237s [c 30dd2ae] c⇒6 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 7 237s + filename=c.txt 237s + text=7 237s + echo 7 237s + git add c.txt 237s + commit -m c⇒7 237s + TIME=1112912001 237s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 237s [c 0883eb9] c⇒7 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 8 237s + filename=c.txt 237s + text=8 237s + echo 8 237s + git add c.txt 237s + commit -m c⇒8 237s + TIME=1112912002 237s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 237s [c f661c06] c⇒8 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify c.txt 9 237s + filename=c.txt 237s + text=9 237s + echo 9 237s + git add c.txt 237s + commit -m c⇒9 237s + TIME=1112912003 237s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 237s [c 243e8ed] c⇒9 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + git checkout -b d master -- 237s Switched to a new branch 'd' 237s + seq 6 237s + modify d.txt 1 237s + filename=d.txt 237s + text=1 237s + echo 1 237s + git add d.txt 237s + commit -m d⇒1 237s + TIME=1112912004 237s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 237s [d bd5368a] d⇒1 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 2 237s + filename=d.txt 237s + text=2 237s + echo 2 237s + git add d.txt 237s + commit -m d⇒2 237s + TIME=1112912005 237s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 237s [d 93e27e6] d⇒2 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 3 237s + filename=d.txt 237s + text=3 237s + echo 3 237s + git add d.txt 237s + commit -m d⇒3 237s + TIME=1112912006 237s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 237s [d 133f385] d⇒3 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 4 237s + filename=d.txt 237s + text=4 237s + echo 4 237s + git add d.txt 237s + commit -m d⇒4 237s + TIME=1112912007 237s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 237s [d 586472a] d⇒4 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 5 237s + filename=d.txt 237s + text=5 237s + echo 5 237s + git add d.txt 237s + commit -m d⇒5 237s + TIME=1112912008 237s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 237s [d 9522207] d⇒5 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + modify d.txt 6 237s + filename=d.txt 237s + text=6 237s + echo 6 237s + git add d.txt 237s + modify conflict.txt d version 237s + filename=conflict.txt 237s + text=d version 237s + echo d version 237s + git add conflict.txt 237s + commit -m d⇒6 237s + TIME=1112912009 237s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 237s [d f7e451a] d⇒6 237s 2 files changed, 2 insertions(+), 2 deletions(-) 237s + git checkout c 237s Switched to branch 'c' 237s + git-imerge init --name=c-d d 237s + git-imerge list 237s * c-d 237s + git-imerge diagram --commits --frontier --html=imerge0.html 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *????????? 237s *????????? 237s *????????? 237s *????????? 237s 5 - *????????? 237s 6 - *????????? 237s | 237s d 237s 237s 0 5 9 237s | | | 237s 0 - ********** - c 237s *????????? 237s *????????? 237s *????????? 237s *????????? 237s 5 - *????????? 237s 6 - *????????? 237s | 237s d 237s 237s Key: 237s |,-,+ = rectangles forming current merge frontier 237s * = merge done manually 237s . = merge done automatically 237s # = conflict that is currently blocking progress 237s @ = merge was blocked but has been resolved 237s ? = no merge recorded 237s 237s + git-imerge autofill 237s + tee autofill.out 237s Attempting automerge of 9-6...failure. 237s Attempting automerge of 1-1...success. 237s Attempting automerge of 1-4...success. 237s Attempting automerge of 1-6...failure. 237s Attempting automerge of 1-5...success. 237s Attempting automerge of 9-5...success. 237s Autofilling 1-5...success. 238s Autofilling 2-5...success. 238s Autofilling 3-5...success. 238s Autofilling 4-5...success. 238s Autofilling 5-5...success. 238s Autofilling 6-5...success. 238s Autofilling 7-5...success. 238s Autofilling 8-5...success. 238s Autofilling 9-1...success. 238s Autofilling 9-2...success. 238s Autofilling 9-3...success. 238s Autofilling 9-4...success. 238s Autofilling 9-5 (first way)...success. 238s Autofilling 9-5 (second way)...success. 238s The two ways of autofilling 9-5 agree. 238s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 238s Attempting automerge of 9-6...failure. 238s Attempting automerge of 1-6...failure. 238s HEAD is now at 243e8ed c⇒9 238s Conflict; suggest manual merge of 1-6 238s + grep -q Traceback autofill.out 238s + grep -q suggest manual merge of 1-6 autofill.out 238s + git-imerge diagram --commits --frontier --html=imerge1.html 238s 0 5 9 238s | | | 238s 0 - ********** - c 238s *????????. 238s *????????. 238s *????????. 238s *????????. 238s 5 - *......... 238s 6 - *#???????? 238s | 238s d 238s 238s 0 5 9 238s | | | 238s 0 - ********** - c 238s *????????| 238s *????????| 238s *????????| 238s *????????| 238s 5 - *--------+ 238s 6 - *#???????? 238s | 238s d 238s 238s Key: 238s |,-,+ = rectangles forming current merge frontier 238s * = merge done manually 238s . = merge done automatically 238s # = conflict that is currently blocking progress 238s @ = merge was blocked but has been resolved 238s ? = no merge recorded 238s 238s + git-imerge continue --edit 238s Switched to branch 'imerge/c-d' 238s Auto-merging conflict.txt 238s CONFLICT (content): Merge conflict in conflict.txt 238s Automatic merge failed; fix conflicts and then commit the result. 238s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 238s Author: Loú User 238s Date: Thu Apr 7 22:13:15 2005 +0000 238s 238s c⇒1 238s 238s Original first commit: 238s 238s Original second commit: 238s commit f7e451a6c9656dda15641a9fbc591a602f158692 238s Author: Loú User 238s Date: Thu Apr 7 22:13:29 2005 +0000 238s 238s d⇒6 238s 238s There was a conflict merging commit 1-6, shown above. 238s Please resolve the conflict, commit the result, then type 238s 238s git-imerge continue 238s + echo merged version 238s + git add conflict.txt 238s + git-imerge continue --no-edit 238s [imerge/c-d d873df5] imerge 'c-d': manual merge 1-6 238s Merge has been recorded for merge 1-6. 238s Attempting automerge of 9-6...success. 238s Autofilling 2-6...success. 238s Autofilling 3-6...success. 238s Autofilling 4-6...success. 238s Autofilling 5-6...success. 238s Autofilling 6-6...success. 238s Autofilling 7-6...success. 238s Autofilling 8-6...success. 238s Autofilling 9-6...success. 238s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 238s Merge is complete! 238s + git-imerge diagram --commits --frontier --html=imerge2.html 238s 0 5 9 238s | | | 238s 0 - ********** - c 238s *????????. 238s *????????. 238s *????????. 238s *????????. 238s 5 - *......... 238s 6 - **........ 238s | 238s d 238s 238s 0 5 9 238s | | | 238s 0 - ********** - c 238s *????????| 238s *????????| 238s *????????| 238s *????????| 238s 5 - *........| 238s 6 - **-------+ 238s | 238s d 238s 238s Key: 238s |,-,+ = rectangles forming current merge frontier 238s * = merge done manually 238s . = merge done automatically 238s # = conflict that is currently blocking progress 238s @ = merge was blocked but has been resolved 238s ? = no merge recorded 238s 238s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 238s Merge d into c (using imerge) 238s 238s # Please enter the commit message for your changes. Lines starting 238s # with '#' will be ignored, and an empty message aborts the commit. 238s # 238s # Date: Fri Dec 5 08:26:30 2025 +0000 238s # 238s # On branch c-d-merge 238s # Changes to be committed: 238s # modified: conflict.txt 238s # modified: d.txt 238s # 238s [c-d-merge b26f813] Merge d into c (using imerge) 238s Date: Fri Dec 5 08:26:30 2025 +0000 238s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + local refname=c-d-merge 238s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + git rev-parse c-d-merge^{tree} 238s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 238s + git-imerge simplify --goal=rebase --branch=c-d-rebase 239s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-rebase 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-rebase^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 239s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-rebase-with-history 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-rebase-with-history^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge simplify --goal=border --branch=c-d-border 239s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-border 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-border^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 239s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-border-with-history 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-border-with-history^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 239s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + local refname=c-d-border-with-history2 239s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git rev-parse c-d-border-with-history2^{tree} 239s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 239s + git-imerge remove 239s + git checkout c 239s Switched to branch 'c' 239s + git-imerge start --goal=full --first-parent --name=c-d d 239s + tee start.out 239s Attempting to merge 1-1...success. 239s Attempting to merge 1-2...success. 239s Attempting to merge 1-3...success. 239s Attempting to merge 1-4...success. 239s Attempting to merge 1-5...success. 239s Attempting to merge 1-6...conflict. 239s Attempting to merge 2-1...success. 239s Attempting to merge 2-2...success. 239s Attempting to merge 2-3...success. 239s Attempting to merge 2-4...success. 239s Attempting to merge 2-5...success. 239s Attempting to merge 3-1...success. 239s Attempting to merge 3-2...success. 239s Attempting to merge 3-3...success. 239s Attempting to merge 3-4...success. 239s Attempting to merge 3-5...success. 240s Attempting to merge 4-1...success. 240s Attempting to merge 4-2...success. 240s Attempting to merge 4-3...success. 240s Attempting to merge 4-4...success. 240s Attempting to merge 4-5...success. 240s Attempting to merge 5-1...success. 240s Attempting to merge 5-2...success. 240s Attempting to merge 5-3...success. 240s Attempting to merge 5-4...success. 240s Attempting to merge 5-5...success. 240s Attempting to merge 6-1...success. 240s Attempting to merge 6-2...success. 240s Attempting to merge 6-3...success. 240s Attempting to merge 6-4...success. 240s Attempting to merge 6-5...success. 240s Attempting to merge 7-1...success. 240s Attempting to merge 7-2...success. 240s Attempting to merge 7-3...success. 240s Attempting to merge 7-4...success. 240s Attempting to merge 7-5...success. 240s Attempting to merge 8-1...success. 240s Attempting to merge 8-2...success. 240s Attempting to merge 8-3...success. 240s Attempting to merge 8-4...success. 240s Attempting to merge 8-5...success. 240s Attempting to merge 9-1...success. 240s Attempting to merge 9-2...success. 240s Attempting to merge 9-3...success. 240s Attempting to merge 9-4...success. 240s Attempting to merge 9-5...success. 240s Previous HEAD position was 1c1c3ef imerge 'c-d': automatic merge 9-5 240s Switched to branch 'imerge/c-d' 240s Auto-merging conflict.txt 240s CONFLICT (content): Merge conflict in conflict.txt 240s Automatic merge failed; fix conflicts and then commit the result. 240s 240s Original first commit: 240s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 240s Author: Loú User 240s Date: Thu Apr 7 22:13:15 2005 +0000 240s 240s c⇒1 240s 240s Original second commit: 240s commit f7e451a6c9656dda15641a9fbc591a602f158692 240s Author: Loú User 240s Date: Thu Apr 7 22:13:29 2005 +0000 240s 240s d⇒6 240s 240s There was a conflict merging commit 1-6, shown above. 240s Please resolve the conflict, commit the result, then type 240s 240s git-imerge continue 240s + grep -q Traceback start.out 240s + grep -q suggest manual merge of 1-6 autofill.out 240s + git-imerge diagram --commits --frontier --html=imerge3.html 240s 0 5 9 240s | | | 240s 0 - ********** - c 240s *......... 240s *......... 240s *......... 240s *......... 240s 5 - *......... 240s 6 - *#???????? 240s | 240s d 240s 240s 0 5 9 240s | | | 240s 0 - ********** - c 240s *........| 240s *........| 240s *........| 240s *........| 240s 5 - *--------+ 240s 6 - *#???????? 240s | 240s d 240s 240s Key: 240s |,-,+ = rectangles forming current merge frontier 240s * = merge done manually 240s . = merge done automatically 240s # = conflict that is currently blocking progress 240s @ = merge was blocked but has been resolved 240s ? = no merge recorded 240s 240s + echo merged version 240s + git add conflict.txt 240s + GIT_EDITOR=cat git commit 240s + git-imerge continue --edit 240s imerge 'c-d': manual merge 1-6 240s 240s # Conflicts: 240s # conflict.txt 240s # 240s # It looks like you may be committing a merge. 240s # If this is not correct, please run 240s # git update-ref -d MERGE_HEAD 240s # and try again. 240s 240s 240s # Please enter the commit message for your changes. Lines starting 240s # with '#' will be ignored, and an empty message aborts the commit. 240s # 240s # On branch imerge/c-d 240s # All conflicts fixed but you are still merging. 240s # 240s # Changes to be committed: 240s # modified: conflict.txt 240s # modified: d.txt 240s # 240s [imerge/c-d 0446abf] imerge 'c-d': manual merge 1-6 240s Merge has been recorded for merge 1-6. 240s Attempting to merge 2-6...success. 240s Attempting to merge 3-6...success. 240s Attempting to merge 4-6...success. 240s Attempting to merge 5-6...success. 240s Attempting to merge 6-6...success. 240s Attempting to merge 7-6...success. 240s Attempting to merge 8-6...success. 240s Attempting to merge 9-6...success. 240s Merge is complete! 240s + git-imerge diagram --commits --frontier --html=imerge4.html 240s 0 5 9 240s | | | 240s 0 - ********** - c 240s *......... 240s *......... 240s *......... 240s *......... 240s 5 - *......... 240s 6 - **........ 240s | 240s d 240s 240s 0 5 9 240s | | | 240s 0 - ********** - c 240s *........| 240s *........| 240s *........| 240s *........| 240s 5 - *........| 240s 6 - **-------+ 240s | 240s d 240s 240s Key: 240s |,-,+ = rectangles forming current merge frontier 240s * = merge done manually 240s . = merge done automatically 240s # = conflict that is currently blocking progress 240s @ = merge was blocked but has been resolved 240s ? = no merge recorded 240s 240s + git-imerge finish --branch=c-d-full 241s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + local refname=c-d-full 241s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git rev-parse c-d-full^{tree} 241s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + test_conflict 9-6 241s + local conflict=9-6 241s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s + DESCRIPTION=git-imerge test repository with conflict at 9-6 241s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 241s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s + local description=git-imerge test repository with conflict at 9-6 241s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 241s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s + local description=git-imerge test repository with conflict at 9-6 241s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s hint: Using 'master' as the name for the initial branch. This default branch name 241s hint: is subject to change. To configure the initial branch name to use in all 241s hint: of your new repositories, which will suppress this warning, call: 241s hint: 241s hint: git config --global init.defaultBranch 241s hint: 241s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 241s hint: 'development'. The just-created branch can be renamed via this command: 241s hint: 241s hint: git branch -m 241s hint: 241s hint: Disable this message with "git config set advice.defaultBranchName false" 241s + echo git-imerge test repository with conflict at 9-6 241s + printf %s\n /*.out /*.css /*.html 241s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6/.git config user.name Loú User 241s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 241s + TIME=1112911993 241s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6/.git/ 241s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-6 241s + modify c.txt 0 241s + filename=c.txt 241s + text=0 241s + echo 0 241s + git add c.txt 241s + modify d.txt 0 241s + filename=d.txt 241s + text=0 241s + echo 0 241s + git add d.txt 241s + modify conflict.txt original version 241s + filename=conflict.txt 241s + text=original version 241s + echo original version 241s + git add conflict.txt 241s + commit -m m⇒0 241s + TIME=1112911994 241s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 241s + git checkout -b c master -- 241s Switched to a new branch 'c' 241s + seq 9 241s [master (root-commit) d70e04b] m⇒0 241s 3 files changed, 3 insertions(+) 241s create mode 100644 c.txt 241s create mode 100644 conflict.txt 241s create mode 100644 d.txt 241s + modify c.txt 1 241s + filename=c.txt 241s + text=1 241s + echo 1 241s + git add c.txt 241s + commit -m c⇒1 241s + TIME=1112911995 241s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 241s + modify c.txt 2 241s + filename=c.txt 241s + text=2 241s + echo 2 241s + git add c.txt 241s + commit -m c⇒2 241s + TIME=1112911996 241s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 241s [c 89e2141] c⇒1 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify c.txt 3 241s + filename=c.txt 241s + text=3 241s + echo 3 241s + git add c.txt 241s + commit -m c⇒3 241s + TIME=1112911997 241s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 241s [c 7c431f2] c⇒2 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s [c f02ab24] c⇒3 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify c.txt 4 241s + filename=c.txt 241s + text=4 241s + echo 4 241s + git add c.txt 241s + commit -m c⇒4 241s + TIME=1112911998 241s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 241s + modify c.txt 5 241s + filename=c.txt 241s + text=5 241s + echo 5 241s + git add c.txt 241s [c ed9122f] c⇒4 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m c⇒5 241s + TIME=1112911999 241s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 241s [c 1d3bf09] c⇒5 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify c.txt 6 241s + filename=c.txt 241s + text=6 241s + echo 6 241s + git add c.txt 241s + commit -m c⇒6 241s + TIME=1112912000 241s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 241s [c f999ecd] c⇒6 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify c.txt 7 241s + filename=c.txt 241s + text=7 241s + echo 7 241s + git add c.txt 241s + commit -m c⇒7 241s + TIME=1112912001 241s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 241s + modify c.txt 8 241s + filename=c.txt 241s + text=8 241s + echo 8 241s + git add c.txt 241s [c 7050a8a] c⇒7 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m c⇒8 241s + TIME=1112912002 241s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 241s + modify c.txt 9 241s + filename=c.txt 241s + text=9 241s + echo 9 241s + git add c.txt 241s [c 9732e77] c⇒8 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify conflict.txt c version 241s + filename=conflict.txt 241s + text=c version 241s + echo c version 241s + git add conflict.txt 241s + commit -m c⇒9 241s + TIME=1112912003 241s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 241s [c 73a5eed] c⇒9 241s 2 files changed, 2 insertions(+), 2 deletions(-) 241s + git checkout -b d master -- 241s Switched to a new branch 'd' 241s + seq 6 241s + modify d.txt 1 241s + filename=d.txt 241s + text=1 241s + echo 1 241s + git add d.txt 241s + commit -m d⇒1 241s + TIME=1112912004 241s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 241s [d bd5368a] d⇒1 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify d.txt 2 241s + filename=d.txt 241s + text=2 241s + echo 2 241s + git add d.txt 241s + commit -m d⇒2 241s + TIME=1112912005 241s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 241s [d 93e27e6] d⇒2 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify d.txt 3 241s + filename=d.txt 241s + text=3 241s + echo 3 241s + git add d.txt 241s + commit -m d⇒3 241s + TIME=1112912006 241s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 241s [d 133f385] d⇒3 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify d.txt 4 241s + filename=d.txt 241s + text=4 241s + echo 4 241s + git add d.txt 241s + commit -m d⇒4 241s + TIME=1112912007 241s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 241s [d 586472a] d⇒4 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + modify d.txt 5 241s + filename=d.txt 241s + text=5 241s + echo 5 241s + git add d.txt 241s [d 9522207] d⇒5 241s 1 file changed, 1 insertion(+), 1 deletion(-) 241s + commit -m d⇒5 241s + TIME=1112912008 241s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 241s + modify d.txt 6 241s + filename=d.txt 241s + text=6 241s + echo 6 241s + git add d.txt 241s + modify conflict.txt d version 241s + filename=conflict.txt 241s + text=d version 241s + echo d version 241s + git add conflict.txt 241s + commit -m d⇒6 241s + TIME=1112912009 241s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 241s [d f7e451a] d⇒6 241s 2 files changed, 2 insertions(+), 2 deletions(-) 241s + git checkout c 241s Switched to branch 'c' 241s + git-imerge init --name=c-d d 241s + git-imerge list 241s * c-d 241s + git-imerge diagram --commits --frontier --html=imerge0.html 241s 0 5 9 241s | | | 241s 0 - ********** - c 241s *????????? 241s *????????? 241s *????????? 241s *????????? 241s 5 - *????????? 241s 6 - *????????? 241s | 241s d 241s 241s 0 5 9 241s | | | 241s 0 - ********** - c 241s *????????? 241s *????????? 241s *????????? 241s *????????? 241s 5 - *????????? 241s 6 - *????????? 241s | 241s d 241s 241s Key: 241s |,-,+ = rectangles forming current merge frontier 241s * = merge done manually 241s . = merge done automatically 241s # = conflict that is currently blocking progress 241s @ = merge was blocked but has been resolved 241s ? = no merge recorded 241s 241s + git-imerge autofill 241s + tee autofill.out 241s Attempting automerge of 9-6...failure. 241s Attempting automerge of 1-1...success. 241s Attempting automerge of 1-4...success. 241s Attempting automerge of 1-6...success. 241s Attempting automerge of 9-6...failure. 241s Attempting automerge of 5-6...success. 241s Attempting automerge of 7-6...success. 241s Attempting automerge of 8-6...success. 241s Attempting automerge of 9-1...success. 241s Attempting automerge of 9-4...success. 241s Attempting automerge of 9-5...success. 241s Autofilling 1-6...success. 241s Autofilling 2-6...success. 241s Autofilling 3-6...success. 241s Autofilling 4-6...success. 241s Autofilling 5-6...success. 241s Autofilling 6-6...success. 241s Autofilling 7-6...success. 241s Autofilling 8-1...success. 241s Autofilling 8-2...success. 241s Autofilling 8-3...success. 241s Autofilling 8-4...success. 241s Autofilling 8-5...success. 241s Autofilling 8-6 (first way)...success. 241s Autofilling 8-6 (second way)...success. 241s The two ways of autofilling 8-6 agree. 241s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 241s Autofilling 9-1...success. 241s Autofilling 9-2...success. 241s Autofilling 9-3...success. 241s Autofilling 9-4...success. 241s Autofilling 9-5...success. 241s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 241s Attempting automerge of 9-6...failure. 241s Attempting automerge of 9-6...failure. 241s HEAD is now at 73a5eed c⇒9 241s Conflict; suggest manual merge of 9-6 241s + grep -q Traceback autofill.out 241s + grep -q suggest manual merge of 9-6 autofill.out 241s + git-imerge diagram --commits --frontier --html=imerge1.html 241s 0 5 9 241s | | | 241s 0 - ********** - c 241s *???????.. 241s *???????.. 241s *???????.. 241s *???????.. 241s 5 - *???????.. 241s 6 - *........# 241s | 241s d 241s 241s 0 5 9 241s | | | 241s 0 - ********** - c 241s *???????.| 241s *???????.| 241s *???????.| 241s *???????.| 241s 5 - *???????.+ 241s 6 - *-------+# 241s | 241s d 241s 241s Key: 241s |,-,+ = rectangles forming current merge frontier 241s * = merge done manually 241s . = merge done automatically 241s # = conflict that is currently blocking progress 241s @ = merge was blocked but has been resolved 241s ? = no merge recorded 241s 241s + git-imerge continue --edit 241s Switched to branch 'imerge/c-d' 241s Auto-merging conflict.txt 241s CONFLICT (content): Merge conflict in conflict.txt 241s Automatic merge failed; fix conflicts and then commit the result. 241s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 241s Author: Loú User 241s Date: Thu Apr 7 22:13:23 2005 +0000 241s 241s c⇒9 241s 241s Original first commit: 241s 241s Original second commit: 241s commit f7e451a6c9656dda15641a9fbc591a602f158692 241s Author: Loú User 241s Date: Thu Apr 7 22:13:29 2005 +0000 241s 241s d⇒6 241s 241s There was a conflict merging commit 9-6, shown above. 241s Please resolve the conflict, commit the result, then type 241s 241s git-imerge continue 241s + echo merged version 241s + git add conflict.txt 241s + git-imerge continue --no-edit 242s [imerge/c-d 054860d] imerge 'c-d': manual merge 9-6 242s Merge has been recorded for merge 9-6. 242s Merge is complete! 242s + git-imerge diagram --commits --frontier --html=imerge2.html 242s 0 5 9 242s | | | 242s 0 - ********** - c 242s *???????.. 242s *???????.. 242s *???????.. 242s *???????.. 242s 5 - *???????.. 242s 6 - *........* 242s | 242s d 242s 242s 0 5 9 242s | | | 242s 0 - ********** - c 242s *???????.| 242s *???????.| 242s *???????.| 242s *???????.| 242s 5 - *???????.| 242s 6 - *--------* 242s | 242s d 242s 242s Key: 242s |,-,+ = rectangles forming current merge frontier 242s * = merge done manually 242s . = merge done automatically 242s # = conflict that is currently blocking progress 242s @ = merge was blocked but has been resolved 242s ? = no merge recorded 242s 242s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 242s Merge d into c (using imerge) 242s 242s # Please enter the commit message for your changes. Lines starting 242s # with '#' will be ignored, and an empty message aborts the commit. 242s # 242s # Date: Fri Dec 5 08:26:34 2025 +0000 242s # 242s # On branch c-d-merge 242s # Changes to be committed: 242s # modified: conflict.txt 242s # modified: d.txt 242s # 242s [c-d-merge 9f7cfc0] Merge d into c (using imerge) 242s Date: Fri Dec 5 08:26:34 2025 +0000 242s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + local refname=c-d-merge 242s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git rev-parse c-d-merge^{tree} 242s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git-imerge simplify --goal=rebase --branch=c-d-rebase 242s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + local refname=c-d-rebase 242s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git rev-parse c-d-rebase^{tree} 242s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 242s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + local refname=c-d-rebase-with-history 242s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git rev-parse c-d-rebase-with-history^{tree} 242s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git-imerge simplify --goal=border --branch=c-d-border 242s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + local refname=c-d-border 242s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git rev-parse c-d-border^{tree} 242s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 242s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 243s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + local refname=c-d-border-with-history 243s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git rev-parse c-d-border-with-history^{tree} 243s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 244s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + local refname=c-d-border-with-history2 244s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + git rev-parse c-d-border-with-history2^{tree} 244s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 244s + git-imerge remove 244s Attempting to merge 1-1...success. 244s Attempting to merge 1-2...success. 244s Attempting to merge 1-3...success. 244s Attempting to merge 1-4...success. 244s Attempting to merge 1-5...success. 244s + git checkout c 244s Switched to branch 'c' 244s + git-imerge start --goal=full --first-parent --name=c-d d 244s + tee start.out 244s Attempting to merge 1-6...success. 244s Attempting to merge 2-1...success. 244s Attempting to merge 2-2...success. 244s Attempting to merge 2-3...success. 244s Attempting to merge 2-4...success. 244s Attempting to merge 2-5...success. 244s Attempting to merge 2-6...success. 244s Attempting to merge 3-1...success. 244s Attempting to merge 3-2...success. 244s Attempting to merge 3-3...success. 244s Attempting to merge 3-4...success. 244s Attempting to merge 3-5...success. 244s Attempting to merge 3-6...success. 244s Attempting to merge 4-1...success. 244s Attempting to merge 4-2...success. 244s Attempting to merge 4-3...success. 244s Attempting to merge 4-4...success. 244s Attempting to merge 4-5...success. 244s Attempting to merge 4-6...success. 244s Attempting to merge 5-1...success. 244s Attempting to merge 5-2...success. 244s Attempting to merge 5-3...success. 245s Attempting to merge 5-4...success. 245s Attempting to merge 5-5...success. 246s Attempting to merge 5-6...success. 246s Attempting to merge 6-1...success. 246s Attempting to merge 6-2...success. 246s Attempting to merge 6-3...success. 246s Attempting to merge 6-4...success. 246s Attempting to merge 6-5...success. 246s + grep -q Traceback start.out 246s + grep -q suggest manual merge of 9-6 autofill.out 246s + git-imerge diagram --commits --frontier --html=imerge3.html 246s + echo merged version 246s + git add conflict.txt 246s + GIT_EDITOR=cat git commit 246s + git-imerge continue --edit 246s Merge has been recorded for merge 9-6. 246s Merge is complete! 246s + git-imerge diagram --commits --frontier --html=imerge4.html 246s + git-imerge finish --branch=c-d-full 246s Attempting to merge 6-6...success. 246s Attempting to merge 7-1...success. 246s Attempting to merge 7-2...success. 246s Attempting to merge 7-3...success. 246s Attempting to merge 7-4...success. 246s Attempting to merge 7-5...success. 246s Attempting to merge 7-6...success. 246s Attempting to merge 8-1...success. 246s Attempting to merge 8-2...success. 246s Attempting to merge 8-3...success. 246s Attempting to merge 8-4...success. 246s Attempting to merge 8-5...success. 246s Attempting to merge 8-6...success. 246s Attempting to merge 9-1...success. 246s Attempting to merge 9-2...success. 246s Attempting to merge 9-3...success. 246s Attempting to merge 9-4...success. 246s Attempting to merge 9-5...success. 246s Attempting to merge 9-6...conflict. 246s Switched to branch 'imerge/c-d' 246s Auto-merging conflict.txt 246s CONFLICT (content): Merge conflict in conflict.txt 246s Automatic merge failed; fix conflicts and then commit the result. 246s 246s Original first commit: 246s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 246s Author: Loú User 246s Date: Thu Apr 7 22:13:23 2005 +0000 246s 246s c⇒9 246s 246s Original second commit: 246s commit f7e451a6c9656dda15641a9fbc591a602f158692 246s Author: Loú User 246s Date: Thu Apr 7 22:13:29 2005 +0000 246s 246s d⇒6 246s 246s There was a conflict merging commit 9-6, shown above. 246s Please resolve the conflict, commit the result, then type 246s 246s git-imerge continue 246s 0 5 9 246s | | | 246s 0 - ********** - c 246s *......... 246s *......... 246s *......... 246s *......... 246s 5 - *......... 246s 6 - *........# 246s | 246s d 246s 246s 0 5 9 246s | | | 246s 0 - ********** - c 246s *........| 246s *........| 246s *........| 246s *........| 246s 5 - *........+ 246s 6 - *-------+# 246s | 246s d 246s 246s Key: 246s |,-,+ = rectangles forming current merge frontier 246s * = merge done manually 246s . = merge done automatically 246s # = conflict that is currently blocking progress 246s @ = merge was blocked but has been resolved 246s ? = no merge recorded 246s 246s imerge 'c-d': manual merge 9-6 246s 246s # Conflicts: 246s # conflict.txt 246s # 246s # It looks like you may be committing a merge. 246s # If this is not correct, please run 246s # git update-ref -d MERGE_HEAD 246s # and try again. 246s 246s 246s # Please enter the commit message for your changes. Lines starting 246s # with '#' will be ignored, and an empty message aborts the commit. 246s # 246s # On branch imerge/c-d 246s # All conflicts fixed but you are still merging. 246s # 246s # Changes to be committed: 246s # modified: conflict.txt 246s # modified: d.txt 246s # 246s [imerge/c-d 8626b5b] imerge 'c-d': manual merge 9-6 246s 0 5 9 246s | | | 246s 0 - ********** - c 246s *......... 246s *......... 246s *......... 246s *......... 246s 5 - *......... 246s 6 - *........* 246s | 246s d 246s 246s 0 5 9 246s | | | 246s 0 - ********** - c 246s *........| 246s *........| 246s *........| 246s *........| 246s 5 - *........| 246s 6 - *--------* 246s | 246s d 246s 246s Key: 246s |,-,+ = rectangles forming current merge frontier 246s * = merge done manually 246s . = merge done automatically 246s # = conflict that is currently blocking progress 246s @ = merge was blocked but has been resolved 246s ? = no merge recorded 246s 246s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2/.git/ 246s [master (root-commit) d70e04b] m⇒0 246s 3 files changed, 3 insertions(+) 246s create mode 100644 c.txt 246s create mode 100644 conflict.txt 246s create mode 100644 d.txt 246s [c 2120f40] c⇒1 246s 2 files changed, 2 insertions(+), 2 deletions(-) 246s [c 90cc7de] c⇒2 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c 2046ed2] c⇒3 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c 8a2cee9] c⇒4 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + local refname=c-d-full 246s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git rev-parse c-d-full^{tree} 246s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + test_conflict 1-2 246s + local conflict=1-2 246s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s + DESCRIPTION=git-imerge test repository with conflict at 1-2 246s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 246s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s + local description=git-imerge test repository with conflict at 1-2 246s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 246s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s + local description=git-imerge test repository with conflict at 1-2 246s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s hint: Using 'master' as the name for the initial branch. This default branch name 246s hint: is subject to change. To configure the initial branch name to use in all 246s hint: of your new repositories, which will suppress this warning, call: 246s hint: 246s hint: git config --global init.defaultBranch 246s hint: 246s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 246s hint: 'development'. The just-created branch can be renamed via this command: 246s hint: 246s hint: git branch -m 246s hint: 246s hint: Disable this message with "git config set advice.defaultBranchName false" 246s + echo git-imerge test repository with conflict at 1-2 246s + printf %s\n /*.out /*.css /*.html 246s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2/.git config user.name Loú User 246s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 246s + TIME=1112911993 246s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-1-2 246s + modify c.txt 0 246s + filename=c.txt 246s + text=0 246s + echo 0 246s + git add c.txt 246s + modify d.txt 0 246s + filename=d.txt 246s + text=0 246s + echo 0 246s + git add d.txt 246s + modify conflict.txt original version 246s + filename=conflict.txt 246s + text=original version 246s + echo original version 246s + git add conflict.txt 246s + commit -m m⇒0 246s + TIME=1112911994 246s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 246s + git checkout -b c master -- 246s Switched to a new branch 'c' 246s + seq 9 246s + modify c.txt 1 246s + filename=c.txt 246s + text=1 246s + echo 1 246s + git add c.txt 246s + modify conflict.txt c version 246s + filename=conflict.txt 246s + text=c version 246s + echo c version 246s + git add conflict.txt 246s + commit -m c⇒1 246s + TIME=1112911995 246s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 246s + modify c.txt 2 246s + filename=c.txt 246s + text=2 246s + echo 2 246s + git add c.txt 246s + commit -m c⇒2 246s + TIME=1112911996 246s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 246s + modify c.txt 3 246s + filename=c.txt 246s + text=3 246s + echo 3 246s + git add c.txt 246s + commit -m c⇒3 246s + TIME=1112911997 246s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 246s + modify c.txt 4 246s + filename=c.txt 246s + text=4 246s + echo 4 246s + git add c.txt 246s + commit -m c⇒4 246s + TIME=1112911998 246s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 246s [c ac16a05] c⇒5 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c 30dd2ae] c⇒6 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c 0883eb9] c⇒7 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c f661c06] c⇒8 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [c 243e8ed] c⇒9 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d bd5368a] d⇒1 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d 69efde8] d⇒2 246s 2 files changed, 2 insertions(+), 2 deletions(-) 246s [d 3169557] d⇒3 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d 86c8052] d⇒4 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d 1700773] d⇒5 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s [d df2e493] d⇒6 246s 1 file changed, 1 insertion(+), 1 deletion(-) 246s + modify c.txt 5 246s + filename=c.txt 246s + text=5 246s + echo 5 246s + git add c.txt 246s + commit -m c⇒5 246s + TIME=1112911999 246s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 246s + modify c.txt 6 246s + filename=c.txt 246s + text=6 246s + echo 6 246s + git add c.txt 246s + commit -m c⇒6 246s + TIME=1112912000 246s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 246s + modify c.txt 7 246s + filename=c.txt 246s + text=7 246s + echo 7 246s + git add c.txt 246s + commit -m c⇒7 246s + TIME=1112912001 246s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 246s + modify c.txt 8 246s + filename=c.txt 246s + text=8 246s + echo 8 246s + git add c.txt 246s + commit -m c⇒8 246s + TIME=1112912002 246s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 246s + modify c.txt 9 246s + filename=c.txt 246s + text=9 246s + echo 9 246s + git add c.txt 246s + commit -m c⇒9 246s + TIME=1112912003 246s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 246s + git checkout -b d master -- 246s Switched to a new branch 'd' 246s + seq 6 246s + modify d.txt 1 246s + filename=d.txt 246s + text=1 246s + echo 1 246s + git add d.txt 246s + commit -m d⇒1 246s + TIME=1112912004 246s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 246s + modify d.txt 2 246s + filename=d.txt 246s + text=2 246s + echo 2 246s + git add d.txt 246s + modify conflict.txt d version 246s + filename=conflict.txt 246s + text=d version 246s + echo d version 246s + git add conflict.txt 246s + commit -m d⇒2 246s + TIME=1112912005 246s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 246s + modify d.txt 3 246s + filename=d.txt 246s + text=3 246s + echo 3 246s + git add d.txt 246s + commit -m d⇒3 246s + TIME=1112912006 246s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 246s + modify d.txt 4 246s + filename=d.txt 246s + text=4 246s + echo 4 246s + git add d.txt 246s + commit -m d⇒4 246s + TIME=1112912007 246s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 246s + modify d.txt 5 246s + filename=d.txt 246s + text=5 246s + echo 5 246s + git add d.txt 246s + commit -m d⇒5 246s + TIME=1112912008 246s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 246s + modify d.txt 6 246s + filename=d.txt 246s + text=6 246s + echo 6 246s + git add d.txt 246s + commit -m d⇒6 246s + TIME=1112912009 246s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 246s + git checkout c 246s Switched to branch 'c' 246s + git-imerge init --name=c-d d 247s + git-imerge list 247s * c-d 247s + git-imerge diagram --commits --frontier --html=imerge0.html 247s 0 5 9 247s | | | 247s 0 - ********** - c 247s *????????? 247s *????????? 247s *????????? 247s *????????? 247s 5 - *????????? 247s 6 - *????????? 247s | 247s d 247s 247s 0 5 9 247s | | | 247s 0 - ********** - c 247s *????????? 247s *????????? 247s *????????? 247s *????????? 247s 5 - *????????? 247s 6 - *????????? 247s | 247s d 247s 247s Key: 247s |,-,+ = rectangles forming current merge frontier 247s * = merge done manually 247s . = merge done automatically 247s # = conflict that is currently blocking progress 247s @ = merge was blocked but has been resolved 247s ? = no merge recorded 247s 247s + git-imerge autofill 247s + tee autofill.out 247s Attempting automerge of 9-6...failure. 247s Attempting automerge of 1-1...success. 247s Attempting automerge of 1-4...failure. 247s Attempting automerge of 1-3...failure. 247s Attempting automerge of 1-2...failure. 247s Attempting automerge of 9-1...success. 247s Autofilling 1-1...success. 247s Autofilling 2-1...success. 247s Autofilling 3-1...success. 247s Autofilling 4-1...success. 247s Autofilling 5-1...success. 247s Autofilling 6-1...success. 247s Autofilling 7-1...success. 247s Autofilling 8-1...success. 247s Autofilling 9-1...success. 247s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 247s Attempting automerge of 9-6...failure. 247s Attempting automerge of 1-2...failure. 247s HEAD is now at 243e8ed c⇒9 247s Conflict; suggest manual merge of 1-2 247s + grep -q Traceback autofill.out 247s + grep -q suggest manual merge of 1-2 autofill.out 247s + git-imerge diagram --commits --frontier --html=imerge1.html 248s 0 5 9 248s | | | 248s 0 - ********** - c 248s *......... 248s *#???????? 248s *????????? 248s *????????? 248s 5 - *????????? 248s 6 - *????????? 248s | 248s d 248s 248s 0 5 9 248s | | | 248s 0 - ********** - c 248s *--------+ 248s *#???????? 248s *????????? 248s *????????? 248s 5 - *????????? 248s 6 - *????????? 248s | 248s d 248s 248s Key: 248s |,-,+ = rectangles forming current merge frontier 248s * = merge done manually 248s . = merge done automatically 248s # = conflict that is currently blocking progress 248s @ = merge was blocked but has been resolved 248s ? = no merge recorded 248s 248s + git-imerge continue --edit 248s Switched to branch 'imerge/c-d' 248s Auto-merging conflict.txt 248s CONFLICT (content): Merge conflict in conflict.txt 248s Automatic merge failed; fix conflicts and then commit the result. 248s 248s Original first commit: 248s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 248s Author: Loú User 248s Date: Thu Apr 7 22:13:15 2005 +0000 248s 248s c⇒1 248s 248s Original second commit: 248s commit 69efde8f66d581a765a3909ffacb9f895f95c345 248s Author: Loú User 248s Date: Thu Apr 7 22:13:25 2005 +0000 248s 248s d⇒2 248s 248s There was a conflict merging commit 1-2, shown above. 248s Please resolve the conflict, commit the result, then type 248s 248s git-imerge continue 248s + echo merged version 248s + git add conflict.txt 248s + git-imerge continue --no-edit 248s [imerge/c-d e33b5ba] imerge 'c-d': manual merge 1-2 248s Merge has been recorded for merge 1-2. 248s Attempting automerge of 1-6...success. 248s Autofilling 1-3...success. 248s Autofilling 1-4...success. 248s Autofilling 1-5...success. 248s Autofilling 1-6...success. 248s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 248s Attempting automerge of 9-6...success. 248s Autofilling 2-6...success. 248s Autofilling 3-6...success. 248s Autofilling 4-6...success. 248s Autofilling 5-6...success. 248s Autofilling 6-6...success. 248s Autofilling 7-6...success. 248s Autofilling 8-6...success. 248s Autofilling 9-2...success. 248s Autofilling 9-3...success. 248s Autofilling 9-4...success. 248s Autofilling 9-5...success. 248s Autofilling 9-6 (first way)...success. 248s Autofilling 9-6 (second way)...success. 248s The two ways of autofilling 9-6 agree. 248s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 248s Merge is complete! 248s + git-imerge diagram --commits --frontier --html=imerge2.html 249s 0 5 9 249s | | | 249s 0 - ********** - c 249s *......... 249s **???????. 249s *.???????. 249s *.???????. 249s 5 - *.???????. 249s 6 - *......... 249s | 249s d 249s 249s 0 5 9 249s | | | 249s 0 - ********** - c 249s *........| 249s **???????| 249s *.???????| 249s *.???????| 249s 5 - *.???????| 249s 6 - *--------+ 249s | 249s d 249s 249s Key: 249s |,-,+ = rectangles forming current merge frontier 249s * = merge done manually 249s . = merge done automatically 249s # = conflict that is currently blocking progress 249s @ = merge was blocked but has been resolved 249s ? = no merge recorded 249s 249s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 249s Merge d into c (using imerge) 249s 249s # Please enter the commit message for your changes. Lines starting 249s # with '#' will be ignored, and an empty message aborts the commit. 249s # 249s # Date: Fri Dec 5 08:26:41 2025 +0000 249s # 249s # On branch c-d-merge 249s # Changes to be committed: 249s # modified: conflict.txt 249s # modified: d.txt 249s # 249s [c-d-merge 1ed20d8] Merge d into c (using imerge) 249s Date: Fri Dec 5 08:26:41 2025 +0000 249s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + local refname=c-d-merge 249s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git rev-parse c-d-merge^{tree} 249s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git-imerge simplify --goal=rebase --branch=c-d-rebase 249s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + local refname=c-d-rebase 249s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git rev-parse c-d-rebase^{tree} 249s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 249s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + local refname=c-d-rebase-with-history 249s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git rev-parse c-d-rebase-with-history^{tree} 249s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 249s + git-imerge simplify --goal=border --branch=c-d-border 250s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + local refname=c-d-border 250s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git rev-parse c-d-border^{tree} 250s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 250s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + local refname=c-d-border-with-history 250s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git rev-parse c-d-border-with-history^{tree} 250s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 251s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + local refname=c-d-border-with-history2 251s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + git rev-parse c-d-border-with-history2^{tree} 251s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 251s + git-imerge remove 251s + git checkout c 251s Switched to branch 'c' 251s + tee start.out 251s + git-imerge start --goal=full --first-parent --name=c-d d 251s Attempting to merge 1-1...success. 251s Attempting to merge 1-2...conflict. 251s Attempting to merge 2-1...success. 251s Attempting to merge 3-1...success. 251s Attempting to merge 4-1...success. 251s Attempting to merge 5-1...success. 251s Attempting to merge 6-1...success. 251s Attempting to merge 7-1...success. 251s Attempting to merge 8-1...success. 252s Attempting to merge 9-1...success. 252s Previous HEAD position was 1a5629c imerge 'c-d': automatic merge 9-1 252s Switched to branch 'imerge/c-d' 252s Auto-merging conflict.txt 252s CONFLICT (content): Merge conflict in conflict.txt 252s Automatic merge failed; fix conflicts and then commit the result. 252s 252s Original first commit: 252s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 252s Author: Loú User 252s Date: Thu Apr 7 22:13:15 2005 +0000 252s 252s c⇒1 252s 252s Original second commit: 252s commit 69efde8f66d581a765a3909ffacb9f895f95c345 252s Author: Loú User 252s Date: Thu Apr 7 22:13:25 2005 +0000 252s 252s d⇒2 252s 252s There was a conflict merging commit 1-2, shown above. 252s Please resolve the conflict, commit the result, then type 252s 252s git-imerge continue 252s + grep -q Traceback start.out 252s + grep -q suggest manual merge of 1-2 autofill.out 252s + git-imerge diagram --commits --frontier --html=imerge3.html 252s 0 5 9 252s | | | 252s 0 - ********** - c 252s *......... 252s *#???????? 252s *????????? 252s *????????? 252s 5 - *????????? 252s 6 - *????????? 252s | 252s d 252s 252s 0 5 9 252s | | | 252s 0 - ********** - c 252s *--------+ 252s *#???????? 252s *????????? 252s *????????? 252s 5 - *????????? 252s 6 - *????????? 252s | 252s d 252s 252s Key: 252s |,-,+ = rectangles forming current merge frontier 252s * = merge done manually 252s . = merge done automatically 252s # = conflict that is currently blocking progress 252s @ = merge was blocked but has been resolved 252s ? = no merge recorded 252s 252s + echo merged version 252s + git add conflict.txt 252s + GIT_EDITOR=cat git commit 252s imerge 'c-d': manual merge 1-2 252s 252s # Conflicts: 252s # conflict.txt 252s # 252s # It looks like you may be committing a merge. 252s # If this is not correct, please run 252s # git update-ref -d MERGE_HEAD 252s # and try again. 252s 252s 252s # Please enter the commit message for your changes. Lines starting 252s # with '#' will be ignored, and an empty message aborts the commit. 252s # 252s # On branch imerge/c-d 252s # All conflicts fixed but you are still merging. 252s # 252s # Changes to be committed: 252s # modified: conflict.txt 252s # modified: d.txt 252s # 252s [imerge/c-d 7aaa8f1] imerge 'c-d': manual merge 1-2 252s + git-imerge continue --edit 252s Merge has been recorded for merge 1-2. 252s Attempting to merge 1-3...success. 252s Attempting to merge 1-4...success. 252s Attempting to merge 1-5...success. 252s Attempting to merge 1-6...success. 252s Attempting to merge 2-2...success. 252s Attempting to merge 2-3...success. 253s Attempting to merge 2-4...success. 253s Attempting to merge 2-5...success. 253s Attempting to merge 2-6...success. 253s Attempting to merge 3-2...success. 253s Attempting to merge 3-3...success. 253s Attempting to merge 3-4...success. 253s Attempting to merge 3-5...success. 253s Attempting to merge 3-6...success. 253s Attempting to merge 4-2...success. 253s Attempting to merge 4-3...success. 253s Attempting to merge 4-4...success. 253s Attempting to merge 4-5...success. 253s Attempting to merge 4-6...success. 253s Attempting to merge 5-2...success. 253s Attempting to merge 5-3...success. 253s Attempting to merge 5-4...success. 253s Attempting to merge 5-5...success. 253s Attempting to merge 5-6...success. 253s Attempting to merge 6-2...success. 253s Attempting to merge 6-3...success. 253s Attempting to merge 6-4...success. 254s Attempting to merge 6-5...success. 254s Attempting to merge 6-6...success. 254s Attempting to merge 7-2...success. 254s Attempting to merge 7-3...success. 254s Attempting to merge 7-4...success. 254s Attempting to merge 7-5...success. 254s Attempting to merge 7-6...success. 254s Attempting to merge 8-2...success. 254s Attempting to merge 8-3...success. 254s Attempting to merge 8-4...success. 254s Attempting to merge 8-5...success. 254s Attempting to merge 8-6...success. 254s Attempting to merge 9-2...success. 254s Attempting to merge 9-3...success. 254s Attempting to merge 9-4...success. 254s Attempting to merge 9-5...success. 254s Attempting to merge 9-6...success. 254s Merge is complete! 254s + git-imerge diagram --commits --frontier --html=imerge4.html 255s 0 5 9 255s | | | 255s 0 - ********** - c 255s *......... 255s **........ 255s *......... 255s *......... 255s 5 - *......... 255s 6 - *......... 255s | 255s d 255s 255s 0 5 9 255s | | | 255s 0 - ********** - c 255s *........| 255s **.......| 255s *........| 255s *........| 255s 5 - *........| 255s 6 - *--------+ 255s | 255s d 255s 255s Key: 255s |,-,+ = rectangles forming current merge frontier 255s * = merge done manually 255s . = merge done automatically 255s # = conflict that is currently blocking progress 255s @ = merge was blocked but has been resolved 255s ? = no merge recorded 255s 255s + git-imerge finish --branch=c-d-full 255s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 255s + local refname=c-d-full 255s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 255s + git rev-parse c-d-full^{tree} 255s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 255s + test_conflict 9-5 255s + local conflict=9-5 255s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s + DESCRIPTION=git-imerge test repository with conflict at 9-5 255s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 255s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s + local description=git-imerge test repository with conflict at 9-5 255s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 255s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s + local description=git-imerge test repository with conflict at 9-5 255s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s hint: Using 'master' as the name for the initial branch. This default branch name 255s hint: is subject to change. To configure the initial branch name to use in all 255s hint: of your new repositories, which will suppress this warning, call: 255s hint: 255s hint: git config --global init.defaultBranch 255s hint: 255s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 255s hint: 'development'. The just-created branch can be renamed via this command: 255s hint: 255s hint: git branch -m 255s hint: 255s hint: Disable this message with "git config set advice.defaultBranchName false" 255s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5/.git/ 255s + echo git-imerge test repository with conflict at 9-5 255s + printf %s\n /*.out /*.css /*.html 255s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5/.git config user.name Loú User 255s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 255s + TIME=1112911993 255s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-9-5 255s + modify c.txt 0 255s + filename=c.txt 255s + text=0 255s + echo 0 255s + git add c.txt 255s + modify d.txt 0 255s + filename=d.txt 255s + text=0 255s + echo 0 255s + git add d.txt 255s + modify conflict.txt original version 255s + filename=conflict.txt 255s + text=original version 255s + echo original version 255s + git add conflict.txt 255s + commit -m m⇒0 255s + TIME=1112911994 255s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 255s [master (root-commit) d70e04b] m⇒0 255s 3 files changed, 3 insertions(+) 255s create mode 100644 c.txt 255s create mode 100644 conflict.txt 255s create mode 100644 d.txt 255s + git checkout -b c master -- 255s Switched to a new branch 'c' 255s + seq 9 255s + modify c.txt 1 255s + filename=c.txt 255s + text=1 255s + echo 1 255s + git add c.txt 255s + commit -m c⇒1 255s + TIME=1112911995 255s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 255s [c 89e2141] c⇒1 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + modify c.txt 2 255s + filename=c.txt 255s + text=2 255s + echo 2 255s + git add c.txt 255s + commit -m c⇒2 255s + TIME=1112911996 255s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 255s [c 7c431f2] c⇒2 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + modify c.txt 3 255s + filename=c.txt 255s + text=3 255s + echo 3 255s + git add c.txt 255s + commit -m c⇒3 255s + TIME=1112911997 255s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 255s [c f02ab24] c⇒3 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + modify c.txt 4 255s + filename=c.txt 255s + text=4 255s + echo 4 255s + git add c.txt 255s [c ed9122f] c⇒4 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c 1d3bf09] c⇒5 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c f999ecd] c⇒6 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c 7050a8a] c⇒7 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c 9732e77] c⇒8 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [c 73a5eed] c⇒9 255s 2 files changed, 2 insertions(+), 2 deletions(-) 255s [d bd5368a] d⇒1 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [d 93e27e6] d⇒2 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [d 133f385] d⇒3 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [d 586472a] d⇒4 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s [d 0a6f956] d⇒5 255s 2 files changed, 2 insertions(+), 2 deletions(-) 255s [d bfb30f0] d⇒6 255s 1 file changed, 1 insertion(+), 1 deletion(-) 255s + commit -m c⇒4 255s + TIME=1112911998 255s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 255s + modify c.txt 5 255s + filename=c.txt 255s + text=5 255s + echo 5 255s + git add c.txt 255s + commit -m c⇒5 255s + TIME=1112911999 255s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 255s + modify c.txt 6 255s + filename=c.txt 255s + text=6 255s + echo 6 255s + git add c.txt 255s + commit -m c⇒6 255s + TIME=1112912000 255s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 255s + modify c.txt 7 255s + filename=c.txt 255s + text=7 255s + echo 7 255s + git add c.txt 255s + commit -m c⇒7 255s + TIME=1112912001 255s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 255s + modify c.txt 8 255s + filename=c.txt 255s + text=8 255s + echo 8 255s + git add c.txt 255s + commit -m c⇒8 255s + TIME=1112912002 255s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 255s + modify c.txt 9 255s + filename=c.txt 255s + text=9 255s + echo 9 255s + git add c.txt 255s + modify conflict.txt c version 255s + filename=conflict.txt 255s + text=c version 255s + echo c version 255s + git add conflict.txt 255s + commit -m c⇒9 255s + TIME=1112912003 255s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 255s + git checkout -b d master -- 255s Switched to a new branch 'd' 255s + seq 6 255s + modify d.txt 1 255s + filename=d.txt 255s + text=1 255s + echo 1 255s + git add d.txt 255s + commit -m d⇒1 255s + TIME=1112912004 255s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 255s + modify d.txt 2 255s + filename=d.txt 255s + text=2 255s + echo 2 255s + git add d.txt 255s + commit -m d⇒2 255s + TIME=1112912005 255s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 255s + modify d.txt 3 255s + filename=d.txt 255s + text=3 255s + echo 3 255s + git add d.txt 255s + commit -m d⇒3 255s + TIME=1112912006 255s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 255s + modify d.txt 4 255s + filename=d.txt 255s + text=4 255s + echo 4 255s + git add d.txt 255s + commit -m d⇒4 255s + TIME=1112912007 255s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 255s + modify d.txt 5 255s + filename=d.txt 255s + text=5 255s + echo 5 255s + git add d.txt 255s + modify conflict.txt d version 255s + filename=conflict.txt 255s + text=d version 255s + echo d version 255s + git add conflict.txt 255s + commit -m d⇒5 255s + TIME=1112912008 255s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 255s + modify d.txt 6 255s + filename=d.txt 255s + text=6 255s + echo 6 255s + git add d.txt 255s + commit -m d⇒6 255s + TIME=1112912009 255s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 255s + git checkout c 255s Switched to branch 'c' 255s + git-imerge init --name=c-d d 256s + git-imerge list 256s * c-d 256s + git-imerge diagram --commits --frontier --html=imerge0.html 256s 0 5 9 256s | | | 256s 0 - ********** - c 256s *????????? 256s *????????? 256s *????????? 256s *????????? 256s 5 - *????????? 256s 6 - *????????? 256s | 256s d 256s 256s 0 5 9 256s | | | 256s 0 - ********** - c 256s *????????? 256s *????????? 256s *????????? 256s *????????? 256s 5 - *????????? 256s 6 - *????????? 256s | 256s d 256s 256s Key: 256s |,-,+ = rectangles forming current merge frontier 256s * = merge done manually 256s . = merge done automatically 256s # = conflict that is currently blocking progress 256s @ = merge was blocked but has been resolved 256s ? = no merge recorded 256s 256s + git-imerge autofill 256s + tee autofill.out 256s Attempting automerge of 9-6...failure. 256s Attempting automerge of 1-1...success. 256s Attempting automerge of 1-4...success. 256s Attempting automerge of 1-6...success. 256s Attempting automerge of 9-6...failure. 256s Attempting automerge of 5-6...success. 256s Attempting automerge of 7-6...success. 256s Attempting automerge of 8-6...success. 256s Attempting automerge of 9-1...success. 256s Attempting automerge of 9-4...success. 257s Attempting automerge of 9-5...failure. 257s Autofilling 1-6...success. 257s Autofilling 2-6...success. 257s Autofilling 3-6...success. 257s Autofilling 4-6...success. 257s Autofilling 5-6...success. 257s Autofilling 6-6...success. 257s Autofilling 7-6...success. 257s Autofilling 8-1...success. 257s Autofilling 8-2...success. 257s Autofilling 8-3...success. 257s Autofilling 8-4...success. 257s Autofilling 8-5...success. 257s Autofilling 8-6 (first way)...success. 257s Autofilling 8-6 (second way)...success. 257s The two ways of autofilling 8-6 agree. 257s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 257s Autofilling 9-1...success. 257s Autofilling 9-2...success. 257s Autofilling 9-3...success. 257s Autofilling 9-4...success. 257s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 257s Attempting automerge of 9-6...failure. 257s Attempting automerge of 9-5...failure. 257s HEAD is now at 73a5eed c⇒9 257s Conflict; suggest manual merge of 9-5 257s + grep -q Traceback autofill.out 257s + grep -q suggest manual merge of 9-5 autofill.out 257s + git-imerge diagram --commits --frontier --html=imerge1.html 257s 0 5 9 257s | | | 257s 0 - ********** - c 257s *???????.. 257s *???????.. 257s *???????.. 257s *???????.. 257s 5 - *???????.# 257s 6 - *........? 257s | 257s d 257s 257s 0 5 9 257s | | | 257s 0 - ********** - c 257s *???????.| 257s *???????.| 257s *???????.| 257s *???????.+ 257s 5 - *???????|# 257s 6 - *-------+? 257s | 257s d 257s 257s Key: 257s |,-,+ = rectangles forming current merge frontier 257s * = merge done manually 257s . = merge done automatically 257s # = conflict that is currently blocking progress 257s @ = merge was blocked but has been resolved 257s ? = no merge recorded 257s 257s + git-imerge continue --edit 257s Auto-merging conflict.txt 257s CONFLICT (content): Merge conflict in conflict.txt 257s Automatic merge failed; fix conflicts and then commit the result. 257s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 257s Author: Loú User 257s Date: Thu Apr 7 22:13:23 2005 +0000 257s 257s c⇒9 257s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 257s Author: Loú User 257s Date: Thu Apr 7 22:13:28 2005 +0000 257s 257s d⇒5 257s Switched to branch 'imerge/c-d' 257s 257s Original first commit: 257s 257s Original second commit: 257s 257s There was a conflict merging commit 9-5, shown above. 257s Please resolve the conflict, commit the result, then type 257s 257s git-imerge continue 257s + echo merged version 257s + git add conflict.txt 257s + git-imerge continue --no-edit 258s [imerge/c-d 374643c] imerge 'c-d': manual merge 9-5 258s 0 5 9 258s | | | 258s 0 - ********** - c 258s *???????.. 258s *???????.. 258s *???????.. 258s *???????.. 258s 5 - *???????.* 258s 6 - *......... 258s | 258s d 258s 258s 0 5 9 258s | | | 258s 0 - ********** - c 258s *???????.| 258s *???????.| 258s *???????.| 258s *???????.| 258s 5 - *???????.* 258s 6 - *--------+ 258s | 258s d 258s 258s Key: 258s |,-,+ = rectangles forming current merge frontier 258s * = merge done manually 258s . = merge done automatically 258s # = conflict that is currently blocking progress 258s @ = merge was blocked but has been resolved 258s ? = no merge recorded 258s 258s Merge d into c (using imerge) 258s 258s # Please enter the commit message for your changes. Lines starting 258s # with '#' will be ignored, and an empty message aborts the commit. 258s # 258s # Date: Fri Dec 5 08:26:49 2025 +0000 258s # 258s # On branch c-d-merge 258s # Changes to be committed: 258s # modified: conflict.txt 258s # modified: d.txt 258s # 258s [c-d-merge dd6b7f6] Merge d into c (using imerge) 258s Date: Fri Dec 5 08:26:49 2025 +0000 258s Merge has been recorded for merge 9-5. 258s Attempting automerge of 9-6...success. 258s Autofilling 9-6...success. 258s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 258s Merge is complete! 258s + git-imerge diagram --commits --frontier --html=imerge2.html 258s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 258s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-merge 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-merge^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=rebase --branch=c-d-rebase 258s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-rebase 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-rebase^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 258s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-rebase-with-history 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-rebase-with-history^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=border --branch=c-d-border 258s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-border 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-border^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 258s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-border-with-history 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-border-with-history^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 258s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + local refname=c-d-border-with-history2 258s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git rev-parse c-d-border-with-history2^{tree} 258s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 258s + git-imerge remove 258s + git checkout c 258s Switched to branch 'c' 258s + + git-imerge start --goal=full --first-parent --name=c-d d 258s tee start.out 258s Attempting to merge 1-1...success. 258s Attempting to merge 1-2...success. 258s Attempting to merge 1-3...success. 258s Attempting to merge 1-4...success. 258s Attempting to merge 1-5...success. 258s Attempting to merge 1-6...success. 258s Attempting to merge 2-1...success. 258s Attempting to merge 2-2...success. 258s Attempting to merge 2-3...success. 258s Attempting to merge 2-4...success. 258s Attempting to merge 2-5...success. 258s Attempting to merge 2-6...success. 258s Attempting to merge 3-1...success. 258s Attempting to merge 3-2...success. 258s Attempting to merge 3-3...success. 259s Attempting to merge 3-4...success. 259s Attempting to merge 3-5...success. 259s Attempting to merge 3-6...success. 259s Attempting to merge 4-1...success. 259s Attempting to merge 4-2...success. 259s Attempting to merge 4-3...success. 259s Attempting to merge 4-4...success. 259s Attempting to merge 4-5...success. 259s Attempting to merge 4-6...success. 259s Attempting to merge 5-1...success. 259s Attempting to merge 5-2...success. 259s Attempting to merge 5-3...success. 259s Attempting to merge 5-4...success. 259s Attempting to merge 5-5...success. 259s Attempting to merge 5-6...success. 259s Attempting to merge 6-1...success. 259s Attempting to merge 6-2...success. 259s Attempting to merge 6-3...success. 259s Attempting to merge 6-4...success. 259s Attempting to merge 6-5...success. 259s Attempting to merge 6-6...success. 259s Attempting to merge 7-1...success. 259s Attempting to merge 7-2...success. 259s Attempting to merge 7-3...success. 259s Attempting to merge 7-4...success. 259s Attempting to merge 7-5...success. 259s Attempting to merge 7-6...success. 259s Attempting to merge 8-1...success. 259s Attempting to merge 8-2...success. 259s Attempting to merge 8-3...success. 259s Attempting to merge 8-4...success. 259s Attempting to merge 8-5...success. 259s Attempting to merge 8-6...success. 259s Attempting to merge 9-1...success. 259s Attempting to merge 9-2...success. 259s Attempting to merge 9-3...success. 259s Attempting to merge 9-4...success. 259s Attempting to merge 9-5...conflict. 259s Switched to branch 'imerge/c-d' 259s Auto-merging conflict.txt 259s CONFLICT (content): Merge conflict in conflict.txt 259s Automatic merge failed; fix conflicts and then commit the result. 259s 259s Original first commit: 259s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 259s Author: Loú User 259s Date: Thu Apr 7 22:13:23 2005 +0000 259s 259s c⇒9 259s 259s Original second commit: 259s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 259s Author: Loú User 259s Date: Thu Apr 7 22:13:28 2005 +0000 259s 259s d⇒5 259s 259s There was a conflict merging commit 9-5, shown above. 259s Please resolve the conflict, commit the result, then type 259s 259s git-imerge continue 259s + grep -q Traceback start.out 259s + grep -q suggest manual merge of 9-5 autofill.out 259s + git-imerge diagram --commits --frontier --html=imerge3.html 259s 0 5 9 259s | | | 259s 0 - ********** - c 259s *......... 259s *......... 259s *......... 259s *......... 259s 5 - *........# 259s 6 - *........? 259s | 259s d 259s 259s 0 5 9 259s | | | 259s 0 - ********** - c 259s *........| 259s *........| 259s *........| 259s *........+ 259s 5 - *.......|# 259s 6 - *-------+? 259s | 259s d 259s 259s Key: 259s |,-,+ = rectangles forming current merge frontier 259s * = merge done manually 259s . = merge done automatically 259s # = conflict that is currently blocking progress 259s @ = merge was blocked but has been resolved 259s ? = no merge recorded 259s 259s + echo merged version 259s + git add conflict.txt 259s + GIT_EDITOR=cat git commit 259s imerge 'c-d': manual merge 9-5 259s 259s # Conflicts: 259s # conflict.txt 259s # 259s # It looks like you may be committing a merge. 259s # If this is not correct, please run 259s # git update-ref -d MERGE_HEAD 259s # and try again. 259s 259s 259s # Please enter the commit message for your changes. Lines starting 259s # with '#' will be ignored, and an empty message aborts the commit. 259s # 259s # On branch imerge/c-d 259s # All conflicts fixed but you are still merging. 259s # 259s # Changes to be committed: 259s # modified: conflict.txt 259s # modified: d.txt 259s # 259s [imerge/c-d dc7d123] imerge 'c-d': manual merge 9-5 259s + git-imerge continue --edit 259s Merge has been recorded for merge 9-5. 259s Attempting to merge 9-6...success. 259s Merge is complete! 259s + git-imerge diagram --commits --frontier --html=imerge4.html 259s 0 5 9 259s | | | 259s 0 - ********** - c 259s *......... 259s *......... 259s *......... 259s *......... 259s 5 - *........* 259s 6 - *......... 259s | 259s d 259s 259s 0 5 9 259s | | | 259s 0 - ********** - c 259s *........| 259s *........| 259s *........| 259s *........| 259s 5 - *........* 259s 6 - *--------+ 259s | 259s d 259s 259s Key: 259s |,-,+ = rectangles forming current merge frontier 259s * = merge done manually 259s . = merge done automatically 259s # = conflict that is currently blocking progress 259s @ = merge was blocked but has been resolved 259s ? = no merge recorded 259s 259s + git-imerge finish --branch=c-d-full 259s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 259s + local refname=c-d-full 259s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 259s + git rev-parse c-d-full^{tree} 259s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 259s + test_conflict 5-1 259s + local conflict=5-1 259s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s + DESCRIPTION=git-imerge test repository with conflict at 5-1 259s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 259s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s + local description=git-imerge test repository with conflict at 5-1 259s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 259s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s + local description=git-imerge test repository with conflict at 5-1 259s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1/.git/ 259s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s hint: Using 'master' as the name for the initial branch. This default branch name 259s hint: is subject to change. To configure the initial branch name to use in all 259s hint: of your new repositories, which will suppress this warning, call: 259s hint: 259s hint: git config --global init.defaultBranch 259s hint: 259s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 259s hint: 'development'. The just-created branch can be renamed via this command: 259s hint: 259s hint: git branch -m 259s hint: 259s hint: Disable this message with "git config set advice.defaultBranchName false" 259s + echo git-imerge test repository with conflict at 5-1 259s + printf %s\n /*.out /*.css /*.html 259s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1/.git config user.name Loú User 259s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 259s + TIME=1112911993 259s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-5-1 259s + modify c.txt 0 259s + filename=c.txt 259s + text=0 259s + echo 0 259s + git add c.txt 259s + modify d.txt 0 259s + filename=d.txt 259s + text=0 259s + echo 0 259s + git add d.txt 259s + modify conflict.txt original version 259s + filename=conflict.txt 259s + text=original version 259s + echo original version 259s + git add conflict.txt 259s + commit -m m⇒0 259s + TIME=1112911994 259s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 259s + git checkout -b c master -- 259s [master (root-commit) d70e04b] m⇒0 259s 3 files changed, 3 insertions(+) 259s create mode 100644 c.txt 259s create mode 100644 conflict.txt 259s create mode 100644 d.txt 259s Switched to a new branch 'c' 259s + seq 9 259s + modify c.txt 1 259s + filename=c.txt 259s + text=1 259s + echo 1 259s + git add c.txt 259s + commit -m c⇒1 259s + TIME=1112911995 259s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 259s [c 89e2141] c⇒1 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify c.txt 2 259s + filename=c.txt 259s + text=2 259s + echo 2 259s + git add c.txt 259s + commit -m c⇒2 259s + TIME=1112911996 259s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 259s [c 7c431f2] c⇒2 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify c.txt 3 259s + filename=c.txt 259s + text=3 259s + echo 3 259s + git add c.txt 259s + commit -m c⇒3 259s + TIME=1112911997 259s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 259s + modify c.txt 4 259s + filename=c.txt 259s + text=4 259s + echo 4 259s + git add c.txt 259s + commit -m c⇒4 259s + TIME=1112911998 259s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 259s [c f02ab24] c⇒3 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s [c ed9122f] c⇒4 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify c.txt 5 259s + filename=c.txt 259s + text=5 259s + echo 5 259s + git add c.txt 259s + modify conflict.txt c version 259s + filename=conflict.txt 259s + text=c version 259s + echo c version 259s + git add conflict.txt 259s + commit -m c⇒5 259s + TIME=1112911999 259s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 259s + modify c.txt 6 259s + filename=c.txt 259s + text=6 259s + echo 6 259s + git add c.txt 259s [c 7e31f25] c⇒5 259s 2 files changed, 2 insertions(+), 2 deletions(-) 259s + commit -m c⇒6 259s + TIME=1112912000 259s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 259s [c df3c57a] c⇒6 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify c.txt 7 259s + filename=c.txt 259s + text=7 259s + echo 7 259s + git add c.txt 259s + commit -m c⇒7 259s + TIME=1112912001 259s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 259s + modify c.txt 8 259s + filename=c.txt 259s + text=8 259s + echo 8 259s + git add c.txt 259s + commit -m c⇒8 259s + TIME=1112912002 259s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 259s [c ea32d81] c⇒7 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s [c 44473d6] c⇒8 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify c.txt 9 259s + filename=c.txt 259s + text=9 259s + echo 9 259s + git add c.txt 259s + commit -m c⇒9 259s + TIME=1112912003 259s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 259s [c d8d80cf] c⇒9 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + git checkout -b d master -- 259s Switched to a new branch 'd' 259s + seq 6 259s + modify d.txt 1 259s + filename=d.txt 259s + text=1 259s + echo 1 259s + git add d.txt 259s + modify conflict.txt d version 259s + filename=conflict.txt 259s + text=d version 259s + echo d version 259s + git add conflict.txt 259s + commit -m d⇒1 259s + TIME=1112912004 259s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 259s [d ac0427a] d⇒1 259s 2 files changed, 2 insertions(+), 2 deletions(-) 259s + modify d.txt 2 259s + filename=d.txt 259s + text=2 259s + echo 2 259s + git add d.txt 259s + commit -m d⇒2 259s + TIME=1112912005 259s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 259s [d 43c38c0] d⇒2 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify d.txt 3 259s + filename=d.txt 259s + text=3 259s + echo 3 259s + git add d.txt 259s + commit -m d⇒3 259s + TIME=1112912006 259s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 259s [d 0260058] d⇒3 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify d.txt 4 259s + filename=d.txt 259s + text=4 259s + echo 4 259s + git add d.txt 259s + commit -m d⇒4 259s + TIME=1112912007 259s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 259s [d 40fef44] d⇒4 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify d.txt 5 259s + filename=d.txt 259s + text=5 259s + echo 5 259s + git add d.txt 259s + commit -m d⇒5 259s + TIME=1112912008 259s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 259s [d b080a65] d⇒5 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + modify d.txt 6 259s + filename=d.txt 259s + text=6 259s + echo 6 259s + git add d.txt 259s + commit -m d⇒6 259s + TIME=1112912009 259s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 259s [d 200ce5c] d⇒6 259s 1 file changed, 1 insertion(+), 1 deletion(-) 259s + git checkout c 259s Switched to branch 'c' 259s + git-imerge init --name=c-d d 260s + git-imerge list 260s * c-d 260s + git-imerge diagram --commits --frontier --html=imerge0.html 260s 0 5 9 260s | | | 260s 0 - ********** - c 260s *????????? 260s *????????? 260s *????????? 260s *????????? 260s 5 - *????????? 260s 6 - *????????? 260s | 260s d 260s 260s 0 5 9 260s | | | 260s 0 - ********** - c 260s *????????? 260s *????????? 260s *????????? 260s *????????? 260s 5 - *????????? 260s 6 - *????????? 260s | 260s d 260s 260s Key: 260s |,-,+ = rectangles forming current merge frontier 260s * = merge done manually 260s . = merge done automatically 260s # = conflict that is currently blocking progress 260s @ = merge was blocked but has been resolved 260s ? = no merge recorded 260s 260s + git-imerge autofill 260s + tee autofill.out 260s Attempting automerge of 9-6...failure. 260s Attempting automerge of 1-1...success. 260s Attempting automerge of 1-4...success. 260s Attempting automerge of 1-6...success. 260s Attempting automerge of 9-6...failure. 260s Attempting automerge of 5-6...failure. 260s Attempting automerge of 3-6...success. 260s Attempting automerge of 4-6...success. 260s Attempting automerge of 5-1...failure. 260s Autofilling 1-6...success. 260s Autofilling 2-6...success. 260s Autofilling 3-6...success. 260s Autofilling 4-1...success. 260s Autofilling 4-2...success. 260s Autofilling 4-3...success. 260s Autofilling 4-4...success. 260s Autofilling 4-5...success. 260s Autofilling 4-6 (first way)...success. 260s Autofilling 4-6 (second way)...success. 260s The two ways of autofilling 4-6 agree. 260s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 260s Attempting automerge of 9-6...failure. 260s Attempting automerge of 5-1...failure. 260s HEAD is now at d8d80cf c⇒9 260s Conflict; suggest manual merge of 5-1 260s + grep -q Traceback autofill.out 260s + grep -q suggest manual merge of 5-1 autofill.out 260s + git-imerge diagram --commits --frontier --html=imerge1.html 260s 0 5 9 260s | | | 260s 0 - ********** - c 260s *???.#???? 260s *???.????? 260s *???.????? 260s *???.????? 260s 5 - *???.????? 260s 6 - *....????? 260s | 260s d 260s 260s 0 5 9 260s | | | 260s 0 - ********** - c 260s *???|#???? 260s *???|????? 260s *???|????? 260s *???|????? 260s 5 - *???|????? 260s 6 - *---+????? 260s | 260s d 260s 260s Key: 260s |,-,+ = rectangles forming current merge frontier 260s * = merge done manually 260s . = merge done automatically 260s # = conflict that is currently blocking progress 260s @ = merge was blocked but has been resolved 260s ? = no merge recorded 260s 260s + git-imerge continue --edit 260s Auto-merging conflict.txt 260s CONFLICT (content): Merge conflict in conflict.txt 260s Switched to branch 'imerge/c-d' 260s Automatic merge failed; fix conflicts and then commit the result. 260s commit 7e31f254c318decc434628f023dac0703f3d2b9e 260s Author: Loú User 260s Date: Thu Apr 7 22:13:19 2005 +0000 260s 260s c⇒5 260s 260s Original first commit: 260s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 260s Author: Loú User 260s Date: Thu Apr 7 22:13:24 2005 +0000 260s 260s d⇒1 260s 260s Original second commit: 260s 260s There was a conflict merging commit 5-1, shown above. 260s Please resolve the conflict, commit the result, then type 260s 260s git-imerge continue 260s + echo merged version 260s + git add conflict.txt 260s + git-imerge continue --no-edit 260s [imerge/c-d 9906c85] imerge 'c-d': manual merge 5-1 260s Merge has been recorded for merge 5-1. 260s Attempting automerge of 5-6...success. 260s Autofilling 5-2...success. 260s Autofilling 5-3...success. 260s Autofilling 5-4...success. 260s Autofilling 5-5...success. 260s Autofilling 5-6...success. 260s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 260s Attempting automerge of 9-6...success. 260s Autofilling 6-6...success. 261s Autofilling 7-6...success. 261s Autofilling 8-6...success. 261s Autofilling 9-1...success. 261s Autofilling 9-2...success. 261s Autofilling 9-3...success. 261s Autofilling 9-4...success. 261s Autofilling 9-5...success. 261s Autofilling 9-6 (first way)...success. 261s Autofilling 9-6 (second way)...success. 261s The two ways of autofilling 9-6 agree. 261s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 261s Merge is complete! 261s + git-imerge diagram --commits --frontier --html=imerge2.html 261s 0 5 9 261s | | | 261s 0 - ********** - c 261s *???.*???. 261s *???..???. 261s *???..???. 261s *???..???. 261s 5 - *???..???. 261s 6 - *......... 261s | 261s d 261s 261s 0 5 9 261s | | | 261s 0 - ********** - c 261s *???.*???| 261s *???..???| 261s *???..???| 261s *???..???| 261s 5 - *???..???| 261s 6 - *--------+ 261s | 261s d 261s 261s Key: 261s |,-,+ = rectangles forming current merge frontier 261s * = merge done manually 261s . = merge done automatically 261s # = conflict that is currently blocking progress 261s @ = merge was blocked but has been resolved 261s ? = no merge recorded 261s 261s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 261s Merge d into c (using imerge) 261s 261s # Please enter the commit message for your changes. Lines starting 261s # with '#' will be ignored, and an empty message aborts the commit. 261s # 261s # Date: Fri Dec 5 08:26:53 2025 +0000 261s # 261s # On branch c-d-merge 261s # Changes to be committed: 261s # modified: conflict.txt 261s # modified: d.txt 261s # 261s [c-d-merge 6c43bbd] Merge d into c (using imerge) 261s Date: Fri Dec 5 08:26:53 2025 +0000 261s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + local refname=c-d-merge 261s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git rev-parse c-d-merge^{tree} 261s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git-imerge simplify --goal=rebase --branch=c-d-rebase 261s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + local refname=c-d-rebase 261s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git rev-parse c-d-rebase^{tree} 261s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 261s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + local refname=c-d-rebase-with-history 261s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git rev-parse c-d-rebase-with-history^{tree} 261s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git-imerge simplify --goal=border --branch=c-d-border 261s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + local refname=c-d-border 261s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git rev-parse c-d-border^{tree} 261s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 262s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + local refname=c-d-border-with-history 262s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git rev-parse c-d-border-with-history^{tree} 262s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 262s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + local refname=c-d-border-with-history2 262s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git rev-parse c-d-border-with-history2^{tree} 262s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 262s + git-imerge remove 262s + git checkout c 262s Switched to branch 'c' 262s + git-imerge start --goal=full --first-parent --name=c-d d 262s + tee start.out 262s Attempting to merge 1-1...success. 262s Attempting to merge 1-2...success. 262s Attempting to merge 1-3...success. 262s Attempting to merge 1-4...success. 262s Attempting to merge 1-5...success. 262s Attempting to merge 1-6...success. 262s Attempting to merge 2-1...success. 262s Attempting to merge 2-2...success. 262s Attempting to merge 2-3...success. 262s Attempting to merge 2-4...success. 262s Attempting to merge 2-5...success. 262s Attempting to merge 2-6...success. 262s Attempting to merge 3-1...success. 262s Attempting to merge 3-2...success. 262s Attempting to merge 3-3...success. 262s Attempting to merge 3-4...success. 263s Attempting to merge 3-5...success. 263s Attempting to merge 3-6...success. 263s Attempting to merge 4-1...success. 263s Attempting to merge 4-2...success. 263s Attempting to merge 4-3...success. 263s Attempting to merge 4-4...success. 263s Attempting to merge 4-5...success. 263s Attempting to merge 4-6...success. 263s Attempting to merge 5-1...conflict. 263s Switched to branch 'imerge/c-d' 263s Auto-merging conflict.txt 263s CONFLICT (content): Merge conflict in conflict.txt 263s Automatic merge failed; fix conflicts and then commit the result. 263s 263s Original first commit: 263s commit 7e31f254c318decc434628f023dac0703f3d2b9e 263s Author: Loú User 263s Date: Thu Apr 7 22:13:19 2005 +0000 263s 263s c⇒5 263s 263s Original second commit: 263s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 263s Author: Loú User 263s Date: Thu Apr 7 22:13:24 2005 +0000 263s 263s d⇒1 263s 263s There was a conflict merging commit 5-1, shown above. 263s Please resolve the conflict, commit the result, then type 263s 263s git-imerge continue 263s + grep -q Traceback start.out 263s + grep -q suggest manual merge of 5-1 autofill.out 263s + git-imerge diagram --commits --frontier --html=imerge3.html 263s 0 5 9 263s | | | 263s 0 - ********** - c 263s *....#???? 263s *....????? 263s *....????? 263s *....????? 263s 5 - *....????? 263s 6 - *....????? 263s | 263s d 263s 263s 0 5 9 263s | | | 263s 0 - ********** - c 263s *...|#???? 263s *...|????? 263s *...|????? 263s *...|????? 263s 5 - *...|????? 263s 6 - *---+????? 263s | 263s d 263s 263s Key: 263s |,-,+ = rectangles forming current merge frontier 263s * = merge done manually 263s . = merge done automatically 263s # = conflict that is currently blocking progress 263s @ = merge was blocked but has been resolved 263s ? = no merge recorded 263s 263s + echo merged version 263s + git add conflict.txt 263s + GIT_EDITOR=cat git commit 263s imerge 'c-d': manual merge 5-1 263s 263s # Conflicts: 263s # conflict.txt 263s # 263s # It looks like you may be committing a merge. 263s # If this is not correct, please run 263s # git update-ref -d MERGE_HEAD 263s # and try again. 263s 263s 263s # Please enter the commit message for your changes. Lines starting 263s # with '#' will be ignored, and an empty message aborts the commit. 263s # 263s # On branch imerge/c-d 263s # All conflicts fixed but you are still merging. 263s # 263s # Changes to be committed: 263s # modified: conflict.txt 263s # modified: d.txt 263s # 263s + git-imerge continue --edit 263s [imerge/c-d 81e33f6] imerge 'c-d': manual merge 5-1 263s Merge has been recorded for merge 5-1. 263s Attempting to merge 5-2...success. 263s Attempting to merge 5-3...success. 263s Attempting to merge 5-4...success. 263s Attempting to merge 5-5...success. 263s Attempting to merge 5-6...success. 263s Attempting to merge 6-1...success. 263s Attempting to merge 6-2...success. 263s Attempting to merge 6-3...success. 263s Attempting to merge 6-4...success. 263s Attempting to merge 6-5...success. 263s Attempting to merge 6-6...success. 263s Attempting to merge 7-1...success. 263s Attempting to merge 7-2...success. 263s Attempting to merge 7-3...success. 263s Attempting to merge 7-4...success. 263s Attempting to merge 7-5...success. 263s Attempting to merge 7-6...success. 263s Attempting to merge 8-1...success. 263s Attempting to merge 8-2...success. 263s Attempting to merge 8-3...success. 263s Attempting to merge 8-4...success. 263s Attempting to merge 8-5...success. 263s Attempting to merge 8-6...success. 263s Attempting to merge 9-1...success. 263s Attempting to merge 9-2...success. 263s Attempting to merge 9-3...success. 263s Attempting to merge 9-4...success. 263s Attempting to merge 9-5...success. 263s Attempting to merge 9-6...success. 263s Merge is complete! 263s + git-imerge diagram --commits --frontier --html=imerge4.html 263s 0 5 9 263s | | | 263s 0 - ********** - c 263s *....*.... 263s *......... 263s *......... 263s *......... 263s 5 - *......... 263s 6 - *......... 263s | 263s d 263s 263s 0 5 9 263s | | | 263s 0 - ********** - c 263s *....*...| 263s *........| 263s *........| 263s *........| 263s 5 - *........| 263s 6 - *--------+ 263s | 263s d 263s 263s Key: 263s |,-,+ = rectangles forming current merge frontier 263s * = merge done manually 263s . = merge done automatically 263s # = conflict that is currently blocking progress 263s @ = merge was blocked but has been resolved 263s ? = no merge recorded 263s 263s + git-imerge finish --branch=c-d-full 263s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + local refname=c-d-full 263s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + git rev-parse c-d-full^{tree} 263s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 263s + test_conflict 6-6 263s + local conflict=6-6 263s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s + DESCRIPTION=git-imerge test repository with conflict at 6-6 263s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 263s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s + local description=git-imerge test repository with conflict at 6-6 263s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 263s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s + local description=git-imerge test repository with conflict at 6-6 263s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s hint: Using 'master' as the name for the initial branch. This default branch name 263s hint: is subject to change. To configure the initial branch name to use in all 263s hint: of your new repositories, which will suppress this warning, call: 263s hint: 263s hint: git config --global init.defaultBranch 263s hint: 263s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 263s hint: 'development'. The just-created branch can be renamed via this command: 263s hint: 263s hint: git branch -m 263s hint: 263s hint: Disable this message with "git config set advice.defaultBranchName false" 263s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6/.git/ 263s + echo git-imerge test repository with conflict at 6-6 263s + printf %s\n /*.out /*.css /*.html 263s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6/.git config user.name Loú User 263s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 263s + TIME=1112911993 263s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/conflicted-6-6 263s + modify c.txt 0 263s + filename=c.txt 263s + text=0 263s + echo 0 263s + git add c.txt 263s + modify d.txt 0 263s + filename=d.txt 263s + text=0 263s [master (root-commit) d70e04b] m⇒0 263s 3 files changed, 3 insertions(+) 263s create mode 100644 c.txt 263s create mode 100644 conflict.txt 263s create mode 100644 d.txt 263s + echo 0 263s + git add d.txt 263s + modify conflict.txt original version 263s + filename=conflict.txt 263s + text=original version 263s + echo original version 263s + git add conflict.txt 263s + commit -m m⇒0 263s + TIME=1112911994 263s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 263s + git checkout -b c master -- 263s Switched to a new branch 'c' 263s + seq 9 263s [c 89e2141] c⇒1 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify c.txt 1 263s + filename=c.txt 263s + text=1 263s + echo 1 263s + git add c.txt 263s + commit -m c⇒1 263s + TIME=1112911995 263s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 263s + modify c.txt 2 263s + filename=c.txt 263s + text=2 263s + echo 2 263s + git add c.txt 263s + commit -m c⇒2 263s + TIME=1112911996 263s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 263s [c 7c431f2] c⇒2 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [c f02ab24] c⇒3 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify c.txt 3 263s + filename=c.txt 263s + text=3 263s + echo 3 263s + git add c.txt 263s + commit -m c⇒3 263s + TIME=1112911997 263s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 263s + modify c.txt 4 263s + filename=c.txt 263s + text=4 263s + echo 4 263s + git add c.txt 263s + commit -m c⇒4 263s + TIME=1112911998 263s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 263s [c ed9122f] c⇒4 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify c.txt 5 263s + filename=c.txt 263s + text=5 263s + echo 5 263s + git add c.txt 263s + commit -m c⇒5 263s + TIME=1112911999 263s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 263s [c 1d3bf09] c⇒5 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [c fe4fed8] c⇒6 263s 2 files changed, 2 insertions(+), 2 deletions(-) 263s + modify c.txt 6 263s + filename=c.txt 263s + text=6 263s + echo 6 263s + git add c.txt 263s + modify conflict.txt c version 263s + filename=conflict.txt 263s + text=c version 263s + echo c version 263s + git add conflict.txt 263s + commit -m c⇒6 263s + TIME=1112912000 263s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 263s + modify c.txt 7 263s + filename=c.txt 263s + text=7 263s + echo 7 263s + git add c.txt 263s + commit -m c⇒7 263s + TIME=1112912001 263s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 263s [c ec255ea] c⇒7 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify c.txt 8 263s + filename=c.txt 263s + text=8 263s + echo 8 263s + git add c.txt 263s + commit -m c⇒8 263s + TIME=1112912002 263s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 263s [c 7459ac3] c⇒8 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify c.txt 9 263s + filename=c.txt 263s + text=9 263s + echo 9 263s + git add c.txt 263s + commit -m c⇒9 263s + TIME=1112912003 263s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 263s [c 70408c8] c⇒9 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + git checkout -b d master -- 263s Switched to a new branch 'd' 263s + seq 6 263s + modify d.txt 1 263s + filename=d.txt 263s + text=1 263s + echo 1 263s + git add d.txt 263s + commit -m d⇒1 263s + TIME=1112912004 263s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 263s [d bd5368a] d⇒1 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify d.txt 2 263s + filename=d.txt 263s + text=2 263s + echo 2 263s + git add d.txt 263s [d 93e27e6] d⇒2 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + commit -m d⇒2 263s + TIME=1112912005 263s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 263s + modify d.txt 3 263s + filename=d.txt 263s + text=3 263s + echo 3 263s + git add d.txt 263s [d 133f385] d⇒3 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [d 586472a] d⇒4 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [d 9522207] d⇒5 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + commit -m d⇒3 263s + TIME=1112912006 263s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 263s + modify d.txt 4 263s + filename=d.txt 263s + text=4 263s + echo 4 263s + git add d.txt 263s + commit -m d⇒4 263s + TIME=1112912007 263s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 263s + modify d.txt 5 263s + filename=d.txt 263s + text=5 263s + echo 5 263s + git add d.txt 263s + commit -m d⇒5 263s + TIME=1112912008 263s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 263s + modify d.txt 6 263s + filename=d.txt 263s + text=6 263s + echo 6 263s + git add d.txt 263s [d f7e451a] d⇒6 263s 2 files changed, 2 insertions(+), 2 deletions(-) 263s + modify conflict.txt d version 263s + filename=conflict.txt 263s + text=d version 263s + echo d version 263s + git add conflict.txt 263s + commit -m d⇒6 263s + TIME=1112912009 263s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 263s + git checkout c 263s Switched to branch 'c' 263s + git-imerge init --name=c-d d 264s + git-imerge list 264s * c-d 264s + git-imerge diagram --commits --frontier --html=imerge0.html 264s 0 5 9 264s | | | 264s 0 - ********** - c 264s *????????? 264s *????????? 264s *????????? 264s *????????? 264s 5 - *????????? 264s 6 - *????????? 264s | 264s d 264s 264s 0 5 9 264s | | | 264s 0 - ********** - c 264s *????????? 264s *????????? 264s *????????? 264s *????????? 264s 5 - *????????? 264s 6 - *????????? 264s | 264s d 264s 264s Key: 264s |,-,+ = rectangles forming current merge frontier 264s * = merge done manually 264s . = merge done automatically 264s # = conflict that is currently blocking progress 264s @ = merge was blocked but has been resolved 264s ? = no merge recorded 264s 264s + + tee autofill.out 264s git-imerge autofill 264s Attempting automerge of 9-6...failure. 264s Attempting automerge of 1-1...success. 264s Attempting automerge of 1-4...success. 264s Attempting automerge of 1-6...success. 264s Attempting automerge of 9-6...failure. 264s Attempting automerge of 5-6...success. 264s Attempting automerge of 7-6...failure. 264s Attempting automerge of 6-6...failure. 264s Attempting automerge of 6-1...success. 264s Attempting automerge of 6-4...success. 264s Attempting automerge of 6-5...success. 264s Attempting automerge of 9-5...success. 264s Autofilling 1-6...success. 264s Autofilling 2-6...success. 264s Autofilling 3-6...success. 264s Autofilling 4-6...success. 264s Autofilling 5-1...success. 264s Autofilling 5-2...success. 264s Autofilling 5-3...success. 264s Autofilling 5-4...success. 264s Autofilling 5-5...success. 264s Autofilling 5-6 (first way)...success. 264s Autofilling 5-6 (second way)...success. 264s The two ways of autofilling 5-6 agree. 264s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 264s Autofilling 6-5...success. 264s Autofilling 7-5...success. 264s Autofilling 8-5...success. 264s Autofilling 9-1...success. 265s Autofilling 9-2...success. 265s Autofilling 9-3...success. 265s Autofilling 9-4...success. 265s Autofilling 9-5 (first way)...success. 265s Autofilling 9-5 (second way)...success. 265s The two ways of autofilling 9-5 agree. 265s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 265s Attempting automerge of 9-6...failure. 265s Attempting automerge of 6-6...failure. 265s HEAD is now at 70408c8 c⇒9 265s Conflict; suggest manual merge of 6-6 265s + grep -q Traceback autofill.out 265s + grep -q suggest manual merge of 6-6 autofill.out 265s + git-imerge diagram --commits --frontier --html=imerge1.html 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *????.???. 265s *????.???. 265s *????.???. 265s *????.???. 265s 5 - *????..... 265s 6 - *.....#??? 265s | 265s d 265s 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *????.???| 265s *????.???| 265s *????.???| 265s *????.???| 265s 5 - *????.---+ 265s 6 - *----+#??? 265s | 265s d 265s 265s Key: 265s |,-,+ = rectangles forming current merge frontier 265s * = merge done manually 265s . = merge done automatically 265s # = conflict that is currently blocking progress 265s @ = merge was blocked but has been resolved 265s ? = no merge recorded 265s 265s + git-imerge continue --edit 265s Switched to branch 'imerge/c-d' 265s Auto-merging conflict.txt 265s CONFLICT (content): Merge conflict in conflict.txt 265s 265s Original first commit: 265s 265s Original second commit: 265s 265s There was a conflict merging commit 6-6, shown above. 265s Please resolve the conflict, commit the result, then type 265s 265s git-imerge continue 265s Automatic merge failed; fix conflicts and then commit the result. 265s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 265s Author: Loú User 265s Date: Thu Apr 7 22:13:20 2005 +0000 265s 265s c⇒6 265s commit f7e451a6c9656dda15641a9fbc591a602f158692 265s Author: Loú User 265s Date: Thu Apr 7 22:13:29 2005 +0000 265s 265s d⇒6 265s + echo merged version 265s + git add conflict.txt 265s + git-imerge continue --no-edit 265s [imerge/c-d 50e1af1] imerge 'c-d': manual merge 6-6 265s Merge has been recorded for merge 6-6. 265s Attempting automerge of 9-6...success. 265s Autofilling 7-6...success. 265s Autofilling 8-6...success. 265s Autofilling 9-6...success. 265s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 265s Merge is complete! 265s + git-imerge diagram --commits --frontier --html=imerge2.html 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *????.???. 265s *????.???. 265s *????.???. 265s *????.???. 265s 5 - *????..... 265s 6 - *.....*... 265s | 265s d 265s 265s 0 5 9 265s | | | 265s 0 - ********** - c 265s *????.???| 265s *????.???| 265s *????.???| 265s *????.???| 265s 5 - *????....| 265s 6 - *-----*--+ 265s | 265s d 265s 265s Key: 265s |,-,+ = rectangles forming current merge frontier 265s * = merge done manually 265s . = merge done automatically 265s # = conflict that is currently blocking progress 265s @ = merge was blocked but has been resolved 265s ? = no merge recorded 265s 265s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 265s Merge d into c (using imerge) 265s 265s # Please enter the commit message for your changes. Lines starting 265s # with '#' will be ignored, and an empty message aborts the commit. 265s # 265s # Date: Fri Dec 5 08:26:57 2025 +0000 265s # 265s # On branch c-d-merge 265s # Changes to be committed: 265s # modified: conflict.txt 265s # modified: d.txt 265s # 265s [c-d-merge caf5c8d] Merge d into c (using imerge) 265s Date: Fri Dec 5 08:26:57 2025 +0000 265s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + local refname=c-d-merge 265s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + git rev-parse c-d-merge^{tree} 265s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + git-imerge simplify --goal=rebase --branch=c-d-rebase 265s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + local refname=c-d-rebase 265s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + git rev-parse c-d-rebase^{tree} 265s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 265s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 266s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + local refname=c-d-rebase-with-history 266s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git rev-parse c-d-rebase-with-history^{tree} 266s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git-imerge simplify --goal=border --branch=c-d-border 266s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + local refname=c-d-border 266s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git rev-parse c-d-border^{tree} 266s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 266s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + local refname=c-d-border-with-history 266s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git rev-parse c-d-border-with-history^{tree} 266s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 267s Attempting to merge 1-1...success. 267s Attempting to merge 1-2...success. 267s Attempting to merge 1-3...success. 267s Attempting to merge 1-4...success. 267s Attempting to merge 1-5...success. 267s Attempting to merge 1-6...success. 267s Attempting to merge 2-1...success. 267s Attempting to merge 2-2...success. 267s Attempting to merge 2-3...success. 267s Attempting to merge 2-4...success. 267s Attempting to merge 2-5...success. 267s Attempting to merge 2-6...success. 267s Attempting to merge 3-1...success. 267s Attempting to merge 3-2...success. 267s Attempting to merge 3-3...success. 267s Attempting to merge 3-4...success. 267s Attempting to merge 3-5...success. 267s Attempting to merge 3-6...success. 267s Attempting to merge 4-1...success. 267s Attempting to merge 4-2...success. 267s Attempting to merge 4-3...success. 267s Attempting to merge 4-4...success. 267s Attempting to merge 4-5...success. 267s Attempting to merge 4-6...success. 267s Attempting to merge 5-1...success. 267s Attempting to merge 5-2...success. 267s Attempting to merge 5-3...success. 267s Attempting to merge 5-4...success. 267s Attempting to merge 5-5...success. 267s Attempting to merge 5-6...success. 267s Attempting to merge 6-1...success. 267s Attempting to merge 6-2...success. 267s Attempting to merge 6-3...success. 267s Attempting to merge 6-4...success. 267s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + local refname=c-d-border-with-history2 267s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git rev-parse c-d-border-with-history2^{tree} 267s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git-imerge remove 267s + git checkout c 267s Switched to branch 'c' 267s + git-imerge start --goal=full --first-parent --name=c-d d 267s + tee start.out 267s Attempting to merge 6-5...success. 267s Attempting to merge 6-6...conflict. 267s Attempting to merge 7-1...success. 267s Attempting to merge 7-2...success. 267s Attempting to merge 7-3...success. 267s Attempting to merge 7-4...success. 267s Attempting to merge 7-5...success. 267s Attempting to merge 8-1...success. 267s Attempting to merge 8-2...success. 267s Attempting to merge 8-3...success. 267s Attempting to merge 8-4...success. 267s Attempting to merge 8-5...success. 267s Attempting to merge 9-1...success. 267s Attempting to merge 9-2...success. 267s Attempting to merge 9-3...success. 267s Attempting to merge 9-4...success. 267s Attempting to merge 9-5...success. 267s Previous HEAD position was fa68827 imerge 'c-d': automatic merge 9-5 267s Switched to branch 'imerge/c-d' 267s Auto-merging conflict.txt 267s CONFLICT (content): Merge conflict in conflict.txt 267s Automatic merge failed; fix conflicts and then commit the result. 267s 267s Original first commit: 267s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 267s Author: Loú User 267s Date: Thu Apr 7 22:13:20 2005 +0000 267s 267s c⇒6 267s 267s Original second commit: 267s commit f7e451a6c9656dda15641a9fbc591a602f158692 267s Author: Loú User 267s Date: Thu Apr 7 22:13:29 2005 +0000 267s 267s d⇒6 267s 267s There was a conflict merging commit 6-6, shown above. 267s Please resolve the conflict, commit the result, then type 267s 267s git-imerge continue 267s + grep -q Traceback start.out 267s + grep -q suggest manual merge of 6-6 autofill.out 267s + git-imerge diagram --commits --frontier --html=imerge3.html 267s 0 5 9 267s | | | 267s 0 - ********** - c 267s *......... 267s *......... 267s *......... 267s *......... 267s 5 - *......... 267s 6 - *.....#??? 267s | 267s d 267s 267s 0 5 9 267s | | | 267s 0 - ********** - c 267s *........| 267s *........| 267s *........| 267s *........| 267s 5 - *.....---+ 267s 6 - *----+#??? 267s | 267s d 267s 267s Key: 267s |,-,+ = rectangles forming current merge frontier 267s * = merge done manually 267s . = merge done automatically 267s # = conflict that is currently blocking progress 267s @ = merge was blocked but has been resolved 267s ? = no merge recorded 267s 267s + echo merged version 267s + git add conflict.txt 267s + GIT_EDITOR=cat git commit 267s + git-imerge continue --edit 267s imerge 'c-d': manual merge 6-6 267s 267s # Conflicts: 267s # conflict.txt 267s # 267s # It looks like you may be committing a merge. 267s # If this is not correct, please run 267s # git update-ref -d MERGE_HEAD 267s # and try again. 267s 267s 267s # Please enter the commit message for your changes. Lines starting 267s # with '#' will be ignored, and an empty message aborts the commit. 267s # 267s # On branch imerge/c-d 267s # All conflicts fixed but you are still merging. 267s # 267s # Changes to be committed: 267s # modified: conflict.txt 267s # modified: d.txt 267s # 267s [imerge/c-d a7845ab] imerge 'c-d': manual merge 6-6 267s Merge has been recorded for merge 6-6. 267s Attempting to merge 7-6...success. 267s Attempting to merge 8-6...success. 268s Attempting to merge 9-6...success. 268s Merge is complete! 268s + git-imerge diagram --commits --frontier --html=imerge4.html 268s 0 5 9 268s | | | 268s 0 - ********** - c 268s *......... 268s *......... 268s *......... 268s *......... 268s 5 - *......... 268s 6 - *.....*... 268s | 268s d 268s 268s 0 5 9 268s | | | 268s 0 - ********** - c 268s *........| 268s *........| 268s *........| 268s *........| 268s 5 - *........| 268s 6 - *-----*--+ 268s | 268s d 268s 268s Key: 268s |,-,+ = rectangles forming current merge frontier 268s * = merge done manually 268s . = merge done automatically 268s # = conflict that is currently blocking progress 268s @ = merge was blocked but has been resolved 268s ? = no merge recorded 268s 268s + git-imerge finish --branch=c-d-full 268s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + local refname=c-d-full 268s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 268s + git rev-parse c-d-full^{tree} 268s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 268s py313: commands[2] /tmp/autopkgtest.NNLTRo/build.brh/src> /bin/sh t/test-really-conflicted 268s + dirname t/test-really-conflicted 268s + cd t 268s + pwd 268s + dirname /tmp/autopkgtest.NNLTRo/build.brh/src/t 268s + BASE=/tmp/autopkgtest.NNLTRo/build.brh/src 268s + . /tmp/autopkgtest.NNLTRo/build.brh/src/t/test-lib.sh 268s + GIT_IMERGE=git-imerge 268s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s + DESCRIPTION=git-imerge test repository with multiple conflicts 268s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 268s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s + local description=git-imerge test repository with multiple conflicts 268s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 268s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s + local description=git-imerge test repository with multiple conflicts 268s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s hint: Using 'master' as the name for the initial branch. This default branch name 268s hint: is subject to change. To configure the initial branch name to use in all 268s hint: of your new repositories, which will suppress this warning, call: 268s hint: 268s hint: git config --global init.defaultBranch 268s hint: 268s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 268s hint: 'development'. The just-created branch can be renamed via this command: 268s hint: 268s hint: git branch -m 268s hint: 268s hint: Disable this message with "git config set advice.defaultBranchName false" 268s + echo git-imerge test repository with multiple conflicts 268s + printf %s\n /*.out /*.css /*.html 268s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted/.git config user.name Loú User 268s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted/.git config user.email luser@example.com 268s + TIME=1112911993 268s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted 268s + modify c.txt 0 268s + filename=c.txt 268s + text=0 268s + echo 0 268s + git add c.txt 268s + modify d.txt 0 268s + filename=d.txt 268s + text=0 268s + echo 0 268s + git add d.txt 268s + seq 0 7 268s + modify conflict0.txt original version 269s + filename=conflict0.txt 269s + text=original version 269s + echo original version 269s + git add conflict0.txt 269s + modify conflict1.txt original version 269s + filename=conflict1.txt 269s + text=original version 269s + echo original version 269s + git add conflict1.txt 269s + modify conflict2.txt original version 269s + filename=conflict2.txt 269s + text=original version 269s + echo original version 269s + git add conflict2.txt 269s + modify conflict3.txt original version 269s + filename=conflict3.txt 269s + text=original version 269s + echo original version 269s + git add conflict3.txt 269s + modify conflict4.txt original version 269s + filename=conflict4.txt 269s + text=original version 269s + echo original version 269s + git add conflict4.txt 269s + modify conflict5.txt original version 269s + filename=conflict5.txt 269s + text=original version 269s + echo original version 269s + git add conflict5.txt 269s + modify conflict6.txt original version 269s + filename=conflict6.txt 269s + text=original version 269s + echo original version 269s + git add conflict6.txt 269s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/really-conflicted/.git/ 269s + modify conflict7.txt original version 269s + filename=conflict7.txt 269s + text=original version 269s + echo original version 269s + git add conflict7.txt 269s + commit -m m⇒0 269s + TIME=1112911994 269s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 269s + git checkout -b c master -- 269s Switched to a new branch 'c' 269s + modify c.txt 1 269s + filename=c.txt 269s + text=1 269s + echo 1 269s + git add c.txt 269s + modify conflict0.txt c version 269s + filename=conflict0.txt 269s + text=c version 269s + echo c version 269s + git add conflict0.txt 269s + modify conflict4.txt c version 269s + filename=conflict4.txt 269s + text=c version 269s [master (root-commit) 8e21fbd] m⇒0 269s 10 files changed, 10 insertions(+) 269s create mode 100644 c.txt 269s create mode 100644 conflict0.txt 269s create mode 100644 conflict1.txt 269s create mode 100644 conflict2.txt 269s create mode 100644 conflict3.txt 269s create mode 100644 conflict4.txt 269s create mode 100644 conflict5.txt 269s create mode 100644 conflict6.txt 269s create mode 100644 conflict7.txt 269s create mode 100644 d.txt 269s + echo c version 269s + git add conflict4.txt 269s + commit -m c⇒1 269s + TIME=1112911995 269s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 269s + modify c.txt 2 269s + filename=c.txt 269s + text=2 269s + echo 2 269s + git add c.txt 269s + commit -m c⇒2 269s + TIME=1112911996 269s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 269s + modify c.txt 3 269s + filename=c.txt 269s + text=3 269s + echo 3 269s + git add c.txt 269s + commit -m c⇒3 269s + TIME=1112911997 269s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 269s + modify c.txt 4 269s + filename=c.txt 269s + text=4 269s + echo 4 269s + git add c.txt 269s + modify conflict1.txt c version 269s + filename=conflict1.txt 269s + text=c version 269s + echo c version 269s + git add conflict1.txt 269s + commit -m c⇒4 269s + TIME=1112911998 269s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 269s + modify c.txt 5 269s + filename=c.txt 269s + text=5 269s + echo 5 269s + git add c.txt 269s + modify conflict3.txt c version 269s + filename=conflict3.txt 269s + text=c version 269s + echo c version 269s + git add conflict3.txt 269s + modify conflict6.txt c version 269s + filename=conflict6.txt 269s + text=c version 269s + echo c version 269s + git add conflict6.txt 269s + commit -m c⇒5 269s + TIME=1112911999 269s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 269s + modify c.txt 6 269s + filename=c.txt 269s + text=6 269s + echo 6 269s + git add c.txt 269s + modify conflict5.txt c version 269s + filename=conflict5.txt 269s + text=c version 269s + echo c version 269s + git add conflict5.txt 269s [c 4e6007a] c⇒1 269s 3 files changed, 3 insertions(+), 3 deletions(-) 269s [c c2b7c49] c⇒2 269s 1 file changed, 1 insertion(+), 1 deletion(-) 269s [c 42ad55a] c⇒3 269s 1 file changed, 1 insertion(+), 1 deletion(-) 269s [c a891793] c⇒4 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s [c c21441d] c⇒5 269s 3 files changed, 3 insertions(+), 3 deletions(-) 269s + commit -m c⇒6 269s + TIME=1112912000 269s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 269s + modify c.txt 7 269s + filename=c.txt 269s + text=7 269s + echo 7 269s + git add c.txt 269s + modify conflict2.txt c version 269s + filename=conflict2.txt 269s + text=c version 269s + echo c version 269s + git add conflict2.txt 269s + commit -m c⇒7 269s + TIME=1112912001 269s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 269s + modify c.txt 8 269s + filename=c.txt 269s + text=8 269s + echo 8 269s + git add c.txt 269s + commit -m c⇒8 269s + TIME=1112912002 269s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 269s + modify c.txt 9 269s + filename=c.txt 269s + text=9 269s + echo 9 269s + git add c.txt 269s [c a797a66] c⇒6 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s [c c0e1537] c⇒7 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s [c 9f3e7c8] c⇒8 269s 1 file changed, 1 insertion(+), 1 deletion(-) 269s + modify conflict7.txt c version 269s + filename=conflict7.txt 269s + text=c version 269s + echo c version 269s + git add conflict7.txt 269s + commit -m c⇒9 269s + TIME=1112912003 269s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 269s + git checkout -b d master -- 269s Switched to a new branch 'd' 269s + modify d.txt 1 269s + filename=d.txt 269s + text=1 269s + echo 1 269s + git add d.txt 269s + modify conflict0.txt d version 269s + filename=conflict0.txt 269s + text=d version 269s + echo d version 269s + git add conflict0.txt 269s + modify conflict6.txt d version 269s + filename=conflict6.txt 269s + text=d version 269s + echo d version 269s + git add conflict6.txt 269s + commit -m d⇒1 269s + TIME=1112912004 269s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 269s + modify d.txt 2 269s + filename=d.txt 269s + text=2 269s + echo 2 269s + git add d.txt 269s + modify conflict1.txt d version 269s + filename=conflict1.txt 269s + text=d version 269s + echo d version 269s + git add conflict1.txt 269s + modify conflict2.txt d version 269s + filename=conflict2.txt 269s + text=d version 269s + echo d version 269s + git add conflict2.txt 269s + commit -m d⇒2 269s + TIME=1112912005 269s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 269s + modify d.txt 3 269s + filename=d.txt 269s + text=3 269s + echo 3 269s + git add d.txt 269s + commit -m d⇒3 269s + TIME=1112912006 269s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 269s + modify d.txt 4 269s + filename=d.txt 269s + text=4 269s + echo 4 269s + git add d.txt 269s + commit -m d⇒4 269s + TIME=1112912007 269s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 269s + modify d.txt 5 269s + filename=d.txt 269s + text=5 269s + echo 5 269s + git add d.txt 269s [c ccbfccb] c⇒9 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s [d 8c3c065] d⇒1 269s 3 files changed, 3 insertions(+), 3 deletions(-) 269s [d 820b787] d⇒2 269s 3 files changed, 3 insertions(+), 3 deletions(-) 269s [d 821c792] d⇒3 269s 1 file changed, 1 insertion(+), 1 deletion(-) 269s [d c2a1456] d⇒4 269s 1 file changed, 1 insertion(+), 1 deletion(-) 269s + modify conflict3.txt d version 269s + filename=conflict3.txt 269s + text=d version 269s + echo d version 269s + git add conflict3.txt 269s + commit -m d⇒5 269s + TIME=1112912008 269s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 269s + modify d.txt 6 269s + filename=d.txt 269s + text=6 269s + echo 6 269s + git add d.txt 269s + modify conflict4.txt d version 269s + filename=conflict4.txt 269s + text=d version 269s + echo d version 269s + git add conflict4.txt 269s + commit -m d⇒6 269s + TIME=1112912009 269s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 269s + modify d.txt 7 269s + filename=d.txt 269s + text=7 269s + echo 7 269s + git add d.txt 269s [d c3e3890] d⇒5 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s [d b2f5c5e] d⇒6 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s [d 892af56] d⇒7 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s [d 67099d0] d⇒8 269s 2 files changed, 2 insertions(+), 2 deletions(-) 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *????????? 269s *????????? 269s *????????? 269s *????????? 269s 5 - *????????? 269s *????????? 269s *????????? 269s 8 - *????????? 269s | 269s d 269s 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *????????? 269s *????????? 269s *????????? 269s *????????? 269s 5 - *????????? 269s *????????? 269s *????????? 269s 8 - *????????? 269s | 269s d 269s 269s Key: 269s |,-,+ = rectangles forming current merge frontier 269s * = merge done manually 269s . = merge done automatically 269s # = conflict that is currently blocking progress 269s @ = merge was blocked but has been resolved 269s ? = no merge recorded 269s 269s Attempting automerge of 9-8...failure. 269s Attempting automerge of 1-1...failure. 269s Switched to branch 'imerge/c-d' 269s Auto-merging conflict0.txt 269s CONFLICT (content): Merge conflict in conflict0.txt 269s Automatic merge failed; fix conflicts and then commit the result. 269s 269s Original first commit: 269s + modify conflict5.txt d version 269s + filename=conflict5.txt 269s + text=d version 269s + echo d version 269s + git add conflict5.txt 269s + commit -m d⇒7 269s + TIME=1112912010 269s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 269s + modify d.txt 8 269s + filename=d.txt 269s + text=8 269s + echo 8 269s + git add d.txt 269s + modify conflict7.txt d version 269s + filename=conflict7.txt 269s + text=d version 269s + echo d version 269s + git add conflict7.txt 269s + commit -m d⇒8 269s + TIME=1112912011 269s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 269s + git checkout c 269s Switched to branch 'c' 269s + git-imerge init --name=c-d d 269s + git-imerge diagram --commits --frontier 269s + conflict_count=0 269s + true 269s + git-imerge continue --no-edit 269s + tee autofill.out 269s + grep -q Traceback autofill.out 269s + git-imerge diagram --frontier 269s + grep -q There was a conflict merging autofill.out 269s + seq 0 7 269s + grep -q ==== conflict0.txt 269s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 269s Author: Loú User 269s Date: Thu Apr 7 22:13:15 2005 +0000 269s 269s c⇒1 269s 269s Original second commit: 269s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 269s Author: Loú User 269s Date: Thu Apr 7 22:13:24 2005 +0000 269s 269s d⇒1 269s 269s There was a conflict merging commit 1-1, shown above. 269s Please resolve the conflict, commit the result, then type 269s 269s git-imerge continue 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *#???????? 269s *????????? 269s *????????? 269s *????????? 269s 5 - *????????? 269s *????????? 269s *????????? 269s 8 - *????????? 269s | 269s d 269s 269s Key: 269s |,-,+ = rectangles forming current merge frontier 269s * = merge done manually 269s . = merge done automatically 269s # = conflict that is currently blocking progress 269s @ = merge was blocked but has been resolved 269s ? = no merge recorded 269s 269s + modify conflict0.txt merged version 269s + filename=conflict0.txt 269s + text=merged version 269s + echo merged version 269s + git add conflict0.txt 269s + conflict_count=1 269s + grep -q ==== conflict1.txt 269s + grep -q ==== conflict2.txt 269s + grep -q ==== conflict3.txt 269s + grep -q ==== conflict4.txt 269s + grep -q ==== conflict5.txt 269s + grep -q ==== conflict6.txt 269s + grep -q ==== conflict7.txt 269s + true 269s + git-imerge continue --no-edit 269s + tee autofill.out 269s [imerge/c-d 8f8a7d6] imerge 'c-d': manual merge 1-1 269s Merge has been recorded for merge 1-1. 269s Attempting automerge of 1-8...failure. 269s Attempting automerge of 1-2...success. 269s Attempting automerge of 1-6...failure. 269s Attempting automerge of 1-4...success. 269s Attempting automerge of 1-5...success. 269s Autofilling 1-2...success. 269s Autofilling 1-3...success. 269s Autofilling 1-4...success. 269s Autofilling 1-5...success. 269s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 269s Attempting automerge of 1-8...failure. 269s Attempting automerge of 1-6...failure. 269s Attempting automerge of 9-5...failure. 269s Attempting automerge of 2-1...success. 269s Attempting automerge of 2-4...success. 269s Attempting automerge of 2-5...success. 269s Attempting automerge of 9-5...failure. 269s Attempting automerge of 6-5...failure. 269s Attempting automerge of 4-5...failure. 269s Attempting automerge of 3-5...success. 269s Attempting automerge of 4-1...success. 269s Attempting automerge of 4-3...failure. 269s Attempting automerge of 4-2...failure. 269s Attempting automerge of 9-1...failure. 269s Attempting automerge of 7-1...failure. 269s Attempting automerge of 6-1...failure. 269s Attempting automerge of 5-1...failure. 269s Autofilling 2-5...success. 269s Autofilling 3-1...success. 269s Autofilling 3-2...success. 269s Autofilling 3-3...success. 269s Autofilling 3-4...success. 269s Autofilling 3-5 (first way)...success. 269s Autofilling 3-5 (second way)...success. 269s The two ways of autofilling 3-5 agree. 269s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 269s Autofilling 4-1...success. 269s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 269s Attempting automerge of 4-5...failure. 269s Attempting automerge of 4-2...failure. 269s Attempting automerge of 9-1...failure. 269s Attempting automerge of 5-1...failure. 269s Previous HEAD position was c21441d c⇒5 269s Switched to branch 'imerge/c-d' 269s Auto-merging conflict4.txt 269s CONFLICT (content): Merge conflict in conflict4.txt 269s Automatic merge failed; fix conflicts and then commit the result. 269s 269s Original first commit: 269s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 269s Author: Loú User 269s Date: Thu Apr 7 22:13:15 2005 +0000 269s 269s c⇒1 269s 269s Original second commit: 269s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 269s Author: Loú User 269s Date: Thu Apr 7 22:13:29 2005 +0000 269s 269s d⇒6 269s 269s There was a conflict merging commit 1-6, shown above. 269s Please resolve the conflict, commit the result, then type 269s 269s git-imerge continue 269s + grep -q Traceback autofill.out 269s + git-imerge diagram --frontier 269s + grep -q There was a conflict merging autofill.out 269s + seq 0 7 269s + grep -q ==== conflict0.txt 269s + grep -q ==== conflict1.txt 269s + grep -q ==== conflict2.txt 269s + grep -q ==== conflict3.txt 269s + grep -q ==== conflict4.txt 269s + modify conflict4.txt merged version 269s + filename=conflict4.txt 269s + text=merged version 269s + echo merged version 269s + git add conflict4.txt 269s + conflict_count=2 269s + grep -q ==== conflict5.txt 269s + grep -q ==== conflict6.txt 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s **?.+#???? 269s *.?|#????? 269s *.?|?????? 269s *.?|?????? 269s 5 - *--+?????? 269s *#???????? 269s *????????? 269s 8 - *????????? 269s | 269s d 269s 269s Key: 269s |,-,+ = rectangles forming current merge frontier 269s * = merge done manually 269s . = merge done automatically 269s # = conflict that is currently blocking progress 269s @ = merge was blocked but has been resolved 269s ? = no merge recorded 269s 270s [imerge/c-d 2b93edc] imerge 'c-d': manual merge 1-6 270s Merge has been recorded for merge 1-6. 270s Attempting automerge of 1-8...success. 270s Autofilling 1-7...success. 270s Autofilling 1-8...success. 270s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 270s Attempting automerge of 3-8...success. 270s Autofilling 2-8...success. 270s Autofilling 3-6...success. 270s Autofilling 3-7...success. 270s Autofilling 3-8 (first way)...success. 270s Autofilling 3-8 (second way)...success. 270s The two ways of autofilling 3-8 agree. 270s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 270s Warning: you are leaving 1 commit behind, not connected to 270s any of your branches: 270s 270s f8e7aa8 imerge 'c-d': automatic merge 3-8 270s 270s If you want to keep it by creating a new branch, this may be a good time 270s to do so with: 270s 270s git branch f8e7aa8 270s 270s Switched to branch 'imerge/c-d' 270s Auto-merging conflict1.txt 270s CONFLICT (content): Merge conflict in conflict1.txt 270s Automatic merge failed; fix conflicts and then commit the result. 270s 270s Original first commit: 270s commit a89179336bb40a4ca90903425239a9ef3ce659bd 270s Author: Loú User 270s Date: Thu Apr 7 22:13:18 2005 +0000 270s 270s c⇒4 270s 270s Original second commit: 270s commit 820b787e86e22612af7a061db842dc95e9f1d49f 270s Author: Loú User 270s Date: Thu Apr 7 22:13:25 2005 +0000 270s 270s d⇒2 270s 270s There was a conflict merging commit 4-2, shown above. 270s Please resolve the conflict, commit the result, then type 270s 270s git-imerge continue 270s + grep -q ==== conflict7.txt 270s + true 270s + git-imerge continue --no-edit 270s + tee autofill.out 270s + grep -q Traceback autofill.out 270s + git-imerge diagram --frontier 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s **?.+#???? 270s *.?|#????? 270s *.?|?????? 270s *.?|?????? 270s 5 - *..|?????? 270s **?|?????? 270s *.?|?????? 270s 8 - *--+?????? 270s | 270s d 270s 270s Key: 270s |,-,+ = rectangles forming current merge frontier 270s * = merge done manually 270s . = merge done automatically 270s # = conflict that is currently blocking progress 270s @ = merge was blocked but has been resolved 270s ? = no merge recorded 270s 270s + grep -q There was a conflict merging autofill.out 270s + seq 0 7 270s + grep -q ==== conflict0.txt 270s + grep -q ==== conflict1.txt 270s + modify conflict1.txt merged version 270s + filename=conflict1.txt 270s + text=merged version 270s + echo merged version 270s + git add conflict1.txt 270s + conflict_count=3 270s + grep -q ==== conflict2.txt 270s + grep -q ==== conflict3.txt 270s [imerge/c-d 6c97f8e] imerge 'c-d': manual merge 4-2 270s Merge has been recorded for merge 4-2. 270s Attempting automerge of 4-8...success. 270s Autofilling 4-3...success. 270s Autofilling 4-4...success. 270s Autofilling 4-5...success. 270s Autofilling 4-6...success. 270s Autofilling 4-7...success. 270s Autofilling 4-8...success. 270s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 270s Previous HEAD position was fb02171 imerge 'c-d': automatic merge 4-8 270s Switched to branch 'imerge/c-d' 270s Auto-merging conflict6.txt 270s CONFLICT (content): Merge conflict in conflict6.txt 270s Automatic merge failed; fix conflicts and then commit the result. 270s 270s Original first commit: 270s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 270s Author: Loú User 270s Date: Thu Apr 7 22:13:19 2005 +0000 270s 270s c⇒5 270s 270s Original second commit: 270s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 270s Author: Loú User 270s Date: Thu Apr 7 22:13:24 2005 +0000 270s 270s d⇒1 270s 270s There was a conflict merging commit 5-1, shown above. 270s Please resolve the conflict, commit the result, then type 270s 270s git-imerge continue 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s **?.|#???? 270s *.?.*????? 270s *.?.|????? 270s *.?.|????? 270s 5 - *...|????? 270s **?.|????? 270s *.?.|????? 270s 8 - *---+????? 270s | 270s d 270s 270s Key: 270s |,-,+ = rectangles forming current merge frontier 270s * = merge done manually 270s . = merge done automatically 270s # = conflict that is currently blocking progress 270s @ = merge was blocked but has been resolved 270s ? = no merge recorded 270s 270s + grep -q ==== conflict4.txt 270s + grep -q ==== conflict5.txt 270s + grep -q ==== conflict6.txt 270s + grep -q ==== conflict7.txt 270s + true 270s + git-imerge continue --no-edit 270s + tee autofill.out 270s + grep -q Traceback autofill.out 270s + git-imerge diagram --frontier 270s [imerge/c-d 6f45098] imerge 'c-d': manual merge 5-1 270s Merge has been recorded for merge 5-1. 270s Attempting automerge of 5-8...failure. 270s Attempting automerge of 5-2...success. 270s Attempting automerge of 5-6...failure. 270s Attempting automerge of 5-4...success. 270s Attempting automerge of 5-5...failure. 270s Autofilling 5-2...success. 270s Autofilling 5-3...success. 270s Autofilling 5-4...success. 270s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 270s Attempting automerge of 5-8...failure. 270s Attempting automerge of 5-5...failure. 270s Attempting automerge of 9-4...failure. 270s Attempting automerge of 6-1...success. 270s + grep -q There was a conflict merging autofill.out 270s + seq 0 7 270s + grep -q ==== conflict0.txt 270s + grep -q ==== conflict1.txt 270s + grep -q ==== conflict2.txt 270s + grep -q ==== conflict3.txt 270s + grep -q ==== conflict4.txt 270s + grep -q ==== conflict5.txt 270s + grep -q ==== conflict6.txt 270s + modify conflict6.txt merged version 270s + filename=conflict6.txt 270s + text=merged version 270s + echo merged version 270s + git add conflict6.txt 270s + conflict_count=4 270s + grep -q ==== conflict7.txt 270s + true 270s + git-imerge continue --no-edit 270s + tee autofill.out 270s Attempting automerge of 6-3...success. 271s Attempting automerge of 6-4...success. 271s Attempting automerge of 9-4...failure. 271s Attempting automerge of 8-4...failure. 271s Attempting automerge of 7-4...failure. 271s Attempting automerge of 7-1...success. 271s Attempting automerge of 7-3...failure. 271s Attempting automerge of 7-2...failure. 271s Attempting automerge of 9-1...success. 271s Autofilling 6-1...success. 271s Autofilling 6-2...success. 271s Autofilling 6-3...success. 271s Autofilling 6-4...success. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 271s Autofilling 7-1...success. 271s Autofilling 8-1...success. 271s Autofilling 9-1...success. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 271s Attempting automerge of 9-4...failure. 271s Attempting automerge of 7-2...failure. 271s Previous HEAD position was 6ab7e36 imerge 'c-d': automatic merge 7-1 271s Switched to branch 'imerge/c-d' 271s Auto-merging conflict3.txt 271s CONFLICT (content): Merge conflict in conflict3.txt 271s Automatic merge failed; fix conflicts and then commit the result. 271s 271s Original first commit: 271s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 271s Author: Loú User 271s Date: Thu Apr 7 22:13:19 2005 +0000 271s 271s c⇒5 271s 271s Original second commit: 271s commit c3e3890b9e3c756c1d8f7e345184d576739be079 271s Author: Loú User 271s Date: Thu Apr 7 22:13:28 2005 +0000 271s 271s d⇒5 271s 271s There was a conflict merging commit 5-5, shown above. 271s Please resolve the conflict, commit the result, then type 271s 271s git-imerge continue 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s **?..*.--+ 271s *.?.*.|#?? 271s *.?...|??? 271s *.?..-+??? 271s 5 - *...|#???? 271s **?.|????? 271s *.?.|????? 271s 8 - *---+????? 271s | 271s d 271s 271s Key: 271s |,-,+ = rectangles forming current merge frontier 271s * = merge done manually 271s . = merge done automatically 271s # = conflict that is currently blocking progress 271s @ = merge was blocked but has been resolved 271s ? = no merge recorded 271s 271s + grep -q Traceback autofill.out 271s + git-imerge diagram --frontier 271s + grep -q There was a conflict merging autofill.out 271s + seq 0 7 271s + grep -q ==== conflict0.txt 271s + grep -q ==== conflict1.txt 271s + grep -q ==== conflict2.txt 271s + grep -q ==== conflict3.txt 271s + modify conflict3.txt merged version 271s + filename=conflict3.txt 271s + text=merged version 271s + echo merged version 271s + git add conflict3.txt 271s + conflict_count=5 271s + grep -q ==== conflict4.txt 271s + grep -q ==== conflict5.txt 271s + grep -q ==== conflict6.txt 271s + grep -q ==== conflict7.txt 271s + true 271s + git-imerge continue --no-edit 271s + tee autofill.out 271s [imerge/c-d b3fcc8a] imerge 'c-d': manual merge 5-5 271s Merge has been recorded for merge 5-5. 271s Attempting automerge of 5-8...success. 271s Autofilling 5-6...success. 271s Autofilling 5-7...success. 271s Autofilling 5-8...success. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 271s Attempting automerge of 6-8...failure. 271s Attempting automerge of 6-5...success. 271s Attempting automerge of 6-7...failure. 271s Attempting automerge of 6-6...success. 271s Autofilling 6-5...success. 271s Autofilling 6-6...success. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 271s Attempting automerge of 6-8...failure. 271s Attempting automerge of 6-7...failure. 271s + grep -q Traceback autofill.out 271s + git-imerge diagram --frontier 271s Switched to branch 'imerge/c-d' 271s Auto-merging conflict5.txt 271s CONFLICT (content): Merge conflict in conflict5.txt 271s Automatic merge failed; fix conflicts and then commit the result. 271s 271s Original first commit: 271s commit a797a66a0e4b89690099557280641efeac302bcf 271s Author: Loú User 271s Date: Thu Apr 7 22:13:20 2005 +0000 271s 271s c⇒6 271s 271s Original second commit: 271s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 271s Author: Loú User 271s Date: Thu Apr 7 22:13:30 2005 +0000 271s 271s d⇒7 271s 271s There was a conflict merging commit 6-7, shown above. 271s Please resolve the conflict, commit the result, then type 271s 271s git-imerge continue 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s **?..*.--+ 271s *.?.*.|#?? 271s *.?...|??? 271s *.?...|??? 271s 5 - *....*|??? 271s **?...+??? 271s *.?..|#??? 271s 8 - *----+???? 271s | 271s d 271s 271s Key: 271s |,-,+ = rectangles forming current merge frontier 271s * = merge done manually 271s . = merge done automatically 271s # = conflict that is currently blocking progress 271s @ = merge was blocked but has been resolved 271s ? = no merge recorded 271s 271s + grep -q There was a conflict merging autofill.out 271s + seq 0 7 271s + grep -q ==== conflict0.txt 271s + grep -q ==== conflict1.txt 271s + grep -q ==== conflict2.txt 271s + grep -q ==== conflict3.txt 271s + grep -q ==== conflict4.txt 271s + grep -q ==== conflict5.txt 271s + modify conflict5.txt merged version 271s + filename=conflict5.txt 271s + text=merged version 271s + echo merged version 271s + git add conflict5.txt 272s [imerge/c-d 1eb67f0] imerge 'c-d': manual merge 6-7 272s Merge has been recorded for merge 6-7. 272s Attempting automerge of 6-8...success. 272s Autofilling 6-8...success. 272s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 272s Previous HEAD position was 8c6f418 imerge 'c-d': automatic merge 6-8 272s Switched to branch 'imerge/c-d' 272s Auto-merging conflict2.txt 272s CONFLICT (content): Merge conflict in conflict2.txt 272s Automatic merge failed; fix conflicts and then commit the result. 272s 272s Original first commit: 272s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 272s Author: Loú User 272s Date: Thu Apr 7 22:13:21 2005 +0000 272s 272s c⇒7 272s 272s Original second commit: 272s + conflict_count=6 272s + grep -q ==== conflict6.txt 272s + grep -q ==== conflict7.txt 272s + true 272s + git-imerge continue --no-edit 272s + tee autofill.out 272s commit 820b787e86e22612af7a061db842dc95e9f1d49f 272s Author: Loú User 272s Date: Thu Apr 7 22:13:25 2005 +0000 272s 272s d⇒2 272s 272s There was a conflict merging commit 7-2, shown above. 272s Please resolve the conflict, commit the result, then type 272s 272s git-imerge continue 272s + grep -q Traceback autofill.out 272s + git-imerge diagram --frontier 272s 0 5 9 272s | | | 272s 0 - ********** - c 272s **?..*.--+ 272s *.?.*.|#?? 272s *.?...|??? 272s *.?...|??? 272s 5 - *....*|??? 272s **?...|??? 272s *.?...*??? 272s 8 - *-----+??? 272s | 272s d 272s 272s Key: 272s |,-,+ = rectangles forming current merge frontier 272s * = merge done manually 272s . = merge done automatically 272s # = conflict that is currently blocking progress 272s @ = merge was blocked but has been resolved 272s ? = no merge recorded 272s 275s [imerge/c-d 3eef51e] imerge 'c-d': manual merge 7-2 275s Merge has been recorded for merge 7-2. 275s Attempting automerge of 7-8...success. 275s Autofilling 7-3...success. 275s Autofilling 7-4...success. 275s Autofilling 7-5...success. 275s Autofilling 7-6...success. 275s Autofilling 7-7...success. 275s Autofilling 7-8...success. 275s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 275s Attempting automerge of 9-8...failure. 275s Attempting automerge of 8-2...success. 275s Attempting automerge of 8-6...success. 275s Attempting automerge of 8-8...success. 275s Attempting automerge of 9-8...failure. 275s Attempting automerge of 9-2...success. 275s Attempting automerge of 9-5...success. 275s Attempting automerge of 9-7...success. 275s Autofilling 8-2...success. 275s Autofilling 8-3...success. 275s Autofilling 8-4...success. 275s Autofilling 8-5...success. 275s Autofilling 8-6...success. 275s Autofilling 8-7...success. 275s Autofilling 8-8...success. 275s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 275s Autofilling 9-2...success. 275s Autofilling 9-3...success. 275s Autofilling 9-4...success. 275s Autofilling 9-5...success. 275s Autofilling 9-6...success. 275s Autofilling 9-7...success. 275s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 275s Attempting automerge of 9-8...failure. 275s Attempting automerge of 9-8...failure. 275s Switched to branch 'imerge/c-d' 275s Auto-merging conflict7.txt 275s CONFLICT (content): Merge conflict in conflict7.txt 275s Automatic merge failed; fix conflicts and then commit the result. 275s 275s Original first commit: 275s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 275s Author: Loú User 275s Date: Thu Apr 7 22:13:23 2005 +0000 275s 275s c⇒9 275s 275s Original second commit: 275s commit 67099d078100141fbe4063d46a6408200f4ff311 275s Author: Loú User 275s Date: Thu Apr 7 22:13:31 2005 +0000 275s 275s d⇒8 275s 275s There was a conflict merging commit 9-8, shown above. 275s Please resolve the conflict, commit the result, then type 275s 275s git-imerge continue 275s 0 5 9 275s | | | 275s 0 - ********** - c 275s **?..*...| 275s *.?.*..*.| 275s *.?......| 275s *.?......| 275s 5 - *....*...| 275s **?......| 275s *.?...*..+ 275s 8 - *-------+# 275s | 275s d 275s 275s Key: 275s |,-,+ = rectangles forming current merge frontier 275s * = merge done manually 275s . = merge done automatically 275s # = conflict that is currently blocking progress 275s @ = merge was blocked but has been resolved 275s ? = no merge recorded 275s 275s + grep -q There was a conflict merging autofill.out 275s + seq 0 7 275s + grep -q ==== conflict0.txt 275s + grep -q ==== conflict1.txt 275s + grep -q ==== conflict2.txt 275s + modify conflict2.txt merged version 275s + filename=conflict2.txt 275s + text=merged version 275s + echo merged version 275s + git add conflict2.txt 275s + conflict_count=7 275s + grep -q ==== conflict3.txt 275s + grep -q ==== conflict4.txt 275s + grep -q ==== conflict5.txt 275s + grep -q ==== conflict6.txt 275s + grep -q ==== conflict7.txt 275s + true 275s + git-imerge continue --no-edit 275s + tee autofill.out 275s + grep -q Traceback autofill.out 275s + git-imerge diagram --frontier 275s + grep -q There was a conflict merging autofill.out 275s + seq 0 7 275s + grep -q ==== conflict0.txt 275s + grep -q ==== conflict1.txt 275s + grep -q ==== conflict2.txt 275s + grep -q ==== conflict3.txt 275s + grep -q ==== conflict4.txt 275s [imerge/c-d c5b989d] imerge 'c-d': manual merge 9-8 275s Merge has been recorded for merge 9-8. 275s Merge is complete! 275s 0 5 9 275s | | | 275s 0 - ********** - c 275s **?..*...| 275s *.?.*..*.| 275s *.?......| 275s *.?......| 275s 5 - *....*...| 275s **?......| 275s *.?...*..| 275s 8 - *--------* 275s | 275s d 275s 275s Key: 275s |,-,+ = rectangles forming current merge frontier 275s * = merge done manually 275s . = merge done automatically 275s # = conflict that is currently blocking progress 275s @ = merge was blocked but has been resolved 275s ? = no merge recorded 275s 275s + grep -q ==== conflict5.txt 275s + grep -q ==== conflict6.txt 275s + grep -q ==== conflict7.txt 275s + modify conflict7.txt merged version 275s + filename=conflict7.txt 275s + text=merged version 275s + echo merged version 275s + git add conflict7.txt 275s + conflict_count=8 275s + true 275s + + tee autofill.out 275s git-imerge continue --no-edit 275s + grep -q Traceback autofill.out 275s + git-imerge diagram --frontier 275s + grep -q There was a conflict merging autofill.out 275s + break 275s + test 8 -ne 8 275s + git-imerge diagram --commits 275s + cat 275s + diff -u - diagram.out 275s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 275s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + local refname=c-d-merge 275s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git rev-parse c-d-merge^{tree} 275s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git-imerge simplify --goal=rebase --branch=c-d-rebase 275s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + local refname=c-d-rebase 275s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git rev-parse c-d-rebase^{tree} 275s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 275s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + local refname=c-d-rebase-with-history 275s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git rev-parse c-d-rebase-with-history^{tree} 275s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git-imerge simplify --goal=border --branch=c-d-border 275s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + local refname=c-d-border 275s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git rev-parse c-d-border^{tree} 275s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 275s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + local refname=c-d-border-with-history 275s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git rev-parse c-d-border-with-history^{tree} 275s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 275s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + local refname=c-d-border-with-history2 275s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git rev-parse c-d-border-with-history2^{tree} 275s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 275s + git-imerge remove 275s + dirname t/test-duplicated 275s + cd t 275s + pwd 275s + dirname /tmp/autopkgtest.NNLTRo/build.brh/src/t 275s + BASE=/tmp/autopkgtest.NNLTRo/build.brh/src 275s + . /tmp/autopkgtest.NNLTRo/build.brh/src/t/test-lib.sh 275s + GIT_IMERGE=git-imerge 275s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s + DESCRIPTION=git-imerge test repository with duplicate commits 275s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated git-imerge test repository with duplicate commits 275s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s + local description=git-imerge test repository with duplicate commits 275s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated git-imerge test repository with duplicate commits 275s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s + local description=git-imerge test repository with duplicate commits 275s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s hint: Using 'master' as the name for the initial branch. This default branch name 275s hint: is subject to change. To configure the initial branch name to use in all 275s hint: of your new repositories, which will suppress this warning, call: 275s hint: 275s hint: git config --global init.defaultBranch 275s hint: 275s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 275s hint: 'development'. The just-created branch can be renamed via this command: 275s hint: 275s hint: git branch -m 275s hint: 275s hint: Disable this message with "git config set advice.defaultBranchName false" 275s + echo git-imerge test repository with duplicate commits 275s + printf %s\n /*.out /*.css /*.html 275s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated/.git config user.name Loú User 275s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated/.git config user.email luser@example.com 275s + TIME=1112911993 275s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated 275s + modify a.txt 0 275s + filename=a.txt 275s + text=0 275s + echo 0 275s + git add a.txt 275s + commit -m m⇒0 275s + TIME=1112911994 275s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 275s + git checkout -b a -- 275s Switched to a new branch 'a' 275s + seq 3 275s + modify a.txt 1 275s + filename=a.txt 275s + text=1 275s + echo 1 275s + git add a.txt 275s + commit -m a⇒1 on branch a 275s + TIME=1112911995 275s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 275s + modify a.txt 2 275s + filename=a.txt 275s + text=2 275s + echo 2 275s + git add a.txt 275s + commit -m a⇒2 on branch a 275s + TIME=1112911996 275s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 275s + modify a.txt 3 275s + filename=a.txt 275s + text=3 275s + echo 3 275s + git add a.txt 275s + commit -m a⇒3 on branch a 275s + TIME=1112911997 275s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 275s + git checkout -b b master -- 275s Switched to a new branch 'b' 275s + seq 4 275s + modify a.txt 1 275s + filename=a.txt 275s + text=1 275s + echo 1 275s + git add a.txt 275s + commit -m a⇒1 on branch b 275s + TIME=1112911998 275s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 275s + modify a.txt 2 275s + filename=a.txt 275s + text=2 275s + echo 2 275s + git add a.txt 275s + commit -m a⇒2 on branch b 275s + TIME=1112911999 275s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 275s + modify a.txt 3 275s + filename=a.txt 275s + text=3 275s + echo 3 275s + git add a.txt 275s + commit -m a⇒3 on branch b 275s + TIME=1112912000 275s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 275s + modify a.txt 4 275s + filename=a.txt 275s + text=4 275s + echo 4 275s + git add a.txt 275s + commit -m a⇒4 on branch b 275s + TIME=1112912001 275s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 275s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git checkout a 275s Switched to branch 'a' 275s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 275s Attempting automerge of 3-4...failure. 275s Attempting automerge of 1-1...success. 275s Attempting automerge of 1-3...failure. 275s Attempting automerge of 1-2...failure. 275s Attempting automerge of 3-1...failure. 275s Attempting automerge of 2-1...failure. 275s Autofilling 1-1...success. 275s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 275s Attempting automerge of 1-4...success. 275s Autofilling 1-2...success. 275s Autofilling 1-3...success. 275s Autofilling 1-4...success. 275s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 275s Attempting automerge of 3-4...failure. 275s Attempting automerge of 2-1...success. 275s Attempting automerge of 2-3...failure. 275s Attempting automerge of 2-2...success. 275s Attempting automerge of 3-2...failure. 275s Attempting automerge of 3-1...success. 275s Autofilling 2-1...success. 275s Autofilling 2-2...success. 275s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 275s Autofilling 3-1...success. 275s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 275s Attempting automerge of 2-4...success. 275s Autofilling 2-3...success. 275s Autofilling 2-4...success. 275s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 275s Attempting automerge of 3-4...failure. 275s Attempting automerge of 3-2...success. 275s Attempting automerge of 3-4...failure. 275s Attempting automerge of 3-3...success. 275s Autofilling 3-2...success. 275s Autofilling 3-3...success. 275s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 275s Attempting automerge of 3-4...success. 275s Autofilling 3-4...success. 275s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 275s Merge is complete! 275s + git-imerge diagram --commits --frontier --html=imerge5.html 275s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 275s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-merge 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-merge^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git-imerge simplify --goal=rebase --branch=a-b-rebase 275s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-rebase 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-rebase^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 275s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-rebase-with-history 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-rebase-with-history^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git-imerge simplify --goal=border --branch=a-b-border 275s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-border 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-border^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 275s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-border-with-history 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-border-with-history^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 275s Merge d into c (using imerge) 275s 275s # Please enter the commit message for your changes. Lines starting 275s # with '#' will be ignored, and an empty message aborts the commit. 275s # 275s # Date: Fri Dec 5 08:27:04 2025 +0000 275s # 275s # On branch c-d-merge 275s # Changes to be committed: 275s # modified: conflict0.txt 275s # modified: conflict1.txt 275s # modified: conflict2.txt 275s # modified: conflict3.txt 275s # modified: conflict4.txt 275s # modified: conflict5.txt 275s # modified: conflict6.txt 275s # modified: conflict7.txt 275s # modified: d.txt 275s # 275s [c-d-merge 3c42f31] Merge d into c (using imerge) 275s Date: Fri Dec 5 08:27:04 2025 +0000 275s py313: commands[3] /tmp/autopkgtest.NNLTRo/build.brh/src> /bin/sh t/test-duplicated 275s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/duplicated/.git/ 275s [master (root-commit) a733afa] m⇒0 275s 1 file changed, 1 insertion(+) 275s create mode 100644 a.txt 275s [a 2f1f75a] a⇒1 on branch a 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [a 4700669] a⇒2 on branch a 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [a 621c381] a⇒3 on branch a 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [b 62a5c56] a⇒1 on branch b 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [b f846281] a⇒2 on branch b 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [b a4b2c2b] a⇒3 on branch b 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [b 5b24553] a⇒4 on branch b 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s 0 3 275s | | 275s 0 - **** - a 275s *... 275s *... 275s *... 275s 4 - *... 275s | 275s b 275s 275s 0 3 275s | | 275s 0 - **** - a 275s *..| 275s *..| 275s *..| 275s 4 - *--+ 275s | 275s b 275s 275s Key: 275s |,-,+ = rectangles forming current merge frontier 275s * = merge done manually 275s . = merge done automatically 275s # = conflict that is currently blocking progress 275s @ = merge was blocked but has been resolved 275s ? = no merge recorded 275s 275s Merge b into a (using imerge) 275s 275s # Please enter the commit message for your changes. Lines starting 275s # with '#' will be ignored, and an empty message aborts the commit. 275s # 275s # Date: Fri Dec 5 08:27:06 2025 +0000 275s # 275s # On branch a-b-merge 275s # Changes to be committed: 275s # modified: a.txt 275s # 275s [a-b-merge 34b705c] Merge b into a (using imerge) 275s Date: Fri Dec 5 08:27:06 2025 +0000 275s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-border-with-history2 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-border-with-history2^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git checkout a 275s Switched to branch 'a' 275s + git-imerge start --goal=full --name=a-b b 275s Attempting to merge 1-1...success. 275s Attempting to merge 1-2...success. 275s Attempting to merge 1-3...success. 275s Attempting to merge 1-4...success. 275s Attempting to merge 2-1...success. 275s Attempting to merge 2-2...success. 275s Attempting to merge 2-3...success. 275s Attempting to merge 2-4...success. 275s Attempting to merge 3-1...success. 275s * a-b 275s 0 3 275s | | 275s 0 - **** - a 275s *... 275s *... 275s *... 275s 4 - *... 275s | 275s b 275s 275s 0 3 275s | | 275s 0 - **** - a 275s *..| 275s *..| 275s *..| 275s 4 - *--+ 275s | 275s b 275s 275s Key: 275s |,-,+ = rectangles forming current merge frontier 275s * = merge done manually 275s . = merge done automatically 275s # = conflict that is currently blocking progress 275s @ = merge was blocked but has been resolved 275s ? = no merge recorded 275s 275s Attempting to merge 3-2...success. 275s Attempting to merge 3-3...success. 275s Attempting to merge 3-4...success. 275s Merge is complete! 275s + git-imerge list 275s + git-imerge diagram --commits --frontier --html=imerge6.html 275s + git-imerge finish --branch=a-b-full 275s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + local refname=a-b-full 275s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + git rev-parse a-b-full^{tree} 275s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 275s + dirname t/test-flip-flop 275s + cd t 275s + pwd 275s + dirname /tmp/autopkgtest.NNLTRo/build.brh/src/t 275s + BASE=/tmp/autopkgtest.NNLTRo/build.brh/src 275s + . /tmp/autopkgtest.NNLTRo/build.brh/src/t/test-lib.sh 275s + GIT_IMERGE=git-imerge 275s + flip_flop_test 1 275s + local n=1 275s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 275s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 275s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s + local description=git-imerge test repository with a commit and its revert at n=1 275s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 275s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s + local description=git-imerge test repository with a commit and its revert at n=1 275s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s hint: Using 'master' as the name for the initial branch. This default branch name 275s hint: is subject to change. To configure the initial branch name to use in all 275s hint: of your new repositories, which will suppress this warning, call: 275s hint: 275s hint: git config --global init.defaultBranch 275s hint: 275s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 275s hint: 'development'. The just-created branch can be renamed via this command: 275s hint: 275s hint: git branch -m 275s hint: 275s hint: Disable this message with "git config set advice.defaultBranchName false" 275s + echo git-imerge test repository with a commit and its revert at n=1 275s + printf %s\n /*.out /*.css /*.html 275s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1/.git config user.name Loú User 275s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 275s py313: commands[4] /tmp/autopkgtest.NNLTRo/build.brh/src> /bin/sh t/test-flip-flop 275s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1/.git/ 275s [master (root-commit) a733afa] m⇒0 275s 1 file changed, 1 insertion(+) 275s create mode 100644 a.txt 275s [a 2f1f75a] a⇒1 on branch a 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s + TIME=1112911993 275s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-1 275s + modify a.txt 0 275s + filename=a.txt 275s + text=0 275s + echo 0 275s + git add a.txt 275s + commit -m m⇒0 275s + TIME=1112911994 275s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 275s + git checkout -b a -- 275s Switched to a new branch 'a' 275s + modify a.txt 1 275s + filename=a.txt 275s + text=1 275s + echo 1 275s + git add a.txt 275s + commit -m a⇒1 on branch a 275s + TIME=1112911995 275s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 275s + modify a.txt 2 275s + filename=a.txt 275s + text=2 275s + echo 2 275s + git add a.txt 275s [a 4700669] a⇒2 on branch a 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [a 621c381] a⇒3 on branch a 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s + commit -m a⇒2 on branch a 275s + TIME=1112911996 275s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 275s + modify a.txt 3 275s + filename=a.txt 275s + text=3 275s + echo 3 275s + git add a.txt 275s + commit -m a⇒3 on branch a 275s + TIME=1112911997 275s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 275s + git checkout -b b master -- 275s Switched to a new branch 'b' 275s + modify b.txt 1 275s + filename=b.txt 275s + text=1 275s + echo 1 275s + git add b.txt 275s + msg=b⇒1 275s + test 1 = 1 275s + modify a.txt X 275s + filename=a.txt 275s + text=X 275s + echo X 275s + git add a.txt 275s + msg=b⇒1 and a⇒X 275s + test 1 = 2 275s + commit -m b⇒1 and a⇒X on branch b 275s + TIME=1112911998 275s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 275s + modify b.txt 2 275s + filename=b.txt 275s + text=2 275s + echo 2 275s + git add b.txt 275s + msg=b⇒2 275s + test 2 = 1 275s + test 2 = 2 275s + modify a.txt 0 275s + filename=a.txt 275s + text=0 275s + echo 0 275s + git add a.txt 275s + msg=b⇒2 and a⇒0 275s + commit -m b⇒2 and a⇒0 on branch b 275s + TIME=1112911999 275s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 275s + modify b.txt 3 275s + filename=b.txt 275s + text=3 275s + echo 3 275s + git add b.txt 275s + msg=b⇒3 275s + test 3 = 1 275s + test 3 = 2 275s + commit -m b⇒3 on branch b 275s + TIME=1112912000 275s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 275s + modify b.txt 4 275s + filename=b.txt 275s + text=4 275s + echo 4 275s + git add b.txt 275s + msg=b⇒4 275s + test 4 = 1 275s + test 4 = 2 275s + commit -m b⇒4 on branch b 275s + TIME=1112912001 275s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 275s + test_merge b-into-a-1 a b 1-1 1-2 275s + local name=b-into-a-1 275s + local dst=a 275s + local src=b 275s + local conflict1=1-1 275s + local conflict2=1-2 275s + git checkout a 275s Switched to branch 'a' 275s + git-imerge merge --branch=b-into-a-1 b 275s + tee imerge-b-into-a-1-1.out 275s + git-imerge diagram --commits --frontier 275s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 275s + echo 1 275s + git add a.txt 275s [b 044a3fa] b⇒1 and a⇒X on branch b 275s 2 files changed, 2 insertions(+), 1 deletion(-) 275s create mode 100644 b.txt 275s [b 7851975] b⇒2 and a⇒0 on branch b 275s 2 files changed, 2 insertions(+), 2 deletions(-) 275s [b 6fe24f0] b⇒3 on branch b 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s [b 2dc5eb7] b⇒4 on branch b 275s 1 file changed, 1 insertion(+), 1 deletion(-) 275s Attempting automerge of 3-4...success. 275s Autofilling 1-4...success. 275s Autofilling 2-4...success. 275s Autofilling 3-1...unexpected conflict. Backtracking... 275s Autofilling 1-4...success. 275s Autofilling 2-1...unexpected conflict. Backtracking... 275s Autofilling 1-1...unexpected conflict. Backtracking... 275s Switched to branch 'imerge/b' 275s Auto-merging a.txt 275s CONFLICT (content): Merge conflict in a.txt 275s Automatic merge failed; fix conflicts and then commit the result. 275s 275s Original first commit: 275s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 275s Author: Loú User 275s Date: Thu Apr 7 22:13:15 2005 +0000 275s 275s a⇒1 on branch a 275s 275s Original second commit: 275s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 275s Author: Loú User 275s Date: Thu Apr 7 22:13:18 2005 +0000 275s 275s b⇒1 and a⇒X on branch b 275s 275s There was a conflict merging commit 1-1, shown above. 275s Please resolve the conflict, commit the result, then type 275s 275s git-imerge continue 275s 0 3 275s | | 275s 0 - **** - a 275s *#?? 275s *??? 275s *??? 275s 4 - *??? 275s | 275s b 275s 275s 0 3 275s | | 275s 0 - **** - a 275s *#?? 275s *??? 275s *??? 275s 4 - *??? 275s | 275s b 275s 275s Key: 275s |,-,+ = rectangles forming current merge frontier 275s * = merge done manually 275s . = merge done automatically 275s # = conflict that is currently blocking progress 275s @ = merge was blocked but has been resolved 275s ? = no merge recorded 275s 275s + + tee imerge-b-into-a-1-2.out 275s git-imerge continue --no-edit 275s [imerge/b 4e5498c] imerge 'b': manual merge 1-1 275s Merge has been recorded for merge 1-1. 275s Attempting automerge of 1-4...failure. 276s Attempting automerge of 1-2...failure. 276s Attempting automerge of 3-1...success. 276s Autofilling 2-1...success. 276s Autofilling 3-1...success. 276s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 276s Previous HEAD position was 233bf89 imerge 'b': automatic merge 3-1 276s Switched to branch 'imerge/b' 276s Auto-merging a.txt 276s CONFLICT (content): Merge conflict in a.txt 276s Automatic merge failed; fix conflicts and then commit the result. 276s 276s Original first commit: 276s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 276s Author: Loú User 276s Date: Thu Apr 7 22:13:15 2005 +0000 276s 276s a⇒1 on branch a 276s 276s Original second commit: 276s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 276s Author: Loú User 276s Date: Thu Apr 7 22:13:19 2005 +0000 276s 276s b⇒2 and a⇒0 on branch b 276s 276s There was a conflict merging commit 1-2, shown above. 276s Please resolve the conflict, commit the result, then type 276s 276s git-imerge continue 276s + git-imerge diagram --commits --frontier 276s 0 3 276s | | 276s 0 - **** - a 276s **.. 276s *#?? 276s *??? 276s 4 - *??? 276s | 276s b 276s 276s 0 3 276s | | 276s 0 - **** - a 276s **-+ 276s *#?? 276s *??? 276s 4 - *??? 276s | 276s b 276s 276s Key: 276s |,-,+ = rectangles forming current merge frontier 276s * = merge done manually 276s . = merge done automatically 276s # = conflict that is currently blocking progress 276s @ = merge was blocked but has been resolved 276s ? = no merge recorded 276s 276s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 276s + echo 1 276s + git add a.txt 276s + git-imerge continue --no-edit 276s + tee imerge-b-into-a-1-3.out 276s [imerge/b fbd4c32] imerge 'b': manual merge 1-2 276s Merge has been recorded for merge 1-2. 276s Attempting automerge of 1-4...success. 276s Autofilling 1-3...success. 276s Autofilling 1-4...success. 276s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 276s Attempting automerge of 3-4...success. 276s Autofilling 2-4...success. 276s Autofilling 3-2...success. 276s Autofilling 3-3...success. 276s Autofilling 3-4 (first way)...success. 276s Autofilling 3-4 (second way)...success. 276s The two ways of autofilling 3-4 agree. 276s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 276s Merge is complete! 276s + grep -q Merge is complete imerge-b-into-a-1-3.out 276s + git-imerge diagram --commits --frontier 276s + GIT_EDITOR=cat git-imerge finish 276s 0 3 276s | | 276s 0 - **** - a 276s **.. 276s **?. 276s *.?. 276s 4 - *... 276s | 276s b 276s 276s 0 3 276s | | 276s 0 - **** - a 276s **.| 276s **?| 276s *.?| 276s 4 - *--+ 276s | 276s b 276s 276s Key: 276s |,-,+ = rectangles forming current merge frontier 276s * = merge done manually 276s . = merge done automatically 276s # = conflict that is currently blocking progress 276s @ = merge was blocked but has been resolved 276s ? = no merge recorded 276s 276s Merge b into a (using imerge) 276s 276s # Please enter the commit message for your changes. Lines starting 276s # with '#' will be ignored, and an empty message aborts the commit. 276s # 276s # Date: Fri Dec 5 08:27:08 2025 +0000 276s # 276s # On branch b-into-a-1 276s # Changes to be committed: 276s # new file: b.txt 276s # 276s [b-into-a-1 2c69eb3] Merge b into a (using imerge) 276s Date: Fri Dec 5 08:27:08 2025 +0000 276s + test_merge a-into-b-1 b a 1-1 2-1 276s + local name=a-into-b-1 276s + local dst=b 276s + local src=a 276s + local conflict1=1-1 276s + local conflict2=2-1 276s + git checkout b 276s Switched to branch 'b' 276s + git-imerge merge --branch=a-into-b-1 a 276s + tee imerge-a-into-b-1-1.out 276s Attempting automerge of 4-3...success. 276s Autofilling 1-3...unexpected conflict. Backtracking... 276s Autofilling 1-2...unexpected conflict. Backtracking... 276s Autofilling 1-1...unexpected conflict. Backtracking... 276s Switched to branch 'imerge/a' 276s Auto-merging a.txt 276s CONFLICT (content): Merge conflict in a.txt 276s Automatic merge failed; fix conflicts and then commit the result. 276s 276s Original first commit: 276s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 276s Author: Loú User 276s Date: Thu Apr 7 22:13:18 2005 +0000 276s 276s b⇒1 and a⇒X on branch b 276s 276s Original second commit: 276s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 276s Author: Loú User 276s Date: Thu Apr 7 22:13:15 2005 +0000 276s 276s a⇒1 on branch a 276s 276s There was a conflict merging commit 1-1, shown above. 276s Please resolve the conflict, commit the result, then type 276s 276s git-imerge continue 276s + git-imerge diagram --commits --frontier 276s 0 4 276s | | 276s 0 - ***** - b 276s *#??? 276s *???? 276s 3 - *???? 276s | 276s a 276s 276s 0 4 276s | | 276s 0 - ***** - b 276s *#??? 276s *???? 276s 3 - *???? 276s | 276s a 276s 276s Key: 276s |,-,+ = rectangles forming current merge frontier 276s * = merge done manually 276s . = merge done automatically 276s # = conflict that is currently blocking progress 276s @ = merge was blocked but has been resolved 276s ? = no merge recorded 276s 276s [imerge/a c9eb984] imerge 'a': manual merge 1-1 276s Merge has been recorded for merge 1-1. 276s Attempting automerge of 1-3...success. 276s Autofilling 1-2...success. 276s Autofilling 1-3...success. 276s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 276s Attempting automerge of 4-3...failure. 276s Attempting automerge of 2-1...failure. 276s Switched to branch 'imerge/a' 276s Auto-merging a.txt 276s CONFLICT (content): Merge conflict in a.txt 276s Automatic merge failed; fix conflicts and then commit the result. 276s 276s Original first commit: 276s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 276s Author: Loú User 276s Date: Thu Apr 7 22:13:19 2005 +0000 276s 276s b⇒2 and a⇒0 on branch b 276s 276s Original second commit: 276s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 276s Author: Loú User 276s Date: Thu Apr 7 22:13:15 2005 +0000 276s 276s a⇒1 on branch a 276s 276s There was a conflict merging commit 2-1, shown above. 276s Please resolve the conflict, commit the result, then type 276s 276s git-imerge continue 276s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 276s + echo 1 276s + git add a.txt 276s + git-imerge continue --no-edit 276s + tee imerge-a-into-b-1-2.out 276s + git-imerge diagram --commits --frontier 276s 0 4 276s | | 276s 0 - ***** - b 276s **#?? 276s *.??? 276s 3 - *.??? 276s | 276s a 276s 276s 0 4 276s | | 276s 0 - ***** - b 276s **#?? 276s *|??? 276s 3 - *+??? 276s | 276s a 276s 276s Key: 276s |,-,+ = rectangles forming current merge frontier 276s * = merge done manually 276s . = merge done automatically 276s # = conflict that is currently blocking progress 276s @ = merge was blocked but has been resolved 276s ? = no merge recorded 276s 276s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 276s + echo 1 276s + git add a.txt 276s + git-imerge continue --no-edit 276s + tee imerge-a-into-b-1-3.out 276s [imerge/a 91d8723] imerge 'a': manual merge 2-1 276s Merge has been recorded for merge 2-1. 276s Attempting automerge of 2-3...success. 276s Autofilling 2-2...success. 276s Autofilling 2-3...success. 276s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 276s Attempting automerge of 4-3...success. 276s Autofilling 3-3...success. 276s Autofilling 4-1...success. 276s Autofilling 4-2...success. 276s Autofilling 4-3 (first way)...success. 276s Autofilling 4-3 (second way)...success. 276s The two ways of autofilling 4-3 agree. 276s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 276s Merge is complete! 276s + grep -q Merge is complete imerge-a-into-b-1-3.out 276s + git-imerge diagram --commits --frontier 277s 0 4 277s | | 277s 0 - ***** - b 277s ***?. 277s *..?. 277s 3 - *.... 277s | 277s a 277s 277s 0 4 277s | | 277s 0 - ***** - b 277s ***?| 277s *..?| 277s 3 - *---+ 277s | 277s a 277s 277s Key: 277s |,-,+ = rectangles forming current merge frontier 277s * = merge done manually 277s . = merge done automatically 277s # = conflict that is currently blocking progress 277s @ = merge was blocked but has been resolved 277s ? = no merge recorded 277s 277s Merge a into b (using imerge) 277s 277s # Please enter the commit message for your changes. Lines starting 277s # with '#' will be ignored, and an empty message aborts the commit. 277s # 277s # Date: Fri Dec 5 08:27:09 2025 +0000 277s # 277s # On branch a-into-b-1 277s # Changes to be committed: 277s # modified: a.txt 277s # 277s [a-into-b-1 58d7ebc] Merge a into b (using imerge) 277s Date: Fri Dec 5 08:27:09 2025 +0000 277s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2/.git/ 277s [master (root-commit) a733afa] m⇒0 277s 1 file changed, 1 insertion(+) 277s create mode 100644 a.txt 277s [a 2f1f75a] a⇒1 on branch a 277s 1 file changed, 1 insertion(+), 1 deletion(-) 277s [a 4700669] a⇒2 on branch a 277s 1 file changed, 1 insertion(+), 1 deletion(-) 277s [a 621c381] a⇒3 on branch a 277s 1 file changed, 1 insertion(+), 1 deletion(-) 277s [b 1f7d097] b⇒1 on branch b 277s 1 file changed, 1 insertion(+) 277s create mode 100644 b.txt 277s [b 48df77d] b⇒2 and a⇒X on branch b 277s 2 files changed, 2 insertions(+), 2 deletions(-) 277s [b f3ef019] b⇒3 and a⇒0 on branch b 277s 2 files changed, 2 insertions(+), 2 deletions(-) 277s [b 69d0c21] b⇒4 on branch b 277s 1 file changed, 1 insertion(+), 1 deletion(-) 277s + GIT_EDITOR=cat git-imerge finish 277s + flip_flop_test 2 277s + local n=2 277s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 277s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 277s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s + local description=git-imerge test repository with a commit and its revert at n=2 277s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 277s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s + local description=git-imerge test repository with a commit and its revert at n=2 277s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s hint: Using 'master' as the name for the initial branch. This default branch name 277s hint: is subject to change. To configure the initial branch name to use in all 277s hint: of your new repositories, which will suppress this warning, call: 277s hint: 277s hint: git config --global init.defaultBranch 277s hint: 277s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 277s hint: 'development'. The just-created branch can be renamed via this command: 277s hint: 277s hint: git branch -m 277s hint: 277s hint: Disable this message with "git config set advice.defaultBranchName false" 277s + echo git-imerge test repository with a commit and its revert at n=2 277s + printf %s\n /*.out /*.css /*.html 277s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2/.git config user.name Loú User 277s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 277s + TIME=1112911993 277s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-2 277s + modify a.txt 0 277s + filename=a.txt 277s + text=0 277s + echo 0 277s + git add a.txt 277s + commit -m m⇒0 277s + TIME=1112911994 277s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 277s + git checkout -b a -- 277s Switched to a new branch 'a' 277s + modify a.txt 1 277s + filename=a.txt 277s + text=1 277s + echo 1 277s + git add a.txt 277s + commit -m a⇒1 on branch a 277s + TIME=1112911995 277s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 277s + modify a.txt 2 277s + filename=a.txt 277s + text=2 277s + echo 2 277s + git add a.txt 277s + commit -m a⇒2 on branch a 277s + TIME=1112911996 277s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 277s + modify a.txt 3 277s + filename=a.txt 277s + text=3 277s + echo 3 277s + git add a.txt 277s + commit -m a⇒3 on branch a 277s + TIME=1112911997 277s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 277s + git checkout -b b master -- 277s Switched to a new branch 'b' 277s + modify b.txt 1 277s + filename=b.txt 277s + text=1 277s + echo 1 277s + git add b.txt 277s + msg=b⇒1 277s + test 1 = 2 277s + test 1 = 3 277s + commit -m b⇒1 on branch b 277s + TIME=1112911998 277s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 277s + modify b.txt 2 277s + filename=b.txt 277s + text=2 277s + echo 2 277s + git add b.txt 277s + msg=b⇒2 277s + test 2 = 2 277s + modify a.txt X 277s + filename=a.txt 277s + text=X 277s + echo X 277s + git add a.txt 277s + msg=b⇒2 and a⇒X 277s + test 2 = 3 277s + commit -m b⇒2 and a⇒X on branch b 277s + TIME=1112911999 277s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 277s + modify b.txt 3 277s + filename=b.txt 277s + text=3 277s + echo 3 277s + git add b.txt 277s + msg=b⇒3 277s + test 3 = 2 277s + test 3 = 3 277s + modify a.txt 0 277s + filename=a.txt 277s + text=0 277s + echo 0 277s + git add a.txt 277s + msg=b⇒3 and a⇒0 277s + commit -m b⇒3 and a⇒0 on branch b 277s + TIME=1112912000 277s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 277s + modify b.txt 4 277s + filename=b.txt 277s + text=4 277s + echo 4 277s + git add b.txt 277s + msg=b⇒4 277s + test 4 = 2 277s + test 4 = 3 277s + commit -m b⇒4 on branch b 277s + TIME=1112912001 277s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 277s + test_merge b-into-a-2 a b 1-2 1-3 277s + local name=b-into-a-2 277s + local dst=a 277s + local src=b 277s + local conflict1=1-2 277s + local conflict2=1-3 277s + git checkout a 277s Switched to branch 'a' 277s + git-imerge merge --branch=b-into-a-2 b 277s + tee imerge-b-into-a-2-1.out 277s + git-imerge diagram --commits --frontier 277s Attempting automerge of 3-4...success. 277s Autofilling 1-4...success. 277s Autofilling 2-4...success. 277s Autofilling 3-1...success. 277s Autofilling 3-2...unexpected conflict. Backtracking... 277s Autofilling 1-4...success. 277s Autofilling 2-1...success. 277s Autofilling 2-2...unexpected conflict. Backtracking... 277s Autofilling 1-1...success. 277s Autofilling 1-2...unexpected conflict. Backtracking... 277s Autofilling 1-1...success. 277s Autofilling 2-1...success. 277s Autofilling 3-1...success. 277s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 277s Attempting automerge of 3-4...success. 277s Autofilling 1-4...success. 277s Autofilling 2-4...success. 277s Autofilling 3-2...unexpected conflict. Backtracking... 277s Autofilling 1-4...success. 277s Autofilling 2-2...unexpected conflict. Backtracking... 277s Autofilling 1-2...unexpected conflict. Backtracking... 277s Switched to branch 'imerge/b' 277s Auto-merging a.txt 277s CONFLICT (content): Merge conflict in a.txt 277s Automatic merge failed; fix conflicts and then commit the result. 277s 277s Original first commit: 277s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 277s Author: Loú User 277s Date: Thu Apr 7 22:13:15 2005 +0000 277s 277s a⇒1 on branch a 277s 277s Original second commit: 277s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 277s Author: Loú User 277s Date: Thu Apr 7 22:13:19 2005 +0000 277s 277s b⇒2 and a⇒X on branch b 277s 277s There was a conflict merging commit 1-2, shown above. 277s Please resolve the conflict, commit the result, then type 277s 277s git-imerge continue 277s 0 3 277s | | 277s 0 - **** - a 277s *... 277s *#?? 277s *??? 277s 4 - *??? 277s | 277s b 277s 277s 0 3 277s | | 277s 0 - **** - a 277s *--+ 277s *#?? 277s *??? 277s 4 - *??? 277s | 277s b 277s 277s Key: 277s |,-,+ = rectangles forming current merge frontier 277s * = merge done manually 277s . = merge done automatically 277s # = conflict that is currently blocking progress 277s @ = merge was blocked but has been resolved 277s ? = no merge recorded 277s 277s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 277s + echo 1 277s + git add a.txt 277s + git-imerge continue --no-edit 277s + tee imerge-b-into-a-2-2.out 279s [imerge/b 2baa58d] imerge 'b': manual merge 1-2 279s Merge has been recorded for merge 1-2. 279s Attempting automerge of 1-4...failure. 279s Attempting automerge of 1-3...failure. 279s Attempting automerge of 3-2...success. 279s Autofilling 2-2...success. 279s Autofilling 3-2...success. 279s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 279s Previous HEAD position was 914b318 imerge 'b': automatic merge 3-2 279s Switched to branch 'imerge/b' 279s Auto-merging a.txt 279s CONFLICT (content): Merge conflict in a.txt 279s Automatic merge failed; fix conflicts and then commit the result. 279s 279s Original first commit: 279s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 279s Author: Loú User 279s Date: Thu Apr 7 22:13:15 2005 +0000 279s 279s a⇒1 on branch a 279s 279s Original second commit: 279s commit f3ef01986be02ef5e40589b283c0385471ecca7d 279s Author: Loú User 279s Date: Thu Apr 7 22:13:20 2005 +0000 279s 279s b⇒3 and a⇒0 on branch b 279s 279s There was a conflict merging commit 1-3, shown above. 279s Please resolve the conflict, commit the result, then type 279s 279s git-imerge continue 279s 0 3 279s | | 279s 0 - **** - a 279s *... 279s **.. 279s *#?? 279s 4 - *??? 279s | 279s b 279s 279s 0 3 279s | | 279s 0 - **** - a 279s *..| 279s **-+ 279s *#?? 279s 4 - *??? 279s | 279s b 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s [imerge/b 98f4ab7] imerge 'b': manual merge 1-3 279s Merge has been recorded for merge 1-3. 279s Attempting automerge of 1-4...success. 279s Autofilling 1-4...success. 279s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 279s Attempting automerge of 3-4...success. 279s Autofilling 2-4...success. 279s Autofilling 3-3...success. 279s Autofilling 3-4 (first way)...success. 279s Autofilling 3-4 (second way)...success. 279s The two ways of autofilling 3-4 agree. 279s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 279s Merge is complete! 279s 0 3 279s | | 279s 0 - **** - a 279s *... 279s **.. 279s **?. 279s 4 - *... 279s | 279s b 279s 279s 0 3 279s | | 279s 0 - **** - a 279s *..| 279s **.| 279s **?| 279s 4 - *--+ 279s | 279s b 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s Merge b into a (using imerge) 279s 279s # Please enter the commit message for your changes. Lines starting 279s # with '#' will be ignored, and an empty message aborts the commit. 279s # 279s # Date: Fri Dec 5 08:27:10 2025 +0000 279s # 279s # On branch b-into-a-2 279s # Changes to be committed: 279s # new file: b.txt 279s # 279s [b-into-a-2 f8e3615] Merge b into a (using imerge) 279s Date: Fri Dec 5 08:27:10 2025 +0000 279s Attempting automerge of 4-3...success. 279s Autofilling 1-3...success. 279s Autofilling 2-3...unexpected conflict. Backtracking... 279s Autofilling 1-1...success. 279s Autofilling 1-2...success. 279s Autofilling 1-3...success. 279s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 279s Autofilling 2-2...unexpected conflict. Backtracking... 279s Autofilling 2-1...unexpected conflict. Backtracking... 279s Switched to branch 'imerge/a' 279s Auto-merging a.txt 279s CONFLICT (content): Merge conflict in a.txt 279s Automatic merge failed; fix conflicts and then commit the result. 279s 279s Original first commit: 279s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 279s Author: Loú User 279s Date: Thu Apr 7 22:13:19 2005 +0000 279s 279s b⇒2 and a⇒X on branch b 279s 279s Original second commit: 279s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 279s Author: Loú User 279s Date: Thu Apr 7 22:13:15 2005 +0000 279s 279s a⇒1 on branch a 279s 279s There was a conflict merging commit 2-1, shown above. 279s Please resolve the conflict, commit the result, then type 279s 279s git-imerge continue 279s 0 4 279s | | 279s 0 - ***** - b 279s *.#?? 279s *.??? 279s 3 - *.??? 279s | 279s a 279s 279s 0 4 279s | | 279s 0 - ***** - b 279s *|#?? 279s *|??? 279s 3 - *+??? 279s | 279s a 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s [imerge/a c97b5d9] imerge 'a': manual merge 2-1 279s Merge has been recorded for merge 2-1. 279s Attempting automerge of 2-3...success. 279s Autofilling 2-2...success. 279s Autofilling 2-3...success. 279s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 279s Attempting automerge of 4-3...failure. 279s Attempting automerge of 3-1...failure. 279s Switched to branch 'imerge/a' 279s Auto-merging a.txt 279s CONFLICT (content): Merge conflict in a.txt 279s Automatic merge failed; fix conflicts and then commit the result. 279s 279s Original first commit: 279s commit f3ef01986be02ef5e40589b283c0385471ecca7d 279s Author: Loú User 279s Date: Thu Apr 7 22:13:20 2005 +0000 279s 279s b⇒3 and a⇒0 on branch b 279s 279s Original second commit: 279s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 279s Author: Loú User 279s Date: Thu Apr 7 22:13:15 2005 +0000 279s 279s a⇒1 on branch a 279s 279s There was a conflict merging commit 3-1, shown above. 279s Please resolve the conflict, commit the result, then type 279s 279s git-imerge continue 279s 0 4 279s | | 279s 0 - ***** - b 279s *.*#? 279s *..?? 279s 3 - *..?? 279s | 279s a 279s 279s 0 4 279s | | 279s 0 - ***** - b 279s *.*#? 279s *.|?? 279s 3 - *-+?? 279s | 279s a 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s [imerge/a 94e0fb2] imerge 'a': manual merge 3-1 279s Merge has been recorded for merge 3-1. 279s Attempting automerge of 3-3...success. 279s Autofilling 3-2...success. 279s Autofilling 3-3...success. 279s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 279s Attempting automerge of 4-3...success. 279s Autofilling 4-1...success. 279s Autofilling 4-2...success. 279s Autofilling 4-3...success. 279s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 279s Merge is complete! 279s 0 4 279s | | 279s 0 - ***** - b 279s *.**. 279s *.... 279s 3 - *.... 279s | 279s a 279s 279s 0 4 279s | | 279s 0 - ***** - b 279s *.**| 279s *...| 279s 3 - *---+ 279s | 279s a 279s 279s Key: 279s |,-,+ = rectangles forming current merge frontier 279s * = merge done manually 279s . = merge done automatically 279s # = conflict that is currently blocking progress 279s @ = merge was blocked but has been resolved 279s ? = no merge recorded 279s 279s Merge a into b (using imerge) 279s 279s # Please enter the commit message for your changes. Lines starting 279s # with '#' will be ignored, and an empty message aborts the commit. 279s # 279s # Date: Fri Dec 5 08:27:11 2025 +0000 279s # 279s # On branch a-into-b-2 279s # Changes to be committed: 279s # modified: a.txt 279s # 279s [a-into-b-2 d8b728e] Merge a into b (using imerge) 279s Date: Fri Dec 5 08:27:11 2025 +0000 279s + git-imerge diagram --commits --frontier 279s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 279s + echo 1 279s + git add a.txt 279s + git-imerge continue --no-edit 279s + tee imerge-b-into-a-2-3.out 279s + grep -q Merge is complete imerge-b-into-a-2-3.out 279s + git-imerge diagram --commits --frontier 279s + GIT_EDITOR=cat git-imerge finish 279s + test_merge a-into-b-2 b a 2-1 3-1 279s + local name=a-into-b-2 279s + local dst=b 279s + local src=a 279s + local conflict1=2-1 279s + local conflict2=3-1 279s + git checkout b 279s Switched to branch 'b' 279s + git-imerge merge --branch=a-into-b-2 a 279s + tee imerge-a-into-b-2-1.out 279s + git-imerge diagram --commits --frontier 279s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 279s + echo 1 279s + git add a.txt 279s + git-imerge continue --no-edit 279s + tee imerge-a-into-b-2-2.out 279s + git-imerge diagram --commits --frontier 279s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 279s + echo 1 279s + git add a.txt 279s + + tee imerge-a-into-b-2-3.out 279s git-imerge continue --no-edit 279s + grep -q Merge is complete imerge-a-into-b-2-3.out 279s + git-imerge diagram --commits --frontier 279s + GIT_EDITOR=cat git-imerge finish 279s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3/.git/ 279s [master (root-commit) a733afa] m⇒0 279s 1 file changed, 1 insertion(+) 280s create mode 100644 a.txt 280s [a 2f1f75a] a⇒1 on branch a 280s 1 file changed, 1 insertion(+), 1 deletion(-) 280s [a 4700669] a⇒2 on branch a 280s 1 file changed, 1 insertion(+), 1 deletion(-) 280s [a 621c381] a⇒3 on branch a 280s 1 file changed, 1 insertion(+), 1 deletion(-) 280s [b 1f7d097] b⇒1 on branch b 280s 1 file changed, 1 insertion(+) 280s create mode 100644 b.txt 280s [b ce671e9] b⇒2 on branch b 280s 1 file changed, 1 insertion(+), 1 deletion(-) 280s [b d40495e] b⇒3 and a⇒X on branch b 280s 2 files changed, 2 insertions(+), 2 deletions(-) 280s [b eb736f2] b⇒4 and a⇒0 on branch b 280s 2 files changed, 2 insertions(+), 2 deletions(-) 280s Attempting automerge of 3-4...success. 280s Autofilling 1-4...success. 280s Autofilling 2-4...success. 280s Autofilling 3-1...success. 280s Autofilling 3-2...success. 280s Autofilling 3-3...unexpected conflict. Backtracking... 280s Autofilling 1-4...success. 280s Autofilling 2-1...success. 280s Autofilling 2-2...success. 280s Autofilling 2-3...unexpected conflict. Backtracking... 280s Autofilling 1-1...success. 280s Autofilling 1-2...success. 280s Autofilling 1-3...unexpected conflict. Backtracking... 280s Autofilling 1-2...success. 280s Autofilling 2-2...success. 280s Autofilling 3-1...success. 280s Autofilling 3-2 (first way)...success. 280s Autofilling 3-2 (second way)...success. 280s The two ways of autofilling 3-2 agree. 280s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 280s Attempting automerge of 3-4...success. 280s Autofilling 1-4...success. 280s Autofilling 2-4...success. 280s Autofilling 3-3...unexpected conflict. Backtracking... 280s Autofilling 1-4...success. 280s Autofilling 2-3...unexpected conflict. Backtracking... 280s Autofilling 1-3...unexpected conflict. Backtracking... 280s Switched to branch 'imerge/b' 280s Auto-merging a.txt 280s CONFLICT (content): Merge conflict in a.txt 280s Automatic merge failed; fix conflicts and then commit the result. 280s 280s Original first commit: 280s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 280s Author: Loú User 280s Date: Thu Apr 7 22:13:15 2005 +0000 280s 280s a⇒1 on branch a 280s 280s Original second commit: 280s commit d40495ed379f376841e517047f90b663e8c7c7e1 280s Author: Loú User 280s Date: Thu Apr 7 22:13:20 2005 +0000 280s 280s b⇒3 and a⇒X on branch b 280s 280s There was a conflict merging commit 1-3, shown above. 280s Please resolve the conflict, commit the result, then type 280s 280s git-imerge continue 280s 0 3 280s | | 280s 0 - **** - a 280s *??. 280s *... 280s *#?? 280s 4 - *??? 280s | 280s b 280s 280s 0 3 280s | | 280s 0 - **** - a 280s *??| 280s *--+ 280s *#?? 280s 4 - *??? 280s | 280s b 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s [imerge/b ee42c84] imerge 'b': manual merge 1-3 280s Merge has been recorded for merge 1-3. 280s Attempting automerge of 1-4...failure. 280s Attempting automerge of 1-4...failure. 280s Attempting automerge of 3-3...success. 280s Autofilling 2-3...success. 280s Autofilling 3-3...success. 280s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 280s Previous HEAD position was 0092290 imerge 'b': automatic merge 3-3 280s Switched to branch 'imerge/b' 280s Auto-merging a.txt 280s CONFLICT (content): Merge conflict in a.txt 280s Automatic merge failed; fix conflicts and then commit the result. 280s 280s Original first commit: 280s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 280s Author: Loú User 280s Date: Thu Apr 7 22:13:15 2005 +0000 280s 280s a⇒1 on branch a 280s 280s Original second commit: 280s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 280s Author: Loú User 280s Date: Thu Apr 7 22:13:21 2005 +0000 280s 280s b⇒4 and a⇒0 on branch b 280s 280s There was a conflict merging commit 1-4, shown above. 280s Please resolve the conflict, commit the result, then type 280s 280s git-imerge continue 280s 0 3 280s | | 280s 0 - **** - a 280s *??. 280s *... 280s **.. 280s 4 - *#?? 280s | 280s b 280s 280s 0 3 280s | | 280s 0 - **** - a 280s *??| 280s *..| 280s **-+ 280s 4 - *#?? 280s | 280s b 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + flip_flop_test 3 280s + local n=3 280s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 280s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 280s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s + local description=git-imerge test repository with a commit and its revert at n=3 280s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 280s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s + local description=git-imerge test repository with a commit and its revert at n=3 280s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s hint: Using 'master' as the name for the initial branch. This default branch name 280s hint: is subject to change. To configure the initial branch name to use in all 280s hint: of your new repositories, which will suppress this warning, call: 280s hint: 280s hint: git config --global init.defaultBranch 280s hint: 280s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 280s hint: 'development'. The just-created branch can be renamed via this command: 280s hint: 280s hint: git branch -m 280s hint: 280s hint: Disable this message with "git config set advice.defaultBranchName false" 280s + echo git-imerge test repository with a commit and its revert at n=3 280s + printf %s\n /*.out /*.css /*.html 280s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3/.git config user.name Loú User 280s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 280s + TIME=1112911993 280s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/flip-flop-3 280s + modify a.txt 0 280s + filename=a.txt 280s + text=0 280s + echo 0 280s + git add a.txt 280s + commit -m m⇒0 280s + TIME=1112911994 280s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 280s + git checkout -b a -- 280s Switched to a new branch 'a' 280s + modify a.txt 1 280s + filename=a.txt 280s + text=1 280s + echo 1 280s + git add a.txt 280s + commit -m a⇒1 on branch a 280s + TIME=1112911995 280s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 280s + modify a.txt 2 280s + filename=a.txt 280s + text=2 280s + echo 2 280s + git add a.txt 280s + commit -m a⇒2 on branch a 280s + TIME=1112911996 280s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 280s + modify a.txt 3 280s + filename=a.txt 280s + text=3 280s + echo 3 280s + git add a.txt 280s + commit -m a⇒3 on branch a 280s + TIME=1112911997 280s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 280s + git checkout -b b master -- 280s Switched to a new branch 'b' 280s + modify b.txt 1 280s + filename=b.txt 280s + text=1 280s + echo 1 280s + git add b.txt 280s + msg=b⇒1 280s + test 1 = 3 280s + test 1 = 4 280s + commit -m b⇒1 on branch b 280s + TIME=1112911998 280s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 280s + modify b.txt 2 280s + filename=b.txt 280s + text=2 280s + echo 2 280s + git add b.txt 280s + msg=b⇒2 280s + test 2 = 3 280s + test 2 = 4 280s + commit -m b⇒2 on branch b 280s + TIME=1112911999 280s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 280s + modify b.txt 3 280s + filename=b.txt 280s + text=3 280s + echo 3 280s + git add b.txt 280s + msg=b⇒3 280s + test 3 = 3 280s + modify a.txt X 280s + filename=a.txt 280s + text=X 280s + echo X 280s + git add a.txt 280s + msg=b⇒3 and a⇒X 280s + test 3 = 4 280s + commit -m b⇒3 and a⇒X on branch b 280s + TIME=1112912000 280s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 280s + modify b.txt 4 280s + filename=b.txt 280s + text=4 280s + echo 4 280s + git add b.txt 280s + msg=b⇒4 280s + test 4 = 3 280s + test 4 = 4 280s + modify a.txt 0 280s + filename=a.txt 280s + text=0 280s + echo 0 280s + git add a.txt 280s + msg=b⇒4 and a⇒0 280s + commit -m b⇒4 and a⇒0 on branch b 280s + TIME=1112912001 280s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 280s + test_merge b-into-a-3 a b 1-3 1-4 280s + local name=b-into-a-3 280s + local dst=a 280s + local src=b 280s + local conflict1=1-3 280s + local conflict2=1-4 280s + git checkout a 280s Switched to branch 'a' 280s + git-imerge merge --branch=b-into-a-3+ b 280s tee imerge-b-into-a-3-1.out 280s + git-imerge diagram --commits --frontier 280s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 280s + echo 1 280s + git add a.txt 280s + git-imerge continue --no-edit 280s + tee imerge-b-into-a-3-2.out 280s + git-imerge diagram --commits --frontier 280s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 280s + echo 1 280s + git add a.txt 280s + git-imerge continue --no-edit 280s + tee imerge-b-into-a-3-3.out 280s [imerge/b 5965a49] imerge 'b': manual merge 1-4 280s Merge has been recorded for merge 1-4. 280s Attempting automerge of 3-4...success. 280s Autofilling 2-4...success. 280s Autofilling 3-4...success. 280s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 280s Merge is complete! 280s + grep -q Merge is complete imerge-b-into-a-3-3.out 280s + git-imerge diagram --commits --frontier 280s 0 3 280s | | 280s 0 - **** - a 280s *??. 280s *... 280s **.. 280s 4 - **.. 280s | 280s b 280s 280s 0 3 280s | | 280s 0 - **** - a 280s *??| 280s *..| 280s **.| 280s 4 - **-+ 280s | 280s b 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + GIT_EDITOR=cat git-imerge finish 280s Merge b into a (using imerge) 280s 280s # Please enter the commit message for your changes. Lines starting 280s # with '#' will be ignored, and an empty message aborts the commit. 280s # 280s # Date: Fri Dec 5 08:27:12 2025 +0000 280s # 280s # On branch b-into-a-3 280s # Changes to be committed: 280s # new file: b.txt 280s # 280s [b-into-a-3 90bfb01] Merge b into a (using imerge) 280s Date: Fri Dec 5 08:27:12 2025 +0000 280s + test_merge a-into-b-3 b a 3-1 4-1 280s + local name=a-into-b-3 280s + local dst=b 280s + local src=a 280s + local conflict1=3-1 280s + local conflict2=4-1 280s + git checkout b 280s Switched to branch 'b' 280s + git-imerge merge --branch=a-into-b-3 a 280s + tee imerge-a-into-b-3-1.out 280s Attempting automerge of 4-3...success. 280s Autofilling 1-3...success. 280s Autofilling 2-3...success. 280s Autofilling 3-3...unexpected conflict. Backtracking... 280s Autofilling 1-3...success. 280s Autofilling 2-1...success. 280s Autofilling 2-2...success. 280s Autofilling 2-3 (first way)...success. 280s Autofilling 2-3 (second way)...success. 280s The two ways of autofilling 2-3 agree. 280s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 280s Autofilling 3-2...unexpected conflict. Backtracking... 280s Autofilling 3-1...unexpected conflict. Backtracking... 280s Switched to branch 'imerge/a' 280s Auto-merging a.txt 280s CONFLICT (content): Merge conflict in a.txt 280s Automatic merge failed; fix conflicts and then commit the result. 280s 280s Original first commit: 280s commit d40495ed379f376841e517047f90b663e8c7c7e1 280s Author: Loú User 280s Date: Thu Apr 7 22:13:20 2005 +0000 280s 280s b⇒3 and a⇒X on branch b 280s 280s Original second commit: 280s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 280s Author: Loú User 280s Date: Thu Apr 7 22:13:15 2005 +0000 280s 280s a⇒1 on branch a 280s 280s There was a conflict merging commit 3-1, shown above. 280s Please resolve the conflict, commit the result, then type 280s 280s git-imerge continue 280s + git-imerge diagram --commits --frontier 280s 0 4 280s | | 280s 0 - ***** - b 280s *?.#? 280s *?.?? 280s 3 - *..?? 280s | 280s a 280s 280s 0 4 280s | | 280s 0 - ***** - b 280s *?|#? 280s *?|?? 280s 3 - *-+?? 280s | 280s a 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 280s + echo 1 280s + git add a.txt 280s + git-imerge continue --no-edit 280s + tee imerge-a-into-b-3-2.out 280s [imerge/a 5ee01cf] imerge 'a': manual merge 3-1 280s Merge has been recorded for merge 3-1. 280s Attempting automerge of 3-3...success. 280s Autofilling 3-2...success. 280s Autofilling 3-3...success. 280s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 280s Attempting automerge of 4-3...failure. 280s Attempting automerge of 4-1...failure. 280s Switched to branch 'imerge/a' 280s Auto-merging a.txt 280s CONFLICT (content): Merge conflict in a.txt 280s Automatic merge failed; fix conflicts and then commit the result. 280s 280s Original first commit: 280s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 280s Author: Loú User 280s Date: Thu Apr 7 22:13:21 2005 +0000 280s 280s b⇒4 and a⇒0 on branch b 280s 280s Original second commit: 280s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 280s Author: Loú User 280s Date: Thu Apr 7 22:13:15 2005 +0000 280s 280s a⇒1 on branch a 280s 280s There was a conflict merging commit 4-1, shown above. 280s Please resolve the conflict, commit the result, then type 280s 280s git-imerge continue 280s + git-imerge diagram --commits --frontier 280s 0 4 280s | | 280s 0 - ***** - b 280s *?.*# 280s *?..? 280s 3 - *...? 280s | 280s a 280s 280s 0 4 280s | | 280s 0 - ***** - b 280s *?.*# 280s *?.|? 280s 3 - *--+? 280s | 280s a 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 280s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 280s + echo 1 280s + git add a.txt 280s + git-imerge continue --no-edit 280s + tee imerge-a-into-b-3-3.out 280s [imerge/a d3aa34f] imerge 'a': manual merge 4-1 280s Merge has been recorded for merge 4-1. 280s Attempting automerge of 4-3...success. 280s Autofilling 4-2...success. 280s Autofilling 4-3...success. 280s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 280s Merge is complete! 280s + grep -q Merge is complete imerge-a-into-b-3-3.out 280s + git-imerge diagram --commits --frontier 280s 0 4 280s | | 280s 0 - ***** - b 280s *?.** 280s *?... 280s 3 - *.... 280s | 280s a 280s 280s 0 4 280s | | 280s 0 - ***** - b 280s *?.** 280s *?..| 280s 3 - *---+ 280s | 280s a 280s 280s Key: 280s |,-,+ = rectangles forming current merge frontier 280s * = merge done manually 280s . = merge done automatically 280s # = conflict that is currently blocking progress 280s @ = merge was blocked but has been resolved 280s ? = no merge recorded 280s 281s + GIT_EDITOR=cat git-imerge finish 281s Merge a into b (using imerge) 281s 281s # Please enter the commit message for your changes. Lines starting 281s # with '#' will be ignored, and an empty message aborts the commit. 281s # 281s # Date: Fri Dec 5 08:27:13 2025 +0000 281s # 281s # On branch a-into-b-3 281s # Changes to be committed: 281s # modified: a.txt 281s # 281s [a-into-b-3 ac7ec29] Merge a into b (using imerge) 281s Date: Fri Dec 5 08:27:13 2025 +0000 281s py313: commands[5] /tmp/autopkgtest.NNLTRo/build.brh/src> /bin/sh t/test-drop 281s + dirname t/test-drop 281s + cd t 281s + pwd 281s + dirname /tmp/autopkgtest.NNLTRo/build.brh/src/t 281s + BASE=/tmp/autopkgtest.NNLTRo/build.brh/src 281s + . /tmp/autopkgtest.NNLTRo/build.brh/src/t/test-lib.sh 281s + GIT_IMERGE=git-imerge 281s + TMP=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s + DESCRIPTION=git-imerge drop test repository 281s + init_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop git-imerge drop test repository 281s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s + local description=git-imerge drop test repository 281s + delete_test_repo /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop git-imerge drop test repository 281s + local path=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s + local description=git-imerge drop test repository 281s + test -d /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s + mkdir -p /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s + git init /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s hint: Using 'master' as the name for the initial branch. This default branch name 281s hint: is subject to change. To configure the initial branch name to use in all 281s hint: of your new repositories, which will suppress this warning, call: 281s hint: 281s hint: git config --global init.defaultBranch 281s hint: 281s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 281s hint: 'development'. The just-created branch can be renamed via this command: 281s hint: 281s hint: git branch -m 281s hint: 281s hint: Disable this message with "git config set advice.defaultBranchName false" 281s Initialized empty Git repository in /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop/.git/ 281s + echo git-imerge drop test repository 281s + printf %s\n /*.out /*.css /*.html 281s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop/.git config user.name Loú User 281s + git --git-dir=/tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop/.git config user.email luser@example.com 281s + TIME=1112911993 281s + ln -s /tmp/autopkgtest.NNLTRo/build.brh/src/imerge.css /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s + cd /tmp/autopkgtest.NNLTRo/build.brh/src/t/tmp/drop 281s + modify a.txt 0 281s + filename=a.txt 281s + text=0 281s + echo 0 281s + git add a.txt 281s + commit -m m⇒0 281s + TIME=1112911994 281s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 281s + seq 6 281s [master (root-commit) a733afa] m⇒0 281s 1 file changed, 1 insertion(+) 281s create mode 100644 a.txt 281s + modify a1.txt 1 281s + filename=a1.txt 281s + text=1 281s + echo 1 281s + git add a1.txt 281s + commit -m a1⇒1 281s + TIME=1112911995 281s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 281s [master 389a4ba] a1⇒1 281s 1 file changed, 1 insertion(+) 281s create mode 100644 a1.txt 281s + modify a2.txt 2 281s + filename=a2.txt 281s + text=2 281s + echo 2 281s + git add a2.txt 281s + commit -m a2⇒2 281s + TIME=1112911996 281s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 281s [master 4785218] a2⇒2 281s 1 file changed, 1 insertion(+) 281s create mode 100644 a2.txt 281s + modify a3.txt 3 281s + filename=a3.txt 281s + text=3 281s + echo 3 281s + git add a3.txt 281s + commit -m a3⇒3 281s + TIME=1112911997 281s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 281s [master 34bdde3] a3⇒3 281s 1 file changed, 1 insertion(+) 281s create mode 100644 a3.txt 281s + modify a4.txt 4 281s + filename=a4.txt 281s + text=4 281s + echo 4 281s + git add a4.txt 281s + commit -m a4⇒4 281s + TIME=1112911998 281s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 281s [master c793a5a] a4⇒4 281s 1 file changed, 1 insertion(+) 281s create mode 100644 a4.txt 281s + modify a5.txt 5 281s + filename=a5.txt 281s + text=5 281s + echo 5 281s + git add a5.txt 281s + commit -m a5⇒5 281s + TIME=1112911999 281s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 281s [master b42f60c] a5⇒5 281s 1 file changed, 1 insertion(+) 281s create mode 100644 a5.txt 281s [master 9d6aec5] a6⇒6 281s 1 file changed, 1 insertion(+) 281s create mode 100644 a6.txt 281s + modify a6.txt 6 281s + filename=a6.txt 281s + text=6 281s + echo 6 281s + git add a6.txt 281s + commit -m a6⇒6 281s + TIME=1112912000 281s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 281s + git checkout -b dropped master 281s Switched to a new branch 'dropped' 281s + git-imerge drop HEAD~5..HEAD~3 281s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 281s 281s You are in 'detached HEAD' state. You can look around, make experimental 281s changes and commit them, and you can discard any commits you make in this 281s state without impacting any branches by switching back to a branch. 281s 281s If you want to create a new branch to retain commits you create, you may 281s do so (now or later) by using -c with the switch command. Example: 281s 281s git switch -c 281s 281s Or undo this operation with: 281s 281s git switch - 281s 281s Turn off this advice by setting config variable advice.detachedHead to false 281s 281s HEAD is now at 34bdde3 a3⇒3 281s [detached HEAD 943c648] Revert "a3⇒3" 281s Date: Fri Dec 5 08:27:13 2025 +0000 281s 1 file changed, 1 deletion(-) 281s delete mode 100644 a3.txt 281s [detached HEAD e9dfc41] Revert "a2⇒2" 281s Date: Fri Dec 5 08:27:13 2025 +0000 281s 1 file changed, 1 deletion(-) 281s delete mode 100644 a2.txt 281s Attempting automerge of 3-2...success. 281s Autofilling 1-2...success. 281s Autofilling 2-2...success. 281s Autofilling 3-1...success. 281s Autofilling 3-2 (first way)...success. 281s Autofilling 3-2 (second way)...success. 281s The two ways of autofilling 3-2 agree. 281s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='e9dfc417b33da5cf4f0833298db6647758119b91', goal='drop')[0:4,0:3]. 281s Merge is complete! 281s + git-imerge diagram --commits --frontier --html=imerge-drop.html 281s 0 3 281s | | 281s 0 - **** - dropped 281s *??. 281s 2 - *... 281s | 281s e9dfc417b33da5cf4f0833298db6647758119b91 281s 281s 0 3 281s | | 281s 0 - **** - dropped 281s *??| 281s 2 - *--+ 281s | 281s e9dfc417b33da5cf4f0833298db6647758119b91 281s 281s Key: 281s |,-,+ = rectangles forming current merge frontier 281s * = merge done manually 281s . = merge done automatically 281s # = conflict that is currently blocking progress 281s @ = merge was blocked but has been resolved 281s ? = no merge recorded 281s 281s + git-imerge finish 281s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 281s + local refname=dropped 281s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 281s + git rev-parse dropped^{tree} 281s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 281s + git checkout -b reverted master 281s Switched to a new branch 'reverted' 281s + git-imerge revert HEAD~5..HEAD~3 281s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 281s 281s You are in 'detached HEAD' state. You can look around, make experimental 281s changes and commit them, and you can discard any commits you make in this 281s state without impacting any branches by switching back to a branch. 281s 281s If you want to create a new branch to retain commits you create, you may 281s do so (now or later) by using -c with the switch command. Example: 281s 281s git switch -c 281s 281s Or undo this operation with: 281s 281s git switch - 281s 281s Turn off this advice by setting config variable advice.detachedHead to false 281s 281s HEAD is now at 34bdde3 a3⇒3 281s [detached HEAD 943c648] Revert "a3⇒3" 281s Date: Fri Dec 5 08:27:13 2025 +0000 281s 1 file changed, 1 deletion(-) 281s delete mode 100644 a3.txt 281s [detached HEAD e9dfc41] Revert "a2⇒2" 281s Date: Fri Dec 5 08:27:13 2025 +0000 281s 1 file changed, 1 deletion(-) 281s delete mode 100644 a2.txt 281s Attempting automerge of 3-2...success. 281s Autofilling 1-2...success. 281s Autofilling 2-2...success. 281s Autofilling 3-1...success. 281s Autofilling 3-2 (first way)...success. 281s Autofilling 3-2 (second way)...success. 281s The two ways of autofilling 3-2 agree. 281s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='e9dfc417b33da5cf4f0833298db6647758119b91', goal='revert')[0:4,0:3]. 281s Merge is complete! 281s + git-imerge diagram --commits --frontier --html=imerge-revert.html 281s 0 3 281s | | 281s 0 - **** - reverted 281s *??. 281s 2 - *... 281s | 281s e9dfc417b33da5cf4f0833298db6647758119b91 281s 281s 0 3 281s | | 281s 0 - **** - reverted 281s *??| 281s 2 - *--+ 281s | 281s e9dfc417b33da5cf4f0833298db6647758119b91 281s 281s Key: 281s |,-,+ = rectangles forming current merge frontier 281s * = merge done manually 281s . = merge done automatically 281s # = conflict that is currently blocking progress 281s @ = merge was blocked but has been resolved 281s ? = no merge recorded 281s 281s + git-imerge finish 282s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 282s + local refname=reverted 282s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 282s + git rev-parse reverted^{tree} 282s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 282s py313: OK (58.50=setup[0.15]+cmd[2.52,41.80,5.40,1.90,5.84,0.88] seconds) 282s congratulations :) (58.59 seconds) 282s autopkgtest [08:27:14]: test pybuild-autopkgtest: -----------------------] 283s pybuild-autopkgtest PASS 283s autopkgtest [08:27:15]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 283s autopkgtest [08:27:15]: @@@@@@@@@@@@@@@@@@@@ summary 283s pybuild-autopkgtest PASS