0s autopkgtest [22:43:12]: starting date and time: 2024-03-21 22:43:12+0000 0s autopkgtest [22:43:12]: git checkout: 4a1cd702 l/adt_testbed: don't blame the testbed for unsolvable build deps 0s autopkgtest [22:43:12]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.a2dekrla/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --setup-commands /home/ubuntu/autopkgtest/setup-commands/setup-testbed --apt-pocket=proposed=src:git,src:curl,src:gnutls28,src:libpsl,src:nettle --apt-upgrade git-imerge --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 '--env=ADT_TEST_TRIGGERS=git/1:2.43.0-1ubuntu5 curl/8.5.0-2ubuntu7 gnutls28/3.8.3-1.1ubuntu2 libpsl/0.21.2-1.1 nettle/3.9.1-2.2' -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@bos02-s390x-15.secgroup --name adt-noble-s390x-git-imerge-20240321-224312-juju-7f2275-prod-proposed-migration-environment-2 --image adt/ubuntu-noble-s390x-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-proposed-migration -e TERM=linux -e ''"'"'http_proxy=http://squid.internal:3128'"'"'' -e ''"'"'https_proxy=http://squid.internal:3128'"'"'' -e ''"'"'no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com'"'"'' --mirror=http://ftpmaster.internal/ubuntu/ 107s autopkgtest [22:44:59]: testbed dpkg architecture: s390x 108s autopkgtest [22:45:00]: testbed apt version: 2.7.12 108s autopkgtest [22:45:00]: @@@@@@@@@@@@@@@@@@@@ test bed setup 108s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB] 109s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/main Sources [496 kB] 109s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/universe Sources [3774 kB] 111s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/multiverse Sources [53.9 kB] 111s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/restricted Sources [6540 B] 111s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main s390x Packages [671 kB] 111s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main s390x c-n-f Metadata [3032 B] 111s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/restricted s390x Packages [1372 B] 111s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/restricted s390x c-n-f Metadata [116 B] 111s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x Packages [3994 kB] 112s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x c-n-f Metadata [7292 B] 112s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/multiverse s390x Packages [45.1 kB] 112s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/multiverse s390x c-n-f Metadata [116 B] 115s Fetched 9169 kB in 5s (1874 kB/s) 115s Reading package lists... 119s Reading package lists... 120s Building dependency tree... 120s Reading state information... 120s Calculating upgrade... 120s The following packages have been kept back: 120s curl 120s The following packages will be upgraded: 120s cloud-init debianutils python3-markupsafe 120s 3 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 120s Need to get 700 kB of archives. 120s After this operation, 11.3 kB disk space will be freed. 120s Get:1 http://ftpmaster.internal/ubuntu noble/main s390x debianutils s390x 5.17 [90.1 kB] 120s Get:2 http://ftpmaster.internal/ubuntu noble/main s390x python3-markupsafe s390x 2.1.5-1build1 [12.8 kB] 120s Get:3 http://ftpmaster.internal/ubuntu noble/main s390x cloud-init all 24.1.2-0ubuntu1 [597 kB] 121s Preconfiguring packages ... 121s Fetched 700 kB in 1s (1150 kB/s) 121s (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 ... 52171 files and directories currently installed.) 121s Preparing to unpack .../debianutils_5.17_s390x.deb ... 121s Unpacking debianutils (5.17) over (5.16) ... 121s Setting up debianutils (5.17) ... 121s (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 ... 52171 files and directories currently installed.) 121s Preparing to unpack .../python3-markupsafe_2.1.5-1build1_s390x.deb ... 121s Unpacking python3-markupsafe (2.1.5-1build1) over (2.1.5-1) ... 121s Preparing to unpack .../cloud-init_24.1.2-0ubuntu1_all.deb ... 122s Unpacking cloud-init (24.1.2-0ubuntu1) over (24.1.1-0ubuntu1) ... 122s Setting up cloud-init (24.1.2-0ubuntu1) ... 124s Setting up python3-markupsafe (2.1.5-1build1) ... 124s Processing triggers for man-db (2.12.0-3) ... 125s Processing triggers for rsyslog (8.2312.0-3ubuntu3) ... 126s Reading package lists... 126s Building dependency tree... 126s Reading state information... 127s 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 127s Unknown architecture, assuming PC-style ttyS0 127s sh: Attempting to set up Debian/Ubuntu apt sources automatically 127s sh: Distribution appears to be Ubuntu 128s Reading package lists... 129s Building dependency tree... 129s Reading state information... 129s eatmydata is already the newest version (131-1). 129s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 129s Reading package lists... 129s Building dependency tree... 129s Reading state information... 130s dbus is already the newest version (1.14.10-4ubuntu1). 130s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 130s Reading package lists... 130s Building dependency tree... 130s Reading state information... 131s rng-tools-debian is already the newest version (2.4). 131s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 131s Reading package lists... 131s Building dependency tree... 131s Reading state information... 131s The following packages will be REMOVED: 131s cloud-init* python3-configobj* python3-debconf* 132s 0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded. 132s After this operation, 3256 kB disk space will be freed. 132s (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 ... 52170 files and directories currently installed.) 132s Removing cloud-init (24.1.2-0ubuntu1) ... 132s Removing python3-configobj (5.0.8-3) ... 132s Removing python3-debconf (1.5.86) ... 133s Processing triggers for man-db (2.12.0-3) ... 133s (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 ... 51781 files and directories currently installed.) 133s Purging configuration files for cloud-init (24.1.2-0ubuntu1) ... 134s dpkg: warning: while removing cloud-init, directory '/etc/cloud/cloud.cfg.d' not empty so not removed 134s Processing triggers for rsyslog (8.2312.0-3ubuntu3) ... 134s invoke-rc.d: policy-rc.d denied execution of try-restart. 134s Reading package lists... 134s Building dependency tree... 134s Reading state information... 135s linux-generic is already the newest version (6.8.0-11.11+1). 135s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 135s Hit:1 http://ftpmaster.internal/ubuntu noble InRelease 135s Hit:2 http://ftpmaster.internal/ubuntu noble-updates InRelease 135s Hit:3 http://ftpmaster.internal/ubuntu noble-security InRelease 138s Reading package lists... 138s Reading package lists... 139s Building dependency tree... 139s Reading state information... 139s Calculating upgrade... 139s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 139s Reading package lists... 140s Building dependency tree... 140s Reading state information... 140s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 140s autopkgtest [22:45:32]: rebooting testbed after setup commands that affected boot 160s autopkgtest [22:45:52]: testbed running kernel: Linux 6.8.0-11-generic #11-Ubuntu SMP Tue Feb 13 23:45:46 UTC 2024 164s autopkgtest [22:45:56]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 166s Get:1 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (dsc) [1896 B] 166s Get:2 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 166s Get:3 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (diff) [3144 B] 166s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 166s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 166s gpgv: Can't check signature: No public key 166s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 166s autopkgtest [22:45:58]: testing package git-imerge version 1.2.0-5 166s autopkgtest [22:45:58]: build not needed 168s autopkgtest [22:46:00]: test pybuild-autopkgtest: preparing testbed 169s Reading package lists... 169s Building dependency tree... 169s Reading state information... 169s Starting pkgProblemResolver with broken count: 0 169s Starting 2 pkgProblemResolver with broken count: 0 169s Done 170s The following additional packages will be installed: 170s autoconf automake autopoint autotools-dev build-essential cpp cpp-13 170s cpp-13-s390x-linux-gnu cpp-s390x-linux-gnu debhelper debugedit dh-autoreconf 170s dh-python dh-strip-nondeterminism dwz g++ g++-13 g++-13-s390x-linux-gnu 170s g++-s390x-linux-gnu gcc gcc-13 gcc-13-s390x-linux-gnu gcc-s390x-linux-gnu 170s gettext git git-imerge git-man intltool-debian libarchive-zip-perl libasan8 170s libatomic1 libc-dev-bin libc6-dev libcc1-0 libcrypt-dev libdebhelper-perl 170s libdw1 liberror-perl libfile-stripnondeterminism-perl libgcc-13-dev libgomp1 170s libisl23 libitm1 libjs-jquery libjs-sphinxdoc libjs-underscore libmpc3 170s libnsl-dev libpkgconf3 libstdc++-13-dev libsub-override-perl libtirpc-dev 170s libtool libubsan1 linux-libc-dev m4 pkg-config pkgconf pkgconf-bin 170s po-debconf pybuild-plugin-autopkgtest python3-cachetools python3-colorama 170s python3-distlib python3-filelock python3-packaging python3-pip-whl 170s python3-platformdirs python3-pluggy python3-pyproject-api 170s python3-setuptools-whl python3-virtualenv python3-wheel python3-wheel-whl 170s rpcsvc-proto tox 170s Suggested packages: 170s autoconf-archive gnu-standards autoconf-doc cpp-doc gcc-13-locales 170s cpp-13-doc dh-make flit python3-build python3-installer g++-multilib 170s g++-13-multilib gcc-13-doc gcc-multilib manpages-dev flex bison gdb gcc-doc 170s gcc-13-multilib gdb-s390x-linux-gnu gettext-doc libasprintf-dev 170s libgettextpo-dev git-daemon-run | git-daemon-sysvinit git-doc git-email 170s git-gui gitk gitweb git-cvs git-mediawiki git-svn git-mergify-rebase mergify 170s glibc-doc libstdc++-13-doc libtool-doc gfortran | fortran95-compiler gcj-jdk 170s m4-doc libmail-box-perl 170s Recommended packages: 170s manpages manpages-dev libc-devtools libarchive-cpio-perl javascript-common 170s libltdl-dev libmail-sendmail-perl python3-dev 170s The following NEW packages will be installed: 170s autoconf automake autopkgtest-satdep autopoint autotools-dev build-essential 170s cpp cpp-13 cpp-13-s390x-linux-gnu cpp-s390x-linux-gnu debhelper debugedit 170s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 170s g++-13-s390x-linux-gnu g++-s390x-linux-gnu gcc gcc-13 gcc-13-s390x-linux-gnu 170s gcc-s390x-linux-gnu gettext git git-imerge git-man intltool-debian 170s libarchive-zip-perl libasan8 libatomic1 libc-dev-bin libc6-dev libcc1-0 170s libcrypt-dev libdebhelper-perl libdw1 liberror-perl 170s libfile-stripnondeterminism-perl libgcc-13-dev libgomp1 libisl23 libitm1 170s libjs-jquery libjs-sphinxdoc libjs-underscore libmpc3 libnsl-dev libpkgconf3 170s libstdc++-13-dev libsub-override-perl libtirpc-dev libtool libubsan1 170s linux-libc-dev m4 pkg-config pkgconf pkgconf-bin po-debconf 170s pybuild-plugin-autopkgtest python3-cachetools python3-colorama 170s python3-distlib python3-filelock python3-packaging python3-pip-whl 170s python3-platformdirs python3-pluggy python3-pyproject-api 170s python3-setuptools-whl python3-virtualenv python3-wheel python3-wheel-whl 170s rpcsvc-proto tox 170s 0 upgraded, 77 newly installed, 0 to remove and 0 not upgraded. 170s Need to get 66.9 MB/66.9 MB of archives. 170s After this operation, 228 MB of additional disk space will be used. 170s Get:1 /tmp/autopkgtest.S6VHsS/1-autopkgtest-satdep.deb autopkgtest-satdep s390x 0 [816 B] 170s Get:2 http://ftpmaster.internal/ubuntu noble/main s390x m4 s390x 1.4.19-4 [255 kB] 170s Get:3 http://ftpmaster.internal/ubuntu noble/main s390x autoconf all 2.71-3 [339 kB] 171s Get:4 http://ftpmaster.internal/ubuntu noble/main s390x autotools-dev all 20220109.1 [44.9 kB] 171s Get:5 http://ftpmaster.internal/ubuntu noble/main s390x automake all 1:1.16.5-1.3ubuntu1 [558 kB] 171s Get:6 http://ftpmaster.internal/ubuntu noble/main s390x autopoint all 0.21-14ubuntu1 [422 kB] 171s Get:7 http://ftpmaster.internal/ubuntu noble/main s390x libc-dev-bin s390x 2.39-0ubuntu2 [20.2 kB] 171s Get:8 http://ftpmaster.internal/ubuntu noble/main s390x linux-libc-dev s390x 6.8.0-11.11 [1590 kB] 171s Get:9 http://ftpmaster.internal/ubuntu noble/main s390x libcrypt-dev s390x 1:4.4.36-4 [135 kB] 171s Get:10 http://ftpmaster.internal/ubuntu noble/main s390x libtirpc-dev s390x 1.3.4+ds-1build1 [225 kB] 171s Get:11 http://ftpmaster.internal/ubuntu noble/main s390x libnsl-dev s390x 1.3.0-3 [73.5 kB] 171s Get:12 http://ftpmaster.internal/ubuntu noble/main s390x rpcsvc-proto s390x 1.4.2-0ubuntu6 [64.7 kB] 171s Get:13 http://ftpmaster.internal/ubuntu noble/main s390x libc6-dev s390x 2.39-0ubuntu2 [1629 kB] 172s Get:14 http://ftpmaster.internal/ubuntu noble/main s390x libisl23 s390x 0.26-3 [722 kB] 172s Get:15 http://ftpmaster.internal/ubuntu noble/main s390x libmpc3 s390x 1.3.1-1 [54.9 kB] 172s Get:16 http://ftpmaster.internal/ubuntu noble/main s390x cpp-13-s390x-linux-gnu s390x 13.2.0-17ubuntu2 [9929 kB] 175s Get:17 http://ftpmaster.internal/ubuntu noble/main s390x cpp-13 s390x 13.2.0-17ubuntu2 [1026 B] 175s Get:18 http://ftpmaster.internal/ubuntu noble/main s390x cpp-s390x-linux-gnu s390x 4:13.2.0-7ubuntu1 [5308 B] 175s Get:19 http://ftpmaster.internal/ubuntu noble/main s390x cpp s390x 4:13.2.0-7ubuntu1 [22.4 kB] 175s Get:20 http://ftpmaster.internal/ubuntu noble/main s390x libcc1-0 s390x 14-20240303-1ubuntu1 [49.9 kB] 175s Get:21 http://ftpmaster.internal/ubuntu noble/main s390x libgomp1 s390x 14-20240303-1ubuntu1 [151 kB] 175s Get:22 http://ftpmaster.internal/ubuntu noble/main s390x libitm1 s390x 14-20240303-1ubuntu1 [31.1 kB] 175s Get:23 http://ftpmaster.internal/ubuntu noble/main s390x libatomic1 s390x 14-20240303-1ubuntu1 [9392 B] 175s Get:24 http://ftpmaster.internal/ubuntu noble/main s390x libasan8 s390x 14-20240303-1ubuntu1 [2998 kB] 177s Get:25 http://ftpmaster.internal/ubuntu noble/main s390x libubsan1 s390x 14-20240303-1ubuntu1 [1186 kB] 177s Get:26 http://ftpmaster.internal/ubuntu noble/main s390x libgcc-13-dev s390x 13.2.0-17ubuntu2 [1003 kB] 178s Get:27 http://ftpmaster.internal/ubuntu noble/main s390x gcc-13-s390x-linux-gnu s390x 13.2.0-17ubuntu2 [19.1 MB] 186s Get:28 http://ftpmaster.internal/ubuntu noble/main s390x gcc-13 s390x 13.2.0-17ubuntu2 [467 kB] 186s Get:29 http://ftpmaster.internal/ubuntu noble/main s390x gcc-s390x-linux-gnu s390x 4:13.2.0-7ubuntu1 [1208 B] 186s Get:30 http://ftpmaster.internal/ubuntu noble/main s390x gcc s390x 4:13.2.0-7ubuntu1 [5014 B] 186s Get:31 http://ftpmaster.internal/ubuntu noble/main s390x libstdc++-13-dev s390x 13.2.0-17ubuntu2 [2430 kB] 187s Get:32 http://ftpmaster.internal/ubuntu noble/main s390x g++-13-s390x-linux-gnu s390x 13.2.0-17ubuntu2 [11.3 MB] 192s Get:33 http://ftpmaster.internal/ubuntu noble/main s390x g++-13 s390x 13.2.0-17ubuntu2 [14.4 kB] 192s Get:34 http://ftpmaster.internal/ubuntu noble/main s390x g++-s390x-linux-gnu s390x 4:13.2.0-7ubuntu1 [956 B] 192s Get:35 http://ftpmaster.internal/ubuntu noble/main s390x g++ s390x 4:13.2.0-7ubuntu1 [1096 B] 192s Get:36 http://ftpmaster.internal/ubuntu noble/main s390x build-essential s390x 12.10ubuntu1 [4930 B] 192s Get:37 http://ftpmaster.internal/ubuntu noble/main s390x libdebhelper-perl all 13.14.1ubuntu1 [89.5 kB] 192s Get:38 http://ftpmaster.internal/ubuntu noble/main s390x libtool all 2.4.7-7 [166 kB] 192s Get:39 http://ftpmaster.internal/ubuntu noble/main s390x dh-autoreconf all 20 [16.1 kB] 192s Get:40 http://ftpmaster.internal/ubuntu noble/main s390x libarchive-zip-perl all 1.68-1 [90.2 kB] 192s Get:41 http://ftpmaster.internal/ubuntu noble/main s390x libsub-override-perl all 0.10-1 [10.0 kB] 192s Get:42 http://ftpmaster.internal/ubuntu noble/main s390x libfile-stripnondeterminism-perl all 1.13.1-1 [18.1 kB] 192s Get:43 http://ftpmaster.internal/ubuntu noble/main s390x dh-strip-nondeterminism all 1.13.1-1 [5362 B] 192s Get:44 http://ftpmaster.internal/ubuntu noble/main s390x libdw1 s390x 0.190-1 [282 kB] 192s Get:45 http://ftpmaster.internal/ubuntu noble/main s390x debugedit s390x 1:5.0-5 [47.5 kB] 192s Get:46 http://ftpmaster.internal/ubuntu noble/main s390x dwz s390x 0.15-1 [108 kB] 192s Get:47 http://ftpmaster.internal/ubuntu noble/main s390x gettext s390x 0.21-14ubuntu1 [917 kB] 193s Get:48 http://ftpmaster.internal/ubuntu noble/main s390x intltool-debian all 0.35.0+20060710.6 [23.2 kB] 193s Get:49 http://ftpmaster.internal/ubuntu noble/main s390x po-debconf all 1.0.21+nmu1 [233 kB] 193s Get:50 http://ftpmaster.internal/ubuntu noble/main s390x debhelper all 13.14.1ubuntu1 [869 kB] 194s Get:51 http://ftpmaster.internal/ubuntu noble/universe s390x dh-python all 6.20231223ubuntu2 [111 kB] 194s Get:52 http://ftpmaster.internal/ubuntu noble/main s390x liberror-perl all 0.17029-2 [25.6 kB] 194s Get:53 http://ftpmaster.internal/ubuntu noble/main s390x git-man all 1:2.43.0-1ubuntu1 [1100 kB] 196s Get:54 http://ftpmaster.internal/ubuntu noble/main s390x git s390x 1:2.43.0-1ubuntu1 [3837 kB] 199s Get:55 http://ftpmaster.internal/ubuntu noble/universe s390x git-imerge all 1.2.0-5 [49.5 kB] 199s Get:56 http://ftpmaster.internal/ubuntu noble/main s390x libjs-jquery all 3.6.1+dfsg+~3.5.14-1 [328 kB] 199s Get:57 http://ftpmaster.internal/ubuntu noble/main s390x libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 199s Get:58 http://ftpmaster.internal/ubuntu noble/main s390x libjs-sphinxdoc all 7.2.6-4 [149 kB] 199s Get:59 http://ftpmaster.internal/ubuntu noble/main s390x libpkgconf3 s390x 1.8.1-2 [30.4 kB] 199s Get:60 http://ftpmaster.internal/ubuntu noble/main s390x pkgconf-bin s390x 1.8.1-2 [20.8 kB] 199s Get:61 http://ftpmaster.internal/ubuntu noble/main s390x pkgconf s390x 1.8.1-2 [16.7 kB] 199s Get:62 http://ftpmaster.internal/ubuntu noble/main s390x pkg-config s390x 1.8.1-2 [7170 B] 199s Get:63 http://ftpmaster.internal/ubuntu noble/universe s390x pybuild-plugin-autopkgtest all 6.20231223ubuntu2 [1760 B] 199s Get:64 http://ftpmaster.internal/ubuntu noble/main s390x python3-cachetools all 5.3.0-2 [10.6 kB] 199s Get:65 http://ftpmaster.internal/ubuntu noble/main s390x python3-colorama all 0.4.6-4 [32.1 kB] 199s Get:66 http://ftpmaster.internal/ubuntu noble/universe s390x python3-distlib all 0.3.8-1 [318 kB] 200s Get:67 http://ftpmaster.internal/ubuntu noble/universe s390x python3-filelock all 3.13.1-1 [10.8 kB] 200s Get:68 http://ftpmaster.internal/ubuntu noble/main s390x python3-packaging all 23.2-1 [40.6 kB] 200s Get:69 http://ftpmaster.internal/ubuntu noble/universe s390x python3-pip-whl all 24.0+dfsg-1 [1702 kB] 201s Get:70 http://ftpmaster.internal/ubuntu noble/universe s390x python3-platformdirs all 4.2.0-1 [16.1 kB] 201s Get:71 http://ftpmaster.internal/ubuntu noble/universe s390x python3-pluggy all 1.4.0-1 [20.4 kB] 201s Get:72 http://ftpmaster.internal/ubuntu noble/universe s390x python3-pyproject-api all 1.6.1-1 [50.9 kB] 201s Get:73 http://ftpmaster.internal/ubuntu noble/universe s390x python3-setuptools-whl all 68.1.2-2 [715 kB] 201s Get:74 http://ftpmaster.internal/ubuntu noble/universe s390x python3-wheel-whl all 0.42.0-1 [67.8 kB] 201s Get:75 http://ftpmaster.internal/ubuntu noble/universe s390x python3-virtualenv all 20.25.0+ds-1 [70.7 kB] 201s Get:76 http://ftpmaster.internal/ubuntu noble/universe s390x python3-wheel all 0.42.0-1 [53.1 kB] 201s Get:77 http://ftpmaster.internal/ubuntu noble/universe s390x tox all 4.13.0-1 [302 kB] 202s Fetched 66.9 MB in 32s (2100 kB/s) 202s Selecting previously unselected package m4. 203s (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 ... 51726 files and directories currently installed.) 203s Preparing to unpack .../00-m4_1.4.19-4_s390x.deb ... 203s Unpacking m4 (1.4.19-4) ... 203s Selecting previously unselected package autoconf. 203s Preparing to unpack .../01-autoconf_2.71-3_all.deb ... 203s Unpacking autoconf (2.71-3) ... 203s Selecting previously unselected package autotools-dev. 203s Preparing to unpack .../02-autotools-dev_20220109.1_all.deb ... 203s Unpacking autotools-dev (20220109.1) ... 203s Selecting previously unselected package automake. 203s Preparing to unpack .../03-automake_1%3a1.16.5-1.3ubuntu1_all.deb ... 203s Unpacking automake (1:1.16.5-1.3ubuntu1) ... 203s Selecting previously unselected package autopoint. 203s Preparing to unpack .../04-autopoint_0.21-14ubuntu1_all.deb ... 203s Unpacking autopoint (0.21-14ubuntu1) ... 203s Selecting previously unselected package libc-dev-bin. 203s Preparing to unpack .../05-libc-dev-bin_2.39-0ubuntu2_s390x.deb ... 203s Unpacking libc-dev-bin (2.39-0ubuntu2) ... 203s Selecting previously unselected package linux-libc-dev:s390x. 203s Preparing to unpack .../06-linux-libc-dev_6.8.0-11.11_s390x.deb ... 203s Unpacking linux-libc-dev:s390x (6.8.0-11.11) ... 203s Selecting previously unselected package libcrypt-dev:s390x. 203s Preparing to unpack .../07-libcrypt-dev_1%3a4.4.36-4_s390x.deb ... 203s Unpacking libcrypt-dev:s390x (1:4.4.36-4) ... 203s Selecting previously unselected package libtirpc-dev:s390x. 203s Preparing to unpack .../08-libtirpc-dev_1.3.4+ds-1build1_s390x.deb ... 203s Unpacking libtirpc-dev:s390x (1.3.4+ds-1build1) ... 203s Selecting previously unselected package libnsl-dev:s390x. 203s Preparing to unpack .../09-libnsl-dev_1.3.0-3_s390x.deb ... 203s Unpacking libnsl-dev:s390x (1.3.0-3) ... 203s Selecting previously unselected package rpcsvc-proto. 203s Preparing to unpack .../10-rpcsvc-proto_1.4.2-0ubuntu6_s390x.deb ... 203s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 203s Selecting previously unselected package libc6-dev:s390x. 203s Preparing to unpack .../11-libc6-dev_2.39-0ubuntu2_s390x.deb ... 203s Unpacking libc6-dev:s390x (2.39-0ubuntu2) ... 203s Selecting previously unselected package libisl23:s390x. 203s Preparing to unpack .../12-libisl23_0.26-3_s390x.deb ... 203s Unpacking libisl23:s390x (0.26-3) ... 203s Selecting previously unselected package libmpc3:s390x. 203s Preparing to unpack .../13-libmpc3_1.3.1-1_s390x.deb ... 203s Unpacking libmpc3:s390x (1.3.1-1) ... 203s Selecting previously unselected package cpp-13-s390x-linux-gnu. 203s Preparing to unpack .../14-cpp-13-s390x-linux-gnu_13.2.0-17ubuntu2_s390x.deb ... 203s Unpacking cpp-13-s390x-linux-gnu (13.2.0-17ubuntu2) ... 204s Selecting previously unselected package cpp-13. 204s Preparing to unpack .../15-cpp-13_13.2.0-17ubuntu2_s390x.deb ... 204s Unpacking cpp-13 (13.2.0-17ubuntu2) ... 204s Selecting previously unselected package cpp-s390x-linux-gnu. 204s Preparing to unpack .../16-cpp-s390x-linux-gnu_4%3a13.2.0-7ubuntu1_s390x.deb ... 204s Unpacking cpp-s390x-linux-gnu (4:13.2.0-7ubuntu1) ... 204s Selecting previously unselected package cpp. 204s Preparing to unpack .../17-cpp_4%3a13.2.0-7ubuntu1_s390x.deb ... 204s Unpacking cpp (4:13.2.0-7ubuntu1) ... 204s Selecting previously unselected package libcc1-0:s390x. 204s Preparing to unpack .../18-libcc1-0_14-20240303-1ubuntu1_s390x.deb ... 204s Unpacking libcc1-0:s390x (14-20240303-1ubuntu1) ... 204s Selecting previously unselected package libgomp1:s390x. 204s Preparing to unpack .../19-libgomp1_14-20240303-1ubuntu1_s390x.deb ... 204s Unpacking libgomp1:s390x (14-20240303-1ubuntu1) ... 204s Selecting previously unselected package libitm1:s390x. 204s Preparing to unpack .../20-libitm1_14-20240303-1ubuntu1_s390x.deb ... 204s Unpacking libitm1:s390x (14-20240303-1ubuntu1) ... 204s Selecting previously unselected package libatomic1:s390x. 204s Preparing to unpack .../21-libatomic1_14-20240303-1ubuntu1_s390x.deb ... 204s Unpacking libatomic1:s390x (14-20240303-1ubuntu1) ... 204s Selecting previously unselected package libasan8:s390x. 204s Preparing to unpack .../22-libasan8_14-20240303-1ubuntu1_s390x.deb ... 204s Unpacking libasan8:s390x (14-20240303-1ubuntu1) ... 204s Selecting previously unselected package libubsan1:s390x. 204s Preparing to unpack .../23-libubsan1_14-20240303-1ubuntu1_s390x.deb ... 204s Unpacking libubsan1:s390x (14-20240303-1ubuntu1) ... 204s Selecting previously unselected package libgcc-13-dev:s390x. 204s Preparing to unpack .../24-libgcc-13-dev_13.2.0-17ubuntu2_s390x.deb ... 204s Unpacking libgcc-13-dev:s390x (13.2.0-17ubuntu2) ... 204s Selecting previously unselected package gcc-13-s390x-linux-gnu. 204s Preparing to unpack .../25-gcc-13-s390x-linux-gnu_13.2.0-17ubuntu2_s390x.deb ... 204s Unpacking gcc-13-s390x-linux-gnu (13.2.0-17ubuntu2) ... 205s Selecting previously unselected package gcc-13. 205s Preparing to unpack .../26-gcc-13_13.2.0-17ubuntu2_s390x.deb ... 205s Unpacking gcc-13 (13.2.0-17ubuntu2) ... 205s Selecting previously unselected package gcc-s390x-linux-gnu. 205s Preparing to unpack .../27-gcc-s390x-linux-gnu_4%3a13.2.0-7ubuntu1_s390x.deb ... 205s Unpacking gcc-s390x-linux-gnu (4:13.2.0-7ubuntu1) ... 205s Selecting previously unselected package gcc. 205s Preparing to unpack .../28-gcc_4%3a13.2.0-7ubuntu1_s390x.deb ... 205s Unpacking gcc (4:13.2.0-7ubuntu1) ... 205s Selecting previously unselected package libstdc++-13-dev:s390x. 205s Preparing to unpack .../29-libstdc++-13-dev_13.2.0-17ubuntu2_s390x.deb ... 205s Unpacking libstdc++-13-dev:s390x (13.2.0-17ubuntu2) ... 205s Selecting previously unselected package g++-13-s390x-linux-gnu. 205s Preparing to unpack .../30-g++-13-s390x-linux-gnu_13.2.0-17ubuntu2_s390x.deb ... 205s Unpacking g++-13-s390x-linux-gnu (13.2.0-17ubuntu2) ... 206s Selecting previously unselected package g++-13. 206s Preparing to unpack .../31-g++-13_13.2.0-17ubuntu2_s390x.deb ... 206s Unpacking g++-13 (13.2.0-17ubuntu2) ... 206s Selecting previously unselected package g++-s390x-linux-gnu. 206s Preparing to unpack .../32-g++-s390x-linux-gnu_4%3a13.2.0-7ubuntu1_s390x.deb ... 206s Unpacking g++-s390x-linux-gnu (4:13.2.0-7ubuntu1) ... 206s Selecting previously unselected package g++. 206s Preparing to unpack .../33-g++_4%3a13.2.0-7ubuntu1_s390x.deb ... 206s Unpacking g++ (4:13.2.0-7ubuntu1) ... 206s Selecting previously unselected package build-essential. 206s Preparing to unpack .../34-build-essential_12.10ubuntu1_s390x.deb ... 206s Unpacking build-essential (12.10ubuntu1) ... 206s Selecting previously unselected package libdebhelper-perl. 206s Preparing to unpack .../35-libdebhelper-perl_13.14.1ubuntu1_all.deb ... 206s Unpacking libdebhelper-perl (13.14.1ubuntu1) ... 206s Selecting previously unselected package libtool. 206s Preparing to unpack .../36-libtool_2.4.7-7_all.deb ... 206s Unpacking libtool (2.4.7-7) ... 206s Selecting previously unselected package dh-autoreconf. 206s Preparing to unpack .../37-dh-autoreconf_20_all.deb ... 206s Unpacking dh-autoreconf (20) ... 206s Selecting previously unselected package libarchive-zip-perl. 206s Preparing to unpack .../38-libarchive-zip-perl_1.68-1_all.deb ... 206s Unpacking libarchive-zip-perl (1.68-1) ... 206s Selecting previously unselected package libsub-override-perl. 206s Preparing to unpack .../39-libsub-override-perl_0.10-1_all.deb ... 206s Unpacking libsub-override-perl (0.10-1) ... 206s Selecting previously unselected package libfile-stripnondeterminism-perl. 206s Preparing to unpack .../40-libfile-stripnondeterminism-perl_1.13.1-1_all.deb ... 206s Unpacking libfile-stripnondeterminism-perl (1.13.1-1) ... 206s Selecting previously unselected package dh-strip-nondeterminism. 206s Preparing to unpack .../41-dh-strip-nondeterminism_1.13.1-1_all.deb ... 206s Unpacking dh-strip-nondeterminism (1.13.1-1) ... 206s Selecting previously unselected package libdw1:s390x. 206s Preparing to unpack .../42-libdw1_0.190-1_s390x.deb ... 206s Unpacking libdw1:s390x (0.190-1) ... 206s Selecting previously unselected package debugedit. 206s Preparing to unpack .../43-debugedit_1%3a5.0-5_s390x.deb ... 206s Unpacking debugedit (1:5.0-5) ... 206s Selecting previously unselected package dwz. 206s Preparing to unpack .../44-dwz_0.15-1_s390x.deb ... 206s Unpacking dwz (0.15-1) ... 206s Selecting previously unselected package gettext. 206s Preparing to unpack .../45-gettext_0.21-14ubuntu1_s390x.deb ... 206s Unpacking gettext (0.21-14ubuntu1) ... 206s Selecting previously unselected package intltool-debian. 206s Preparing to unpack .../46-intltool-debian_0.35.0+20060710.6_all.deb ... 206s Unpacking intltool-debian (0.35.0+20060710.6) ... 206s Selecting previously unselected package po-debconf. 206s Preparing to unpack .../47-po-debconf_1.0.21+nmu1_all.deb ... 206s Unpacking po-debconf (1.0.21+nmu1) ... 206s Selecting previously unselected package debhelper. 206s Preparing to unpack .../48-debhelper_13.14.1ubuntu1_all.deb ... 206s Unpacking debhelper (13.14.1ubuntu1) ... 206s Selecting previously unselected package dh-python. 206s Preparing to unpack .../49-dh-python_6.20231223ubuntu2_all.deb ... 206s Unpacking dh-python (6.20231223ubuntu2) ... 206s Selecting previously unselected package liberror-perl. 206s Preparing to unpack .../50-liberror-perl_0.17029-2_all.deb ... 206s Unpacking liberror-perl (0.17029-2) ... 206s Selecting previously unselected package git-man. 206s Preparing to unpack .../51-git-man_1%3a2.43.0-1ubuntu1_all.deb ... 206s Unpacking git-man (1:2.43.0-1ubuntu1) ... 206s Selecting previously unselected package git. 206s Preparing to unpack .../52-git_1%3a2.43.0-1ubuntu1_s390x.deb ... 206s Unpacking git (1:2.43.0-1ubuntu1) ... 207s Selecting previously unselected package git-imerge. 207s Preparing to unpack .../53-git-imerge_1.2.0-5_all.deb ... 207s Unpacking git-imerge (1.2.0-5) ... 207s Selecting previously unselected package libjs-jquery. 207s Preparing to unpack .../54-libjs-jquery_3.6.1+dfsg+~3.5.14-1_all.deb ... 207s Unpacking libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 207s Selecting previously unselected package libjs-underscore. 207s Preparing to unpack .../55-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 207s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 207s Selecting previously unselected package libjs-sphinxdoc. 207s Preparing to unpack .../56-libjs-sphinxdoc_7.2.6-4_all.deb ... 207s Unpacking libjs-sphinxdoc (7.2.6-4) ... 207s Selecting previously unselected package libpkgconf3:s390x. 207s Preparing to unpack .../57-libpkgconf3_1.8.1-2_s390x.deb ... 207s Unpacking libpkgconf3:s390x (1.8.1-2) ... 207s Selecting previously unselected package pkgconf-bin. 207s Preparing to unpack .../58-pkgconf-bin_1.8.1-2_s390x.deb ... 207s Unpacking pkgconf-bin (1.8.1-2) ... 207s Selecting previously unselected package pkgconf:s390x. 207s Preparing to unpack .../59-pkgconf_1.8.1-2_s390x.deb ... 207s Unpacking pkgconf:s390x (1.8.1-2) ... 207s Selecting previously unselected package pkg-config:s390x. 207s Preparing to unpack .../60-pkg-config_1.8.1-2_s390x.deb ... 207s Unpacking pkg-config:s390x (1.8.1-2) ... 207s Selecting previously unselected package pybuild-plugin-autopkgtest. 207s Preparing to unpack .../61-pybuild-plugin-autopkgtest_6.20231223ubuntu2_all.deb ... 207s Unpacking pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 207s Selecting previously unselected package python3-cachetools. 207s Preparing to unpack .../62-python3-cachetools_5.3.0-2_all.deb ... 207s Unpacking python3-cachetools (5.3.0-2) ... 207s Selecting previously unselected package python3-colorama. 207s Preparing to unpack .../63-python3-colorama_0.4.6-4_all.deb ... 207s Unpacking python3-colorama (0.4.6-4) ... 207s Selecting previously unselected package python3-distlib. 207s Preparing to unpack .../64-python3-distlib_0.3.8-1_all.deb ... 207s Unpacking python3-distlib (0.3.8-1) ... 207s Selecting previously unselected package python3-filelock. 207s Preparing to unpack .../65-python3-filelock_3.13.1-1_all.deb ... 207s Unpacking python3-filelock (3.13.1-1) ... 207s Selecting previously unselected package python3-packaging. 207s Preparing to unpack .../66-python3-packaging_23.2-1_all.deb ... 207s Unpacking python3-packaging (23.2-1) ... 207s Selecting previously unselected package python3-pip-whl. 207s Preparing to unpack .../67-python3-pip-whl_24.0+dfsg-1_all.deb ... 207s Unpacking python3-pip-whl (24.0+dfsg-1) ... 207s Selecting previously unselected package python3-platformdirs. 207s Preparing to unpack .../68-python3-platformdirs_4.2.0-1_all.deb ... 207s Unpacking python3-platformdirs (4.2.0-1) ... 207s Selecting previously unselected package python3-pluggy. 207s Preparing to unpack .../69-python3-pluggy_1.4.0-1_all.deb ... 207s Unpacking python3-pluggy (1.4.0-1) ... 207s Selecting previously unselected package python3-pyproject-api. 207s Preparing to unpack .../70-python3-pyproject-api_1.6.1-1_all.deb ... 207s Unpacking python3-pyproject-api (1.6.1-1) ... 207s Selecting previously unselected package python3-setuptools-whl. 207s Preparing to unpack .../71-python3-setuptools-whl_68.1.2-2_all.deb ... 207s Unpacking python3-setuptools-whl (68.1.2-2) ... 207s Selecting previously unselected package python3-wheel-whl. 207s Preparing to unpack .../72-python3-wheel-whl_0.42.0-1_all.deb ... 207s Unpacking python3-wheel-whl (0.42.0-1) ... 207s Selecting previously unselected package python3-virtualenv. 207s Preparing to unpack .../73-python3-virtualenv_20.25.0+ds-1_all.deb ... 207s Unpacking python3-virtualenv (20.25.0+ds-1) ... 207s Selecting previously unselected package python3-wheel. 207s Preparing to unpack .../74-python3-wheel_0.42.0-1_all.deb ... 207s Unpacking python3-wheel (0.42.0-1) ... 207s Selecting previously unselected package tox. 207s Preparing to unpack .../75-tox_4.13.0-1_all.deb ... 207s Unpacking tox (4.13.0-1) ... 207s Selecting previously unselected package autopkgtest-satdep. 207s Preparing to unpack .../76-1-autopkgtest-satdep.deb ... 207s Unpacking autopkgtest-satdep (0) ... 208s Setting up dh-python (6.20231223ubuntu2) ... 208s Setting up libdw1:s390x (0.190-1) ... 208s Setting up python3-setuptools-whl (68.1.2-2) ... 208s Setting up python3-filelock (3.13.1-1) ... 208s Setting up python3-cachetools (5.3.0-2) ... 208s Setting up python3-colorama (0.4.6-4) ... 208s Setting up python3-pip-whl (24.0+dfsg-1) ... 208s Setting up libarchive-zip-perl (1.68-1) ... 208s Setting up libdebhelper-perl (13.14.1ubuntu1) ... 208s Setting up linux-libc-dev:s390x (6.8.0-11.11) ... 208s Setting up m4 (1.4.19-4) ... 208s Setting up python3-distlib (0.3.8-1) ... 209s Setting up libgomp1:s390x (14-20240303-1ubuntu1) ... 209s Setting up python3-wheel (0.42.0-1) ... 209s Setting up python3-platformdirs (4.2.0-1) ... 209s Setting up liberror-perl (0.17029-2) ... 209s Setting up autotools-dev (20220109.1) ... 209s Setting up python3-packaging (23.2-1) ... 209s Setting up libtirpc-dev:s390x (1.3.4+ds-1build1) ... 209s Setting up libpkgconf3:s390x (1.8.1-2) ... 209s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 209s Setting up libmpc3:s390x (1.3.1-1) ... 209s Setting up libatomic1:s390x (14-20240303-1ubuntu1) ... 209s Setting up autopoint (0.21-14ubuntu1) ... 209s Setting up pkgconf-bin (1.8.1-2) ... 209s Setting up autoconf (2.71-3) ... 209s Setting up python3-pluggy (1.4.0-1) ... 210s Setting up libubsan1:s390x (14-20240303-1ubuntu1) ... 210s Setting up dwz (0.15-1) ... 210s Setting up libnsl-dev:s390x (1.3.0-3) ... 210s Setting up libcrypt-dev:s390x (1:4.4.36-4) ... 210s Setting up libasan8:s390x (14-20240303-1ubuntu1) ... 210s Setting up debugedit (1:5.0-5) ... 210s Setting up libsub-override-perl (0.10-1) ... 210s Setting up git-man (1:2.43.0-1ubuntu1) ... 210s Setting up libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 210s Setting up libisl23:s390x (0.26-3) ... 210s Setting up libc-dev-bin (2.39-0ubuntu2) ... 210s Setting up python3-wheel-whl (0.42.0-1) ... 210s Setting up libcc1-0:s390x (14-20240303-1ubuntu1) ... 210s Setting up libitm1:s390x (14-20240303-1ubuntu1) ... 210s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 210s Setting up automake (1:1.16.5-1.3ubuntu1) ... 210s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 210s Setting up libfile-stripnondeterminism-perl (1.13.1-1) ... 210s Setting up gettext (0.21-14ubuntu1) ... 210s Setting up python3-virtualenv (20.25.0+ds-1) ... 210s Setting up pkgconf:s390x (1.8.1-2) ... 210s Setting up intltool-debian (0.35.0+20060710.6) ... 210s Setting up cpp-13-s390x-linux-gnu (13.2.0-17ubuntu2) ... 210s Setting up pkg-config:s390x (1.8.1-2) ... 210s Setting up git (1:2.43.0-1ubuntu1) ... 210s Setting up libjs-sphinxdoc (7.2.6-4) ... 210s Setting up dh-strip-nondeterminism (1.13.1-1) ... 210s Setting up libgcc-13-dev:s390x (13.2.0-17ubuntu2) ... 210s Setting up libc6-dev:s390x (2.39-0ubuntu2) ... 210s Setting up libstdc++-13-dev:s390x (13.2.0-17ubuntu2) ... 210s Setting up cpp-13 (13.2.0-17ubuntu2) ... 210s Setting up cpp-s390x-linux-gnu (4:13.2.0-7ubuntu1) ... 210s Setting up po-debconf (1.0.21+nmu1) ... 210s Setting up python3-pyproject-api (1.6.1-1) ... 210s Setting up git-imerge (1.2.0-5) ... 210s Setting up gcc-13-s390x-linux-gnu (13.2.0-17ubuntu2) ... 210s Setting up gcc-s390x-linux-gnu (4:13.2.0-7ubuntu1) ... 210s Setting up g++-13-s390x-linux-gnu (13.2.0-17ubuntu2) ... 210s Setting up gcc-13 (13.2.0-17ubuntu2) ... 210s Setting up cpp (4:13.2.0-7ubuntu1) ... 210s Setting up g++-13 (13.2.0-17ubuntu2) ... 210s Setting up tox (4.13.0-1) ... 211s Setting up libtool (2.4.7-7) ... 211s Setting up g++-s390x-linux-gnu (4:13.2.0-7ubuntu1) ... 211s Setting up gcc (4:13.2.0-7ubuntu1) ... 211s Setting up dh-autoreconf (20) ... 211s Setting up g++ (4:13.2.0-7ubuntu1) ... 211s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 211s Setting up build-essential (12.10ubuntu1) ... 211s Setting up debhelper (13.14.1ubuntu1) ... 211s Setting up pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 211s Setting up autopkgtest-satdep (0) ... 211s Processing triggers for man-db (2.12.0-3) ... 213s Processing triggers for install-info (7.1-3) ... 213s Processing triggers for libc-bin (2.39-0ubuntu2) ... 217s (Reading database ... 57502 files and directories currently installed.) 217s Removing autopkgtest-satdep (0) ... 217s autopkgtest [22:46:49]: test pybuild-autopkgtest: pybuild-autopkgtest 217s autopkgtest [22:46:49]: test pybuild-autopkgtest: [----------------------- 218s pybuild-autopkgtest 219s I: pybuild base:305: cd /tmp/autopkgtest.S6VHsS/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.S6VHsS/build.sHY/src/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 219s py312: skip building and installing the package 219s py312: commands[0] /tmp/autopkgtest.S6VHsS/build.sHY/src> /bin/sh t/test-unconflicted 219s + dirname t/test-unconflicted 219s + cd t 219s + pwd 219s + dirname /tmp/autopkgtest.S6VHsS/build.sHY/src/t 219s + BASE=/tmp/autopkgtest.S6VHsS/build.sHY/src 219s + . /tmp/autopkgtest.S6VHsS/build.sHY/src/t/test-lib.sh 219s + GIT_IMERGE=git-imerge 219s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s + DESCRIPTION=git-imerge test repository without conflicts 219s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted git-imerge test repository without conflicts 219s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s + local description=git-imerge test repository without conflicts 219s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted git-imerge test repository without conflicts 219s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s + local description=git-imerge test repository without conflicts 219s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s hint: Using 'master' as the name for the initial branch. This default branch name 219s hint: is subject to change. To configure the initial branch name to use in all 219s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted/.git/ 219s [master (root-commit) 780ddf5] m⇒0 219s 2 files changed, 2 insertions(+) 219s create mode 100644 a.txt 219s create mode 100644 b.txt 219s [a b862e30] a⇒1 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s hint: of your new repositories, which will suppress this warning, call: 219s hint: 219s hint: git config --global init.defaultBranch 219s hint: 219s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 219s hint: 'development'. The just-created branch can be renamed via this command: 219s hint: 219s hint: git branch -m 219s + echo git-imerge test repository without conflicts 219s + printf %s\n /*.out /*.css /*.html 219s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted/.git config user.name Loú User 219s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted/.git config user.email luser@example.com 219s + TIME=1112911993 219s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/unconflicted 219s + modify a.txt 0 219s + filename=a.txt 219s + text=0 219s + echo 0 219s + git add a.txt 219s + modify b.txt 0 219s + filename=b.txt 219s + text=0 219s + echo 0 219s + git add b.txt 219s + commit -m m⇒0 219s + TIME=1112911994 219s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 219s + git checkout -b a -- 219s Switched to a new branch 'a' 219s + seq 8 219s + modify a.txt 1 219s + filename=a.txt 219s + text=1 219s + echo 1 219s + git add a.txt 219s + commit -m a⇒1 219s + TIME=1112911995 219s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 219s + modify a.txt 2 219s + filename=a.txt 219s + text=2 219s + echo 2 219s + git add a.txt 219s + commit -m a⇒2 219s + TIME=1112911996 219s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 219s [a dcbe282] a⇒2 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify a.txt 3 219s + filename=a.txt 219s + text=3 219s + echo 3 219s + git add a.txt 219s + commit -m a⇒3 219s + TIME=1112911997 219s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 219s [a ecd8647] a⇒3 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify a.txt 4 219s + filename=a.txt 219s + text=4 219s + echo 4 219s + git add a.txt 219s + commit -m a⇒4 219s + TIME=1112911998 219s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 219s [a 1634bab] a⇒4 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify a.txt 5 219s + filename=a.txt 219s + text=5 219s + echo 5 219s + git add a.txt 219s + commit -m a⇒5 219s + TIME=1112911999 219s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 219s [a 909ce12] a⇒5 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s [a f6520bf] a⇒6 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s [a 6797186] a⇒7 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s [a 49643dd] a⇒8 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify a.txt 6 219s + filename=a.txt 219s + text=6 219s + echo 6 219s + git add a.txt 219s + commit -m a⇒6 219s + TIME=1112912000 219s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 219s + modify a.txt 7 219s + filename=a.txt 219s + text=7 219s + echo 7 219s + git add a.txt 219s + commit -m a⇒7 219s + TIME=1112912001 219s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 219s + modify a.txt 8 219s + filename=a.txt 219s + text=8 219s + echo 8 219s + git add a.txt 219s + commit -m a⇒8 219s + TIME=1112912002 219s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 219s + git checkout -b b master -- 219s Switched to a new branch 'b' 219s + seq 5 219s + modify b.txt 1 219s + filename=b.txt 219s + text=1 219s + echo 1 219s + git add b.txt 219s + commit -m b⇒1 219s + TIME=1112912003 219s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 219s [b d43305b] b⇒1 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify b.txt 2 219s + filename=b.txt 219s + text=2 219s + echo 2 219s + git add b.txt 219s + commit -m b⇒2 219s + TIME=1112912004 219s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 219s [b 853ee68] b⇒2 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify b.txt 3 219s + filename=b.txt 219s + text=3 219s + echo 3 219s + git add b.txt 219s + commit -m b⇒3 219s + TIME=1112912005 219s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 219s [b 03a2455] b⇒3 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify b.txt 4 219s + filename=b.txt 219s + text=4 219s + echo 4 219s + git add b.txt 219s + commit -m b⇒4 219s + TIME=1112912006 219s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 219s [b 484ea85] b⇒4 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + modify b.txt 5 219s + filename=b.txt 219s + text=5 219s [b e22cd97] b⇒5 219s 1 file changed, 1 insertion(+), 1 deletion(-) 219s + echo 5 219s + git add b.txt 219s + commit -m b⇒5 219s + TIME=1112912007 219s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 219s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 219s + git checkout a 219s Switched to branch 'a' 219s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 220s Attempting automerge of 8-5...success. 220s Autofilling 1-5...success. 220s Autofilling 2-5...success. 220s Autofilling 3-5...success. 220s Autofilling 4-5...success. 220s Autofilling 5-5...success. 220s Autofilling 6-5...success. 220s Autofilling 7-5...success. 220s Autofilling 8-1...success. 220s Autofilling 8-2...success. 220s Autofilling 8-3...success. 220s Autofilling 8-4...success. 220s Autofilling 8-5 (first way)...success. 220s Autofilling 8-5 (second way)...success. 220s The two ways of autofilling 8-5 agree. 220s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 220s Merge is complete! 220s + git-imerge list 220s * a-b 220s + git-imerge diagram --commits --frontier --html=imerge3.html 220s 0 5 8 220s | | | 220s 0 - ********* - a 220s *???????. 220s *???????. 220s *???????. 220s *???????. 220s 5 - *........ 220s | 220s b 220s 220s 0 5 8 220s | | | 220s 0 - ********* - a 220s *???????| 220s *???????| 220s *???????| 220s *???????| 220s 5 - *-------+ 220s | 220s b 220s 220s Key: 220s |,-,+ = rectangles forming current merge frontier 220s * = merge done manually 220s . = merge done automatically 220s # = conflict that is currently blocking progress 220s @ = merge was blocked but has been resolved 220s ? = no merge recorded 220s 220s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 220s Merge b into a (using imerge) 220s 220s # Please enter the commit message for your changes. Lines starting 220s # with '#' will be ignored, and an empty message aborts the commit. 220s # 220s # Date: Thu Mar 21 22:46:52 2024 +0000 220s # 220s # On branch a-b-merge 220s # Changes to be committed: 220s # modified: b.txt 220s # 220s [a-b-merge 658c736] Merge b into a (using imerge) 220s Date: Thu Mar 21 22:46:52 2024 +0000 220s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 220s + local refname=a-b-merge 220s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 220s + git rev-parse a-b-merge^{tree} 220s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 220s + git-imerge simplify --goal=rebase --branch=a-b-rebase 221s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + local refname=a-b-rebase 221s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git rev-parse a-b-rebase^{tree} 221s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 221s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + local refname=a-b-rebase-with-history 221s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git rev-parse a-b-rebase-with-history^{tree} 221s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git-imerge simplify --goal=border --branch=a-b-border 221s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + local refname=a-b-border 221s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git rev-parse a-b-border^{tree} 221s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 221s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + local refname=a-b-border-with-history 221s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git rev-parse a-b-border-with-history^{tree} 221s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 221s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + local refname=a-b-border-with-history2 221s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git rev-parse a-b-border-with-history2^{tree} 221s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 221s + git-imerge remove 222s + git checkout a 222s Switched to branch 'a' 222s + git-imerge start --goal=full --name=a-b b 222s Attempting to merge 1-1...success. 222s Attempting to merge 1-2...success. 222s Attempting to merge 1-3...success. 222s Attempting to merge 1-4...success. 222s Attempting to merge 1-5...success. 222s Attempting to merge 2-1...success. 222s Attempting to merge 2-2...success. 222s Attempting to merge 2-3...success. 222s Attempting to merge 2-4...success. 222s Attempting to merge 2-5...success. 222s Attempting to merge 3-1...success. 222s Attempting to merge 3-2...success. 222s Attempting to merge 3-3...success. 222s Attempting to merge 3-4...success. 222s Attempting to merge 3-5...success. 222s Attempting to merge 4-1...success. 222s Attempting to merge 4-2...success. 222s Attempting to merge 4-3...success. 222s Attempting to merge 4-4...success. 222s Attempting to merge 4-5...success. 222s Attempting to merge 5-1...success. 222s Attempting to merge 5-2...success. 222s Attempting to merge 5-3...success. 222s Attempting to merge 5-4...success. 222s Attempting to merge 5-5...success. 222s Attempting to merge 6-1...success. 222s Attempting to merge 6-2...success. 222s Attempting to merge 6-3...success. 222s Attempting to merge 6-4...success. 222s Attempting to merge 6-5...success. 222s Attempting to merge 7-1...success. 222s Attempting to merge 7-2...success. 223s Attempting to merge 7-3...success. 223s Attempting to merge 7-4...success. 223s Attempting to merge 7-5...success. 223s Attempting to merge 8-1...success. 223s Attempting to merge 8-2...success. 223s Attempting to merge 8-3...success. 223s Attempting to merge 8-4...success. 223s Attempting to merge 8-5...success. 223s Merge is complete! 223s + git-imerge list 223s * a-b 223s + git-imerge diagram --commits --frontier --html=imerge4.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-imerge finish --branch=a-b-full 223s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 223s + local refname=a-b-full 223s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 223s + git rev-parse a-b-full^{tree} 223s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 223s py312: commands[1] /tmp/autopkgtest.S6VHsS/build.sHY/src> /bin/sh t/test-conflicted 223s + dirname t/test-conflicted 223s + cd t 223s + pwd 223s + dirname /tmp/autopkgtest.S6VHsS/build.sHY/src/t 223s + BASE=/tmp/autopkgtest.S6VHsS/build.sHY/src 223s + . /tmp/autopkgtest.S6VHsS/build.sHY/src/t/test-lib.sh 223s + GIT_IMERGE=git-imerge 223s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 223s + test_conflict 4-3 223s + local conflict=4-3 223s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 223s + DESCRIPTION=git-imerge test repository with conflict at 4-3 223s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 223s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 223s + local description=git-imerge test repository with conflict at 4-3 223s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 223s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 223s + local description=git-imerge test repository with conflict at 4-3 223s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 223s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 223s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 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 Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3/.git/ 223s + echo git-imerge test repository with conflict at 4-3 223s + printf %s\n /*.out /*.css /*.html 223s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3/.git config user.name Loú User 223s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 223s + TIME=1112911993 223s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 223s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-4-3 223s + modify c.txt 0 223s + filename=c.txt 223s + text=0 223s + echo 0 223s + git add c.txt 223s + modify d.txt 0 223s + filename=d.txt 223s + text=0 223s + echo 0 223s + git add d.txt 223s + modify conflict.txt original version 223s + filename=conflict.txt 223s + text=original version 223s + echo original version 223s + git add conflict.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 [master (root-commit) d70e04b] m⇒0 223s 3 files changed, 3 insertions(+) 223s create mode 100644 c.txt 223s create mode 100644 conflict.txt 223s create mode 100644 d.txt 223s + git checkout -b c master -- 223s Switched to a new branch 'c' 223s + seq 9 223s + modify c.txt 1 223s + filename=c.txt 223s [c 89e2141] c⇒1 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + text=1 223s + echo 1 223s + git add c.txt 223s + commit -m c⇒1 223s + TIME=1112911995 223s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 223s + modify c.txt 2 223s + filename=c.txt 223s + text=2 223s + echo 2 223s + git add c.txt 223s + commit -m c⇒2 223s + TIME=1112911996 223s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 223s [c 7c431f2] c⇒2 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify c.txt 3 223s [c f02ab24] c⇒3 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + filename=c.txt 223s + text=3 223s + echo 3 223s + git add c.txt 223s + commit -m c⇒3 223s + TIME=1112911997 223s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 223s + modify c.txt 4 223s + filename=c.txt 223s + text=4 223s + echo 4 223s + git add c.txt 223s + modify conflict.txt c version 223s + filename=conflict.txt 223s + text=c version 223s + echo c version 223s + git add conflict.txt 223s + commit -m c⇒4 223s + TIME=1112911998 223s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 223s [c 3c091de] c⇒4 223s 2 files changed, 2 insertions(+), 2 deletions(-) 223s + modify c.txt 5 223s + filename=c.txt 223s + text=5 223s + echo 5 223s + git add c.txt 223s + commit -m c⇒5 223s + TIME=1112911999 223s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 223s [c a0ac37a] c⇒5 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify c.txt 6 223s + filename=c.txt 223s + text=6 223s + echo 6 223s + git add c.txt 223s + commit -m c⇒6 223s + TIME=1112912000 223s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 223s [c ed9fdfa] c⇒6 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify c.txt 7 223s + filename=c.txt 223s + text=7 223s + echo 7 223s + git add c.txt 223s + commit -m c⇒7 223s + TIME=1112912001 223s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 223s [c 1da7bf5] c⇒7 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify c.txt 8 223s + filename=c.txt 223s + text=8 223s + echo 8 223s + git add c.txt 223s + commit -m c⇒8 223s + TIME=1112912002 223s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 223s [c d8de99f] c⇒8 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify c.txt 9 223s + filename=c.txt 223s + text=9 223s + echo 9 223s + git add c.txt 223s + commit -m c⇒9 223s + TIME=1112912003 223s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 223s [c 9cde605] c⇒9 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + git checkout -b d master -- 223s Switched to a new branch 'd' 223s + seq 6 223s + modify d.txt 1 223s + filename=d.txt 223s + text=1 223s + echo 1 223s + git add d.txt 223s + commit -m d⇒1 223s + TIME=1112912004 223s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 223s [d bd5368a] d⇒1 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify d.txt 2 223s + filename=d.txt 223s + text=2 223s + echo 2 223s + git add d.txt 223s + commit -m d⇒2 223s + TIME=1112912005 223s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 223s [d 93e27e6] d⇒2 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify d.txt 3 223s + filename=d.txt 223s + text=3 223s + echo 3 223s + git add d.txt 223s + modify conflict.txt d version 223s + filename=conflict.txt 223s + text=d version 223s + echo d version 223s + git add conflict.txt 223s + commit -m d⇒3 223s + TIME=1112912006 223s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 223s [d 2bb1a7e] d⇒3 223s 2 files changed, 2 insertions(+), 2 deletions(-) 223s + modify d.txt 4 223s + filename=d.txt 223s + text=4 223s + echo 4 223s + git add d.txt 223s + commit -m d⇒4 223s + TIME=1112912007 223s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 223s [d 81f9c80] d⇒4 223s 1 file changed, 1 insertion(+), 1 deletion(-) 223s + modify d.txt 5 223s + filename=d.txt 223s + text=5 223s + echo 5 223s + git add d.txt 224s + commit -m d⇒5 224s + TIME=1112912008 224s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 224s [d 3690dde] d⇒5 224s 1 file changed, 1 insertion(+), 1 deletion(-) 224s + modify d.txt 6 224s + filename=d.txt 224s + text=6 224s + echo 6 224s + git add d.txt 224s + commit -m d⇒6 224s + TIME=1112912009 224s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 224s [d 8085853] d⇒6 224s 1 file changed, 1 insertion(+), 1 deletion(-) 224s + git checkout c 224s Switched to branch 'c' 224s + git-imerge init --name=c-d d 224s + git-imerge list 224s * c-d 224s + git-imerge diagram --commits --frontier --html=imerge0.html 224s 0 5 9 224s | | | 224s 0 - ********** - c 224s *????????? 224s *????????? 224s *????????? 224s *????????? 224s 5 - *????????? 224s 6 - *????????? 224s | 224s d 224s 224s 0 5 9 224s | | | 224s 0 - ********** - c 224s *????????? 224s *????????? 224s *????????? 224s *????????? 224s 5 - *????????? 224s 6 - *????????? 224s | 224s d 224s 224s Key: 224s |,-,+ = rectangles forming current merge frontier 224s * = merge done manually 224s . = merge done automatically 224s # = conflict that is currently blocking progress 224s @ = merge was blocked but has been resolved 224s ? = no merge recorded 224s 224s + git-imerge autofill 224s + tee autofill.out 224s Attempting automerge of 9-6...failure. 224s Attempting automerge of 1-1...success. 224s Attempting automerge of 1-4...success. 224s Attempting automerge of 1-6...success. 224s Attempting automerge of 9-6...failure. 224s Attempting automerge of 5-6...failure. 224s Attempting automerge of 3-6...success. 224s Attempting automerge of 4-6...failure. 224s Attempting automerge of 4-1...success. 224s Attempting automerge of 4-4...failure. 224s Attempting automerge of 4-3...failure. 224s Attempting automerge of 4-2...success. 224s Attempting automerge of 9-2...success. 224s Autofilling 1-6...success. 224s Autofilling 2-6...success. 224s Autofilling 3-1...success. 224s Autofilling 3-2...success. 224s Autofilling 3-3...success. 224s Autofilling 3-4...success. 224s Autofilling 3-5...success. 224s Autofilling 3-6 (first way)...success. 224s Autofilling 3-6 (second way)...success. 224s The two ways of autofilling 3-6 agree. 224s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 224s Autofilling 4-2...success. 224s Autofilling 5-2...success. 225s Autofilling 6-2...success. 225s Autofilling 7-2...success. 225s Autofilling 8-2...success. 225s Autofilling 9-1...success. 225s Autofilling 9-2 (first way)...success. 225s Autofilling 9-2 (second way)...success. 225s The two ways of autofilling 9-2 agree. 225s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 225s Attempting automerge of 9-6...failure. 225s Attempting automerge of 4-3...failure. 225s HEAD is now at 9cde605 c⇒9 225s Conflict; suggest manual merge of 4-3 225s + grep -q Traceback autofill.out 225s + grep -q suggest manual merge of 4-3 autofill.out 225s + git-imerge diagram --commits --frontier --html=imerge1.html 225s 0 5 9 225s | | | 225s 0 - ********** - c 225s *??.?????. 225s *??....... 225s *??.#????? 225s *??.?????? 225s 5 - *??.?????? 225s 6 - *...?????? 225s | 225s d 225s 225s 0 5 9 225s | | | 225s 0 - ********** - c 225s *??.?????| 225s *??.-----+ 225s *??|#????? 225s *??|?????? 225s 5 - *??|?????? 225s 6 - *--+?????? 225s | 225s d 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 continue --edit 225s Switched to branch 'imerge/c-d' 225s Auto-merging conflict.txt 225s CONFLICT (content): Merge conflict in conflict.txt 225s Automatic merge failed; fix conflicts and then commit the result. 225s 225s Original first commit: 225s commit 3c091ded129a5edf9061360bab867edade996c93 225s Author: Loú User 225s Date: Thu Apr 7 22:13:18 2005 +0000 225s 225s c⇒4 225s 225s Original second commit: 225s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 225s Author: Loú User 225s Date: Thu Apr 7 22:13:26 2005 +0000 225s 225s d⇒3 225s 225s There was a conflict merging commit 4-3, shown above. 225s Please resolve the conflict, commit the result, then type 225s 225s git-imerge continue 225s + echo merged version 225s + git add conflict.txt 225s + git-imerge continue --no-edit 225s [imerge/c-d a799a3f] imerge 'c-d': manual merge 4-3 225s Merge has been recorded for merge 4-3. 226s Attempting automerge of 4-6...success. 226s Autofilling 4-4...success. 226s Autofilling 4-5...success. 226s Autofilling 4-6...success. 226s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 226s Attempting automerge of 9-6...success. 226s Autofilling 5-6...success. 226s Autofilling 6-6...success. 226s Autofilling 7-6...success. 226s Autofilling 8-6...success. 226s Autofilling 9-3...success. 226s Autofilling 9-4...success. 226s Autofilling 9-5...success. 226s Autofilling 9-6 (first way)...success. 226s Autofilling 9-6 (second way)...success. 226s The two ways of autofilling 9-6 agree. 226s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 226s Merge is complete! 226s + git-imerge diagram --commits --frontier --html=imerge2.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_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 226s Merge d into c (using imerge) 226s 226s # Please enter the commit message for your changes. Lines starting 226s # with '#' will be ignored, and an empty message aborts the commit. 226s # 226s # Date: Thu Mar 21 22:46:58 2024 +0000 226s # 226s # On branch c-d-merge 226s # Changes to be committed: 226s # modified: conflict.txt 226s # modified: d.txt 226s # 226s [c-d-merge b3f6aa3] Merge d into c (using imerge) 226s Date: Thu Mar 21 22:46:58 2024 +0000 226s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 226s + local refname=c-d-merge 226s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 226s + git rev-parse c-d-merge^{tree} 226s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 226s + git-imerge simplify --goal=rebase --branch=c-d-rebase 226s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 226s + local refname=c-d-rebase 226s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 226s + git rev-parse c-d-rebase^{tree} 226s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 226s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 227s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + local refname=c-d-rebase-with-history 227s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git rev-parse c-d-rebase-with-history^{tree} 227s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git-imerge simplify --goal=border --branch=c-d-border 227s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + local refname=c-d-border 227s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git rev-parse c-d-border^{tree} 227s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 227s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + local refname=c-d-border-with-history 227s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git rev-parse c-d-border-with-history^{tree} 227s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 227s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + local refname=c-d-border-with-history2 227s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git rev-parse c-d-border-with-history2^{tree} 227s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 227s + git-imerge remove 228s + git checkout c 228s Switched to branch 'c' 228s + git-imerge start --goal=full --first-parent --name=c-d d 228s + tee start.out 228s Attempting to merge 1-1...success. 228s Attempting to merge 1-2...success. 228s Attempting to merge 1-3...success. 228s Attempting to merge 1-4...success. 228s Attempting to merge 1-5...success. 228s Attempting to merge 1-6...success. 228s Attempting to merge 2-1...success. 228s Attempting to merge 2-2...success. 228s Attempting to merge 2-3...success. 228s Attempting to merge 2-4...success. 228s Attempting to merge 2-5...success. 228s Attempting to merge 2-6...success. 228s Attempting to merge 3-1...success. 228s Attempting to merge 3-2...success. 228s Attempting to merge 3-3...success. 228s Attempting to merge 3-4...success. 228s Attempting to merge 3-5...success. 228s Attempting to merge 3-6...success. 228s Attempting to merge 4-1...success. 228s Attempting to merge 4-2...success. 228s Attempting to merge 4-3...conflict. 228s Attempting to merge 5-1...success. 228s Attempting to merge 5-2...success. 228s Attempting to merge 6-1...success. 228s 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 9594b5a 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 584c0ea] 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. 229s Attempting to merge 5-5...success. 229s Attempting to merge 5-6...success. 229s Attempting to merge 6-3...success. 229s Attempting to merge 6-4...success. 229s Attempting to merge 6-5...success. 229s Attempting to merge 6-6...success. 229s Attempting to merge 7-3...success. 229s Attempting to merge 7-4...success. 229s Attempting to merge 7-5...success. 229s 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.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 230s + DESCRIPTION=git-imerge test repository with conflict at 1-1 230s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 230s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 230s + local description=git-imerge test repository with conflict at 1-1 230s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 230s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 230s + local description=git-imerge test repository with conflict at 1-1 230s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 230s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 230s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 230s hint: Using 'master' as the name for the initial branch. This default branch name 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 Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1/.git/ 230s + echo git-imerge test repository with conflict at 1-1 230s + printf %s\n /*.out /*.css /*.html 230s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1/.git config user.name Loú User 230s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 230s + TIME=1112911993 230s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-1 230s + cd /tmp/autopkgtest.S6VHsS/build.sHY/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 + 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 [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 + 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 [c 2120f40] c⇒1 230s 2 files changed, 2 insertions(+), 2 deletions(-) 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 [c 90cc7de] c⇒2 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c 2046ed2] c⇒3 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s + modify c.txt 4 230s + filename=c.txt 230s + text=4 230s + echo 4 230s + git add c.txt 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 [c 8a2cee9] c⇒4 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c ac16a05] c⇒5 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c 30dd2ae] c⇒6 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 + 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 [c f661c06] c⇒8 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s + modify c.txt 9 230s + filename=c.txt 230s [c 243e8ed] c⇒9 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d ac0427a] d⇒1 230s 2 files changed, 2 insertions(+), 2 deletions(-) 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 [d 43c38c0] d⇒2 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d 0260058] d⇒3 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d 40fef44] d⇒4 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d b080a65] d⇒5 230s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [d 200ce5c] d⇒6 230s 1 file changed, 1 insertion(+), 1 deletion(-) 230s + git checkout c 230s Switched to branch 'c' 230s + git-imerge init --name=c-d d 231s + git-imerge list 231s * c-d 231s + git-imerge diagram --commits --frontier --html=imerge0.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-imergetee autofill 231s autofill.out 231s Attempting automerge of 9-6...failure. 231s Attempting automerge of 1-1...failure. 231s HEAD is now at 243e8ed c⇒9 231s No progress was possible; suggest manual merge of 1-1 231s + grep -q Traceback autofill.out 231s + grep -q suggest manual merge of 1-1 autofill.out 231s + 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 232s Switched to branch 'imerge/c-d' 232s Auto-merging conflict.txt 232s CONFLICT (content): Merge conflict in conflict.txt 232s 232s Original first commit: 232s Automatic merge failed; fix conflicts and then commit the result. 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 + echo merged version 232s + git add conflict.txt 232s + git-imerge continue --no-edit 232s [imerge/c-d af01160] imerge 'c-d': manual merge 1-1 232s Merge has been recorded for merge 1-1. 232s Attempting automerge of 1-6...success. 232s Autofilling 1-2...success. 232s Autofilling 1-3...success. 232s Autofilling 1-4...success. 232s Autofilling 1-5...success. 232s Autofilling 1-6...success. 232s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 232s Attempting automerge of 9-6...success. 232s Autofilling 2-6...success. 232s Autofilling 3-6...success. 232s Autofilling 4-6...success. 232s Autofilling 5-6...success. 232s Autofilling 6-6...success. 232s Autofilling 7-6...success. 232s Autofilling 8-6...success. 232s Autofilling 9-1...success. 232s Autofilling 9-2...success. 232s Autofilling 9-3...success. 232s Autofilling 9-4...success. 232s Autofilling 9-5...success. 232s Autofilling 9-6 (first way)...success. 232s Autofilling 9-6 (second way)...success. 232s The two ways of autofilling 9-6 agree. 232s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 232s Merge is complete! 232s + git-imerge diagram --commits --frontier --html=imerge2.html 232s 0 5 9 232s | | | 232s 0 - ********** - c 232s **???????. 232s *.???????. 232s *.???????. 232s *.???????. 232s 5 - *.???????. 232s 6 - *......... 232s | 232s d 232s 232s 0 5 9 232s | | | 232s 0 - ********** - c 232s **???????| 232s *.???????| 232s *.???????| 232s *.???????| 232s 5 - *.???????| 232s 6 - *--------+ 232s | 232s d 232s 232s Key: 232s |,-,+ = rectangles forming current merge frontier 232s * = merge done manually 232s . = merge done automatically 232s # = conflict that is currently blocking progress 232s @ = merge was blocked but has been resolved 232s ? = no merge recorded 232s 232s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 233s Merge d into c (using imerge) 233s 233s # Please enter the commit message for your changes. Lines starting 233s # with '#' will be ignored, and an empty message aborts the commit. 233s # 233s # Date: Thu Mar 21 22:47:05 2024 +0000 233s # 233s # On branch c-d-merge 233s # Changes to be committed: 233s # modified: conflict.txt 233s # modified: d.txt 233s # 233s [c-d-merge 3ded4bf] Merge d into c (using imerge) 233s Date: Thu Mar 21 22:47:05 2024 +0000 233s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + local refname=c-d-merge 233s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git rev-parse c-d-merge^{tree} 233s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git-imerge simplify --goal=rebase --branch=c-d-rebase 233s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + local refname=c-d-rebase 233s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git rev-parse c-d-rebase^{tree} 233s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 233s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + local refname=c-d-rebase-with-history 233s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git rev-parse c-d-rebase-with-history^{tree} 233s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 233s + git-imerge simplify --goal=border --branch=c-d-border 234s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + local refname=c-d-border 234s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git rev-parse c-d-border^{tree} 234s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 234s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + local refname=c-d-border-with-history 234s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git rev-parse c-d-border-with-history^{tree} 234s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 234s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + local refname=c-d-border-with-history2 234s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git rev-parse c-d-border-with-history2^{tree} 234s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 234s + git-imerge remove 234s + git checkout c 234s Switched to branch 'c' 234s + git-imerge start --goal=full --first-parent --name=c-d d 234s + tee start.out 235s Attempting to merge 1-1...conflict. 235s Switched to branch 'imerge/c-d' 235s Auto-merging conflict.txt 235s CONFLICT (content): Merge conflict in conflict.txt 235s Automatic merge failed; fix conflicts and then commit the result. 235s 235s Original first commit: 235s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 235s Author: Loú User 235s Date: Thu Apr 7 22:13:15 2005 +0000 235s 235s c⇒1 235s 235s Original second commit: 235s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 235s Author: Loú User 235s Date: Thu Apr 7 22:13:24 2005 +0000 235s 235s d⇒1 235s 235s There was a conflict merging commit 1-1, shown above. 235s Please resolve the conflict, commit the result, then type 235s 235s git-imerge continue 235s + grep -q Traceback start.out 235s + grep -q suggest manual merge of 1-1 autofill.out 235s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 235s + git add conflict.txt 235s + GIT_EDITOR=cat git commit 235s imerge 'c-d': manual merge 1-1 235s 235s # Conflicts: 235s # conflict.txt 235s # 235s # It looks like you may be committing a merge. 235s # If this is not correct, please run 235s # git update-ref -d MERGE_HEAD 235s # and try again. 235s 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 # On branch imerge/c-d 235s # All conflicts fixed but you are still merging. 235s # 235s # Changes to be committed: 235s # modified: conflict.txt 235s # modified: d.txt 235s # 235s [imerge/c-d 2a92c04] imerge 'c-d': manual merge 1-1 235s + git-imerge continue --edit 235s Merge has been recorded for merge 1-1. 235s Attempting to merge 1-2...success. 235s Attempting to merge 1-3...success. 235s Attempting to merge 1-4...success. 235s Attempting to merge 1-5...success. 235s Attempting to merge 1-6...success. 235s Attempting to merge 2-1...success. 235s Attempting to merge 2-2...success. 235s Attempting to merge 2-3...success. 235s Attempting to merge 2-4...success. 235s Attempting to merge 2-5...success. 235s Attempting to merge 2-6...success. 235s Attempting to merge 3-1...success. 235s Attempting to merge 3-2...success. 235s Attempting to merge 3-3...success. 235s Attempting to merge 3-4...success. 235s Attempting to merge 3-5...success. 235s Attempting to merge 3-6...success. 235s Attempting to merge 4-1...success. 235s Attempting to merge 4-2...success. 235s Attempting to merge 4-3...success. 235s Attempting to merge 4-4...success. 235s 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. 236s Attempting to merge 8-3...success. 236s Attempting to merge 8-4...success. 236s Attempting to merge 8-5...success. 236s Attempting to merge 8-6...success. 236s Attempting to merge 9-1...success. 236s Attempting to merge 9-2...success. 236s Attempting to merge 9-3...success. 236s Attempting to merge 9-4...success. 236s Attempting to merge 9-5...success. 236s Attempting to merge 9-6...success. 236s Merge is complete! 236s + git-imerge diagram --commits --frontier --html=imerge4.html 236s 0 5 9 236s | | | 236s 0 - ********** - c 236s **........ 236s *......... 236s *......... 236s *......... 236s 5 - *......... 236s 6 - *......... 236s | 236s d 236s 236s 0 5 9 236s | | | 236s 0 - ********** - c 236s **.......| 236s *........| 236s *........| 236s *........| 236s 5 - *........| 236s 6 - *--------+ 236s | 236s d 236s 236s Key: 236s |,-,+ = rectangles forming current merge frontier 236s * = merge done manually 236s . = merge done automatically 236s # = conflict that is currently blocking progress 236s @ = merge was blocked but has been resolved 236s ? = no merge recorded 236s 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 9-1 237s + local conflict=9-1 237s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s + DESCRIPTION=git-imerge test repository with conflict at 9-1 237s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 237s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s + local description=git-imerge test repository with conflict at 9-1 237s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 237s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s + local description=git-imerge test repository with conflict at 9-1 237s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s hint: Using 'master' as the name for the initial branch. This default branch name 237s hint: is subject to change. To configure the initial branch name to use in all 237s hint: of your new repositories, which will suppress this warning, call: 237s hint: 237s hint: git config --global init.defaultBranch 237s hint: 237s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 237s hint: 'development'. The just-created branch can be renamed via this command: 237s hint: 237s hint: git branch -m 237s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1/.git/ 237s + echo git-imerge test repository with conflict at 9-1 237s + printf %s\n /*.out /*.css /*.html 237s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1/.git config user.name Loú User 237s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 237s + TIME=1112911993 237s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-1 237s + modify c.txt 0 237s + filename=c.txt 237s + text=0 237s + echo 0 237s + git add c.txt 237s + modify d.txt 0 237s + filename=d.txt 237s + text=0 237s + echo 0 237s + git add d.txt 237s + modify conflict.txt original version 237s + filename=conflict.txt 237s + text=original version 237s + echo original version 237s + git add conflict.txt 237s [master (root-commit) d70e04b] m⇒0 237s 3 files changed, 3 insertions(+) 237s create mode 100644 c.txt 237s create mode 100644 conflict.txt 237s create mode 100644 d.txt 237s [c 89e2141] c⇒1 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [c 7c431f2] c⇒2 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + commit -m m⇒0 237s + TIME=1112911994 237s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 237s + git checkout -b c master -- 237s Switched to a new branch 'c' 237s + seq 9 237s + modify c.txt 1 237s + filename=c.txt 237s + text=1 237s + echo 1 237s + git add c.txt 237s + commit -m c⇒1 237s + TIME=1112911995 237s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 237s + modify c.txt 2 237s + filename=c.txt 237s + text=2 237s + echo 2 237s + git add c.txt 237s + commit -m c⇒2 237s + TIME=1112911996 237s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 237s + modify c.txt 3 237s + filename=c.txt 237s + text=3 237s + echo 3 237s + git add c.txt 237s + commit -m c⇒3 237s + TIME=1112911997 237s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 237s [c f02ab24] c⇒3 237s 1 file changed, 1 insertion(+), 1 deletion(-) 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 ed9122f] 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 1d3bf09] 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 f999ecd] 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 7050a8a] 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 9732e77] 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 + 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⇒9 237s + TIME=1112912003 237s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 237s [c 73a5eed] c⇒9 237s 2 files changed, 2 insertions(+), 2 deletions(-) 237s + git checkout -b d master -- 237s Switched to a new branch 'd' 237s + seq 6 237s + modify d.txt 1 237s + filename=d.txt 237s + text=1 237s + echo 1 237s + git add d.txt 237s + modify conflict.txt d version 237s + filename=conflict.txt 237s + text=d version 237s + echo d version 237s + git add conflict.txt 237s + commit -m d⇒1 237s + TIME=1112912004 237s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 237s [d ac0427a] d⇒1 237s 2 files changed, 2 insertions(+), 2 deletions(-) 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 43c38c0] 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 0260058] d⇒3 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [d 40fef44] d⇒4 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [d b080a65] d⇒5 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s [d 200ce5c] d⇒6 237s 1 file changed, 1 insertion(+), 1 deletion(-) 237s + 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 + modify d.txt 5 237s + filename=d.txt 237s + text=5 237s + echo 5 237s + git add d.txt 237s + commit -m d⇒5 237s + TIME=1112912008 237s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 237s + modify d.txt 6 237s + filename=d.txt 237s + text=6 237s + echo 6 237s + git add d.txt 237s + commit -m d⇒6 237s + TIME=1112912009 237s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 237s + git checkout c 237s Switched to branch 'c' 237s + git-imerge init --name=c-d d 238s + git-imerge list 238s * c-d 238s + git-imerge diagram --commits --frontier --html=imerge0.html 238s + + git-imergetee autofill autofill.out 238s 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 Attempting automerge of 9-6...failure. 238s Attempting automerge of 1-1...success. 238s Attempting automerge of 1-4...success. 238s Attempting automerge of 1-6...success. 238s Attempting automerge of 9-6...failure. 238s Attempting automerge of 5-6...success. 238s Attempting automerge of 7-6...success. 238s Attempting automerge of 8-6...success. 238s Attempting automerge of 9-1...failure. 238s Autofilling 1-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-1...success. 238s Autofilling 8-2...success. 238s Autofilling 8-3...success. 238s Autofilling 8-4...success. 238s Autofilling 8-5...success. 238s Autofilling 8-6 (first way)...success. 238s Autofilling 8-6 (second way)...success. 238s The two ways of autofilling 8-6 agree. 238s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 239s Attempting automerge of 9-6...failure. 239s Attempting automerge of 9-1...failure. 239s HEAD is now at 73a5eed c⇒9 239s Conflict; suggest manual merge of 9-1 239s + grep -q Traceback autofill.out 239s + grep -q suggest manual merge of 9-1 autofill.out 239s + git-imerge diagram --commits --frontier --html=imerge1.html 239s 0 5 9 239s | | | 239s 0 - ********** - c 239s *???????.# 239s *???????.? 239s *???????.? 239s *???????.? 239s 5 - *???????.? 239s 6 - *........? 239s | 239s d 239s 239s 0 5 9 239s | | | 239s 0 - ********** - c 239s *???????|# 239s *???????|? 239s *???????|? 239s *???????|? 239s 5 - *???????|? 239s 6 - *-------+? 239s | 239s d 239s 239s Key: 239s |,-,+ = rectangles forming current merge frontier 239s * = merge done manually 239s . = merge done automatically 239s # = conflict that is currently blocking progress 239s @ = merge was blocked but has been resolved 239s ? = no merge recorded 239s 239s + git-imerge continue --edit 239s Switched to branch 'imerge/c-d' 239s Auto-merging conflict.txt 239s CONFLICT (content): Merge conflict in conflict.txt 239s Automatic merge failed; fix conflicts and then commit the result. 239s 239s Original first commit: 239s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 239s Author: Loú User 239s Date: Thu Apr 7 22:13:23 2005 +0000 239s 239s c⇒9 239s 239s Original second commit: 239s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 239s Author: Loú User 239s Date: Thu Apr 7 22:13:24 2005 +0000 239s 239s d⇒1 239s 239s There was a conflict merging commit 9-1, shown above. 239s Please resolve the conflict, commit the result, then type 239s 239s git-imerge continue 239s + echo merged version 239s + git add conflict.txt 239s + git-imerge continue --no-edit 239s [imerge/c-d c3b4798] imerge 'c-d': manual merge 9-1 239s Merge has been recorded for merge 9-1. 239s Attempting automerge of 9-6...success. 239s Autofilling 9-2...success. 239s Autofilling 9-3...success. 239s Autofilling 9-4...success. 239s Autofilling 9-5...success. 239s Autofilling 9-6...success. 239s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 239s Merge is complete! 239s + git-imerge diagram --commits --frontier --html=imerge2.html 239s 0 5 9 239s | | | 239s 0 - ********** - c 239s *???????.* 239s *???????.. 239s *???????.. 239s *???????.. 239s 5 - *???????.. 239s 6 - *......... 239s | 239s d 239s 239s 0 5 9 239s | | | 239s 0 - ********** - c 239s *???????.* 239s *???????.| 239s *???????.| 239s *???????.| 239s 5 - *???????.| 239s 6 - *--------+ 239s | 239s d 239s 239s Key: 239s |,-,+ = rectangles forming current merge frontier 239s * = merge done manually 239s . = merge done automatically 239s # = conflict that is currently blocking progress 239s @ = merge was blocked but has been resolved 239s ? = no merge recorded 239s 239s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 240s Merge d into c (using imerge) 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 # Date: Thu Mar 21 22:47:11 2024 +0000 240s # 240s # On branch c-d-merge 240s # Changes to be committed: 240s # modified: conflict.txt 240s # modified: d.txt 240s # 240s [c-d-merge 5b843cf] Merge d into c (using imerge) 240s Date: Thu Mar 21 22:47:11 2024 +0000 240s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + local refname=c-d-merge 240s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git rev-parse c-d-merge^{tree} 240s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git-imerge simplify --goal=rebase --branch=c-d-rebase 240s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + local refname=c-d-rebase 240s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git rev-parse c-d-rebase^{tree} 240s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 240s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + local refname=c-d-rebase-with-history 240s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git rev-parse c-d-rebase-with-history^{tree} 240s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git-imerge simplify --goal=border --branch=c-d-border 240s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + local refname=c-d-border 240s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git rev-parse c-d-border^{tree} 240s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 240s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + local refname=c-d-border-with-history 240s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git rev-parse c-d-border-with-history^{tree} 240s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 240s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 241s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + local refname=c-d-border-with-history2 241s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git rev-parse c-d-border-with-history2^{tree} 241s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 241s + git-imerge remove 241s + git checkout c 241s Switched to branch 'c' 241s + + git-imergetee start --goal=full --first-parent --name=c-d d 241s start.out 241s Attempting to merge 1-1...success. 241s Attempting to merge 1-2...success. 241s Attempting to merge 1-3...success. 241s Attempting to merge 1-4...success. 241s Attempting to merge 1-5...success. 241s Attempting to merge 1-6...success. 241s Attempting to merge 2-1...success. 241s Attempting to merge 2-2...success. 241s Attempting to merge 2-3...success. 241s Attempting to merge 2-4...success. 241s Attempting to merge 2-5...success. 242s Attempting to merge 2-6...success. 242s Attempting to merge 3-1...success. 242s Attempting to merge 3-2...success. 242s Attempting to merge 3-3...success. 242s Attempting to merge 3-4...success. 242s Attempting to merge 3-5...success. 242s Attempting to merge 3-6...success. 242s Attempting to merge 4-1...success. 242s Attempting to merge 4-2...success. 242s Attempting to merge 4-3...success. 242s Attempting to merge 4-4...success. 242s Attempting to merge 4-5...success. 242s Attempting to merge 4-6...success. 242s Attempting to merge 5-1...success. 242s Attempting to merge 5-2...success. 242s Attempting to merge 5-3...success. 242s Attempting to merge 5-4...success. 242s Attempting to merge 5-5...success. 242s Attempting to merge 5-6...success. 242s Attempting to merge 6-1...success. 242s Attempting to merge 6-2...success. 242s Attempting to merge 6-3...success. 242s Attempting to merge 6-4...success. 242s Attempting to merge 6-5...success. 242s Attempting to merge 6-6...success. 242s Attempting to merge 7-1...success. 242s Attempting to merge 7-2...success. 242s Attempting to merge 7-3...success. 242s Attempting to merge 7-4...success. 242s Attempting to merge 7-5...success. 242s Attempting to merge 7-6...success. 242s Attempting to merge 8-1...success. 242s Attempting to merge 8-2...success. 242s Attempting to merge 8-3...success. 242s Attempting to merge 8-4...success. 243s Attempting to merge 8-5...success. 243s Attempting to merge 8-6...success. 243s Attempting to merge 9-1...conflict. 243s Switched to branch 'imerge/c-d' 243s Auto-merging conflict.txt 243s CONFLICT (content): Merge conflict in conflict.txt 243s Automatic merge failed; fix conflicts and then commit the result. 243s 243s Original first commit: 243s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 243s Author: Loú User 243s Date: Thu Apr 7 22:13:23 2005 +0000 243s 243s c⇒9 243s 243s Original second commit: 243s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 243s Author: Loú User 243s Date: Thu Apr 7 22:13:24 2005 +0000 243s 243s d⇒1 243s 243s There was a conflict merging commit 9-1, shown above. 243s Please resolve the conflict, commit the result, then type 243s 243s git-imerge continue 243s + grep -q Traceback start.out 243s + grep -q suggest manual merge of 9-1 autofill.out 243s + git-imerge diagram --commits --frontier --html=imerge3.html 243s 0 5 9 243s | | | 243s 0 - ********** - c 243s *........# 243s *........? 243s *........? 243s *........? 243s 5 - *........? 243s 6 - *........? 243s | 243s d 243s 243s 0 5 9 243s | | | 243s 0 - ********** - c 243s *.......|# 243s *.......|? 243s *.......|? 243s *.......|? 243s 5 - *.......|? 243s 6 - *-------+? 243s | 243s d 243s 243s Key: 243s |,-,+ = rectangles forming current merge frontier 243s * = merge done manually 243s . = merge done automatically 243s # = conflict that is currently blocking progress 243s @ = merge was blocked but has been resolved 243s ? = no merge recorded 243s 243s + echo merged version 243s + git add conflict.txt 243s + GIT_EDITOR=cat git commit 243s imerge 'c-d': manual merge 9-1 243s 243s # Conflicts: 243s # conflict.txt 243s # 243s # It looks like you may be committing a merge. 243s # If this is not correct, please run 243s # git update-ref -d MERGE_HEAD 243s # and try again. 243s 243s 243s # Please enter the commit message for your changes. Lines starting 243s # with '#' will be ignored, and an empty message aborts the commit. 243s # 243s # On branch imerge/c-d 243s # All conflicts fixed but you are still merging. 243s # 243s # Changes to be committed: 243s # modified: conflict.txt 243s # modified: d.txt 243s # 243s [imerge/c-d 504642a] imerge 'c-d': manual merge 9-1 243s + git-imerge continue --edit 243s Merge has been recorded for merge 9-1. 243s Attempting to merge 9-2...success. 243s Attempting to merge 9-3...success. 243s Attempting to merge 9-4...success. 243s Attempting to merge 9-5...success. 243s Attempting to merge 9-6...success. 243s Merge is complete! 243s + git-imerge diagram --commits --frontier --html=imerge4.html 243s 0 5 9 243s | | | 243s 0 - ********** - c 243s *........* 243s *......... 243s *......... 243s *......... 243s 5 - *......... 243s 6 - *......... 243s | 243s d 243s 243s 0 5 9 243s | | | 243s 0 - ********** - c 243s *........* 243s *........| 243s *........| 243s *........| 243s 5 - *........| 243s 6 - *--------+ 243s | 243s d 243s 243s Key: 243s |,-,+ = rectangles forming current merge frontier 243s * = merge done manually 243s . = merge done automatically 243s # = conflict that is currently blocking progress 243s @ = merge was blocked but has been resolved 243s ? = no merge recorded 243s 243s + git-imerge finish --branch=c-d-full 243s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + local refname=c-d-full 243s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + git rev-parse c-d-full^{tree} 243s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 243s + test_conflict 1-6 243s + local conflict=1-6 243s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s + DESCRIPTION=git-imerge test repository with conflict at 1-6 243s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 243s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s + local description=git-imerge test repository with conflict at 1-6 243s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 243s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s + local description=git-imerge test repository with conflict at 1-6 243s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s hint: Using 'master' as the name for the initial branch. This default branch name 243s hint: is subject to change. To configure the initial branch name to use in all 243s hint: of your new repositories, which will suppress this warning, call: 243s hint: 243s hint: git config --global init.defaultBranch 243s hint: 243s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 243s hint: 'development'. The just-created branch can be renamed via this command: 243s hint: 243s hint: git branch -m 243s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6/.git/ 243s + echo git-imerge test repository with conflict at 1-6 243s + printf %s\n /*.out /*.css /*.html 243s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6/.git config user.name Loú User 243s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 243s + TIME=1112911993 243s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-6 243s + modify c.txt 0 243s + filename=c.txt 243s + text=0 243s + echo 0 243s + git add c.txt 243s + modify d.txt 0 243s + filename=d.txt 243s + text=0 243s + echo 0 243s + git add d.txt 243s + modify conflict.txt original version 243s + filename=conflict.txt 243s + text=original version 243s + echo original version 243s + git add conflict.txt 243s + commit -m m⇒0 243s + TIME=1112911994 243s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 243s [master (root-commit) d70e04b] m⇒0 243s 3 files changed, 3 insertions(+) 243s create mode 100644 c.txt 243s create mode 100644 conflict.txt 243s create mode 100644 d.txt 243s + git checkout -b c master -- 243s Switched to a new branch 'c' 243s + seq 9 243s [c 2120f40] c⇒1 243s 2 files changed, 2 insertions(+), 2 deletions(-) 243s + modify c.txt 1 243s + filename=c.txt 243s + text=1 243s + echo 1 243s + git add c.txt 243s + modify conflict.txt c version 243s + filename=conflict.txt 243s + text=c version 243s + echo c version 243s + git add conflict.txt 243s + commit -m c⇒1 243s + TIME=1112911995 243s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 243s + modify c.txt 2 243s + filename=c.txt 243s + text=2 243s + echo 2 243s + git add c.txt 243s + commit -m c⇒2 243s + TIME=1112911996 243s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 243s [c 90cc7de] c⇒2 243s 1 file changed, 1 insertion(+), 1 deletion(-) 243s + modify c.txt 3 243s + filename=c.txt 243s + text=3 243s + echo 3 243s + git add c.txt 243s + commit -m c⇒3 243s + TIME=1112911997 243s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 243s [c 2046ed2] c⇒3 243s 1 file changed, 1 insertion(+), 1 deletion(-) 243s + modify c.txt 4 243s + filename=c.txt 243s + text=4 243s + echo 4 243s + git add c.txt 243s + commit -m c⇒4 243s + TIME=1112911998 243s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 243s [c 8a2cee9] c⇒4 243s 1 file changed, 1 insertion(+), 1 deletion(-) 243s + modify c.txt 5 243s + filename=c.txt 243s + text=5 243s + echo 5 243s + git add c.txt 244s + commit -m c⇒5 244s + TIME=1112911999 244s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 244s [c ac16a05] c⇒5 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify c.txt 6 244s + filename=c.txt 244s + text=6 244s + echo 6 244s + git add c.txt 244s + commit -m c⇒6 244s + TIME=1112912000 244s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 244s [c 30dd2ae] c⇒6 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify c.txt 7 244s + filename=c.txt 244s + text=7 244s + echo 7 244s + git add c.txt 244s + commit -m c⇒7 244s + TIME=1112912001 244s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 244s [c 0883eb9] c⇒7 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify c.txt 8 244s + filename=c.txt 244s + text=8 244s + echo 8 244s + git add c.txt 244s + commit -m c⇒8 244s + TIME=1112912002 244s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 244s [c f661c06] c⇒8 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify c.txt 9 244s + filename=c.txt 244s + text=9 244s + echo 9 244s + git add c.txt 244s + commit -m c⇒9 244s + TIME=1112912003 244s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 244s [c 243e8ed] c⇒9 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + git checkout -b d master -- 244s Switched to a new branch 'd' 244s + seq 6 244s + modify d.txt 1 244s + filename=d.txt 244s + text=1 244s + echo 1 244s + git add d.txt 244s + commit -m d⇒1 244s + TIME=1112912004 244s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 244s [d bd5368a] d⇒1 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify d.txt 2 244s + filename=d.txt 244s + text=2 244s + echo 2 244s + git add d.txt 244s + commit -m d⇒2 244s + TIME=1112912005 244s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 244s [d 93e27e6] d⇒2 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify d.txt 3 244s + filename=d.txt 244s + text=3 244s + echo 3 244s + git add d.txt 244s + commit -m d⇒3 244s + TIME=1112912006 244s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 244s [d 133f385] d⇒3 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify d.txt 4 244s + filename=d.txt 244s + text=4 244s + echo 4 244s + git add d.txt 244s + commit -m d⇒4 244s + TIME=1112912007 244s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 244s [d 586472a] d⇒4 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify d.txt 5 244s + filename=d.txt 244s + text=5 244s + echo 5 244s + git add d.txt 244s + commit -m d⇒5 244s + TIME=1112912008 244s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 244s [d 9522207] d⇒5 244s 1 file changed, 1 insertion(+), 1 deletion(-) 244s + modify d.txt 6 244s + filename=d.txt 244s + text=6 244s + echo 6 244s + git add d.txt 244s + modify conflict.txt d version 244s + filename=conflict.txt 244s + text=d version 244s + echo d version 244s + git add conflict.txt 244s + commit -m d⇒6 244s + TIME=1112912009 244s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 244s [d f7e451a] d⇒6 244s 2 files changed, 2 insertions(+), 2 deletions(-) 244s + git checkout c 244s Switched to branch 'c' 244s + git-imerge init --name=c-d d 244s + git-imerge list 244s * c-d 244s + git-imerge diagram --commits --frontier --html=imerge0.html 244s 0 5 9 244s | | | 244s 0 - ********** - c 244s *????????? 244s *????????? 244s *????????? 244s *????????? 244s 5 - *????????? 244s 6 - *????????? 244s | 244s d 244s 244s 0 5 9 244s | | | 244s 0 - ********** - c 244s *????????? 244s *????????? 244s *????????? 244s *????????? 244s 5 - *????????? 244s 6 - *????????? 244s | 244s d 244s 244s Key: 244s |,-,+ = rectangles forming current merge frontier 244s * = merge done manually 244s . = merge done automatically 244s # = conflict that is currently blocking progress 244s @ = merge was blocked but has been resolved 244s ? = no merge recorded 244s 244s + + git-imergetee autofill autofill.out 244s 244s Attempting automerge of 9-6...failure. 244s Attempting automerge of 1-1...success. 244s Attempting automerge of 1-4...success. 244s Attempting automerge of 1-6...failure. 244s Attempting automerge of 1-5...success. 244s Attempting automerge of 9-5...success. 244s Autofilling 1-5...success. 244s Autofilling 2-5...success. 244s Autofilling 3-5...success. 244s Autofilling 4-5...success. 244s Autofilling 5-5...success. 244s Autofilling 6-5...success. 244s Autofilling 7-5...success. 244s Autofilling 8-5...success. 244s Autofilling 9-1...success. 244s Autofilling 9-2...success. 244s Autofilling 9-3...success. 244s Autofilling 9-4...success. 244s Autofilling 9-5 (first way)...success. 244s Autofilling 9-5 (second way)...success. 245s The two ways of autofilling 9-5 agree. 245s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 245s Attempting automerge of 9-6...failure. 245s Attempting automerge of 1-6...failure. 245s HEAD is now at 243e8ed c⇒9 245s Conflict; suggest manual merge of 1-6 245s + grep -q Traceback autofill.out 245s + grep -q suggest manual merge of 1-6 autofill.out 245s + git-imerge diagram --commits --frontier --html=imerge1.html 245s 0 5 9 245s | | | 245s 0 - ********** - c 245s *????????. 245s *????????. 245s *????????. 245s *????????. 245s 5 - *......... 245s 6 - *#???????? 245s | 245s d 245s 245s 0 5 9 245s | | | 245s 0 - ********** - c 245s *????????| 245s *????????| 245s *????????| 245s *????????| 245s 5 - *--------+ 245s 6 - *#???????? 245s | 245s d 245s 245s Key: 245s |,-,+ = rectangles forming current merge frontier 245s * = merge done manually 245s . = merge done automatically 245s # = conflict that is currently blocking progress 245s @ = merge was blocked but has been resolved 245s ? = no merge recorded 245s 245s + git-imerge continue --edit 245s Switched to branch 'imerge/c-d' 245s Auto-merging conflict.txt 245s CONFLICT (content): Merge conflict in conflict.txt 245s Automatic merge failed; fix conflicts and then commit the result. 245s 245s Original first commit: 245s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 245s Author: Loú User 245s Date: Thu Apr 7 22:13:15 2005 +0000 245s 245s c⇒1 245s 245s Original second commit: 245s commit f7e451a6c9656dda15641a9fbc591a602f158692 245s Author: Loú User 245s Date: Thu Apr 7 22:13:29 2005 +0000 245s 245s d⇒6 245s 245s There was a conflict merging commit 1-6, shown above. 245s Please resolve the conflict, commit the result, then type 245s 245s git-imerge continue 245s + echo merged version 245s + git add conflict.txt 245s + git-imerge continue --no-edit 245s [imerge/c-d e14f3d3] imerge 'c-d': manual merge 1-6 245s Merge has been recorded for merge 1-6. 245s Attempting automerge of 9-6...success. 245s Autofilling 2-6...success. 245s Autofilling 3-6...success. 245s Autofilling 4-6...success. 245s Autofilling 5-6...success. 245s Autofilling 6-6...success. 245s Autofilling 7-6...success. 245s Autofilling 8-6...success. 245s Autofilling 9-6...success. 245s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 245s Merge is complete! 245s + git-imerge diagram --commits --frontier --html=imerge2.html 245s 0 5 9 245s | | | 245s 0 - ********** - c 245s *????????. 245s *????????. 245s *????????. 245s *????????. 245s 5 - *......... 245s 6 - **........ 245s | 245s d 245s 245s 0 5 9 245s | | | 245s 0 - ********** - c 245s *????????| 245s *????????| 245s *????????| 245s *????????| 245s 5 - *........| 245s 6 - **-------+ 245s | 245s d 245s 245s Key: 245s |,-,+ = rectangles forming current merge frontier 245s * = merge done manually 245s . = merge done automatically 245s # = conflict that is currently blocking progress 245s @ = merge was blocked but has been resolved 245s ? = no merge recorded 245s 245s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 246s Merge d into c (using imerge) 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 # Date: Thu Mar 21 22:47:18 2024 +0000 246s # 246s # On branch c-d-merge 246s # Changes to be committed: 246s # modified: conflict.txt 246s # modified: d.txt 246s # 246s [c-d-merge d3f81f7] Merge d into c (using imerge) 246s Date: Thu Mar 21 22:47:18 2024 +0000 246s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + local refname=c-d-merge 246s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git rev-parse c-d-merge^{tree} 246s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git-imerge simplify --goal=rebase --branch=c-d-rebase 246s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + local refname=c-d-rebase 246s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git rev-parse c-d-rebase^{tree} 246s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 246s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + local refname=c-d-rebase-with-history 246s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git rev-parse c-d-rebase-with-history^{tree} 246s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 246s + git-imerge simplify --goal=border --branch=c-d-border 247s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 247s + local refname=c-d-border 247s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 247s + git rev-parse c-d-border^{tree} 247s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 247s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 247s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 247s + local refname=c-d-border-with-history 247s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 247s + git rev-parse c-d-border-with-history^{tree} 247s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 247s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 248s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + local refname=c-d-border-with-history2 248s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git rev-parse c-d-border-with-history2^{tree} 248s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 248s + git-imerge remove 248s + git checkout c 248s Switched to branch 'c' 248s + git-imerge start --goal=full --first-parent --name=c-d d 248s + tee start.out 248s Attempting to merge 1-1...success. 248s Attempting to merge 1-2...success. 248s Attempting to merge 1-3...success. 248s Attempting to merge 1-4...success. 248s Attempting to merge 1-5...success. 248s Attempting to merge 1-6...conflict. 248s Attempting to merge 2-1...success. 248s Attempting to merge 2-2...success. 248s Attempting to merge 2-3...success. 248s Attempting to merge 2-4...success. 248s Attempting to merge 2-5...success. 248s Attempting to merge 3-1...success. 248s Attempting to merge 3-2...success. 248s Attempting to merge 3-3...success. 248s Attempting to merge 3-4...success. 248s Attempting to merge 3-5...success. 248s Attempting to merge 4-1...success. 248s Attempting to merge 4-2...success. 248s Attempting to merge 4-3...success. 248s Attempting to merge 4-4...success. 248s Attempting to merge 4-5...success. 248s Attempting to merge 5-1...success. 249s Attempting to merge 5-2...success. 249s Attempting to merge 5-3...success. 249s Attempting to merge 5-4...success. 249s Attempting to merge 5-5...success. 249s Attempting to merge 6-1...success. 249s Attempting to merge 6-2...success. 249s Attempting to merge 6-3...success. 249s Attempting to merge 6-4...success. 249s Attempting to merge 6-5...success. 249s Attempting to merge 7-1...success. 249s Attempting to merge 7-2...success. 249s Attempting to merge 7-3...success. 249s Attempting to merge 7-4...success. 249s Attempting to merge 7-5...success. 249s Attempting to merge 8-1...success. 249s Attempting to merge 8-2...success. 249s Attempting to merge 8-3...success. 249s Attempting to merge 8-4...success. 249s Attempting to merge 8-5...success. 249s Attempting to merge 9-1...success. 249s Attempting to merge 9-2...success. 249s Attempting to merge 9-3...success. 249s Attempting to merge 9-4...success. 249s Attempting to merge 9-5...success. 249s Previous HEAD position was f382d39 imerge 'c-d': automatic merge 9-5 249s Switched to branch 'imerge/c-d' 249s Auto-merging conflict.txt 249s CONFLICT (content): Merge conflict in conflict.txt 249s Automatic merge failed; fix conflicts and then commit the result. 249s 249s Original first commit: 249s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 249s Author: Loú User 249s Date: Thu Apr 7 22:13:15 2005 +0000 249s 249s c⇒1 249s 249s Original second commit: 249s commit f7e451a6c9656dda15641a9fbc591a602f158692 249s Author: Loú User 249s Date: Thu Apr 7 22:13:29 2005 +0000 249s 249s d⇒6 249s 249s There was a conflict merging commit 1-6, shown above. 249s Please resolve the conflict, commit the result, then type 249s 249s git-imerge continue 249s + grep -q Traceback start.out 249s + grep -q suggest manual merge of 1-6 autofill.out 249s + git-imerge diagram --commits --frontier --html=imerge3.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 + echo merged version 249s + git add conflict.txt 249s + GIT_EDITOR=cat git commit 249s imerge 'c-d': manual merge 1-6 249s 249s # Conflicts: 249s # conflict.txt 249s # 249s # It looks like you may be committing a merge. 249s # If this is not correct, please run 249s # git update-ref -d MERGE_HEAD 249s # and try again. 249s 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 # On branch imerge/c-d 249s # All conflicts fixed but you are still merging. 249s # 249s # Changes to be committed: 249s # modified: conflict.txt 249s # modified: d.txt 249s # 249s [imerge/c-d 35360e2] imerge 'c-d': manual merge 1-6 249s + git-imerge continue --edit 250s Merge has been recorded for merge 1-6. 250s Attempting to merge 2-6...success. 250s Attempting to merge 3-6...success. 250s Attempting to merge 4-6...success. 250s Attempting to merge 5-6...success. 250s Attempting to merge 6-6...success. 250s Attempting to merge 7-6...success. 250s Attempting to merge 8-6...success. 250s Attempting to merge 9-6...success. 250s Merge is complete! 250s + git-imerge diagram --commits --frontier --html=imerge4.html 250s 0 5 9 250s | | | 250s 0 - ********** - c 250s *......... 250s *......... 250s *......... 250s *......... 250s 5 - *......... 250s 6 - **........ 250s | 250s d 250s 250s 0 5 9 250s | | | 250s 0 - ********** - c 250s *........| 250s *........| 250s *........| 250s *........| 250s 5 - *........| 250s 6 - **-------+ 250s | 250s d 250s 250s Key: 250s |,-,+ = rectangles forming current merge frontier 250s * = merge done manually 250s . = merge done automatically 250s # = conflict that is currently blocking progress 250s @ = merge was blocked but has been resolved 250s ? = no merge recorded 250s 250s + git-imerge finish --branch=c-d-full 250s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + local refname=c-d-full 250s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + git rev-parse c-d-full^{tree} 250s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 250s + test_conflict 9-6 250s + local conflict=9-6 250s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 250s + DESCRIPTION=git-imerge test repository with conflict at 9-6 250s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 250s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 250s + local description=git-imerge test repository with conflict at 9-6 250s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 250s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 250s + local description=git-imerge test repository with conflict at 9-6 250s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 250s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 250s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 250s hint: Using 'master' as the name for the initial branch. This default branch name 250s hint: is subject to change. To configure the initial branch name to use in all 250s hint: of your new repositories, which will suppress this warning, call: 250s hint: 250s hint: git config --global init.defaultBranch 250s hint: 250s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 250s hint: 'development'. The just-created branch can be renamed via this command: 250s hint: 250s hint: git branch -m 250s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6/.git/ 250s + echo git-imerge test repository with conflict at 9-6 250s + printf %s\n /*.out /*.css /*.html 250s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6/.git config user.name Loú User 251s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 251s + TIME=1112911993 251s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 251s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-6 251s + modify c.txt 0 251s + filename=c.txt 251s + text=0 251s + echo 0 251s + git add c.txt 251s + modify d.txt 0 251s + filename=d.txt 251s + text=0 251s + echo 0 251s + git add d.txt 251s + modify conflict.txt original version 251s + filename=conflict.txt 251s + text=original version 251s + echo original version 251s + git add conflict.txt 251s + commit -m m⇒0 251s + TIME=1112911994 251s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 251s [master (root-commit) d70e04b] m⇒0 251s 3 files changed, 3 insertions(+) 251s create mode 100644 c.txt 251s create mode 100644 conflict.txt 251s create mode 100644 d.txt 251s [c 89e2141] c⇒1 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c 7c431f2] c⇒2 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c f02ab24] c⇒3 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c ed9122f] c⇒4 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c 1d3bf09] c⇒5 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c f999ecd] c⇒6 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c 7050a8a] c⇒7 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s [c 9732e77] c⇒8 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + git checkout -b c master -- 251s Switched to a new branch 'c' 251s + seq 9 251s + modify c.txt 1 251s + filename=c.txt 251s + text=1 251s + echo 1 251s + git add c.txt 251s + commit -m c⇒1 251s + TIME=1112911995 251s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 251s + modify c.txt 2 251s + filename=c.txt 251s + text=2 251s + echo 2 251s + git add c.txt 251s + commit -m c⇒2 251s + TIME=1112911996 251s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 251s + modify c.txt 3 251s + filename=c.txt 251s + text=3 251s + echo 3 251s + git add c.txt 251s + commit -m c⇒3 251s + TIME=1112911997 251s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 251s + modify c.txt 4 251s + filename=c.txt 251s + text=4 251s + echo 4 251s + git add c.txt 251s + commit -m c⇒4 251s + TIME=1112911998 251s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 251s + modify c.txt 5 251s + filename=c.txt 251s + text=5 251s + echo 5 251s + git add c.txt 251s + commit -m c⇒5 251s + TIME=1112911999 251s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 251s + modify c.txt 6 251s + filename=c.txt 251s + text=6 251s + echo 6 251s + git add c.txt 251s + commit -m c⇒6 251s + TIME=1112912000 251s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 251s + modify c.txt 7 251s + filename=c.txt 251s + text=7 251s + echo 7 251s + git add c.txt 251s + commit -m c⇒7 251s + TIME=1112912001 251s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 251s + modify c.txt 8 251s + filename=c.txt 251s + text=8 251s + echo 8 251s + git add c.txt 251s + commit -m c⇒8 251s + TIME=1112912002 251s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 251s + modify c.txt 9 251s + filename=c.txt 251s + text=9 251s + echo 9 251s + git add c.txt 251s + modify conflict.txt c version 251s + filename=conflict.txt 251s + text=c version 251s + echo c version 251s + git add conflict.txt 251s + commit -m c⇒9 251s + TIME=1112912003 251s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 251s [c 73a5eed] c⇒9 251s 2 files changed, 2 insertions(+), 2 deletions(-) 251s + git checkout -b d master -- 251s Switched to a new branch 'd' 251s + seq 6 251s + modify d.txt 1 251s + filename=d.txt 251s + text=1 251s + echo 1 251s + git add d.txt 251s + commit -m d⇒1 251s + TIME=1112912004 251s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 251s [d bd5368a] d⇒1 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify d.txt 2 251s + filename=d.txt 251s + text=2 251s + echo 2 251s + git add d.txt 251s + commit -m d⇒2 251s [d 93e27e6] d⇒2 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + TIME=1112912005 251s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 251s + modify d.txt 3 251s + filename=d.txt 251s + text=3 251s + echo 3 251s + git add d.txt 251s + commit -m d⇒3 251s + TIME=1112912006 251s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 251s [d 133f385] d⇒3 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify d.txt 4 251s + filename=d.txt 251s + text=4 251s + echo 4 251s + git add d.txt 251s + commit -m d⇒4 251s + TIME=1112912007 251s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 251s [d 586472a] d⇒4 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify d.txt 5 251s + filename=d.txt 251s + text=5 251s + echo 5 251s + git add d.txt 251s + commit -m d⇒5 251s + TIME=1112912008 251s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 251s [d 9522207] d⇒5 251s 1 file changed, 1 insertion(+), 1 deletion(-) 251s + modify d.txt 6 251s + filename=d.txt 251s + text=6 251s + echo 6 251s + git add d.txt 251s + modify conflict.txt d version 251s + filename=conflict.txt 251s + text=d version 251s + echo d version 251s + git add conflict.txt 251s + commit -m d⇒6 251s + TIME=1112912009 251s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 251s [d f7e451a] d⇒6 251s 2 files changed, 2 insertions(+), 2 deletions(-) 251s + git checkout c 251s Switched to branch 'c' 251s + git-imerge init --name=c-d d 251s + git-imerge list 251s * c-d 251s + git-imerge diagram --commits --frontier --html=imerge0.html 251s 0 5 9 251s | | | 251s 0 - ********** - c 251s *????????? 251s *????????? 251s *????????? 251s *????????? 251s 5 - *????????? 251s 6 - *????????? 251s | 251s d 251s 251s 0 5 9 251s | | | 251s 0 - ********** - c 251s *????????? 251s *????????? 251s *????????? 251s *????????? 251s 5 - *????????? 251s 6 - *????????? 251s | 251s d 251s 251s Key: 251s |,-,+ = rectangles forming current merge frontier 251s * = merge done manually 251s . = merge done automatically 251s # = conflict that is currently blocking progress 251s @ = merge was blocked but has been resolved 251s ? = no merge recorded 251s 251s + git-imerge autofill 251s + tee autofill.out 251s Attempting automerge of 9-6...failure. 251s Attempting automerge of 1-1...success. 251s Attempting automerge of 1-4...success. 251s Attempting automerge of 1-6...success. 251s Attempting automerge of 9-6...failure. 251s Attempting automerge of 5-6...success. 251s Attempting automerge of 7-6...success. 251s Attempting automerge of 8-6...success. 251s Attempting automerge of 9-1...success. 251s Attempting automerge of 9-4...success. 251s Attempting automerge of 9-5...success. 251s Autofilling 1-6...success. 251s Autofilling 2-6...success. 251s Autofilling 3-6...success. 251s Autofilling 4-6...success. 252s Autofilling 5-6...success. 252s Autofilling 6-6...success. 252s Autofilling 7-6...success. 252s Autofilling 8-1...success. 252s Autofilling 8-2...success. 252s Autofilling 8-3...success. 252s Autofilling 8-4...success. 252s Autofilling 8-5...success. 252s Autofilling 8-6 (first way)...success. 252s Autofilling 8-6 (second way)...success. 252s The two ways of autofilling 8-6 agree. 252s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 252s Autofilling 9-1...success. 252s Autofilling 9-2...success. 252s Autofilling 9-3...success. 252s Autofilling 9-4...success. 252s Autofilling 9-5...success. 252s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 252s Attempting automerge of 9-6...failure. 252s Attempting automerge of 9-6...failure. 252s HEAD is now at 73a5eed c⇒9 252s Conflict; suggest manual merge of 9-6 252s + grep -q Traceback autofill.out 252s + grep -q suggest manual merge of 9-6 autofill.out 252s + git-imerge diagram --commits --frontier --html=imerge1.html 252s 0 5 9 252s | | | 252s 0 - ********** - c 252s *???????.. 252s *???????.. 252s *???????.. 252s *???????.. 252s 5 - *???????.. 252s 6 - *........# 252s | 252s d 252s 252s 0 5 9 252s | | | 252s 0 - ********** - c 252s *???????.| 252s *???????.| 252s *???????.| 252s *???????.| 252s 5 - *???????.+ 252s 6 - *-------+# 252s | 252s d 252s 252s Key: 252s |,-,+ = rectangles forming current merge frontier 252s * = merge done manually 252s . = merge done automatically 252s # = conflict that is currently blocking progress 252s @ = merge was blocked but has been resolved 252s ? = no merge recorded 252s 252s + git-imerge continue --edit 252s 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 73a5eedb087a0f656d730831b8def7943b40f3cf 252s Author: Loú User 252s Date: Thu Apr 7 22:13:23 2005 +0000 252s 252s c⇒9 252s 252s Original second commit: 252s commit f7e451a6c9656dda15641a9fbc591a602f158692 252s Author: Loú User 252s Date: Thu Apr 7 22:13:29 2005 +0000 252s 252s d⇒6 252s 252s There was a conflict merging commit 9-6, shown above. 252s Please resolve the conflict, commit the result, then type 252s 252s git-imerge continue 252s + echo merged version 252s + git add conflict.txt 252s + git-imerge continue --no-edit 252s [imerge/c-d 245a8be] imerge 'c-d': manual merge 9-6 252s Merge has been recorded for merge 9-6. 252s Merge is complete! 252s + git-imerge diagram --commits --frontier --html=imerge2.html 253s 0 5 9 253s | | | 253s 0 - ********** - c 253s *???????.. 253s *???????.. 253s *???????.. 253s *???????.. 253s 5 - *???????.. 253s 6 - *........* 253s | 253s d 253s 253s 0 5 9 253s | | | 253s 0 - ********** - c 253s *???????.| 253s *???????.| 253s *???????.| 253s *???????.| 253s 5 - *???????.| 253s 6 - *--------* 253s | 253s d 253s 253s Key: 253s |,-,+ = rectangles forming current merge frontier 253s * = merge done manually 253s . = merge done automatically 253s # = conflict that is currently blocking progress 253s @ = merge was blocked but has been resolved 253s ? = no merge recorded 253s 253s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 253s Merge d into c (using imerge) 253s 253s # Please enter the commit message for your changes. Lines starting 253s # with '#' will be ignored, and an empty message aborts the commit. 253s # 253s # Date: Thu Mar 21 22:47:25 2024 +0000 253s # 253s # On branch c-d-merge 253s # Changes to be committed: 253s # modified: conflict.txt 253s # modified: d.txt 253s # 253s [c-d-merge 1e075d5] Merge d into c (using imerge) 253s Date: Thu Mar 21 22:47:25 2024 +0000 253s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-merge 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-merge^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=rebase --branch=c-d-rebase 253s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-rebase 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-rebase^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 253s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + local refname=c-d-rebase-with-history 253s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git rev-parse c-d-rebase-with-history^{tree} 253s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 253s + git-imerge simplify --goal=border --branch=c-d-border 254s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + local refname=c-d-border 254s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + git rev-parse c-d-border^{tree} 254s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 254s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + local refname=c-d-border-with-history 254s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + git rev-parse c-d-border-with-history^{tree} 254s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 254s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + local refname=c-d-border-with-history2 254s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + git rev-parse c-d-border-with-history2^{tree} 254s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 254s + git-imerge remove 255s + git checkout c 255s Switched to branch 'c' 255s + + git-imerge start --goal=full --first-parent --name=c-d dtee 255s start.out 255s Attempting to merge 1-1...success. 255s Attempting to merge 1-2...success. 255s Attempting to merge 1-3...success. 255s Attempting to merge 1-4...success. 255s Attempting to merge 1-5...success. 255s Attempting to merge 1-6...success. 255s Attempting to merge 2-1...success. 255s Attempting to merge 2-2...success. 255s Attempting to merge 2-3...success. 255s Attempting to merge 2-4...success. 255s Attempting to merge 2-5...success. 255s Attempting to merge 2-6...success. 255s Attempting to merge 3-1...success. 255s Attempting to merge 3-2...success. 255s Attempting to merge 3-3...success. 255s Attempting to merge 3-4...success. 255s Attempting to merge 3-5...success. 255s Attempting to merge 3-6...success. 255s Attempting to merge 4-1...success. 255s Attempting to merge 4-2...success. 255s Attempting to merge 4-3...success. 255s Attempting to merge 4-4...success. 255s Attempting to merge 4-5...success. 255s Attempting to merge 4-6...success. 255s Attempting to merge 5-1...success. 255s Attempting to merge 5-2...success. 255s Attempting to merge 5-3...success. 255s Attempting to merge 5-4...success. 255s Attempting to merge 5-5...success. 256s Attempting to merge 5-6...success. 256s Attempting to merge 6-1...success. 256s Attempting to merge 6-2...success. 256s Attempting to merge 6-3...success. 256s Attempting to merge 6-4...success. 256s Attempting to merge 6-5...success. 256s Attempting to merge 6-6...success. 256s Attempting to merge 7-1...success. 256s Attempting to merge 7-2...success. 256s Attempting to merge 7-3...success. 256s Attempting to merge 7-4...success. 256s Attempting to merge 7-5...success. 256s Attempting to merge 7-6...success. 256s Attempting to merge 8-1...success. 256s Attempting to merge 8-2...success. 256s Attempting to merge 8-3...success. 256s Attempting to merge 8-4...success. 256s Attempting to merge 8-5...success. 256s Attempting to merge 8-6...success. 256s Attempting to merge 9-1...success. 256s Attempting to merge 9-2...success. 256s Attempting to merge 9-3...success. 256s Attempting to merge 9-4...success. 256s Attempting to merge 9-5...success. 256s Attempting to merge 9-6...conflict. 256s Switched to branch 'imerge/c-d' 256s Auto-merging conflict.txt 256s CONFLICT (content): Merge conflict in conflict.txt 256s Automatic merge failed; fix conflicts and then commit the result. 256s 256s Original first commit: 256s + grep -q Traceback start.out 256s + grep -q suggest manual merge of 9-6 autofill.out 256s + git-imerge diagram --commits --frontier --html=imerge3.html 256s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 256s Author: Loú User 256s Date: Thu Apr 7 22:13:23 2005 +0000 256s 256s c⇒9 256s 256s Original second commit: 256s commit f7e451a6c9656dda15641a9fbc591a602f158692 256s Author: Loú User 256s Date: Thu Apr 7 22:13:29 2005 +0000 256s 256s d⇒6 256s 256s There was a conflict merging commit 9-6, shown above. 256s Please resolve the conflict, commit the result, then type 256s 256s git-imerge continue 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 + echo merged version 256s + git add conflict.txt 256s + GIT_EDITOR=cat git commit 256s imerge 'c-d': manual merge 9-6 256s 256s # Conflicts: 256s # conflict.txt 256s # 256s # It looks like you may be committing a merge. 256s # If this is not correct, please run 256s # git update-ref -d MERGE_HEAD 256s # and try again. 256s 256s 256s # Please enter the commit message for your changes. Lines starting 256s # with '#' will be ignored, and an empty message aborts the commit. 256s # 256s # On branch imerge/c-d 256s # All conflicts fixed but you are still merging. 256s # 256s # Changes to be committed: 256s # modified: conflict.txt 256s # modified: d.txt 256s # 256s [imerge/c-d 5a83646] imerge 'c-d': manual merge 9-6 256s + git-imerge continue --edit 256s Merge has been recorded for merge 9-6. 257s Merge is complete! 257s + git-imerge diagram --commits --frontier --html=imerge4.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 finish --branch=c-d-full 257s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + local refname=c-d-full 257s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + git rev-parse c-d-full^{tree} 257s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 257s + test_conflict 1-2 257s + local conflict=1-2 257s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s + DESCRIPTION=git-imerge test repository with conflict at 1-2 257s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 257s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s + local description=git-imerge test repository with conflict at 1-2 257s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 257s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s + local description=git-imerge test repository with conflict at 1-2 257s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s hint: Using 'master' as the name for the initial branch. This default branch name 257s hint: is subject to change. To configure the initial branch name to use in all 257s hint: of your new repositories, which will suppress this warning, call: 257s hint: 257s hint: git config --global init.defaultBranch 257s hint: 257s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 257s hint: 'development'. The just-created branch can be renamed via this command: 257s hint: 257s hint: git branch -m 257s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2/.git/ 257s + echo git-imerge test repository with conflict at 1-2 257s + printf %s\n /*.out /*.css /*.html 257s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2/.git config user.name Loú User 257s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 257s + TIME=1112911993 257s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-1-2 257s + modify c.txt 0 257s + filename=c.txt 257s + text=0 257s + echo 0 257s + git add c.txt 257s + modify d.txt 0 257s + filename=d.txt 257s + text=0 257s + echo 0 257s + git add d.txt 257s + modify conflict.txt original version 257s + filename=conflict.txt 257s + text=original version 257s + echo original version 257s + git add conflict.txt 257s + commit -m m⇒0 257s + TIME=1112911994 257s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 257s [master (root-commit) d70e04b] m⇒0 257s 3 files changed, 3 insertions(+) 257s create mode 100644 c.txt 257s create mode 100644 conflict.txt 257s create mode 100644 d.txt 257s [c 2120f40] c⇒1 257s 2 files changed, 2 insertions(+), 2 deletions(-) 257s + git checkout -b c master -- 257s Switched to a new branch 'c' 257s + seq 9 257s + modify c.txt 1 257s + filename=c.txt 257s + text=1 257s + echo 1 257s + git add c.txt 257s + modify conflict.txt c version 257s + filename=conflict.txt 257s + text=c version 257s + echo c version 257s + git add conflict.txt 257s + commit -m c⇒1 257s + TIME=1112911995 257s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 257s + modify c.txt 2 257s + filename=c.txt 257s + text=2 257s + echo 2 257s + git add c.txt 257s + commit -m c⇒2 257s + TIME=1112911996 257s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 257s [c 90cc7de] c⇒2 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify c.txt 3 257s + filename=c.txt 257s + text=3 257s + echo 3 257s + git add c.txt 257s + commit -m c⇒3 257s + TIME=1112911997 257s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 257s [c 2046ed2] c⇒3 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify c.txt 4 257s + filename=c.txt 257s + text=4 257s + echo 4 257s + git add c.txt 257s + commit -m c⇒4 257s + TIME=1112911998 257s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 257s [c 8a2cee9] c⇒4 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify c.txt 5 257s + filename=c.txt 257s + text=5 257s + echo 5 257s + git add c.txt 257s + commit -m c⇒5 257s + TIME=1112911999 257s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 257s [c ac16a05] c⇒5 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify c.txt 6 257s + filename=c.txt 257s + text=6 257s + echo 6 257s + git add c.txt 257s + commit -m c⇒6 257s + TIME=1112912000 257s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 257s [c 30dd2ae] c⇒6 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify c.txt 7 257s + filename=c.txt 257s + text=7 257s + echo 7 257s + git add c.txt 257s [c 0883eb9] c⇒7 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s [c f661c06] c⇒8 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s [c 243e8ed] c⇒9 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + commit -m c⇒7 257s + TIME=1112912001 257s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 257s + modify c.txt 8 257s + filename=c.txt 257s + text=8 257s + echo 8 257s + git add c.txt 257s + commit -m c⇒8 257s + TIME=1112912002 257s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 257s + modify c.txt 9 257s + filename=c.txt 257s + text=9 257s + echo 9 257s + git add c.txt 257s + commit -m c⇒9 257s + TIME=1112912003 257s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 257s + git checkout -b d master -- 257s Switched to a new branch 'd' 257s + seq 6 257s + modify d.txt 1 257s + filename=d.txt 257s + text=1 257s + echo 1 257s + git add d.txt 257s + commit -m d⇒1 257s + TIME=1112912004 257s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 257s [d bd5368a] d⇒1 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify d.txt 2 257s + filename=d.txt 257s + text=2 257s + echo 2 257s + git add d.txt 257s + modify conflict.txt d version 257s + filename=conflict.txt 257s + text=d version 257s + echo d version 257s + git add conflict.txt 257s + commit -m d⇒2 257s + TIME=1112912005 257s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 257s + modify d.txt 3 257s + filename=d.txt 257s + text=3 257s + echo 3 257s + git add d.txt 257s [d 69efde8] d⇒2 257s 2 files changed, 2 insertions(+), 2 deletions(-) 257s + commit -m d⇒3 257s + TIME=1112912006 257s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 257s [d 3169557] d⇒3 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify d.txt 4 257s + filename=d.txt 257s + text=4 257s + echo 4 257s + git add d.txt 257s + commit -m d⇒4 257s + TIME=1112912007 257s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 257s [d 86c8052] d⇒4 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + modify d.txt 5 257s + filename=d.txt 257s + text=5 257s + echo 5 257s + git add d.txt 257s + commit -m d⇒5 257s + TIME=1112912008 257s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 257s + modify d.txt 6 257s + filename=d.txt 257s + text=6 257s + echo 6 257s + git add d.txt 257s [d 1700773] d⇒5 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + commit -m d⇒6 257s + TIME=1112912009 257s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 257s [d df2e493] d⇒6 257s 1 file changed, 1 insertion(+), 1 deletion(-) 257s + git checkout c 257s Switched to branch 'c' 257s + git-imerge init --name=c-d d 258s + git-imerge list 258s * c-d 258s + git-imerge diagram --commits --frontier --html=imerge0.html 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 + + git-imergetee autofill 258s autofill.out 258s Attempting automerge of 9-6...failure. 258s Attempting automerge of 1-1...success. 258s Attempting automerge of 1-4...failure. 258s Attempting automerge of 1-3...failure. 258s Attempting automerge of 1-2...failure. 258s Attempting automerge of 9-1...success. 258s Autofilling 1-1...success. 258s Autofilling 2-1...success. 258s Autofilling 3-1...success. 258s Autofilling 4-1...success. 258s Autofilling 5-1...success. 258s Autofilling 6-1...success. 258s Autofilling 7-1...success. 258s Autofilling 8-1...success. 258s Autofilling 9-1...success. 258s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 258s Attempting automerge of 9-6...failure. 259s Attempting automerge of 1-2...failure. 259s HEAD is now at 243e8ed c⇒9 259s Conflict; suggest manual merge of 1-2 259s + grep -q Traceback autofill.out 259s + grep -q suggest manual merge of 1-2 autofill.out 259s + git-imerge diagram --commits --frontier --html=imerge1.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 continue --edit 259s Switched to branch 'imerge/c-d' 259s Auto-merging conflict.txt 259s CONFLICT (content): Merge conflict in conflict.txt 259s Automatic merge failed; fix conflicts and then commit the result. 259s 259s Original first commit: 259s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 259s Author: Loú User 259s Date: Thu Apr 7 22:13:15 2005 +0000 259s 259s c⇒1 259s 259s Original second commit: 259s commit 69efde8f66d581a765a3909ffacb9f895f95c345 259s Author: Loú User 259s Date: Thu Apr 7 22:13:25 2005 +0000 259s 259s d⇒2 259s 259s There was a conflict merging commit 1-2, shown above. 259s Please resolve the conflict, commit the result, then type 259s 259s git-imerge continue 259s + echo merged version 259s + git add conflict.txt 259s + git-imerge continue --no-edit 259s [imerge/c-d 8cbdddf] imerge 'c-d': manual merge 1-2 259s Merge has been recorded for merge 1-2. 259s Attempting automerge of 1-6...success. 259s Autofilling 1-3...success. 259s Autofilling 1-4...success. 259s Autofilling 1-5...success. 259s Autofilling 1-6...success. 259s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 259s Attempting automerge of 9-6...success. 259s Autofilling 2-6...success. 259s Autofilling 3-6...success. 259s Autofilling 4-6...success. 259s Autofilling 5-6...success. 259s Autofilling 6-6...success. 259s Autofilling 7-6...success. 259s Autofilling 8-6...success. 259s Autofilling 9-2...success. 259s Autofilling 9-3...success. 259s Autofilling 9-4...success. 259s Autofilling 9-5...success. 259s Autofilling 9-6 (first way)...success. 259s Autofilling 9-6 (second way)...success. 259s The two ways of autofilling 9-6 agree. 259s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 259s Merge is complete! 259s + git-imerge diagram --commits --frontier --html=imerge2.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_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 260s Merge d into c (using imerge) 260s 260s # Please enter the commit message for your changes. Lines starting 260s # with '#' will be ignored, and an empty message aborts the commit. 260s # 260s # Date: Thu Mar 21 22:47:32 2024 +0000 260s # 260s # On branch c-d-merge 260s # Changes to be committed: 260s # modified: conflict.txt 260s # modified: d.txt 260s # 260s [c-d-merge fc58425] Merge d into c (using imerge) 260s Date: Thu Mar 21 22:47:32 2024 +0000 260s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + local refname=c-d-merge 260s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + git rev-parse c-d-merge^{tree} 260s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + git-imerge simplify --goal=rebase --branch=c-d-rebase 260s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + local refname=c-d-rebase 260s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + git rev-parse c-d-rebase^{tree} 260s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 260s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + local refname=c-d-rebase-with-history 260s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + git rev-parse c-d-rebase-with-history^{tree} 260s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 260s + 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 261s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + local refname=c-d-border-with-history 261s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git rev-parse c-d-border-with-history^{tree} 261s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 261s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + local refname=c-d-border-with-history2 261s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git rev-parse c-d-border-with-history2^{tree} 261s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 261s + git-imerge remove 261s + git checkout c 261s Switched to branch 'c' 261s + + git-imerge start --goal=fulltee --first-parent --name=c-d d 261s start.out 262s Attempting to merge 1-1...success. 262s Attempting to merge 1-2...conflict. 262s Attempting to merge 2-1...success. 262s Attempting to merge 3-1...success. 262s Attempting to merge 4-1...success. 262s Attempting to merge 5-1...success. 262s Attempting to merge 6-1...success. 262s Attempting to merge 7-1...success. 262s Attempting to merge 8-1...success. 262s Attempting to merge 9-1...success. 262s Previous HEAD position was ebc1792 imerge 'c-d': automatic merge 9-1 262s Switched to branch 'imerge/c-d' 262s Auto-merging conflict.txt 262s CONFLICT (content): Merge conflict in conflict.txt 262s Automatic merge failed; fix conflicts and then commit the result. 262s 262s Original first commit: 262s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 262s Author: Loú User 262s Date: Thu Apr 7 22:13:15 2005 +0000 262s 262s c⇒1 262s 262s Original second commit: 262s commit 69efde8f66d581a765a3909ffacb9f895f95c345 262s Author: Loú User 262s Date: Thu Apr 7 22:13:25 2005 +0000 262s 262s d⇒2 262s 262s There was a conflict merging commit 1-2, shown above. 262s Please resolve the conflict, commit the result, then type 262s 262s git-imerge continue 262s + grep -q Traceback start.out 262s + grep -q suggest manual merge of 1-2 autofill.out 262s + git-imerge diagram --commits --frontier --html=imerge3.html 262s 0 5 9 262s | | | 262s 0 - ********** - c 262s *......... 262s *#???????? 262s *????????? 262s *????????? 262s 5 - *????????? 262s 6 - *????????? 262s | 262s d 262s 262s 0 5 9 262s | | | 262s 0 - ********** - c 262s *--------+ 262s *#???????? 262s *????????? 262s *????????? 262s 5 - *????????? 262s 6 - *????????? 262s | 262s d 262s 262s Key: 262s |,-,+ = rectangles forming current merge frontier 262s * = merge done manually 262s . = merge done automatically 262s # = conflict that is currently blocking progress 262s @ = merge was blocked but has been resolved 262s ? = no merge recorded 262s 262s + echo merged version 262s + git add conflict.txt 262s + GIT_EDITOR=cat git commit 262s imerge 'c-d': manual merge 1-2 262s 262s # Conflicts: 262s # conflict.txt 262s # 262s # It looks like you may be committing a merge. 262s # If this is not correct, please run 262s # git update-ref -d MERGE_HEAD 262s # and try again. 262s 262s 262s # Please enter the commit message for your changes. Lines starting 262s # with '#' will be ignored, and an empty message aborts the commit. 262s # 262s # On branch imerge/c-d 262s # All conflicts fixed but you are still merging. 262s # 262s # Changes to be committed: 262s # modified: conflict.txt 262s # modified: d.txt 262s # 262s [imerge/c-d dfe3455] imerge 'c-d': manual merge 1-2 262s + git-imerge continue --edit 262s Merge has been recorded for merge 1-2. 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-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-2...success. 262s Attempting to merge 3-3...success. 263s 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-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-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-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-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-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-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 9-5 263s + local conflict=9-5 263s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 263s + DESCRIPTION=git-imerge test repository with conflict at 9-5 263s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 263s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 263s + local description=git-imerge test repository with conflict at 9-5 263s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 263s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 263s + local description=git-imerge test repository with conflict at 9-5 263s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 263s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 263s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 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 Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5/.git/ 263s + echo git-imerge test repository with conflict at 9-5 263s + printf %s\n /*.out /*.css /*.html 263s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5/.git config user.name Loú User 263s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 263s + TIME=1112911993 263s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 263s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-9-5 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 + 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 [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 + git checkout -b c master -- 263s Switched to a new branch 'c' 263s [c 89e2141] c⇒1 263s 1 file changed, 1 insertion(+), 1 deletion(-) 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 [c ed9122f] c⇒4 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [c 1d3bf09] c⇒5 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [c f999ecd] c⇒6 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s [c 7050a8a] c⇒7 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + seq 9 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 + 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 + 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 + modify c.txt 6 263s + filename=c.txt 263s + text=6 263s + echo 6 263s + git add c.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 + 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 9732e77] 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 + 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⇒9 263s + TIME=1112912003 263s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 263s [c 73a5eed] c⇒9 263s 2 files changed, 2 insertions(+), 2 deletions(-) 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 + commit -m d⇒2 263s + TIME=1112912005 263s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 263s [d 93e27e6] d⇒2 263s 1 file changed, 1 insertion(+), 1 deletion(-) 263s + modify d.txt 3 263s + filename=d.txt 263s + text=3 263s + echo 3 263s + git add d.txt 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 [d 133f385] d⇒3 263s 1 file changed, 1 insertion(+), 1 deletion(-) 264s [d 586472a] d⇒4 264s 1 file changed, 1 insertion(+), 1 deletion(-) 264s [d 0a6f956] d⇒5 264s 2 files changed, 2 insertions(+), 2 deletions(-) 264s [d bfb30f0] d⇒6 264s 1 file changed, 1 insertion(+), 1 deletion(-) 264s + modify d.txt 4 264s + filename=d.txt 264s + text=4 264s + echo 4 264s + git add d.txt 264s + commit -m d⇒4 264s + TIME=1112912007 264s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 264s + modify d.txt 5 264s + filename=d.txt 264s + text=5 264s + echo 5 264s + git add d.txt 264s + modify conflict.txt d version 264s + filename=conflict.txt 264s + text=d version 264s + echo d version 264s + git add conflict.txt 264s + commit -m d⇒5 264s + TIME=1112912008 264s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 264s + modify d.txt 6 264s + filename=d.txt 264s + text=6 264s + echo 6 264s + git add d.txt 264s + commit -m d⇒6 264s + TIME=1112912009 264s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 264s + git checkout c 264s Switched to branch 'c' 264s + 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 + + git-imerge autofill 264s tee autofill.out 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...success. 264s Attempting automerge of 8-6...success. 264s Attempting automerge of 9-1...success. 264s Attempting automerge of 9-4...success. 264s Attempting automerge of 9-5...failure. 264s Autofilling 1-6...success. 264s Autofilling 2-6...success. 264s Autofilling 3-6...success. 264s Autofilling 4-6...success. 264s Autofilling 5-6...success. 265s Autofilling 6-6...success. 265s Autofilling 7-6...success. 265s Autofilling 8-1...success. 265s Autofilling 8-2...success. 265s Autofilling 8-3...success. 265s Autofilling 8-4...success. 265s Autofilling 8-5...success. 265s Autofilling 8-6 (first way)...success. 265s Autofilling 8-6 (second way)...success. 265s The two ways of autofilling 8-6 agree. 265s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 265s Autofilling 9-1...success. 265s Autofilling 9-2...success. 265s Autofilling 9-3...success. 265s Autofilling 9-4...success. 265s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 265s Attempting automerge of 9-6...failure. 265s Attempting automerge of 9-5...failure. 265s HEAD is now at 73a5eed c⇒9 265s Conflict; suggest manual merge of 9-5 265s + grep -q Traceback autofill.out 265s + grep -q suggest manual merge of 9-5 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 Automatic merge failed; fix conflicts and then commit the result. 265s 265s Original first commit: 265s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 265s Author: Loú User 265s Date: Thu Apr 7 22:13:23 2005 +0000 265s 265s c⇒9 265s 265s Original second commit: 265s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 265s Author: Loú User 265s Date: Thu Apr 7 22:13:28 2005 +0000 265s 265s d⇒5 265s 265s There was a conflict merging commit 9-5, shown above. 265s Please resolve the conflict, commit the result, then type 265s 265s git-imerge continue 265s + echo merged version 265s + git add conflict.txt 265s + git-imerge continue --no-edit 265s [imerge/c-d 4e3648e] imerge 'c-d': manual merge 9-5 265s Merge has been recorded for merge 9-5. 265s Attempting automerge of 9-6...success. 265s Autofilling 9-6...success. 266s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 266s Merge is complete! 266s + git-imerge diagram --commits --frontier --html=imerge2.html 266s 0 5 9 266s | | | 266s 0 - ********** - c 266s *???????.. 266s *???????.. 266s *???????.. 266s *???????.. 266s 5 - *???????.* 266s 6 - *......... 266s | 266s d 266s 266s 0 5 9 266s | | | 266s 0 - ********** - c 266s *???????.| 266s *???????.| 266s *???????.| 266s *???????.| 266s 5 - *???????.* 266s 6 - *--------+ 266s | 266s d 266s 266s Key: 266s |,-,+ = rectangles forming current merge frontier 266s * = merge done manually 266s . = merge done automatically 266s # = conflict that is currently blocking progress 266s @ = merge was blocked but has been resolved 266s ? = no merge recorded 266s 266s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 266s Merge d into c (using imerge) 266s 266s # Please enter the commit message for your changes. Lines starting 266s # with '#' will be ignored, and an empty message aborts the commit. 266s # 266s # Date: Thu Mar 21 22:47:38 2024 +0000 266s # 266s # On branch c-d-merge 266s # Changes to be committed: 266s # modified: conflict.txt 266s # modified: d.txt 266s # 266s [c-d-merge d520899] Merge d into c (using imerge) 266s Date: Thu Mar 21 22:47:38 2024 +0000 266s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + local refname=c-d-merge 266s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git rev-parse c-d-merge^{tree} 266s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git-imerge simplify --goal=rebase --branch=c-d-rebase 266s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + local refname=c-d-rebase 266s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + git rev-parse c-d-rebase^{tree} 266s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 266s + 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 267s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + local refname=c-d-border-with-history 267s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git rev-parse c-d-border-with-history^{tree} 267s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 267s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 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-dtee d 267s start.out 267s Attempting to merge 1-1...success. 267s Attempting to merge 1-2...success. 267s Attempting to merge 1-3...success. 268s Attempting to merge 1-4...success. 268s Attempting to merge 1-5...success. 268s Attempting to merge 1-6...success. 268s Attempting to merge 2-1...success. 268s Attempting to merge 2-2...success. 268s Attempting to merge 2-3...success. 268s Attempting to merge 2-4...success. 268s Attempting to merge 2-5...success. 268s Attempting to merge 2-6...success. 268s Attempting to merge 3-1...success. 268s Attempting to merge 3-2...success. 268s Attempting to merge 3-3...success. 268s Attempting to merge 3-4...success. 268s Attempting to merge 3-5...success. 268s Attempting to merge 3-6...success. 268s Attempting to merge 4-1...success. 268s Attempting to merge 4-2...success. 268s Attempting to merge 4-3...success. 268s Attempting to merge 4-4...success. 268s Attempting to merge 4-5...success. 268s Attempting to merge 4-6...success. 268s Attempting to merge 5-1...success. 268s Attempting to merge 5-2...success. 268s Attempting to merge 5-3...success. 268s Attempting to merge 5-4...success. 268s Attempting to merge 5-5...success. 268s Attempting to merge 5-6...success. 268s Attempting to merge 6-1...success. 268s Attempting to merge 6-2...success. 268s Attempting to merge 6-3...success. 268s Attempting to merge 6-4...success. 268s Attempting to merge 6-5...success. 269s Attempting to merge 6-6...success. 269s Attempting to merge 7-1...success. 269s Attempting to merge 7-2...success. 269s Attempting to merge 7-3...success. 269s Attempting to merge 7-4...success. 269s Attempting to merge 7-5...success. 269s Attempting to merge 7-6...success. 269s Attempting to merge 8-1...success. 269s Attempting to merge 8-2...success. 269s Attempting to merge 8-3...success. 269s Attempting to merge 8-4...success. 269s Attempting to merge 8-5...success. 269s Attempting to merge 8-6...success. 269s Attempting to merge 9-1...success. 269s Attempting to merge 9-2...success. 269s Attempting to merge 9-3...success. 269s Attempting to merge 9-4...success. 269s Attempting to merge 9-5...conflict. 269s Switched to branch 'imerge/c-d' 269s Auto-merging conflict.txt 269s CONFLICT (content): Merge conflict in conflict.txt 269s Automatic merge failed; fix conflicts and then commit the result. 269s 269s Original first commit: 269s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 269s Author: Loú User 269s Date: Thu Apr 7 22:13:23 2005 +0000 269s 269s c⇒9 269s 269s Original second commit: 269s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 269s Author: Loú User 269s Date: Thu Apr 7 22:13:28 2005 +0000 269s 269s d⇒5 269s 269s There was a conflict merging commit 9-5, shown above. 269s Please resolve the conflict, commit the result, then type 269s 269s git-imerge continue 269s + grep -q Traceback start.out 269s + grep -q suggest manual merge of 9-5 autofill.out 269s + git-imerge diagram --commits --frontier --html=imerge3.html 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *......... 269s *......... 269s *......... 269s *......... 269s 5 - *........# 269s 6 - *........? 269s | 269s d 269s 269s 0 5 9 269s | | | 269s 0 - ********** - c 269s *........| 269s *........| 269s *........| 269s *........+ 269s 5 - *.......|# 269s 6 - *-------+? 269s | 269s d 269s 269s Key: 269s |,-,+ = rectangles forming current merge frontier 269s * = merge done manually 269s . = merge done automatically 269s # = conflict that is currently blocking progress 269s @ = merge was blocked but has been resolved 269s ? = no merge recorded 269s 269s + echo merged version 269s + git add conflict.txt 269s + GIT_EDITOR=cat git commit 269s imerge 'c-d': manual merge 9-5 269s 269s # Conflicts: 269s # conflict.txt 269s # 269s # It looks like you may be committing a merge. 269s # If this is not correct, please run 269s # git update-ref -d MERGE_HEAD 269s # and try again. 269s 269s 269s # Please enter the commit message for your changes. Lines starting 269s # with '#' will be ignored, and an empty message aborts the commit. 269s # 269s # On branch imerge/c-d 269s # All conflicts fixed but you are still merging. 269s # 269s # Changes to be committed: 269s # modified: conflict.txt 269s # modified: d.txt 269s # 269s [imerge/c-d 193ac73] imerge 'c-d': manual merge 9-5 269s + git-imerge continue --edit 269s Merge has been recorded for merge 9-5. 269s Attempting to merge 9-6...success. 269s Merge is complete! 269s + git-imerge diagram --commits --frontier --html=imerge4.html 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s *......... 270s *......... 270s *......... 270s *......... 270s 5 - *........* 270s 6 - *......... 270s | 270s d 270s 270s 0 5 9 270s | | | 270s 0 - ********** - c 270s *........| 270s *........| 270s *........| 270s *........| 270s 5 - *........* 270s 6 - *--------+ 270s | 270s d 270s 270s Key: 270s |,-,+ = rectangles forming current merge frontier 270s * = merge done manually 270s . = merge done automatically 270s # = conflict that is currently blocking progress 270s @ = merge was blocked but has been resolved 270s ? = no merge recorded 270s 270s + git-imerge finish --branch=c-d-full 270s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + local refname=c-d-full 270s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + git rev-parse c-d-full^{tree} 270s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 270s + test_conflict 5-1 270s + local conflict=5-1 270s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s + DESCRIPTION=git-imerge test repository with conflict at 5-1 270s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 270s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s + local description=git-imerge test repository with conflict at 5-1 270s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 270s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s + local description=git-imerge test repository with conflict at 5-1 270s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s hint: Using 'master' as the name for the initial branch. This default branch name 270s hint: is subject to change. To configure the initial branch name to use in all 270s hint: of your new repositories, which will suppress this warning, call: 270s hint: 270s hint: git config --global init.defaultBranch 270s hint: 270s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 270s hint: 'development'. The just-created branch can be renamed via this command: 270s hint: 270s hint: git branch -m 270s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1/.git/ 270s + echo git-imerge test repository with conflict at 5-1 270s + printf %s\n /*.out /*.css /*.html 270s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1/.git config user.name Loú User 270s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 270s + TIME=1112911993 270s [master (root-commit) d70e04b] m⇒0 270s 3 files changed, 3 insertions(+) 270s create mode 100644 c.txt 270s create mode 100644 conflict.txt 270s create mode 100644 d.txt 270s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-5-1 270s + modify c.txt 0 270s + filename=c.txt 270s + text=0 270s + echo 0 270s + git add c.txt 270s + modify d.txt 0 270s + filename=d.txt 270s + text=0 270s + echo 0 270s + git add d.txt 270s + modify conflict.txt original version 270s + filename=conflict.txt 270s + text=original version 270s + echo original version 270s + git add conflict.txt 270s + commit -m m⇒0 270s + TIME=1112911994 270s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 270s + git checkout -b c master -- 270s Switched to a new branch 'c' 270s + seq 9 270s + modify c.txt 1 270s + filename=c.txt 270s + text=1 270s + echo 1 270s + git add c.txt 270s + commit -m c⇒1 270s + TIME=1112911995 270s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 270s [c 89e2141] c⇒1 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 2 270s + filename=c.txt 270s + text=2 270s + echo 2 270s + git add c.txt 270s + commit -m c⇒2 270s + TIME=1112911996 270s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 270s [c 7c431f2] c⇒2 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 3 270s + filename=c.txt 270s + text=3 270s + echo 3 270s + git add c.txt 270s + commit -m c⇒3 270s + TIME=1112911997 270s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 270s [c f02ab24] c⇒3 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 4 270s + filename=c.txt 270s + text=4 270s + echo 4 270s + git add c.txt 270s + commit -m c⇒4 270s + TIME=1112911998 270s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 270s [c ed9122f] c⇒4 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 5 270s + filename=c.txt 270s + text=5 270s + echo 5 270s + git add c.txt 270s + modify conflict.txt c version 270s + filename=conflict.txt 270s + text=c version 270s + echo c version 270s + git add conflict.txt 270s + commit -m c⇒5 270s + TIME=1112911999 270s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 270s [c 7e31f25] c⇒5 270s 2 files changed, 2 insertions(+), 2 deletions(-) 270s + modify c.txt 6 270s + filename=c.txt 270s + text=6 270s + echo 6 270s + git add c.txt 270s + commit -m c⇒6 270s + TIME=1112912000 270s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 270s [c df3c57a] c⇒6 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 7 270s + filename=c.txt 270s + text=7 270s + echo 7 270s + git add c.txt 270s + commit -m c⇒7 270s + TIME=1112912001 270s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 270s [c ea32d81] c⇒7 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 8 270s + filename=c.txt 270s + text=8 270s + echo 8 270s + git add c.txt 270s + commit -m c⇒8 270s + TIME=1112912002 270s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 270s [c 44473d6] c⇒8 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify c.txt 9 270s + filename=c.txt 270s + text=9 270s + echo 9 270s + git add c.txt 270s + commit -m c⇒9 270s + TIME=1112912003 270s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 270s [c d8d80cf] c⇒9 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + git checkout -b d master -- 270s Switched to a new branch 'd' 270s + seq 6 270s + modify d.txt 1 270s + filename=d.txt 270s + text=1 270s + echo 1 270s + git add d.txt 270s + modify conflict.txt d version 270s + filename=conflict.txt 270s + text=d version 270s + echo d version 270s + git add conflict.txt 270s + commit -m d⇒1 270s + TIME=1112912004 270s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 270s [d ac0427a] d⇒1 270s 2 files changed, 2 insertions(+), 2 deletions(-) 270s + modify d.txt 2 270s + filename=d.txt 270s + text=2 270s + echo 2 270s + git add d.txt 270s + commit -m d⇒2 270s + TIME=1112912005 270s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 270s [d 43c38c0] d⇒2 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify d.txt 3 270s + filename=d.txt 270s + text=3 270s + echo 3 270s + git add d.txt 270s + commit -m d⇒3 270s + TIME=1112912006 270s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 270s [d 0260058] d⇒3 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify d.txt 4 270s + filename=d.txt 270s + text=4 270s + echo 4 270s + git add d.txt 270s + commit -m d⇒4 270s + TIME=1112912007 270s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 270s [d 40fef44] d⇒4 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify d.txt 5 270s + filename=d.txt 270s + text=5 270s + echo 5 270s + git add d.txt 270s + commit -m d⇒5 270s + TIME=1112912008 270s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 270s [d b080a65] d⇒5 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + modify d.txt 6 270s + filename=d.txt 270s + text=6 270s + echo 6 270s + git add d.txt 270s + commit -m d⇒6 270s + TIME=1112912009 270s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 270s [d 200ce5c] d⇒6 270s 1 file changed, 1 insertion(+), 1 deletion(-) 270s + git checkout c 270s Switched to branch 'c' 270s + git-imerge init --name=c-d d 270s + git-imerge list 271s * c-d 271s + git-imerge diagram --commits --frontier --html=imerge0.html 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s *????????? 271s *????????? 271s *????????? 271s *????????? 271s 5 - *????????? 271s 6 - *????????? 271s | 271s d 271s 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s *????????? 271s *????????? 271s *????????? 271s *????????? 271s 5 - *????????? 271s 6 - *????????? 271s | 271s d 271s 271s Key: 271s |,-,+ = rectangles forming current merge frontier 271s * = merge done manually 271s . = merge done automatically 271s # = conflict that is currently blocking progress 271s @ = merge was blocked but has been resolved 271s ? = no merge recorded 271s 271s + + git-imergetee autofill 271s autofill.out 271s Attempting automerge of 9-6...failure. 271s Attempting automerge of 1-1...success. 271s Attempting automerge of 1-4...success. 271s Attempting automerge of 1-6...success. 271s Attempting automerge of 9-6...failure. 271s Attempting automerge of 5-6...failure. 271s Attempting automerge of 3-6...success. 271s Attempting automerge of 4-6...success. 271s Attempting automerge of 5-1...failure. 271s Autofilling 1-6...success. 271s Autofilling 2-6...success. 271s Autofilling 3-6...success. 271s Autofilling 4-1...success. 271s Autofilling 4-2...success. 271s Autofilling 4-3...success. 271s Autofilling 4-4...success. 271s Autofilling 4-5...success. 271s Autofilling 4-6 (first way)...success. 271s Autofilling 4-6 (second way)...success. 271s The two ways of autofilling 4-6 agree. 271s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 271s Attempting automerge of 9-6...failure. 271s Attempting automerge of 5-1...failure. 271s HEAD is now at d8d80cf c⇒9 271s Conflict; suggest manual merge of 5-1 271s + grep -q Traceback autofill.out 271s + grep -q suggest manual merge of 5-1 autofill.out 271s + git-imerge diagram --commits --frontier --html=imerge1.html 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s *???.#???? 271s *???.????? 271s *???.????? 271s *???.????? 271s 5 - *???.????? 271s 6 - *....????? 271s | 271s d 271s 271s 0 5 9 271s | | | 271s 0 - ********** - c 271s *???|#???? 271s *???|????? 271s *???|????? 271s *???|????? 271s 5 - *???|????? 271s 6 - *---+????? 271s | 271s d 271s 271s Key: 271s |,-,+ = rectangles forming current merge frontier 271s * = merge done manually 271s . = merge done automatically 271s # = conflict that is currently blocking progress 271s @ = merge was blocked but has been resolved 271s ? = no merge recorded 271s 271s + git-imerge continue --edit 271s Switched to branch 'imerge/c-d' 271s Auto-merging conflict.txt 271s CONFLICT (content): Merge conflict in conflict.txt 271s Automatic merge failed; fix conflicts and then commit the result. 271s 271s Original first commit: 271s commit 7e31f254c318decc434628f023dac0703f3d2b9e 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 ac0427a285b64f2815ebd6eb83880f309600d0c7 271s Author: Loú User 271s Date: Thu Apr 7 22:13:24 2005 +0000 271s 271s d⇒1 271s 271s There was a conflict merging commit 5-1, shown above. 271s Please resolve the conflict, commit the result, then type 271s 271s git-imerge continue 271s + echo merged version 271s + git add conflict.txt 271s + git-imerge continue --no-edit 272s [imerge/c-d 15f2fa5] imerge 'c-d': manual merge 5-1 272s Merge has been recorded for merge 5-1. 272s Attempting automerge of 5-6...success. 272s Autofilling 5-2...success. 272s Autofilling 5-3...success. 272s Autofilling 5-4...success. 272s Autofilling 5-5...success. 272s Autofilling 5-6...success. 272s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 272s Attempting automerge of 9-6...success. 272s Autofilling 6-6...success. 272s Autofilling 7-6...success. 272s Autofilling 8-6...success. 272s Autofilling 9-1...success. 272s Autofilling 9-2...success. 272s Autofilling 9-3...success. 272s Autofilling 9-4...success. 272s Autofilling 9-5...success. 272s Autofilling 9-6 (first way)...success. 272s Autofilling 9-6 (second way)...success. 272s The two ways of autofilling 9-6 agree. 272s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 272s Merge is complete! 272s + git-imerge diagram --commits --frontier --html=imerge2.html 272s 0 5 9 272s | | | 272s 0 - ********** - c 272s *???.*???. 272s *???..???. 272s *???..???. 272s *???..???. 272s 5 - *???..???. 272s 6 - *......... 272s | 272s d 272s 272s 0 5 9 272s | | | 272s 0 - ********** - c 272s *???.*???| 272s *???..???| 272s *???..???| 272s *???..???| 272s 5 - *???..???| 272s 6 - *--------+ 272s | 272s d 272s 272s Key: 272s |,-,+ = rectangles forming current merge frontier 272s * = merge done manually 272s . = merge done automatically 272s # = conflict that is currently blocking progress 272s @ = merge was blocked but has been resolved 272s ? = no merge recorded 272s 272s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 272s Merge d into c (using imerge) 272s 272s # Please enter the commit message for your changes. Lines starting 272s # with '#' will be ignored, and an empty message aborts the commit. 272s # 272s # Date: Thu Mar 21 22:47:44 2024 +0000 272s # 272s # On branch c-d-merge 272s # Changes to be committed: 272s # modified: conflict.txt 272s # modified: d.txt 272s # 272s [c-d-merge 42d5c75] Merge d into c (using imerge) 272s Date: Thu Mar 21 22:47:44 2024 +0000 272s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + local refname=c-d-merge 272s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git rev-parse c-d-merge^{tree} 272s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git-imerge simplify --goal=rebase --branch=c-d-rebase 272s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + local refname=c-d-rebase 272s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 272s + git rev-parse c-d-rebase^{tree} 273s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 273s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + local refname=c-d-rebase-with-history 273s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git rev-parse c-d-rebase-with-history^{tree} 273s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git-imerge simplify --goal=border --branch=c-d-border 273s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + local refname=c-d-border 273s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git rev-parse c-d-border^{tree} 273s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 273s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + local refname=c-d-border-with-history 273s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git rev-parse c-d-border-with-history^{tree} 273s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 273s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 274s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 274s + local refname=c-d-border-with-history2 274s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 274s + git rev-parse c-d-border-with-history2^{tree} 274s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 274s + git-imerge remove 274s + git checkout c 274s Switched to branch 'c' 274s + + git-imerge start --goal=fulltee --first-parent --name=c-d start.out 274s d 274s Attempting to merge 1-1...success. 274s Attempting to merge 1-2...success. 274s Attempting to merge 1-3...success. 274s Attempting to merge 1-4...success. 274s Attempting to merge 1-5...success. 274s Attempting to merge 1-6...success. 274s Attempting to merge 2-1...success. 274s Attempting to merge 2-2...success. 274s Attempting to merge 2-3...success. 274s Attempting to merge 2-4...success. 274s Attempting to merge 2-5...success. 274s Attempting to merge 2-6...success. 274s Attempting to merge 3-1...success. 274s Attempting to merge 3-2...success. 274s Attempting to merge 3-3...success. 274s Attempting to merge 3-4...success. 274s Attempting to merge 3-5...success. 274s Attempting to merge 3-6...success. 274s Attempting to merge 4-1...success. 274s Attempting to merge 4-2...success. 274s Attempting to merge 4-3...success. 274s Attempting to merge 4-4...success. 274s Attempting to merge 4-5...success. 274s Attempting to merge 4-6...success. 274s Attempting to merge 5-1...conflict. 274s Switched to branch 'imerge/c-d' 274s Auto-merging conflict.txt 274s CONFLICT (content): Merge conflict in conflict.txt 274s Automatic merge failed; fix conflicts and then commit the result. 274s 274s Original first commit: 274s commit 7e31f254c318decc434628f023dac0703f3d2b9e 274s Author: Loú User 274s Date: Thu Apr 7 22:13:19 2005 +0000 274s 274s c⇒5 274s 274s Original second commit: 274s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 274s Author: Loú User 274s Date: Thu Apr 7 22:13:24 2005 +0000 274s 274s d⇒1 274s 274s There was a conflict merging commit 5-1, shown above. 274s Please resolve the conflict, commit the result, then type 274s 274s git-imerge continue 274s + grep -q Traceback start.out 274s + grep -q suggest manual merge of 5-1 autofill.out 274s + git-imerge diagram --commits --frontier --html=imerge3.html 275s 0 5 9 275s | | | 275s 0 - ********** - c 275s *....#???? 275s *....????? 275s *....????? 275s *....????? 275s 5 - *....????? 275s 6 - *....????? 275s | 275s d 275s 275s 0 5 9 275s | | | 275s 0 - ********** - c 275s *...|#???? 275s *...|????? 275s *...|????? 275s *...|????? 275s 5 - *...|????? 275s 6 - *---+????? 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 + echo merged version 275s + git add conflict.txt 275s + GIT_EDITOR=cat git commit 275s imerge 'c-d': manual merge 5-1 275s 275s # Conflicts: 275s # conflict.txt 275s # 275s # It looks like you may be committing a merge. 275s # If this is not correct, please run 275s # git update-ref -d MERGE_HEAD 275s # and try again. 275s 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 # On branch imerge/c-d 275s # All conflicts fixed but you are still merging. 275s # 275s # Changes to be committed: 275s # modified: conflict.txt 275s # modified: d.txt 275s # 275s + git-imerge continue --edit 275s [imerge/c-d f6c422c] imerge 'c-d': manual merge 5-1 275s Merge has been recorded for merge 5-1. 275s Attempting to merge 5-2...success. 275s Attempting to merge 5-3...success. 275s Attempting to merge 5-4...success. 275s Attempting to merge 5-5...success. 275s Attempting to merge 5-6...success. 275s Attempting to merge 6-1...success. 275s Attempting to merge 6-2...success. 275s Attempting to merge 6-3...success. 275s Attempting to merge 6-4...success. 275s Attempting to merge 6-5...success. 275s Attempting to merge 6-6...success. 275s Attempting to merge 7-1...success. 275s Attempting to merge 7-2...success. 275s Attempting to merge 7-3...success. 275s Attempting to merge 7-4...success. 275s Attempting to merge 7-5...success. 275s Attempting to merge 7-6...success. 275s Attempting to merge 8-1...success. 275s Attempting to merge 8-2...success. 275s Attempting to merge 8-3...success. 275s Attempting to merge 8-4...success. 275s Attempting to merge 8-5...success. 275s Attempting to merge 8-6...success. 275s Attempting to merge 9-1...success. 275s Attempting to merge 9-2...success. 275s Attempting to merge 9-3...success. 275s Attempting to merge 9-4...success. 275s Attempting to merge 9-5...success. 275s Attempting to merge 9-6...success. 275s Merge is complete! 275s + git-imerge diagram --commits --frontier --html=imerge4.html 276s 0 5 9 276s | | | 276s 0 - ********** - c 276s *....*.... 276s *......... 276s *......... 276s *......... 276s 5 - *......... 276s 6 - *......... 276s | 276s d 276s 276s 0 5 9 276s | | | 276s 0 - ********** - c 276s *....*...| 276s *........| 276s *........| 276s *........| 276s 5 - *........| 276s 6 - *--------+ 276s | 276s d 276s 276s Key: 276s |,-,+ = rectangles forming current merge frontier 276s * = merge done manually 276s . = merge done automatically 276s # = conflict that is currently blocking progress 276s @ = merge was blocked but has been resolved 276s ? = no merge recorded 276s 276s + git-imerge finish --branch=c-d-full 276s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + local refname=c-d-full 276s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + git rev-parse c-d-full^{tree} 276s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 276s + test_conflict 6-6 276s + local conflict=6-6 276s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s + DESCRIPTION=git-imerge test repository with conflict at 6-6 276s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 276s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s + local description=git-imerge test repository with conflict at 6-6 276s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 276s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s + local description=git-imerge test repository with conflict at 6-6 276s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s hint: Using 'master' as the name for the initial branch. This default branch name 276s hint: is subject to change. To configure the initial branch name to use in all 276s hint: of your new repositories, which will suppress this warning, call: 276s hint: 276s hint: git config --global init.defaultBranch 276s hint: 276s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 276s hint: 'development'. The just-created branch can be renamed via this command: 276s hint: 276s hint: git branch -m 276s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6/.git/ 276s + echo git-imerge test repository with conflict at 6-6 276s + printf %s\n /*.out /*.css /*.html 276s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6/.git config user.name Loú User 276s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 276s + TIME=1112911993 276s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/conflicted-6-6 276s + modify c.txt 0 276s + filename=c.txt 276s + text=0 276s + echo 0 276s + git add c.txt 276s + modify d.txt 0 276s + filename=d.txt 276s + text=0 276s + echo 0 276s + git add d.txt 276s + modify conflict.txt original version 276s + filename=conflict.txt 276s + text=original version 276s + echo original version 276s + git add conflict.txt 276s + commit -m m⇒0 276s + TIME=1112911994 276s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 276s [master (root-commit) d70e04b] m⇒0 276s 3 files changed, 3 insertions(+) 276s create mode 100644 c.txt 276s create mode 100644 conflict.txt 276s create mode 100644 d.txt 276s + git checkout -b c master -- 276s Switched to a new branch 'c' 276s + seq 9 276s + modify c.txt 1 276s + filename=c.txt 276s + text=1 276s + echo 1 276s + git add c.txt 276s + commit -m c⇒1 276s + TIME=1112911995 276s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 276s [c 89e2141] c⇒1 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify c.txt 2 276s + filename=c.txt 276s + text=2 276s + echo 2 276s + git add c.txt 276s + commit -m c⇒2 276s + TIME=1112911996 276s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 276s [c 7c431f2] c⇒2 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify c.txt 3 276s + filename=c.txt 276s + text=3 276s + echo 3 276s + git add c.txt 276s + commit -m c⇒3 276s + TIME=1112911997 276s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 276s [c f02ab24] c⇒3 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify c.txt 4 276s + filename=c.txt 276s + text=4 276s + echo 4 276s + git add c.txt 276s + commit -m c⇒4 276s + TIME=1112911998 276s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 276s [c ed9122f] c⇒4 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify c.txt 5 276s + filename=c.txt 276s + text=5 276s + echo 5 276s + git add c.txt 276s + commit -m c⇒5 276s + TIME=1112911999 276s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 276s [c 1d3bf09] c⇒5 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify c.txt 6 276s + filename=c.txt 276s + text=6 276s + echo 6 276s + git add c.txt 276s + modify conflict.txt c version 276s + filename=conflict.txt 276s + text=c version 276s + echo c version 276s + git add conflict.txt 276s + commit -m c⇒6 276s + TIME=1112912000 276s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 276s [c fe4fed8] c⇒6 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s + modify c.txt 7 276s + filename=c.txt 276s + text=7 276s + echo 7 276s + git add c.txt 276s + commit -m c⇒7 276s + TIME=1112912001 276s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 276s [c ec255ea] c⇒7 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify c.txt 8 276s + filename=c.txt 276s + text=8 276s + echo 8 276s + git add c.txt 276s + commit -m c⇒8 276s + TIME=1112912002 276s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 276s + modify c.txt 9 276s + filename=c.txt 276s + text=9 276s + echo 9 276s + git add c.txt 276s [c 7459ac3] c⇒8 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + commit -m c⇒9 276s + TIME=1112912003 276s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 276s [c 70408c8] c⇒9 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + git checkout -b d master -- 276s Switched to a new branch 'd' 276s + seq 6 276s + modify d.txt 1 276s + filename=d.txt 276s + text=1 276s + echo 1 276s + git add d.txt 276s + commit -m d⇒1 276s + TIME=1112912004 276s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 276s + modify d.txt 2 276s + filename=d.txt 276s + text=2 276s + echo 2 276s + git add d.txt 276s [d bd5368a] d⇒1 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + commit -m d⇒2 276s + TIME=1112912005 276s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 276s [d 93e27e6] d⇒2 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify d.txt 3 276s + filename=d.txt 276s + text=3 276s + echo 3 276s + git add d.txt 276s + commit -m d⇒3 276s + TIME=1112912006 276s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 276s [d 133f385] d⇒3 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify d.txt 4 276s + filename=d.txt 276s + text=4 276s + echo 4 276s + git add d.txt 276s + commit -m d⇒4 276s + TIME=1112912007 276s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 276s [d 586472a] d⇒4 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify d.txt 5 276s + filename=d.txt 276s + text=5 276s + echo 5 276s + git add d.txt 276s + commit -m d⇒5 276s + TIME=1112912008 276s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 276s [d 9522207] d⇒5 276s 1 file changed, 1 insertion(+), 1 deletion(-) 276s + modify d.txt 6 276s + filename=d.txt 276s + text=6 276s + echo 6 276s + git add d.txt 276s + modify conflict.txt d version 276s + filename=conflict.txt 276s + text=d version 276s + echo d version 276s + git add conflict.txt 276s + commit -m d⇒6 276s + TIME=1112912009 276s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 276s [d f7e451a] d⇒6 276s 2 files changed, 2 insertions(+), 2 deletions(-) 276s + git checkout c 276s Switched to branch 'c' 276s + git-imerge init --name=c-d d 276s + git-imerge list 277s * c-d 277s + git-imerge diagram --commits --frontier --html=imerge0.html 277s 0 5 9 277s | | | 277s 0 - ********** - c 277s *????????? 277s *????????? 277s *????????? 277s *????????? 277s 5 - *????????? 277s 6 - *????????? 277s | 277s d 277s 277s 0 5 9 277s | | | 277s 0 - ********** - c 277s *????????? 277s *????????? 277s *????????? 277s *????????? 277s 5 - *????????? 277s 6 - *????????? 277s | 277s d 277s 277s Key: 277s |,-,+ = rectangles forming current merge frontier 277s * = merge done manually 277s . = merge done automatically 277s # = conflict that is currently blocking progress 277s @ = merge was blocked but has been resolved 277s ? = no merge recorded 277s 277s + + git-imerge autofill 277s tee autofill.out 277s Attempting automerge of 9-6...failure. 277s Attempting automerge of 1-1...success. 277s Attempting automerge of 1-4...success. 277s Attempting automerge of 1-6...success. 277s Attempting automerge of 9-6...failure. 277s Attempting automerge of 5-6...success. 277s Attempting automerge of 7-6...failure. 277s Attempting automerge of 6-6...failure. 277s Attempting automerge of 6-1...success. 277s Attempting automerge of 6-4...success. 277s Attempting automerge of 6-5...success. 277s Attempting automerge of 9-5...success. 277s Autofilling 1-6...success. 277s Autofilling 2-6...success. 277s Autofilling 3-6...success. 277s Autofilling 4-6...success. 277s Autofilling 5-1...success. 277s Autofilling 5-2...success. 277s Autofilling 5-3...success. 277s Autofilling 5-4...success. 277s Autofilling 5-5...success. 277s Autofilling 5-6 (first way)...success. 277s Autofilling 5-6 (second way)...success. 277s The two ways of autofilling 5-6 agree. 277s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 277s Autofilling 6-5...success. 277s Autofilling 7-5...success. 277s Autofilling 8-5...success. 277s Autofilling 9-1...success. 277s Autofilling 9-2...success. 277s Autofilling 9-3...success. 277s Autofilling 9-4...success. 277s Autofilling 9-5 (first way)...success. 277s Autofilling 9-5 (second way)...success. 277s The two ways of autofilling 9-5 agree. 278s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 278s Attempting automerge of 9-6...failure. 278s Attempting automerge of 6-6...failure. 278s HEAD is now at 70408c8 c⇒9 278s Conflict; suggest manual merge of 6-6 278s + grep -q Traceback autofill.out 278s + grep -q suggest manual merge of 6-6 autofill.out 278s + git-imerge diagram --commits --frontier --html=imerge1.html 278s 0 5 9 278s | | | 278s 0 - ********** - c 278s *????.???. 278s *????.???. 278s *????.???. 278s *????.???. 278s 5 - *????..... 278s 6 - *.....#??? 278s | 278s d 278s 278s 0 5 9 278s | | | 278s 0 - ********** - c 278s *????.???| 278s *????.???| 278s *????.???| 278s *????.???| 278s 5 - *????.---+ 278s 6 - *----+#??? 278s | 278s d 278s 278s Key: 278s |,-,+ = rectangles forming current merge frontier 278s * = merge done manually 278s . = merge done automatically 278s # = conflict that is currently blocking progress 278s @ = merge was blocked but has been resolved 278s ? = no merge recorded 278s 278s + git-imerge continue --edit 278s Switched to branch 'imerge/c-d' 278s Auto-merging conflict.txt 278s CONFLICT (content): Merge conflict in conflict.txt 278s Automatic merge failed; fix conflicts and then commit the result. 278s 278s Original first commit: 278s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 278s Author: Loú User 278s Date: Thu Apr 7 22:13:20 2005 +0000 278s 278s c⇒6 278s 278s Original second commit: 278s commit f7e451a6c9656dda15641a9fbc591a602f158692 278s Author: Loú User 278s Date: Thu Apr 7 22:13:29 2005 +0000 278s 278s d⇒6 278s 278s There was a conflict merging commit 6-6, shown above. 278s Please resolve the conflict, commit the result, then type 278s 278s git-imerge continue 278s + echo merged version 278s + git add conflict.txt 278s + git-imerge continue --no-edit 278s [imerge/c-d 7336994] imerge 'c-d': manual merge 6-6 278s Merge has been recorded for merge 6-6. 278s Attempting automerge of 9-6...success. 278s Autofilling 7-6...success. 278s Autofilling 8-6...success. 278s Autofilling 9-6...success. 278s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 278s Merge is complete! 278s + git-imerge diagram --commits --frontier --html=imerge2.html 278s 0 5 9 278s | | | 278s 0 - ********** - c 278s *????.???. 278s *????.???. 278s *????.???. 278s *????.???. 278s 5 - *????..... 278s 6 - *.....*... 278s | 278s d 278s 278s 0 5 9 278s | | | 278s 0 - ********** - c 278s *????.???| 278s *????.???| 278s *????.???| 278s *????.???| 278s 5 - *????....| 278s 6 - *-----*--+ 278s | 278s d 278s 278s Key: 278s |,-,+ = rectangles forming current merge frontier 278s * = merge done manually 278s . = merge done automatically 278s # = conflict that is currently blocking progress 278s @ = merge was blocked but has been resolved 278s ? = no merge recorded 278s 278s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 279s Merge d into c (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: Thu Mar 21 22:47:51 2024 +0000 279s # 279s # On branch c-d-merge 279s # Changes to be committed: 279s # modified: conflict.txt 279s # modified: d.txt 279s # 279s [c-d-merge c742ad8] Merge d into c (using imerge) 279s Date: Thu Mar 21 22:47:51 2024 +0000 279s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + local refname=c-d-merge 279s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + git rev-parse c-d-merge^{tree} 279s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + git-imerge simplify --goal=rebase --branch=c-d-rebase 279s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + local refname=c-d-rebase 279s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + git rev-parse c-d-rebase^{tree} 279s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 279s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + local refname=c-d-rebase-with-history 279s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + git rev-parse c-d-rebase-with-history^{tree} 279s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 279s + git-imerge simplify --goal=border --branch=c-d-border 280s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + local refname=c-d-border 280s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + git rev-parse c-d-border^{tree} 280s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 280s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + local refname=c-d-border-with-history 280s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + git rev-parse c-d-border-with-history^{tree} 280s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 280s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + local refname=c-d-border-with-history2 280s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + git rev-parse c-d-border-with-history2^{tree} 280s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 280s + git-imerge remove 281s + git checkout c 281s Switched to branch 'c' 281s + + git-imergetee start --goal=full --first-parent --name=c-d start.out d 281s 281s Attempting to merge 1-1...success. 281s Attempting to merge 1-2...success. 281s Attempting to merge 1-3...success. 281s Attempting to merge 1-4...success. 281s Attempting to merge 1-5...success. 281s Attempting to merge 1-6...success. 281s Attempting to merge 2-1...success. 281s Attempting to merge 2-2...success. 281s Attempting to merge 2-3...success. 281s Attempting to merge 2-4...success. 281s Attempting to merge 2-5...success. 281s Attempting to merge 2-6...success. 281s Attempting to merge 3-1...success. 281s Attempting to merge 3-2...success. 281s Attempting to merge 3-3...success. 281s Attempting to merge 3-4...success. 281s Attempting to merge 3-5...success. 281s Attempting to merge 3-6...success. 281s Attempting to merge 4-1...success. 281s Attempting to merge 4-2...success. 281s Attempting to merge 4-3...success. 281s Attempting to merge 4-4...success. 281s Attempting to merge 4-5...success. 281s Attempting to merge 4-6...success. 281s Attempting to merge 5-1...success. 281s Attempting to merge 5-2...success. 281s Attempting to merge 5-3...success. 281s Attempting to merge 5-4...success. 281s Attempting to merge 5-5...success. 282s Attempting to merge 5-6...success. 282s Attempting to merge 6-1...success. 282s Attempting to merge 6-2...success. 282s Attempting to merge 6-3...success. 282s Attempting to merge 6-4...success. 282s Attempting to merge 6-5...success. 282s Attempting to merge 6-6...conflict. 282s Attempting to merge 7-1...success. 282s Attempting to merge 7-2...success. 282s Attempting to merge 7-3...success. 282s Attempting to merge 7-4...success. 282s Attempting to merge 7-5...success. 282s Attempting to merge 8-1...success. 282s Attempting to merge 8-2...success. 282s Attempting to merge 8-3...success. 282s Attempting to merge 8-4...success. 282s Attempting to merge 8-5...success. 282s Attempting to merge 9-1...success. 282s Attempting to merge 9-2...success. 282s Attempting to merge 9-3...success. 282s Attempting to merge 9-4...success. 282s Attempting to merge 9-5...success. 282s Previous HEAD position was 00f718c imerge 'c-d': automatic merge 9-5 282s Switched to branch 'imerge/c-d' 282s Auto-merging conflict.txt 282s CONFLICT (content): Merge conflict in conflict.txt 282s Automatic merge failed; fix conflicts and then commit the result. 282s 282s Original first commit: 282s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 282s Author: Loú User 282s Date: Thu Apr 7 22:13:20 2005 +0000 282s 282s c⇒6 282s 282s Original second commit: 282s commit f7e451a6c9656dda15641a9fbc591a602f158692 282s Author: Loú User 282s Date: Thu Apr 7 22:13:29 2005 +0000 282s 282s d⇒6 282s 282s There was a conflict merging commit 6-6, shown above. 282s Please resolve the conflict, commit the result, then type 282s 282s git-imerge continue 282s + grep -q Traceback start.out 282s + grep -q suggest manual merge of 6-6 autofill.out 282s + git-imerge diagram --commits --frontier --html=imerge3.html 282s 0 5 9 282s | | | 282s 0 - ********** - c 282s *......... 282s *......... 282s *......... 282s *......... 282s 5 - *......... 282s 6 - *.....#??? 282s | 282s d 282s 282s 0 5 9 282s | | | 282s 0 - ********** - c 282s *........| 282s *........| 282s *........| 282s *........| 282s 5 - *.....---+ 282s 6 - *----+#??? 282s | 282s d 282s 282s Key: 282s |,-,+ = rectangles forming current merge frontier 282s * = merge done manually 282s . = merge done automatically 282s # = conflict that is currently blocking progress 282s @ = merge was blocked but has been resolved 282s ? = no merge recorded 282s 282s + echo merged version 282s + git add conflict.txt 282s + GIT_EDITOR=cat git commit 282s imerge 'c-d': manual merge 6-6 282s 282s # Conflicts: 282s # conflict.txt 282s # 282s # It looks like you may be committing a merge. 282s # If this is not correct, please run 282s # git update-ref -d MERGE_HEAD 282s # and try again. 282s 282s 282s # Please enter the commit message for your changes. Lines starting 282s # with '#' will be ignored, and an empty message aborts the commit. 282s # 282s # On branch imerge/c-d 282s # All conflicts fixed but you are still merging. 282s # 282s # Changes to be committed: 282s # modified: conflict.txt 282s # modified: d.txt 282s # 282s [imerge/c-d eea5b01] imerge 'c-d': manual merge 6-6 282s + git-imerge continue --edit 283s Merge has been recorded for merge 6-6. 283s Attempting to merge 7-6...success. 283s Attempting to merge 8-6...success. 283s Attempting to merge 9-6...success. 283s Merge is complete! 283s + git-imerge diagram --commits --frontier --html=imerge4.html 283s 0 5 9 283s | | | 283s 0 - ********** - c 283s *......... 283s *......... 283s *......... 283s *......... 283s 5 - *......... 283s 6 - *.....*... 283s | 283s d 283s 283s 0 5 9 283s | | | 283s 0 - ********** - c 283s *........| 283s *........| 283s *........| 283s *........| 283s 5 - *........| 283s 6 - *-----*--+ 283s | 283s d 283s 283s Key: 283s |,-,+ = rectangles forming current merge frontier 283s * = merge done manually 283s . = merge done automatically 283s # = conflict that is currently blocking progress 283s @ = merge was blocked but has been resolved 283s ? = no merge recorded 283s 283s + git-imerge finish --branch=c-d-full 283s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 283s + local refname=c-d-full 283s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 283s + git rev-parse c-d-full^{tree} 283s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 283s py312: commands[2] /tmp/autopkgtest.S6VHsS/build.sHY/src> /bin/sh t/test-really-conflicted 283s + dirname t/test-really-conflicted 283s + cd t 283s + pwd 283s + dirname /tmp/autopkgtest.S6VHsS/build.sHY/src/t 283s + BASE=/tmp/autopkgtest.S6VHsS/build.sHY/src 283s + . /tmp/autopkgtest.S6VHsS/build.sHY/src/t/test-lib.sh 283s + GIT_IMERGE=git-imerge 283s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s + DESCRIPTION=git-imerge test repository with multiple conflicts 283s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 283s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s + local description=git-imerge test repository with multiple conflicts 283s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 283s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s + local description=git-imerge test repository with multiple conflicts 283s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s hint: Using 'master' as the name for the initial branch. This default branch name 283s hint: is subject to change. To configure the initial branch name to use in all 283s hint: of your new repositories, which will suppress this warning, call: 283s hint: 283s hint: git config --global init.defaultBranch 283s hint: 283s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 283s hint: 'development'. The just-created branch can be renamed via this command: 283s hint: 283s hint: git branch -m 283s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted/.git/ 283s + echo git-imerge test repository with multiple conflicts 283s + printf %s\n /*.out /*.css /*.html 283s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted/.git config user.name Loú User 283s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted/.git config user.email luser@example.com 283s + TIME=1112911993 283s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/really-conflicted 283s + modify c.txt 0 283s + filename=c.txt 283s + text=0 283s + echo 0 283s + git add c.txt 283s + modify d.txt 0 283s + filename=d.txt 283s + text=0 283s + echo 0 283s + git add d.txt 283s + seq 0 7 283s + modify conflict0.txt original version 283s + filename=conflict0.txt 283s + text=original version 283s + echo original version 283s + git add conflict0.txt 283s + modify conflict1.txt original version 283s + filename=conflict1.txt 283s + text=original version 283s + echo original version 283s + git add conflict1.txt 283s + modify conflict2.txt original version 283s + filename=conflict2.txt 283s + text=original version 283s + echo original version 283s + git add conflict2.txt 283s + modify conflict3.txt original version 283s + filename=conflict3.txt 283s + text=original version 283s + echo original version 283s + git add conflict3.txt 283s + modify conflict4.txt original version 283s + filename=conflict4.txt 283s + text=original version 283s + echo original version 283s + git add conflict4.txt 283s + modify conflict5.txt original version 283s + filename=conflict5.txt 283s + text=original version 283s + echo original version 283s + git add conflict5.txt 283s + modify conflict6.txt original version 283s + filename=conflict6.txt 283s + text=original version 283s + echo original version 283s + git add conflict6.txt 283s + modify conflict7.txt original version 283s + filename=conflict7.txt 283s + text=original version 283s + echo original version 283s + git add conflict7.txt 283s + commit -m m⇒0 283s + TIME=1112911994 283s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 283s + git checkout -b c master -- 283s [master (root-commit) 8e21fbd] m⇒0 283s 10 files changed, 10 insertions(+) 283s create mode 100644 c.txt 283s create mode 100644 conflict0.txt 283s create mode 100644 conflict1.txt 283s create mode 100644 conflict2.txt 283s create mode 100644 conflict3.txt 283s create mode 100644 conflict4.txt 283s create mode 100644 conflict5.txt 283s create mode 100644 conflict6.txt 283s create mode 100644 conflict7.txt 283s create mode 100644 d.txt 283s Switched to a new branch 'c' 283s + modify c.txt 1 283s + filename=c.txt 283s + text=1 283s + echo 1 283s + git add c.txt 283s + modify conflict0.txt c version 283s + filename=conflict0.txt 283s + text=c version 283s + echo c version 283s + git add conflict0.txt 283s + modify conflict4.txt c version 283s + filename=conflict4.txt 283s + text=c version 283s + echo c version 283s + git add conflict4.txt 283s + commit -m c⇒1 283s + TIME=1112911995 283s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 283s [c 4e6007a] c⇒1 283s 3 files changed, 3 insertions(+), 3 deletions(-) 283s + modify c.txt 2 283s + filename=c.txt 283s + text=2 283s + echo 2 283s + git add c.txt 283s + commit -m c⇒2 283s + TIME=1112911996 283s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 283s [c c2b7c49] c⇒2 283s 1 file changed, 1 insertion(+), 1 deletion(-) 283s + modify c.txt 3 283s + filename=c.txt 283s + text=3 283s + echo 3 283s + git add c.txt 283s + commit -m c⇒3 283s + TIME=1112911997 283s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 283s [c 42ad55a] c⇒3 283s 1 file changed, 1 insertion(+), 1 deletion(-) 283s + modify c.txt 4 283s + filename=c.txt 283s + text=4 283s + echo 4 283s + git add c.txt 283s + modify conflict1.txt c version 283s + filename=conflict1.txt 283s + text=c version 283s + echo c version 283s + git add conflict1.txt 283s + commit -m c⇒4 283s + TIME=1112911998 283s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 283s [c a891793] c⇒4 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + modify c.txt 5 283s + filename=c.txt 283s + text=5 283s + echo 5 283s + git add c.txt 283s + modify conflict3.txt c version 283s + filename=conflict3.txt 283s + text=c version 283s + echo c version 283s + git add conflict3.txt 283s + modify conflict6.txt c version 283s + filename=conflict6.txt 283s + text=c version 283s + echo c version 283s + git add conflict6.txt 283s + commit -m c⇒5 283s + TIME=1112911999 283s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 283s [c c21441d] c⇒5 283s 3 files changed, 3 insertions(+), 3 deletions(-) 283s + modify c.txt 6 283s + filename=c.txt 283s + text=6 283s + echo 6 283s + git add c.txt 283s + modify conflict5.txt c version 283s + filename=conflict5.txt 283s + text=c version 283s + echo c version 283s + git add conflict5.txt 283s + commit -m c⇒6 283s + TIME=1112912000 283s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 283s + modify c.txt 7 283s + filename=c.txt 283s + text=7 283s + echo 7 283s + git add c.txt 283s [c a797a66] c⇒6 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + modify conflict2.txt c version 283s + filename=conflict2.txt 283s + text=c version 283s + echo c version 283s + git add conflict2.txt 283s + commit -m c⇒7 283s + TIME=1112912001 283s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 283s [c c0e1537] c⇒7 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + modify c.txt 8 283s + filename=c.txt 283s + text=8 283s + echo 8 283s + git add c.txt 283s + commit -m c⇒8 283s + TIME=1112912002 283s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 283s [c 9f3e7c8] c⇒8 283s 1 file changed, 1 insertion(+), 1 deletion(-) 283s + modify c.txt 9 283s + filename=c.txt 283s + text=9 283s + echo 9 283s + git add c.txt 283s + modify conflict7.txt c version 283s + filename=conflict7.txt 283s + text=c version 283s + echo c version 283s + git add conflict7.txt 283s + commit -m c⇒9 283s + TIME=1112912003 283s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 283s [c ccbfccb] c⇒9 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + git checkout -b d master -- 283s Switched to a new branch 'd' 283s + modify d.txt 1 283s + filename=d.txt 283s + text=1 283s + echo 1 283s + git add d.txt 283s + modify conflict0.txt d version 283s + filename=conflict0.txt 283s + text=d version 283s + echo d version 283s + git add conflict0.txt 283s + modify conflict6.txt d version 283s + filename=conflict6.txt 283s + text=d version 283s + echo d version 283s + git add conflict6.txt 283s + commit -m d⇒1 283s + TIME=1112912004 283s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 283s [d 8c3c065] d⇒1 283s 3 files changed, 3 insertions(+), 3 deletions(-) 283s + modify d.txt 2 283s + filename=d.txt 283s + text=2 283s + echo 2 283s + git add d.txt 283s + modify conflict1.txt d version 283s + filename=conflict1.txt 283s + text=d version 283s + echo d version 283s + git add conflict1.txt 283s + modify conflict2.txt d version 283s + filename=conflict2.txt 283s + text=d version 283s + echo d version 283s + git add conflict2.txt 283s + commit -m d⇒2 283s + TIME=1112912005 283s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 283s [d 820b787] d⇒2 283s 3 files changed, 3 insertions(+), 3 deletions(-) 283s + modify d.txt 3 283s + filename=d.txt 283s + text=3 283s + echo 3 283s + git add d.txt 283s + commit -m d⇒3 283s + TIME=1112912006 283s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 283s [d 821c792] d⇒3 283s 1 file changed, 1 insertion(+), 1 deletion(-) 283s + modify d.txt 4 283s + filename=d.txt 283s + text=4 283s + echo 4 283s + git add d.txt 283s + commit -m d⇒4 283s + TIME=1112912007 283s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 283s [d c2a1456] d⇒4 283s 1 file changed, 1 insertion(+), 1 deletion(-) 283s + modify d.txt 5 283s + filename=d.txt 283s + text=5 283s + echo 5 283s + git add d.txt 283s + modify conflict3.txt d version 283s + filename=conflict3.txt 283s + text=d version 283s + echo d version 283s + git add conflict3.txt 283s + commit -m d⇒5 283s + TIME=1112912008 283s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 283s [d c3e3890] d⇒5 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + modify d.txt 6 283s + filename=d.txt 283s + text=6 283s + echo 6 283s + git add d.txt 283s + modify conflict4.txt d version 283s + filename=conflict4.txt 283s + text=d version 283s + echo d version 283s + git add conflict4.txt 283s + commit -m d⇒6 283s + TIME=1112912009 283s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 283s [d b2f5c5e] d⇒6 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + modify d.txt 7 283s + filename=d.txt 283s + text=7 283s + echo 7 283s + git add d.txt 283s + modify conflict5.txt d version 283s + filename=conflict5.txt 283s + text=d version 283s + echo d version 283s + git add conflict5.txt 283s + commit -m d⇒7 283s + TIME=1112912010 283s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 283s [d 892af56] d⇒7 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + modify d.txt 8 283s + filename=d.txt 283s + text=8 283s + echo 8 283s + git add d.txt 283s + modify conflict7.txt d version 283s + filename=conflict7.txt 283s + text=d version 283s + echo d version 283s + git add conflict7.txt 283s + commit -m d⇒8 283s + TIME=1112912011 283s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 283s [d 67099d0] d⇒8 283s 2 files changed, 2 insertions(+), 2 deletions(-) 283s + git checkout c 283s Switched to branch 'c' 283s + git-imerge init --name=c-d d 284s + git-imerge diagram --commits --frontier 284s 0 5 9 284s | | | 284s 0 - ********** - c 284s *????????? 284s *????????? 284s *????????? 284s *????????? 284s 5 - *????????? 284s *????????? 284s *????????? 284s 8 - *????????? 284s | 284s d 284s 284s 0 5 9 284s | | | 284s 0 - ********** - c 284s *????????? 284s *????????? 284s *????????? 284s *????????? 284s 5 - *????????? 284s *????????? 284s *????????? 284s 8 - *????????? 284s | 284s d 284s 284s Key: 284s |,-,+ = rectangles forming current merge frontier 284s * = merge done manually 284s . = merge done automatically 284s # = conflict that is currently blocking progress 284s @ = merge was blocked but has been resolved 284s ? = no merge recorded 284s 284s + conflict_count=0 284s + true 284s + git-imerge continue --no-edit 284s + tee autofill.out 284s Attempting automerge of 9-8...failure. 284s Attempting automerge of 1-1...failure. 284s Switched to branch 'imerge/c-d' 284s Auto-merging conflict0.txt 284s CONFLICT (content): Merge conflict in conflict0.txt 284s Automatic merge failed; fix conflicts and then commit the result. 284s 284s Original first commit: 284s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 284s Author: Loú User 284s Date: Thu Apr 7 22:13:15 2005 +0000 284s 284s c⇒1 284s 284s Original second commit: 284s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 284s Author: Loú User 284s Date: Thu Apr 7 22:13:24 2005 +0000 284s 284s d⇒1 284s 284s There was a conflict merging commit 1-1, shown above. 284s Please resolve the conflict, commit the result, then type 284s 284s git-imerge continue 284s + grep -q Traceback autofill.out 284s + git-imerge diagram --frontier 284s 0 5 9 284s | | | 284s 0 - ********** - c 284s *#???????? 284s *????????? 284s *????????? 284s *????????? 284s 5 - *????????? 284s *????????? 284s *????????? 284s 8 - *????????? 284s | 284s d 284s 284s Key: 284s |,-,+ = rectangles forming current merge frontier 284s * = merge done manually 284s . = merge done automatically 284s # = conflict that is currently blocking progress 284s @ = merge was blocked but has been resolved 284s ? = no merge recorded 284s 284s + grep -q There was a conflict merging autofill.out 284s + seq 0 7 284s + grep -q ==== conflict0.txt 284s + modify conflict0.txt merged version 284s + filename=conflict0.txt 284s + text=merged version 284s + echo merged version 284s + git add conflict0.txt 284s + conflict_count=1 284s + grep -q ==== conflict1.txt 284s + grep -q ==== conflict2.txt 284s + grep -q ==== conflict3.txt 284s + grep -q ==== conflict4.txt 284s + grep -q ==== conflict5.txt 284s + grep -q ==== conflict6.txt 284s + grep -q ==== conflict7.txt 284s + true 284s + git-imerge continue --no-edit 284s + tee autofill.out 284s [imerge/c-d 75b3a3d] imerge 'c-d': manual merge 1-1 284s Merge has been recorded for merge 1-1. 284s Attempting automerge of 1-8...failure. 284s Attempting automerge of 1-2...success. 284s Attempting automerge of 1-6...failure. 284s Attempting automerge of 1-4...success. 284s Attempting automerge of 1-5...success. 284s Autofilling 1-2...success. 284s Autofilling 1-3...success. 284s Autofilling 1-4...success. 285s Autofilling 1-5...success. 285s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 285s Attempting automerge of 1-8...failure. 285s Attempting automerge of 1-6...failure. 285s Attempting automerge of 9-5...failure. 285s Attempting automerge of 2-1...success. 285s Attempting automerge of 2-4...success. 285s Attempting automerge of 2-5...success. 285s Attempting automerge of 9-5...failure. 285s Attempting automerge of 6-5...failure. 285s Attempting automerge of 4-5...failure. 285s Attempting automerge of 3-5...success. 285s Attempting automerge of 4-1...success. 285s Attempting automerge of 4-3...failure. 285s Attempting automerge of 4-2...failure. 285s Attempting automerge of 9-1...failure. 285s Attempting automerge of 7-1...failure. 285s Attempting automerge of 6-1...failure. 285s Attempting automerge of 5-1...failure. 285s Autofilling 2-5...success. 285s Autofilling 3-1...success. 285s Autofilling 3-2...success. 285s Autofilling 3-3...success. 285s Autofilling 3-4...success. 285s Autofilling 3-5 (first way)...success. 285s Autofilling 3-5 (second way)...success. 285s The two ways of autofilling 3-5 agree. 285s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 285s Autofilling 4-1...success. 285s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 285s Attempting automerge of 4-5...failure. 285s Attempting automerge of 4-2...failure. 285s Attempting automerge of 9-1...failure. 285s Attempting automerge of 5-1...failure. 285s Previous HEAD position was c21441d c⇒5 285s Switched to branch 'imerge/c-d' 285s Auto-merging conflict4.txt 285s CONFLICT (content): Merge conflict in conflict4.txt 285s Automatic merge failed; fix conflicts and then commit the result. 285s 285s Original first commit: 285s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 285s Author: Loú User 285s Date: Thu Apr 7 22:13:15 2005 +0000 285s 285s c⇒1 285s 285s Original second commit: 285s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 285s Author: Loú User 285s Date: Thu Apr 7 22:13:29 2005 +0000 285s 285s d⇒6 285s 285s There was a conflict merging commit 1-6, shown above. 285s Please resolve the conflict, commit the result, then type 285s 285s git-imerge continue 285s + grep -q Traceback autofill.out 285s + git-imerge diagram --frontier 285s 0 5 9 285s | | | 285s 0 - ********** - c 285s **?.+#???? 285s *.?|#????? 285s *.?|?????? 285s *.?|?????? 285s 5 - *--+?????? 285s *#???????? 285s *????????? 285s 8 - *????????? 285s | 285s d 285s 285s Key: 285s |,-,+ = rectangles forming current merge frontier 285s * = merge done manually 285s . = merge done automatically 285s # = conflict that is currently blocking progress 285s @ = merge was blocked but has been resolved 285s ? = no merge recorded 285s 285s + grep -q There was a conflict merging autofill.out 285s + seq 0 7 285s + grep -q ==== conflict0.txt 285s + grep -q ==== conflict1.txt 285s + grep -q ==== conflict2.txt 285s + grep -q ==== conflict3.txt 285s + grep -q ==== conflict4.txt 285s + modify conflict4.txt merged version 285s + filename=conflict4.txt 285s + text=merged version 285s + echo merged version 285s + git add conflict4.txt 285s + conflict_count=2 285s + grep -q ==== conflict5.txt 285s + grep -q ==== conflict6.txt 285s + grep -q ==== conflict7.txt 285s + true 285s + git-imerge continue --no-edit 285s + tee autofill.out 286s [imerge/c-d c2b042a] imerge 'c-d': manual merge 1-6 286s Merge has been recorded for merge 1-6. 286s Attempting automerge of 1-8...success. 286s Autofilling 1-7...success. 286s Autofilling 1-8...success. 286s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 286s Attempting automerge of 3-8...success. 286s Autofilling 2-8...success. 286s Autofilling 3-6...success. 286s Autofilling 3-7...success. 286s Autofilling 3-8 (first way)...success. 286s Autofilling 3-8 (second way)...success. 286s The two ways of autofilling 3-8 agree. 286s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 286s Warning: you are leaving 1 commit behind, not connected to 286s any of your branches: 286s 286s e084921 imerge 'c-d': automatic merge 3-8 286s 286s If you want to keep it by creating a new branch, this may be a good time 286s to do so with: 286s 286s git branch e084921 286s 286s Switched to branch 'imerge/c-d' 286s Auto-merging conflict1.txt 286s CONFLICT (content): Merge conflict in conflict1.txt 286s Automatic merge failed; fix conflicts and then commit the result. 286s 286s Original first commit: 286s commit a89179336bb40a4ca90903425239a9ef3ce659bd 286s Author: Loú User 286s Date: Thu Apr 7 22:13:18 2005 +0000 286s 286s c⇒4 286s 286s Original second commit: 286s commit 820b787e86e22612af7a061db842dc95e9f1d49f 286s Author: Loú User 286s Date: Thu Apr 7 22:13:25 2005 +0000 286s 286s d⇒2 286s 286s There was a conflict merging commit 4-2, shown above. 286s Please resolve the conflict, commit the result, then type 286s 286s git-imerge continue 286s + grep -q Traceback autofill.out 286s + git-imerge diagram --frontier 286s 0 5 9 286s | | | 286s 0 - ********** - c 286s **?.+#???? 286s *.?|#????? 286s *.?|?????? 286s *.?|?????? 286s 5 - *..|?????? 286s **?|?????? 286s *.?|?????? 286s 8 - *--+?????? 286s | 286s d 286s 286s Key: 286s |,-,+ = rectangles forming current merge frontier 286s * = merge done manually 286s . = merge done automatically 286s # = conflict that is currently blocking progress 286s @ = merge was blocked but has been resolved 286s ? = no merge recorded 286s 286s + grep -q There was a conflict merging autofill.out 286s + seq 0 7 286s + grep -q ==== conflict0.txt 286s + grep -q ==== conflict1.txt 286s + modify conflict1.txt merged version 286s + filename=conflict1.txt 286s + text=merged version 286s + echo merged version 286s + git add conflict1.txt 286s + conflict_count=3 286s + grep -q ==== conflict2.txt 286s + grep -q ==== conflict3.txt 286s + grep -q ==== conflict4.txt 286s + grep -q ==== conflict5.txt 286s + grep -q ==== conflict6.txt 286s + grep -q ==== conflict7.txt 286s + true 286s + git-imerge continue --no-edit 286s + tee autofill.out 287s [imerge/c-d 1b2bfc8] imerge 'c-d': manual merge 4-2 287s + grep -q Traceback autofill.out 287s + git-imerge diagram --frontier 287s + grep -q There was a conflict merging autofill.out 287s + seq 0 7 287s + grep -q ==== conflict0.txt 287s + grep -q ==== conflict1.txt 287s + grep -q ==== conflict2.txt 287s + grep -q ==== conflict3.txt 287s + grep -q ==== conflict4.txt 287s + grep -q ==== conflict5.txt 287s + grep -q ==== conflict6.txt 287s + modify conflict6.txt merged version 287s + filename=conflict6.txt 287s + text=merged version 287s + echo merged version 287s + git add conflict6.txt 287s + conflict_count=4 287s + grep -q ==== conflict7.txt 287s + true 287s + git-imerge continue --no-edit 287s + tee autofill.out 287s Merge has been recorded for merge 4-2. 287s Attempting automerge of 4-8...success. 287s Autofilling 4-3...success. 287s Autofilling 4-4...success. 287s Autofilling 4-5...success. 287s Autofilling 4-6...success. 287s Autofilling 4-7...success. 287s Autofilling 4-8...success. 287s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 287s Previous HEAD position was 234e5cd imerge 'c-d': automatic merge 4-8 287s Switched to branch 'imerge/c-d' 287s Auto-merging conflict6.txt 287s CONFLICT (content): Merge conflict in conflict6.txt 287s Automatic merge failed; fix conflicts and then commit the result. 287s 287s Original first commit: 287s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 287s Author: Loú User 287s Date: Thu Apr 7 22:13:19 2005 +0000 287s 287s c⇒5 287s 287s Original second commit: 287s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 287s Author: Loú User 287s Date: Thu Apr 7 22:13:24 2005 +0000 287s 287s d⇒1 287s 287s There was a conflict merging commit 5-1, shown above. 287s Please resolve the conflict, commit the result, then type 287s 287s git-imerge continue 287s 0 5 9 287s | | | 287s 0 - ********** - c 287s **?.|#???? 287s *.?.*????? 287s *.?.|????? 287s *.?.|????? 287s 5 - *...|????? 287s **?.|????? 287s *.?.|????? 287s 8 - *---+????? 287s | 287s d 287s 287s Key: 287s |,-,+ = rectangles forming current merge frontier 287s * = merge done manually 287s . = merge done automatically 287s # = conflict that is currently blocking progress 287s @ = merge was blocked but has been resolved 287s ? = no merge recorded 287s 287s [imerge/c-d f43974c] imerge 'c-d': manual merge 5-1 287s Merge has been recorded for merge 5-1. 287s Attempting automerge of 5-8...failure. 287s Attempting automerge of 5-2...success. 287s Attempting automerge of 5-6...failure. 287s Attempting automerge of 5-4...success. 287s Attempting automerge of 5-5...failure. 287s Autofilling 5-2...success. 287s Autofilling 5-3...success. 287s Autofilling 5-4...success. 287s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 287s Attempting automerge of 5-8...failure. 287s Attempting automerge of 5-5...failure. 287s Attempting automerge of 9-4...failure. 287s Attempting automerge of 6-1...success. 287s Attempting automerge of 6-3...success. 287s Attempting automerge of 6-4...success. 287s Attempting automerge of 9-4...failure. 287s Attempting automerge of 8-4...failure. 287s Attempting automerge of 7-4...failure. 287s Attempting automerge of 7-1...success. 287s Attempting automerge of 7-3...failure. 287s Attempting automerge of 7-2...failure. 287s Attempting automerge of 9-1...success. 287s Autofilling 6-1...success. 287s Autofilling 6-2...success. 287s Autofilling 6-3...success. 287s Autofilling 6-4...success. 287s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 287s Autofilling 7-1...success. 288s Autofilling 8-1...success. 288s Autofilling 9-1...success. 288s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 288s Attempting automerge of 9-4...failure. 288s Attempting automerge of 7-2...failure. 288s Previous HEAD position was 13d26de imerge 'c-d': automatic merge 7-1 288s Switched to branch 'imerge/c-d' 288s Auto-merging conflict3.txt 288s CONFLICT (content): Merge conflict in conflict3.txt 288s Automatic merge failed; fix conflicts and then commit the result. 288s 288s Original first commit: 288s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 288s Author: Loú User 288s Date: Thu Apr 7 22:13:19 2005 +0000 288s 288s c⇒5 288s 288s Original second commit: 288s commit c3e3890b9e3c756c1d8f7e345184d576739be079 288s Author: Loú User 288s Date: Thu Apr 7 22:13:28 2005 +0000 288s 288s d⇒5 288s 288s There was a conflict merging commit 5-5, shown above. 288s Please resolve the conflict, commit the result, then type 288s 288s git-imerge continue 288s + grep -q Traceback autofill.out 288s + git-imerge diagram --frontier 288s 0 5 9 288s | | | 288s 0 - ********** - c 288s **?..*.--+ 288s *.?.*.|#?? 288s *.?...|??? 288s *.?..-+??? 288s 5 - *...|#???? 288s **?.|????? 288s *.?.|????? 288s 8 - *---+????? 288s | 288s d 288s 288s Key: 288s |,-,+ = rectangles forming current merge frontier 288s * = merge done manually 288s . = merge done automatically 288s # = conflict that is currently blocking progress 288s @ = merge was blocked but has been resolved 288s ? = no merge recorded 288s 288s + grep -q There was a conflict merging autofill.out 288s + seq 0 7 288s + grep -q ==== conflict0.txt 288s + grep -q ==== conflict1.txt 288s + grep -q ==== conflict2.txt 288s + grep -q ==== conflict3.txt 288s + modify conflict3.txt merged version 288s + filename=conflict3.txt 288s + text=merged version 288s + echo merged version 288s + git add conflict3.txt 288s + conflict_count=5 288s + grep -q ==== conflict4.txt 288s + grep -q ==== conflict5.txt 288s + grep -q ==== conflict6.txt 288s + grep -q ==== conflict7.txt 288s + true 288s + git-imerge continue --no-edit 288s + tee autofill.out 288s [imerge/c-d 880e672] imerge 'c-d': manual merge 5-5 288s Merge has been recorded for merge 5-5. 288s Attempting automerge of 5-8...success. 288s Autofilling 5-6...success. 288s Autofilling 5-7...success. 288s Autofilling 5-8...success. 288s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 288s Attempting automerge of 6-8...failure. 288s Attempting automerge of 6-5...success. 288s Attempting automerge of 6-7...failure. 288s Attempting automerge of 6-6...success. 288s Autofilling 6-5...success. 288s Autofilling 6-6...success. 288s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 288s Attempting automerge of 6-8...failure. 288s Attempting automerge of 6-7...failure. 288s Switched to branch 'imerge/c-d' 288s Auto-merging conflict5.txt 288s CONFLICT (content): Merge conflict in conflict5.txt 288s Automatic merge failed; fix conflicts and then commit the result. 288s 288s Original first commit: 288s commit a797a66a0e4b89690099557280641efeac302bcf 288s Author: Loú User 288s Date: Thu Apr 7 22:13:20 2005 +0000 288s 288s c⇒6 288s 288s Original second commit: 288s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 288s Author: Loú User 288s Date: Thu Apr 7 22:13:30 2005 +0000 288s 288s d⇒7 288s 288s There was a conflict merging commit 6-7, shown above. 288s Please resolve the conflict, commit the result, then type 288s 288s git-imerge continue 288s + grep -q Traceback autofill.out 288s + git-imerge diagram --frontier 289s 0 5 9 289s | | | 289s 0 - ********** - c 289s **?..*.--+ 289s *.?.*.|#?? 289s *.?...|??? 289s *.?...|??? 289s 5 - *....*|??? 289s **?...+??? 289s *.?..|#??? 289s 8 - *----+???? 289s | 289s d 289s 289s Key: 289s |,-,+ = rectangles forming current merge frontier 289s * = merge done manually 289s . = merge done automatically 289s # = conflict that is currently blocking progress 289s @ = merge was blocked but has been resolved 289s ? = no merge recorded 289s 289s + grep -q There was a conflict merging autofill.out 289s + seq 0 7 289s + grep -q ==== conflict0.txt 289s + grep -q ==== conflict1.txt 289s + grep -q ==== conflict2.txt 289s + grep -q ==== conflict3.txt 289s + grep -q ==== conflict4.txt 289s + grep -q ==== conflict5.txt 289s + modify conflict5.txt merged version 289s + filename=conflict5.txt 289s + text=merged version 289s + echo merged version 289s + git add conflict5.txt 289s + conflict_count=6 289s + grep -q ==== conflict6.txt 289s + grep -q ==== conflict7.txt 289s + true 289s + git-imerge continue --no-edit 289s + tee autofill.out 289s [imerge/c-d f761914] imerge 'c-d': manual merge 6-7 289s Merge has been recorded for merge 6-7. 289s Attempting automerge of 6-8...success. 289s Autofilling 6-8...success. 289s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 289s Previous HEAD position was b39a6d1 imerge 'c-d': automatic merge 6-8 289s Switched to branch 'imerge/c-d' 289s Auto-merging conflict2.txt 289s CONFLICT (content): Merge conflict in conflict2.txt 289s Automatic merge failed; fix conflicts and then commit the result. 289s 289s Original first commit: 289s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 289s Author: Loú User 289s Date: Thu Apr 7 22:13:21 2005 +0000 289s 289s c⇒7 289s 289s Original second commit: 289s commit 820b787e86e22612af7a061db842dc95e9f1d49f 289s Author: Loú User 289s Date: Thu Apr 7 22:13:25 2005 +0000 289s 289s d⇒2 289s 289s There was a conflict merging commit 7-2, shown above. 289s Please resolve the conflict, commit the result, then type 289s 289s git-imerge continue 289s + grep -q Traceback autofill.out 289s + git-imerge diagram --frontier 289s 0 5 9 289s | | | 289s 0 - ********** - c 289s **?..*.--+ 289s *.?.*.|#?? 289s *.?...|??? 289s *.?...|??? 289s 5 - *....*|??? 289s **?...|??? 289s *.?...*??? 289s 8 - *-----+??? 289s | 289s d 289s 289s Key: 289s |,-,+ = rectangles forming current merge frontier 289s * = merge done manually 289s . = merge done automatically 289s # = conflict that is currently blocking progress 289s @ = merge was blocked but has been resolved 289s ? = no merge recorded 289s 289s + grep -q There was a conflict merging autofill.out 289s + seq 0 7 289s + grep -q ==== conflict0.txt 289s + grep -q ==== conflict1.txt 289s + grep -q ==== conflict2.txt 289s + modify conflict2.txt merged version 289s + filename=conflict2.txt 289s + text=merged version 289s + echo merged version 289s + git add conflict2.txt 289s + conflict_count=7 289s + grep -q ==== conflict3.txt 289s + grep -q ==== conflict4.txt 289s + grep -q ==== conflict5.txt 289s + grep -q ==== conflict6.txt 289s + grep -q ==== conflict7.txt 289s + true 289s + + tee autofill.out 289s git-imerge continue --no-edit 289s [imerge/c-d c091317] imerge 'c-d': manual merge 7-2 289s Merge has been recorded for merge 7-2. 289s Attempting automerge of 7-8...success. 289s Autofilling 7-3...success. 290s Autofilling 7-4...success. 290s Autofilling 7-5...success. 290s Autofilling 7-6...success. 290s Autofilling 7-7...success. 290s Autofilling 7-8...success. 290s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 290s Attempting automerge of 9-8...failure. 290s Attempting automerge of 8-2...success. 290s Attempting automerge of 8-6...success. 290s Attempting automerge of 8-8...success. 290s Attempting automerge of 9-8...failure. 290s Attempting automerge of 9-2...success. 290s Attempting automerge of 9-5...success. 290s Attempting automerge of 9-7...success. 290s Autofilling 8-2...success. 290s Autofilling 8-3...success. 290s Autofilling 8-4...success. 290s Autofilling 8-5...success. 290s Autofilling 8-6...success. 290s Autofilling 8-7...success. 290s Autofilling 8-8...success. 290s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 290s Autofilling 9-2...success. 290s Autofilling 9-3...success. 290s Autofilling 9-4...success. 290s Autofilling 9-5...success. 290s Autofilling 9-6...success. 290s Autofilling 9-7...success. 290s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 290s Attempting automerge of 9-8...failure. 290s Attempting automerge of 9-8...failure. 290s Switched to branch 'imerge/c-d' 290s Auto-merging conflict7.txt 290s CONFLICT (content): Merge conflict in conflict7.txt 290s Automatic merge failed; fix conflicts and then commit the result. 290s 290s Original first commit: 290s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 290s Author: Loú User 290s Date: Thu Apr 7 22:13:23 2005 +0000 290s 290s c⇒9 290s 290s Original second commit: 290s commit 67099d078100141fbe4063d46a6408200f4ff311 290s Author: Loú User 290s Date: Thu Apr 7 22:13:31 2005 +0000 290s 290s d⇒8 290s 290s There was a conflict merging commit 9-8, shown above. 290s Please resolve the conflict, commit the result, then type 290s 290s git-imerge continue 290s + grep -q Traceback autofill.out 290s + git-imerge diagram --frontier 290s 0 5 9 290s | | | 290s 0 - ********** - c 290s **?..*...| 290s *.?.*..*.| 290s *.?......| 290s *.?......| 290s 5 - *....*...| 290s **?......| 290s *.?...*..+ 290s 8 - *-------+# 290s | 290s d 290s 290s Key: 290s |,-,+ = rectangles forming current merge frontier 290s * = merge done manually 290s . = merge done automatically 290s # = conflict that is currently blocking progress 290s @ = merge was blocked but has been resolved 290s ? = no merge recorded 290s 290s + grep -q There was a conflict merging autofill.out 290s + seq 0 7 290s + grep -q ==== conflict0.txt 290s + grep -q ==== conflict1.txt 290s + grep -q ==== conflict2.txt 290s + grep -q ==== conflict3.txt 290s + grep -q ==== conflict4.txt 290s + grep -q ==== conflict5.txt 290s + grep -q ==== conflict6.txt 290s + grep -q ==== conflict7.txt 290s + modify conflict7.txt merged version 290s + filename=conflict7.txt 290s + text=merged version 290s + echo merged version 290s + git add conflict7.txt 290s + conflict_count=8 290s + true 290s + + git-imerge continue --no-edit 290s tee autofill.out 290s [imerge/c-d 0667722] imerge 'c-d': manual merge 9-8 290s Merge has been recorded for merge 9-8. 291s Merge is complete! 291s + grep -q Traceback autofill.out 291s + git-imerge diagram --frontier 291s 0 5 9 291s | | | 291s 0 - ********** - c 291s **?..*...| 291s *.?.*..*.| 291s *.?......| 291s *.?......| 291s 5 - *....*...| 291s **?......| 291s *.?...*..| 291s 8 - *--------* 291s | 291s d 291s 291s Key: 291s |,-,+ = rectangles forming current merge frontier 291s * = merge done manually 291s . = merge done automatically 291s # = conflict that is currently blocking progress 291s @ = merge was blocked but has been resolved 291s ? = no merge recorded 291s 291s + grep -q There was a conflict merging autofill.out 291s + break 291s + test 8 -ne 8 291s + git-imerge diagram --commits 291s + + cat 291s diff -u - diagram.out 291s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 291s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 291s Merge d into c (using imerge) 291s 291s # Please enter the commit message for your changes. Lines starting 291s # with '#' will be ignored, and an empty message aborts the commit. 291s # 291s # Date: Thu Mar 21 22:48:03 2024 +0000 291s # 291s # On branch c-d-merge 291s # Changes to be committed: 291s # modified: conflict0.txt 291s # modified: conflict1.txt 291s # modified: conflict2.txt 291s # modified: conflict3.txt 291s # modified: conflict4.txt 291s # modified: conflict5.txt 291s # modified: conflict6.txt 291s # modified: conflict7.txt 291s # modified: d.txt 291s # 291s [c-d-merge 8001e76] Merge d into c (using imerge) 291s Date: Thu Mar 21 22:48:03 2024 +0000 291s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 291s + local refname=c-d-merge 291s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 291s + git rev-parse c-d-merge^{tree} 291s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 291s + git-imerge simplify --goal=rebase --branch=c-d-rebase 292s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + local refname=c-d-rebase 292s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + git rev-parse c-d-rebase^{tree} 292s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 292s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + local refname=c-d-rebase-with-history 292s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + git rev-parse c-d-rebase-with-history^{tree} 292s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + git-imerge simplify --goal=border --branch=c-d-border 292s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + local refname=c-d-border 292s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + git rev-parse c-d-border^{tree} 292s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 292s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 293s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 293s + local refname=c-d-border-with-history 293s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 293s + git rev-parse c-d-border-with-history^{tree} 293s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 293s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 293s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 293s + local refname=c-d-border-with-history2 293s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 293s + git rev-parse c-d-border-with-history2^{tree} 293s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 293s + git-imerge remove 293s py312: commands[3] /tmp/autopkgtest.S6VHsS/build.sHY/src> /bin/sh t/test-duplicated 293s + dirname t/test-duplicated 293s + cd t 293s + pwd 293s + dirname /tmp/autopkgtest.S6VHsS/build.sHY/src/t 293s + BASE=/tmp/autopkgtest.S6VHsS/build.sHY/src 293s + . /tmp/autopkgtest.S6VHsS/build.sHY/src/t/test-lib.sh 293s + GIT_IMERGE=git-imerge 293s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s + DESCRIPTION=git-imerge test repository with duplicate commits 293s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated git-imerge test repository with duplicate commits 293s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s + local description=git-imerge test repository with duplicate commits 293s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated git-imerge test repository with duplicate commits 293s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s + local description=git-imerge test repository with duplicate commits 293s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s hint: Using 'master' as the name for the initial branch. This default branch name 293s hint: is subject to change. To configure the initial branch name to use in all 293s hint: of your new repositories, which will suppress this warning, call: 293s hint: 293s hint: git config --global init.defaultBranch 293s hint: 293s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 293s hint: 'development'. The just-created branch can be renamed via this command: 293s hint: 293s hint: git branch -m 293s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated/.git/ 293s + echo git-imerge test repository with duplicate commits 293s + printf %s\n /*.out /*.css /*.html 293s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated/.git config user.name Loú User 293s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated/.git config user.email luser@example.com 293s + TIME=1112911993 293s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/duplicated 293s + modify a.txt 0 293s + filename=a.txt 293s + text=0 293s + echo 0 293s + git add a.txt 293s + commit -m m⇒0 293s + TIME=1112911994 293s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 293s + git checkout -b a -- 293s Switched to a new branch 'a' 293s + seq 3 293s + modify a.txt 1 293s + filename=a.txt 293s + text=1 293s + echo 1 293s + git add a.txt 293s + commit -m a⇒1 on branch a 293s + TIME=1112911995 293s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 293s + modify a.txt 2 293s + filename=a.txt 293s + text=2 293s + echo 2 293s + git add a.txt 293s + commit -m a⇒2 on branch a 293s [master (root-commit) a733afa] m⇒0 293s 1 file changed, 1 insertion(+) 293s create mode 100644 a.txt 293s [a 2f1f75a] a⇒1 on branch a 293s 1 file changed, 1 insertion(+), 1 deletion(-) 293s + TIME=1112911996 293s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 293s [a 4700669] a⇒2 on branch a 293s 1 file changed, 1 insertion(+), 1 deletion(-) 293s + modify a.txt 3 293s + filename=a.txt 293s + text=3 293s + echo 3 293s + git add a.txt 293s + commit -m a⇒3 on branch a 293s + TIME=1112911997 293s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 293s [a 621c381] a⇒3 on branch a 293s 1 file changed, 1 insertion(+), 1 deletion(-) 293s + git checkout -b b master -- 293s Switched to a new branch 'b' 293s + seq 4 293s + modify a.txt 1 293s + filename=a.txt 293s + text=1 293s + echo 1 293s + git add a.txt 293s + commit -m a⇒1 on branch b 293s + TIME=1112911998 293s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 293s [b 62a5c56] a⇒1 on branch b 293s 1 file changed, 1 insertion(+), 1 deletion(-) 293s + modify a.txt 2 293s + filename=a.txt 293s + text=2 293s + echo 2 293s + git add a.txt 293s + commit -m a⇒2 on branch b 293s + TIME=1112911999 293s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 293s + modify a.txt 3 293s + filename=a.txt 293s + text=3 293s [b f846281] a⇒2 on branch b 293s 1 file changed, 1 insertion(+), 1 deletion(-) 293s + echo 3 293s + git add a.txt 293s + commit -m a⇒3 on branch b 293s + TIME=1112912000 293s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 293s [b a4b2c2b] a⇒3 on branch b 293s 1 file changed, 1 insertion(+), 1 deletion(-) 293s + modify a.txt 4 293s + filename=a.txt 293s + text=4 293s + echo 4 293s + git add a.txt 293s + commit -m a⇒4 on branch b 293s + TIME=1112912001 293s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 293s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 293s + git checkout a 293s [b 5b24553] a⇒4 on branch b 293s 1 file changed, 1 insertion(+), 1 deletion(-) 293s Switched to branch 'a' 293s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 294s Attempting automerge of 3-4...failure. 294s Attempting automerge of 1-1...success. 294s Attempting automerge of 1-3...failure. 294s Attempting automerge of 1-2...failure. 294s Attempting automerge of 3-1...failure. 294s Attempting automerge of 2-1...failure. 294s Autofilling 1-1...success. 294s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 294s Attempting automerge of 1-4...success. 294s Autofilling 1-2...success. 294s Autofilling 1-3...success. 294s Autofilling 1-4...success. 294s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 294s Attempting automerge of 3-4...failure. 294s Attempting automerge of 2-1...success. 294s Attempting automerge of 2-3...failure. 294s Attempting automerge of 2-2...success. 294s Attempting automerge of 3-2...failure. 294s Attempting automerge of 3-1...success. 294s Autofilling 2-1...success. 294s Autofilling 2-2...success. 294s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 294s Autofilling 3-1...success. 294s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 294s Attempting automerge of 2-4...success. 294s Autofilling 2-3...success. 294s Autofilling 2-4...success. 294s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 294s Attempting automerge of 3-4...failure. 294s Attempting automerge of 3-2...success. 294s Attempting automerge of 3-4...failure. 294s Attempting automerge of 3-3...success. 294s Autofilling 3-2...success. 294s Autofilling 3-3...success. 294s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 294s Attempting automerge of 3-4...success. 294s Autofilling 3-4...success. 294s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 294s Merge is complete! 294s + git-imerge diagram --commits --frontier --html=imerge5.html 294s 0 3 294s | | 294s 0 - **** - a 294s *... 294s *... 294s *... 294s 4 - *... 294s | 294s b 294s 294s 0 3 294s | | 294s 0 - **** - a 294s *..| 294s *..| 294s *..| 294s 4 - *--+ 294s | 294s b 294s 294s Key: 294s |,-,+ = rectangles forming current merge frontier 294s * = merge done manually 294s . = merge done automatically 294s # = conflict that is currently blocking progress 294s @ = merge was blocked but has been resolved 294s ? = no merge recorded 294s 294s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 294s Merge b into a (using imerge) 294s 294s # Please enter the commit message for your changes. Lines starting 294s # with '#' will be ignored, and an empty message aborts the commit. 294s # 294s # Date: Thu Mar 21 22:48:06 2024 +0000 294s # 294s # On branch a-b-merge 294s # Changes to be committed: 294s # modified: a.txt 294s # 294s [a-b-merge e8b2246] Merge b into a (using imerge) 294s Date: Thu Mar 21 22:48:06 2024 +0000 295s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + local refname=a-b-merge 295s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git rev-parse a-b-merge^{tree} 295s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git-imerge simplify --goal=rebase --branch=a-b-rebase 295s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + local refname=a-b-rebase 295s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git rev-parse a-b-rebase^{tree} 295s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 295s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + local refname=a-b-rebase-with-history 295s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git rev-parse a-b-rebase-with-history^{tree} 295s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git-imerge simplify --goal=border --branch=a-b-border 295s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + local refname=a-b-border 295s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git rev-parse a-b-border^{tree} 295s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 295s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + local refname=a-b-border-with-history 295s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git rev-parse a-b-border-with-history^{tree} 295s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 295s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + local refname=a-b-border-with-history2 295s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git rev-parse a-b-border-with-history2^{tree} 295s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 295s + git checkout a 295s Switched to branch 'a' 295s + git-imerge start --goal=full --name=a-b b 296s Attempting to merge 1-1...success. 296s Attempting to merge 1-2...success. 296s Attempting to merge 1-3...success. 296s Attempting to merge 1-4...success. 296s Attempting to merge 2-1...success. 296s Attempting to merge 2-2...success. 296s Attempting to merge 2-3...success. 296s Attempting to merge 2-4...success. 296s Attempting to merge 3-1...success. 296s Attempting to merge 3-2...success. 296s Attempting to merge 3-3...success. 296s Attempting to merge 3-4...success. 296s Merge is complete! 296s + git-imerge list 296s * a-b 296s + git-imerge diagram --commits --frontier --html=imerge6.html 296s 0 3 296s | | 296s 0 - **** - a 296s *... 296s *... 296s *... 296s 4 - *... 296s | 296s b 296s 296s 0 3 296s | | 296s 0 - **** - a 296s *..| 296s *..| 296s *..| 296s 4 - *--+ 296s | 296s b 296s 296s Key: 296s |,-,+ = rectangles forming current merge frontier 296s * = merge done manually 296s . = merge done automatically 296s # = conflict that is currently blocking progress 296s @ = merge was blocked but has been resolved 296s ? = no merge recorded 296s 296s + git-imerge finish --branch=a-b-full 296s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 296s + local refname=a-b-full 296s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 296s + git rev-parse a-b-full^{tree} 296s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 296s py312: commands[4] /tmp/autopkgtest.S6VHsS/build.sHY/src> /bin/sh t/test-flip-flop 296s + dirname t/test-flip-flop 296s + cd t 296s + pwd 296s + dirname /tmp/autopkgtest.S6VHsS/build.sHY/src/t 296s + BASE=/tmp/autopkgtest.S6VHsS/build.sHY/src 296s + . /tmp/autopkgtest.S6VHsS/build.sHY/src/t/test-lib.sh 296s + GIT_IMERGE=git-imerge 296s + flip_flop_test 1 296s + local n=1 296s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 296s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 296s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s + local description=git-imerge test repository with a commit and its revert at n=1 296s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 296s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s + local description=git-imerge test repository with a commit and its revert at n=1 296s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s hint: Using 'master' as the name for the initial branch. This default branch name 296s hint: is subject to change. To configure the initial branch name to use in all 296s hint: of your new repositories, which will suppress this warning, call: 296s hint: 296s hint: git config --global init.defaultBranch 296s hint: 296s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 296s hint: 'development'. The just-created branch can be renamed via this command: 296s hint: 296s hint: git branch -m 296s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1/.git/ 296s + echo git-imerge test repository with a commit and its revert at n=1 296s + printf %s\n /*.out /*.css /*.html 296s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1/.git config user.name Loú User 296s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 296s + TIME=1112911993 296s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-1 296s + modify a.txt 0 296s + filename=a.txt 296s + text=0 296s + echo 0 296s + git add a.txt 296s + commit -m m⇒0 296s + TIME=1112911994 296s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 296s [master (root-commit) a733afa] m⇒0 296s 1 file changed, 1 insertion(+) 296s create mode 100644 a.txt 296s + git checkout -b a -- 296s Switched to a new branch 'a' 296s + modify a.txt 1 296s + filename=a.txt 296s + text=1 296s + echo 1 296s + git add a.txt 296s + commit -m a⇒1 on branch a 296s + TIME=1112911995 296s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 296s [a 2f1f75a] a⇒1 on branch a 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify a.txt 2 296s + filename=a.txt 296s + text=2 296s + echo 2 296s + git add a.txt 296s + commit -m a⇒2 on branch a 296s + TIME=1112911996 296s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 296s [a 4700669] a⇒2 on branch a 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify a.txt 3 296s + filename=a.txt 296s + text=3 296s + echo 3 296s + git add a.txt 296s + commit -m a⇒3 on branch a 296s + TIME=1112911997 296s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 296s [a 621c381] a⇒3 on branch a 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + git checkout -b b master -- 296s Switched to a new branch 'b' 296s + modify b.txt 1 296s + filename=b.txt 296s + text=1 296s + echo 1 296s + git add b.txt 296s + msg=b⇒1 296s + test 1 = 1 296s + modify a.txt X 296s + filename=a.txt 296s + text=X 296s + echo X 296s + git add a.txt 296s + msg=b⇒1 and a⇒X 296s + test 1 = 2 296s + commit -m b⇒1 and a⇒X on branch b 296s + TIME=1112911998 296s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 296s [b 044a3fa] b⇒1 and a⇒X on branch b 296s 2 files changed, 2 insertions(+), 1 deletion(-) 296s create mode 100644 b.txt 296s + modify b.txt 2 296s + filename=b.txt 296s + text=2 296s + echo 2 296s + git add b.txt 296s + msg=b⇒2 296s + test 2 = 1 296s + test 2 = 2 296s + modify a.txt 0 296s + filename=a.txt 296s + text=0 296s + echo 0 296s + git add a.txt 296s + msg=b⇒2 and a⇒0 296s + commit -m b⇒2 and a⇒0 on branch b 296s + TIME=1112911999 296s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 296s [b 7851975] b⇒2 and a⇒0 on branch b 296s 2 files changed, 2 insertions(+), 2 deletions(-) 296s + modify b.txt 3 296s + filename=b.txt 296s + text=3 296s + echo 3 296s + git add b.txt 296s + msg=b⇒3 296s + test 3 = 1 296s + test 3 = 2 296s + commit -m b⇒3 on branch b 296s + TIME=1112912000 296s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 296s [b 6fe24f0] b⇒3 on branch b 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s + modify b.txt 4 296s + filename=b.txt 296s + text=4 296s + echo 4 296s + git add b.txt 296s + msg=b⇒4 296s + test 4 = 1 296s + test 4 = 2 296s + commit -m b⇒4 on branch b 296s + TIME=1112912001 296s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 296s + test_merge b-into-a-1 a b 1-1 1-2 296s + local name=b-into-a-1 296s + local dst=a 296s + local src=b 296s + local conflict1=1-1 296s + local conflict2=1-2 296s + git checkout a 296s [b 2dc5eb7] b⇒4 on branch b 296s 1 file changed, 1 insertion(+), 1 deletion(-) 296s Switched to branch 'a' 296s + + git-imerge merge --branch=b-into-a-1 b 296s tee imerge-b-into-a-1-1.out 296s Attempting automerge of 3-4...success. 297s Autofilling 1-4...success. 297s Autofilling 2-4...success. 297s Autofilling 3-1...unexpected conflict. Backtracking... 297s Autofilling 1-4...success. 297s Autofilling 2-1...unexpected conflict. Backtracking... 297s Autofilling 1-1...unexpected conflict. Backtracking... 297s Switched to branch 'imerge/b' 297s Auto-merging a.txt 297s CONFLICT (content): Merge conflict in a.txt 297s Automatic merge failed; fix conflicts and then commit the result. 297s 297s Original first commit: 297s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 297s Author: Loú User 297s Date: Thu Apr 7 22:13:15 2005 +0000 297s 297s a⇒1 on branch a 297s 297s Original second commit: 297s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 297s Author: Loú User 297s Date: Thu Apr 7 22:13:18 2005 +0000 297s 297s b⇒1 and a⇒X on branch b 297s 297s There was a conflict merging commit 1-1, shown above. 297s Please resolve the conflict, commit the result, then type 297s 297s git-imerge continue 297s + git-imerge diagram --commits --frontier 297s 0 3 297s | | 297s 0 - **** - a 297s *#?? 297s *??? 297s *??? 297s 4 - *??? 297s | 297s b 297s 297s 0 3 297s | | 297s 0 - **** - a 297s *#?? 297s *??? 297s *??? 297s 4 - *??? 297s | 297s b 297s 297s Key: 297s |,-,+ = rectangles forming current merge frontier 297s * = merge done manually 297s . = merge done automatically 297s # = conflict that is currently blocking progress 297s @ = merge was blocked but has been resolved 297s ? = no merge recorded 297s 297s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 297s + echo 1 297s + git add a.txt 297s + + git-imergetee continue --no-edit 297s imerge-b-into-a-1-2.out 297s [imerge/b 7dbc72b] imerge 'b': manual merge 1-1 297s Merge has been recorded for merge 1-1. 297s Attempting automerge of 1-4...failure. 297s Attempting automerge of 1-2...failure. 297s Attempting automerge of 3-1...success. 297s Autofilling 2-1...success. 297s Autofilling 3-1...success. 297s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 297s Previous HEAD position was e7b4ae6 imerge 'b': automatic merge 3-1 297s Switched to branch 'imerge/b' 297s Auto-merging a.txt 297s CONFLICT (content): Merge conflict in a.txt 297s Automatic merge failed; fix conflicts and then commit the result. 297s 297s Original first commit: 297s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 297s Author: Loú User 297s Date: Thu Apr 7 22:13:15 2005 +0000 297s 297s a⇒1 on branch a 297s 297s Original second commit: 297s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 297s Author: Loú User 297s Date: Thu Apr 7 22:13:19 2005 +0000 297s 297s b⇒2 and a⇒0 on branch b 297s 297s There was a conflict merging commit 1-2, shown above. 297s Please resolve the conflict, commit the result, then type 297s 297s git-imerge continue 297s + git-imerge diagram --commits --frontier 297s 0 3 297s | | 297s 0 - **** - a 297s **.. 297s *#?? 297s *??? 297s 4 - *??? 297s | 297s b 297s 297s 0 3 297s | | 297s 0 - **** - a 297s **-+ 297s *#?? 297s *??? 297s 4 - *??? 297s | 297s b 297s 297s Key: 297s |,-,+ = rectangles forming current merge frontier 297s * = merge done manually 297s . = merge done automatically 297s # = conflict that is currently blocking progress 297s @ = merge was blocked but has been resolved 297s ? = no merge recorded 297s 297s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 297s + echo 1 297s + git add a.txt 297s + + git-imerge continue --no-edit 297s tee imerge-b-into-a-1-3.out 297s [imerge/b f4420e1] imerge 'b': manual merge 1-2 297s Merge has been recorded for merge 1-2. 297s Attempting automerge of 1-4...success. 297s Autofilling 1-3...success. 297s Autofilling 1-4...success. 297s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 298s Attempting automerge of 3-4...success. 298s Autofilling 2-4...success. 298s Autofilling 3-2...success. 298s Autofilling 3-3...success. 298s Autofilling 3-4 (first way)...success. 298s Autofilling 3-4 (second way)...success. 298s The two ways of autofilling 3-4 agree. 298s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 298s Merge is complete! 298s + grep -q Merge is complete imerge-b-into-a-1-3.out 298s + git-imerge diagram --commits --frontier 298s 0 3 298s | | 298s 0 - **** - a 298s **.. 298s **?. 298s *.?. 298s 4 - *... 298s | 298s b 298s 298s 0 3 298s | | 298s 0 - **** - a 298s **.| 298s **?| 298s *.?| 298s 4 - *--+ 298s | 298s b 298s 298s Key: 298s |,-,+ = rectangles forming current merge frontier 298s * = merge done manually 298s . = merge done automatically 298s # = conflict that is currently blocking progress 298s @ = merge was blocked but has been resolved 298s ? = no merge recorded 298s 298s + GIT_EDITOR=cat git-imerge finish 298s Merge b into a (using imerge) 298s 298s # Please enter the commit message for your changes. Lines starting 298s # with '#' will be ignored, and an empty message aborts the commit. 298s # 298s # Date: Thu Mar 21 22:48:10 2024 +0000 298s # 298s # On branch b-into-a-1 298s # Changes to be committed: 298s # new file: b.txt 298s # 298s [b-into-a-1 8389ce3] Merge b into a (using imerge) 298s Date: Thu Mar 21 22:48:10 2024 +0000 298s + test_merge a-into-b-1 b a 1-1 2-1 298s + local name=a-into-b-1 298s + local dst=b 298s + local src=a 298s + local conflict1=1-1 298s + local conflict2=2-1 298s + git checkout b 298s Switched to branch 'b' 298s + git-imerge merge --branch=a-into-b-1 a 298s + tee imerge-a-into-b-1-1.out 298s Attempting automerge of 4-3...success. 298s Autofilling 1-3...unexpected conflict. Backtracking... 298s Autofilling 1-2...unexpected conflict. Backtracking... 298s Autofilling 1-1...unexpected conflict. Backtracking... 298s Switched to branch 'imerge/a' 298s Auto-merging a.txt 298s CONFLICT (content): Merge conflict in a.txt 298s Automatic merge failed; fix conflicts and then commit the result. 298s 298s Original first commit: 298s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 298s Author: Loú User 298s Date: Thu Apr 7 22:13:18 2005 +0000 298s 298s b⇒1 and a⇒X on branch b 298s 298s Original second commit: 298s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 298s Author: Loú User 298s Date: Thu Apr 7 22:13:15 2005 +0000 298s 298s a⇒1 on branch a 298s 298s There was a conflict merging commit 1-1, shown above. 298s Please resolve the conflict, commit the result, then type 298s 298s git-imerge continue 298s + git-imerge diagram --commits --frontier 298s 0 4 298s | | 298s 0 - ***** - b 298s *#??? 298s *???? 298s 3 - *???? 298s | 298s a 298s 298s 0 4 298s | | 298s 0 - ***** - b 298s *#??? 298s *???? 298s 3 - *???? 298s | 298s a 298s 298s Key: 298s |,-,+ = rectangles forming current merge frontier 298s * = merge done manually 298s . = merge done automatically 298s # = conflict that is currently blocking progress 298s @ = merge was blocked but has been resolved 298s ? = no merge recorded 298s 298s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 299s + echo 1 299s + git add a.txt 299s + + git-imergetee continue --no-edit 299s imerge-a-into-b-1-2.out 299s [imerge/a 0700ee6] imerge 'a': manual merge 1-1 299s Merge has been recorded for merge 1-1. 299s Attempting automerge of 1-3...success. 299s Autofilling 1-2...success. 299s Autofilling 1-3...success. 299s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 299s Attempting automerge of 4-3...failure. 299s Attempting automerge of 2-1...failure. 299s Switched to branch 'imerge/a' 299s Auto-merging a.txt 299s CONFLICT (content): Merge conflict in a.txt 299s Automatic merge failed; fix conflicts and then commit the result. 299s 299s Original first commit: 299s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 299s Author: Loú User 299s Date: Thu Apr 7 22:13:19 2005 +0000 299s 299s b⇒2 and a⇒0 on branch b 299s 299s Original second commit: 299s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 299s Author: Loú User 299s Date: Thu Apr 7 22:13:15 2005 +0000 299s 299s a⇒1 on branch a 299s 299s There was a conflict merging commit 2-1, shown above. 299s Please resolve the conflict, commit the result, then type 299s 299s git-imerge continue 299s + git-imerge diagram --commits --frontier 299s 0 4 299s | | 299s 0 - ***** - b 299s **#?? 299s *.??? 299s 3 - *.??? 299s | 299s a 299s 299s 0 4 299s | | 299s 0 - ***** - b 299s **#?? 299s *|??? 299s 3 - *+??? 299s | 299s a 299s 299s Key: 299s |,-,+ = rectangles forming current merge frontier 299s * = merge done manually 299s . = merge done automatically 299s # = conflict that is currently blocking progress 299s @ = merge was blocked but has been resolved 299s ? = no merge recorded 299s 299s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 299s + echo 1 299s + git add a.txt 299s + git-imerge+ continue --no-edit 299s tee imerge-a-into-b-1-3.out 299s [imerge/a 960339c] imerge 'a': manual merge 2-1 299s Merge has been recorded for merge 2-1. 299s Attempting automerge of 2-3...success. 299s Autofilling 2-2...success. 299s Autofilling 2-3...success. 299s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 299s Attempting automerge of 4-3...success. 299s Autofilling 3-3...success. 299s Autofilling 4-1...success. 299s Autofilling 4-2...success. 299s Autofilling 4-3 (first way)...success. 299s Autofilling 4-3 (second way)...success. 299s The two ways of autofilling 4-3 agree. 299s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 299s Merge is complete! 299s + grep -q Merge is complete imerge-a-into-b-1-3.out 299s + git-imerge diagram --commits --frontier 300s 0 4 300s | | 300s 0 - ***** - b 300s ***?. 300s *..?. 300s 3 - *.... 300s | 300s a 300s 300s 0 4 300s | | 300s 0 - ***** - b 300s ***?| 300s *..?| 300s 3 - *---+ 300s | 300s a 300s 300s Key: 300s |,-,+ = rectangles forming current merge frontier 300s * = merge done manually 300s . = merge done automatically 300s # = conflict that is currently blocking progress 300s @ = merge was blocked but has been resolved 300s ? = no merge recorded 300s 300s + GIT_EDITOR=cat git-imerge finish 300s Merge a into b (using imerge) 300s 300s # Please enter the commit message for your changes. Lines starting 300s # with '#' will be ignored, and an empty message aborts the commit. 300s # 300s # Date: Thu Mar 21 22:48:12 2024 +0000 300s # 300s # On branch a-into-b-1 300s # Changes to be committed: 300s # modified: a.txt 300s # 300s [a-into-b-1 21e2ef4] Merge a into b (using imerge) 300s Date: Thu Mar 21 22:48:12 2024 +0000 300s + flip_flop_test 2 300s + local n=2 300s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 300s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 300s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s + local description=git-imerge test repository with a commit and its revert at n=2 300s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 300s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s + local description=git-imerge test repository with a commit and its revert at n=2 300s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2/.git/ 300s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s hint: Using 'master' as the name for the initial branch. This default branch name 300s hint: is subject to change. To configure the initial branch name to use in all 300s hint: of your new repositories, which will suppress this warning, call: 300s hint: 300s hint: git config --global init.defaultBranch 300s hint: 300s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 300s hint: 'development'. The just-created branch can be renamed via this command: 300s hint: 300s hint: git branch -m 300s + echo git-imerge test repository with a commit and its revert at n=2 300s + printf %s\n /*.out /*.css /*.html 300s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2/.git config user.name Loú User 300s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 300s + TIME=1112911993 300s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-2 300s + modify a.txt 0 300s + filename=a.txt 300s + text=0 300s + echo 0 300s + git add a.txt 300s + commit -m m⇒0 300s + TIME=1112911994 300s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 300s [master (root-commit) a733afa] m⇒0 300s 1 file changed, 1 insertion(+) 300s create mode 100644 a.txt 300s + git checkout -b a -- 300s Switched to a new branch 'a' 300s + modify a.txt 1 300s + filename=a.txt 300s + text=1 300s + echo 1 300s + git add a.txt 300s + commit -m a⇒1 on branch a 300s + TIME=1112911995 300s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 300s [a 2f1f75a] a⇒1 on branch a 300s 1 file changed, 1 insertion(+), 1 deletion(-) 300s + modify a.txt 2 300s + filename=a.txt 300s + text=2 300s + echo 2 300s + git add a.txt 300s + commit -m a⇒2 on branch a 300s + TIME=1112911996 300s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 300s [a 4700669] a⇒2 on branch a 300s 1 file changed, 1 insertion(+), 1 deletion(-) 300s + modify a.txt 3 300s + filename=a.txt 300s + text=3 300s + echo 3 300s + git add a.txt 300s + commit -m a⇒3 on branch a 300s + TIME=1112911997 300s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 300s [a 621c381] a⇒3 on branch a 300s 1 file changed, 1 insertion(+), 1 deletion(-) 300s + git checkout -b b master -- 300s Switched to a new branch 'b' 300s + modify b.txt 1 300s + filename=b.txt 300s + text=1 300s + echo 1 300s + git add b.txt 300s + msg=b⇒1 300s + test 1 = 2 300s + test 1 = 3 300s + commit -m b⇒1 on branch b 300s + TIME=1112911998 300s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 300s [b 1f7d097] b⇒1 on branch b 300s 1 file changed, 1 insertion(+) 300s create mode 100644 b.txt 300s + modify b.txt 2 300s + filename=b.txt 300s + text=2 300s + echo 2 300s + git add b.txt 300s + msg=b⇒2 300s + test 2 = 2 300s + modify a.txt X 300s + filename=a.txt 300s + text=X 300s + echo X 300s + git add a.txt 300s + msg=b⇒2 and a⇒X 300s + test 2 = 3 300s + commit -m b⇒2 and a⇒X on branch b 300s + TIME=1112911999 300s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 300s [b 48df77d] b⇒2 and a⇒X on branch b 300s 2 files changed, 2 insertions(+), 2 deletions(-) 300s + modify b.txt 3 300s + filename=b.txt 300s + text=3 300s + echo 3 300s + git add b.txt 300s + msg=b⇒3 300s + test 3 = 2 300s + test 3 = 3 300s + modify a.txt 0 300s + filename=a.txt 300s + text=0 300s + echo 0 300s + git add a.txt 300s + msg=b⇒3 and a⇒0 300s + commit -m b⇒3 and a⇒0 on branch b 300s + TIME=1112912000 300s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 300s [b f3ef019] b⇒3 and a⇒0 on branch b 300s 2 files changed, 2 insertions(+), 2 deletions(-) 300s + modify b.txt 4 300s + filename=b.txt 300s + text=4 300s + echo 4 300s + git add b.txt 300s + msg=b⇒4 300s + test 4 = 2 300s + test 4 = 3 300s + commit -m b⇒4 on branch b 300s + TIME=1112912001 300s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 300s [b 69d0c21] b⇒4 on branch b 300s 1 file changed, 1 insertion(+), 1 deletion(-) 300s + test_merge b-into-a-2 a b 1-2 1-3 300s + local name=b-into-a-2 300s + local dst=a 300s + local src=b 300s + local conflict1=1-2 300s + local conflict2=1-3 300s + git checkout a 300s Switched to branch 'a' 300s + + git-imergetee merge --branch=b-into-a-2 imerge-b-into-a-2-1.out 300s b 300s Attempting automerge of 3-4...success. 300s Autofilling 1-4...success. 300s Autofilling 2-4...success. 300s Autofilling 3-1...success. 300s Autofilling 3-2...unexpected conflict. Backtracking... 300s Autofilling 1-4...success. 300s Autofilling 2-1...success. 300s Autofilling 2-2...unexpected conflict. Backtracking... 300s Autofilling 1-1...success. 300s Autofilling 1-2...unexpected conflict. Backtracking... 300s Autofilling 1-1...success. 301s Autofilling 2-1...success. 301s Autofilling 3-1...success. 301s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 301s Attempting automerge of 3-4...success. 301s Autofilling 1-4...success. 301s Autofilling 2-4...success. 301s Autofilling 3-2...unexpected conflict. Backtracking... 301s Autofilling 1-4...success. 301s Autofilling 2-2...unexpected conflict. Backtracking... 301s Autofilling 1-2...unexpected conflict. Backtracking... 301s Switched to branch 'imerge/b' 301s Auto-merging a.txt 301s CONFLICT (content): Merge conflict in a.txt 301s Automatic merge failed; fix conflicts and then commit the result. 301s 301s Original first commit: 301s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 301s Author: Loú User 301s Date: Thu Apr 7 22:13:15 2005 +0000 301s 301s a⇒1 on branch a 301s 301s Original second commit: 301s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 301s Author: Loú User 301s Date: Thu Apr 7 22:13:19 2005 +0000 301s 301s b⇒2 and a⇒X on branch b 301s 301s There was a conflict merging commit 1-2, shown above. 301s Please resolve the conflict, commit the result, then type 301s 301s git-imerge continue 301s + git-imerge diagram --commits --frontier 301s 0 3 301s | | 301s 0 - **** - a 301s *... 301s *#?? 301s *??? 301s 4 - *??? 301s | 301s b 301s 301s 0 3 301s | | 301s 0 - **** - a 301s *--+ 301s *#?? 301s *??? 301s 4 - *??? 301s | 301s b 301s 301s Key: 301s |,-,+ = rectangles forming current merge frontier 301s * = merge done manually 301s . = merge done automatically 301s # = conflict that is currently blocking progress 301s @ = merge was blocked but has been resolved 301s ? = no merge recorded 301s 301s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 301s + echo 1 301s + git add a.txt 301s + + tee imerge-b-into-a-2-2.out 301s git-imerge continue --no-edit 301s [imerge/b 4610faa] imerge 'b': manual merge 1-2 301s Merge has been recorded for merge 1-2. 301s Attempting automerge of 1-4...failure. 301s Attempting automerge of 1-3...failure. 301s Attempting automerge of 3-2...success. 301s Autofilling 2-2...success. 301s Autofilling 3-2...success. 301s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 301s Previous HEAD position was 8a41857 imerge 'b': automatic merge 3-2 301s Switched to branch 'imerge/b' 301s Auto-merging a.txt 301s CONFLICT (content): Merge conflict in a.txt 301s Automatic merge failed; fix conflicts and then commit the result. 301s 301s Original first commit: 301s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 301s Author: Loú User 301s Date: Thu Apr 7 22:13:15 2005 +0000 301s 301s a⇒1 on branch a 301s 301s Original second commit: 301s commit f3ef01986be02ef5e40589b283c0385471ecca7d 301s Author: Loú User 301s Date: Thu Apr 7 22:13:20 2005 +0000 301s 301s b⇒3 and a⇒0 on branch b 301s 301s There was a conflict merging commit 1-3, shown above. 301s Please resolve the conflict, commit the result, then type 301s 301s git-imerge continue 301s + git-imerge diagram --commits --frontier 301s 0 3 301s | | 301s 0 - **** - a 301s *... 301s **.. 301s *#?? 301s 4 - *??? 301s | 301s b 301s 301s 0 3 301s | | 301s 0 - **** - a 301s *..| 301s **-+ 301s *#?? 301s 4 - *??? 301s | 301s b 301s 301s Key: 301s |,-,+ = rectangles forming current merge frontier 301s * = merge done manually 301s . = merge done automatically 301s # = conflict that is currently blocking progress 301s @ = merge was blocked but has been resolved 301s ? = no merge recorded 301s 301s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 301s + echo 1 301s + git add a.txt 301s + git-imerge continue --no-edit 301s + tee imerge-b-into-a-2-3.out 302s [imerge/b b467f41] imerge 'b': manual merge 1-3 302s Merge has been recorded for merge 1-3. 302s Attempting automerge of 1-4...success. 302s Autofilling 1-4...success. 302s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 302s Attempting automerge of 3-4...success. 302s Autofilling 2-4...success. 302s Autofilling 3-3...success. 302s Autofilling 3-4 (first way)...success. 302s Autofilling 3-4 (second way)...success. 302s The two ways of autofilling 3-4 agree. 302s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 302s Merge is complete! 302s + grep -q Merge is complete imerge-b-into-a-2-3.out 302s + git-imerge diagram --commits --frontier 302s 0 3 302s | | 302s 0 - **** - a 302s *... 302s **.. 302s **?. 302s 4 - *... 302s | 302s b 302s 302s 0 3 302s | | 302s 0 - **** - a 302s *..| 302s **.| 302s **?| 302s 4 - *--+ 302s | 302s b 302s 302s Key: 302s |,-,+ = rectangles forming current merge frontier 302s * = merge done manually 302s . = merge done automatically 302s # = conflict that is currently blocking progress 302s @ = merge was blocked but has been resolved 302s ? = no merge recorded 302s 302s + GIT_EDITOR=cat git-imerge finish 302s Merge b into a (using imerge) 302s 302s # Please enter the commit message for your changes. Lines starting 302s # with '#' will be ignored, and an empty message aborts the commit. 302s # 302s # Date: Thu Mar 21 22:48:14 2024 +0000 302s # 302s # On branch b-into-a-2 302s # Changes to be committed: 302s # new file: b.txt 302s # 302s [b-into-a-2 e6cf374] Merge b into a (using imerge) 302s Date: Thu Mar 21 22:48:14 2024 +0000 302s + test_merge a-into-b-2 b a 2-1 3-1 302s + local name=a-into-b-2 302s + local dst=b 302s + local src=a 302s + local conflict1=2-1 302s + local conflict2=3-1 302s + git checkout b 302s Switched to branch 'b' 302s + + git-imergetee merge --branch=a-into-b-2 a 302s imerge-a-into-b-2-1.out 302s Attempting automerge of 4-3...success. 302s Autofilling 1-3...success. 302s Autofilling 2-3...unexpected conflict. Backtracking... 302s Autofilling 1-1...success. 302s Autofilling 1-2...success. 302s Autofilling 1-3...success. 302s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 302s Autofilling 2-2...unexpected conflict. Backtracking... 302s Autofilling 2-1...unexpected conflict. Backtracking... 302s Switched to branch 'imerge/a' 302s Auto-merging a.txt 302s CONFLICT (content): Merge conflict in a.txt 302s Automatic merge failed; fix conflicts and then commit the result. 302s 302s Original first commit: 302s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 302s Author: Loú User 302s Date: Thu Apr 7 22:13:19 2005 +0000 302s 302s b⇒2 and a⇒X on branch b 302s 302s Original second commit: 302s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 302s Author: Loú User 302s Date: Thu Apr 7 22:13:15 2005 +0000 302s 302s a⇒1 on branch a 302s 302s There was a conflict merging commit 2-1, shown above. 302s Please resolve the conflict, commit the result, then type 302s 302s git-imerge continue 302s + git-imerge diagram --commits --frontier 302s 0 4 302s | | 302s 0 - ***** - b 302s *.#?? 302s *.??? 302s 3 - *.??? 302s | 302s a 302s 302s 0 4 302s | | 302s 0 - ***** - b 302s *|#?? 302s *|??? 302s 3 - *+??? 302s | 302s a 302s 302s Key: 302s |,-,+ = rectangles forming current merge frontier 302s * = merge done manually 302s . = merge done automatically 302s # = conflict that is currently blocking progress 302s @ = merge was blocked but has been resolved 302s ? = no merge recorded 302s 302s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 302s + echo 1 302s + git add a.txt 302s + + git-imerge continue --no-edit 302s tee imerge-a-into-b-2-2.out 302s [imerge/a 951d417] imerge 'a': manual merge 2-1 302s Merge has been recorded for merge 2-1. 303s Attempting automerge of 2-3...success. 303s Autofilling 2-2...success. 303s Autofilling 2-3...success. 303s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 303s Attempting automerge of 4-3...failure. 303s Attempting automerge of 3-1...failure. 303s Switched to branch 'imerge/a' 303s Auto-merging a.txt 303s CONFLICT (content): Merge conflict in a.txt 303s Automatic merge failed; fix conflicts and then commit the result. 303s 303s Original first commit: 303s commit f3ef01986be02ef5e40589b283c0385471ecca7d 303s Author: Loú User 303s Date: Thu Apr 7 22:13:20 2005 +0000 303s 303s b⇒3 and a⇒0 on branch b 303s 303s Original second commit: 303s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 303s Author: Loú User 303s Date: Thu Apr 7 22:13:15 2005 +0000 303s 303s a⇒1 on branch a 303s 303s There was a conflict merging commit 3-1, shown above. 303s Please resolve the conflict, commit the result, then type 303s 303s git-imerge continue 303s + git-imerge diagram --commits --frontier 303s 0 4 303s | | 303s 0 - ***** - b 303s *.*#? 303s *..?? 303s 3 - *..?? 303s | 303s a 303s 303s 0 4 303s | | 303s 0 - ***** - b 303s *.*#? 303s *.|?? 303s 3 - *-+?? 303s | 303s a 303s 303s Key: 303s |,-,+ = rectangles forming current merge frontier 303s * = merge done manually 303s . = merge done automatically 303s # = conflict that is currently blocking progress 303s @ = merge was blocked but has been resolved 303s ? = no merge recorded 303s 303s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 303s + echo 1 303s + git add a.txt 303s + git-imerge+ tee imerge-a-into-b-2-3.out 303s continue --no-edit 303s [imerge/a 6cf8c06] imerge 'a': manual merge 3-1 303s Merge has been recorded for merge 3-1. 303s Attempting automerge of 3-3...success. 303s Autofilling 3-2...success. 303s Autofilling 3-3...success. 303s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 303s Attempting automerge of 4-3...success. 303s Autofilling 4-1...success. 303s Autofilling 4-2...success. 303s Autofilling 4-3...success. 303s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 303s Merge is complete! 303s + grep -q Merge is complete imerge-a-into-b-2-3.out 303s + git-imerge diagram --commits --frontier 303s 0 4 303s | | 303s 0 - ***** - b 303s *.**. 303s *.... 303s 3 - *.... 303s | 303s a 303s 303s 0 4 303s | | 303s 0 - ***** - b 303s *.**| 303s *...| 303s 3 - *---+ 303s | 303s a 303s 303s Key: 303s |,-,+ = rectangles forming current merge frontier 303s * = merge done manually 303s . = merge done automatically 303s # = conflict that is currently blocking progress 303s @ = merge was blocked but has been resolved 303s ? = no merge recorded 303s 303s + GIT_EDITOR=cat git-imerge finish 304s Merge a into b (using imerge) 304s 304s # Please enter the commit message for your changes. Lines starting 304s # with '#' will be ignored, and an empty message aborts the commit. 304s # 304s # Date: Thu Mar 21 22:48:15 2024 +0000 304s # 304s # On branch a-into-b-2 304s # Changes to be committed: 304s # modified: a.txt 304s # 304s [a-into-b-2 991cfd1] Merge a into b (using imerge) 304s Date: Thu Mar 21 22:48:15 2024 +0000 304s + flip_flop_test 3 304s + local n=3 304s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 304s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 304s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s + local description=git-imerge test repository with a commit and its revert at n=3 304s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 304s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s + local description=git-imerge test repository with a commit and its revert at n=3 304s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s hint: Using 'master' as the name for the initial branch. This default branch name 304s hint: is subject to change. To configure the initial branch name to use in all 304s hint: of your new repositories, which will suppress this warning, call: 304s hint: 304s hint: git config --global init.defaultBranch 304s hint: 304s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 304s hint: 'development'. The just-created branch can be renamed via this command: 304s hint: 304s hint: git branch -m 304s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3/.git/ 304s + echo git-imerge test repository with a commit and its revert at n=3 304s + printf %s\n /*.out /*.css /*.html 304s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3/.git config user.name Loú User 304s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 304s + TIME=1112911993 304s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/flip-flop-3 304s + modify a.txt 0 304s + filename=a.txt 304s + text=0 304s + echo 0 304s + git add a.txt 304s + commit -m m⇒0 304s + TIME=1112911994 304s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 304s [master (root-commit) a733afa] m⇒0 304s 1 file changed, 1 insertion(+) 304s create mode 100644 a.txt 304s + git checkout -b a -- 304s Switched to a new branch 'a' 304s + modify a.txt 1 304s + filename=a.txt 304s + text=1 304s + echo 1 304s + git add a.txt 304s + commit -m a⇒1 on branch a 304s + TIME=1112911995 304s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 304s [a 2f1f75a] a⇒1 on branch a 304s 1 file changed, 1 insertion(+), 1 deletion(-) 304s + modify a.txt 2 304s + filename=a.txt 304s + text=2 304s + echo 2 304s + git add a.txt 304s + commit -m a⇒2 on branch a 304s + TIME=1112911996 304s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 304s [a 4700669] a⇒2 on branch a 304s 1 file changed, 1 insertion(+), 1 deletion(-) 304s + modify a.txt 3 304s + filename=a.txt 304s + text=3 304s + echo 3 304s + git add a.txt 304s + commit -m a⇒3 on branch a 304s + TIME=1112911997 304s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 304s [a 621c381] a⇒3 on branch a 304s 1 file changed, 1 insertion(+), 1 deletion(-) 304s + git checkout -b b master -- 304s Switched to a new branch 'b' 304s + modify b.txt 1 304s + filename=b.txt 304s + text=1 304s + echo 1 304s + git add b.txt 304s + msg=b⇒1 304s + test 1 = 3 304s + test 1 = 4 304s + commit -m b⇒1 on branch b 304s + TIME=1112911998 304s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 304s [b 1f7d097] b⇒1 on branch b 304s 1 file changed, 1 insertion(+) 304s create mode 100644 b.txt 304s + modify b.txt 2 304s + filename=b.txt 304s + text=2 304s + echo 2 304s + git add b.txt 304s + msg=b⇒2 304s + test 2 = 3 304s + test 2 = 4 304s + commit -m b⇒2 on branch b 304s + TIME=1112911999 304s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 304s [b ce671e9] b⇒2 on branch b 304s 1 file changed, 1 insertion(+), 1 deletion(-) 304s + modify b.txt 3 304s + filename=b.txt 304s + text=3 304s + echo 3 304s + git add b.txt 304s + msg=b⇒3 304s + test 3 = 3 304s + modify a.txt X 304s + filename=a.txt 304s + text=X 304s + echo X 304s + git add a.txt 304s + msg=b⇒3 and a⇒X 304s + test 3 = 4 304s + commit -m b⇒3 and a⇒X on branch b 304s + TIME=1112912000 304s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 304s [b d40495e] b⇒3 and a⇒X on branch b 304s 2 files changed, 2 insertions(+), 2 deletions(-) 304s + modify b.txt 4 304s + filename=b.txt 304s + text=4 304s + echo 4 304s + git add b.txt 304s + msg=b⇒4 304s + test 4 = 3 304s + test 4 = 4 304s + modify a.txt 0 304s + filename=a.txt 304s + text=0 304s + echo 0 304s + git add a.txt 304s + msg=b⇒4 and a⇒0 304s + commit -m b⇒4 and a⇒0 on branch b 304s + TIME=1112912001 304s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 304s [b eb736f2] b⇒4 and a⇒0 on branch b 304s 2 files changed, 2 insertions(+), 2 deletions(-) 304s + test_merge b-into-a-3 a b 1-3 1-4 304s + local name=b-into-a-3 304s + local dst=a 304s + local src=b 304s + local conflict1=1-3 304s + local conflict2=1-4 304s + git checkout a 304s Switched to branch 'a' 304s + git-imerge merge --branch=b-into-a-3 b 304s + tee imerge-b-into-a-3-1.out 304s Attempting automerge of 3-4...success. 304s Autofilling 1-4...success. 304s Autofilling 2-4...success. 304s Autofilling 3-1...success. 304s Autofilling 3-2...success. 304s Autofilling 3-3...unexpected conflict. Backtracking... 304s Autofilling 1-4...success. 304s Autofilling 2-1...success. 304s Autofilling 2-2...success. 304s Autofilling 2-3...unexpected conflict. Backtracking... 304s Autofilling 1-1...success. 304s Autofilling 1-2...success. 304s Autofilling 1-3...unexpected conflict. Backtracking... 304s Autofilling 1-2...success. 304s Autofilling 2-2...success. 304s Autofilling 3-1...success. 304s Autofilling 3-2 (first way)...success. 304s Autofilling 3-2 (second way)...success. 304s The two ways of autofilling 3-2 agree. 304s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 304s Attempting automerge of 3-4...success. 304s Autofilling 1-4...success. 304s Autofilling 2-4...success. 304s Autofilling 3-3...unexpected conflict. Backtracking... 304s Autofilling 1-4...success. 304s Autofilling 2-3...unexpected conflict. Backtracking... 304s Autofilling 1-3...unexpected conflict. Backtracking... 304s Switched to branch 'imerge/b' 304s Auto-merging a.txt 304s CONFLICT (content): Merge conflict in a.txt 304s Automatic merge failed; fix conflicts and then commit the result. 304s 304s Original first commit: 304s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 304s Author: Loú User 304s Date: Thu Apr 7 22:13:15 2005 +0000 304s 304s a⇒1 on branch a 304s 304s Original second commit: 304s commit d40495ed379f376841e517047f90b663e8c7c7e1 304s Author: Loú User 304s Date: Thu Apr 7 22:13:20 2005 +0000 304s 304s b⇒3 and a⇒X on branch b 304s 304s There was a conflict merging commit 1-3, shown above. 304s Please resolve the conflict, commit the result, then type 304s 304s git-imerge continue 304s + git-imerge diagram --commits --frontier 304s 0 3 304s | | 304s 0 - **** - a 304s *??. 304s *... 304s *#?? 304s 4 - *??? 304s | 304s b 304s 304s 0 3 304s | | 304s 0 - **** - a 304s *??| 304s *--+ 304s *#?? 304s 4 - *??? 304s | 304s b 304s 304s Key: 304s |,-,+ = rectangles forming current merge frontier 304s * = merge done manually 304s . = merge done automatically 304s # = conflict that is currently blocking progress 304s @ = merge was blocked but has been resolved 304s ? = no merge recorded 304s 304s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 304s + echo 1 304s + git add a.txt 304s + + tee imerge-b-into-a-3-2.out 304s git-imerge continue --no-edit 305s [imerge/b f9c211e] imerge 'b': manual merge 1-3 305s Merge has been recorded for merge 1-3. 305s Attempting automerge of 1-4...failure. 305s Attempting automerge of 1-4...failure. 305s Attempting automerge of 3-3...success. 305s Autofilling 2-3...success. 305s Autofilling 3-3...success. 305s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 305s Previous HEAD position was d0f2de6 imerge 'b': automatic merge 3-3 305s Switched to branch 'imerge/b' 305s Auto-merging a.txt 305s CONFLICT (content): Merge conflict in a.txt 305s Automatic merge failed; fix conflicts and then commit the result. 305s 305s Original first commit: 305s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 305s Author: Loú User 305s Date: Thu Apr 7 22:13:15 2005 +0000 305s 305s a⇒1 on branch a 305s 305s Original second commit: 305s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 305s Author: Loú User 305s Date: Thu Apr 7 22:13:21 2005 +0000 305s 305s b⇒4 and a⇒0 on branch b 305s 305s There was a conflict merging commit 1-4, shown above. 305s Please resolve the conflict, commit the result, then type 305s 305s git-imerge continue 305s + git-imerge diagram --commits --frontier 305s 0 3 305s | | 305s 0 - **** - a 305s *??. 305s *... 305s **.. 305s 4 - *#?? 305s | 305s b 305s 305s 0 3 305s | | 305s 0 - **** - a 305s *??| 305s *..| 305s **-+ 305s 4 - *#?? 305s | 305s b 305s 305s Key: 305s |,-,+ = rectangles forming current merge frontier 305s * = merge done manually 305s . = merge done automatically 305s # = conflict that is currently blocking progress 305s @ = merge was blocked but has been resolved 305s ? = no merge recorded 305s 305s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 305s + echo 1 305s + git add a.txt 305s + + tee imerge-b-into-a-3-3.out 305s git-imerge continue --no-edit 305s [imerge/b b40705e] imerge 'b': manual merge 1-4 305s Merge has been recorded for merge 1-4. 305s Attempting automerge of 3-4...success. 305s Autofilling 2-4...success. 305s Autofilling 3-4...success. 305s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 305s Merge is complete! 305s + grep -q Merge is complete imerge-b-into-a-3-3.out 305s + git-imerge diagram --commits --frontier 305s 0 3 305s | | 305s 0 - **** - a 305s *??. 305s *... 305s **.. 305s 4 - **.. 305s | 305s b 305s 305s 0 3 305s | | 305s 0 - **** - a 305s *??| 305s *..| 305s **.| 305s 4 - **-+ 305s | 305s b 305s 305s Key: 305s |,-,+ = rectangles forming current merge frontier 305s * = merge done manually 305s . = merge done automatically 305s # = conflict that is currently blocking progress 305s @ = merge was blocked but has been resolved 305s ? = no merge recorded 305s 305s + GIT_EDITOR=cat git-imerge finish 306s Merge b into a (using imerge) 306s 306s # Please enter the commit message for your changes. Lines starting 306s # with '#' will be ignored, and an empty message aborts the commit. 306s # 306s # Date: Thu Mar 21 22:48:18 2024 +0000 306s # 306s # On branch b-into-a-3 306s # Changes to be committed: 306s # new file: b.txt 306s # 306s [b-into-a-3 6bb1a83] Merge b into a (using imerge) 306s Date: Thu Mar 21 22:48:18 2024 +0000 306s + test_merge a-into-b-3 b a 3-1 4-1 306s + local name=a-into-b-3 306s + local dst=b 306s + local src=a 306s + local conflict1=3-1 306s + local conflict2=4-1 306s + git checkout b 306s Switched to branch 'b' 306s + + git-imerge merge --branch=a-into-b-3 a 306s tee imerge-a-into-b-3-1.out 306s Attempting automerge of 4-3...success. 306s Autofilling 1-3...success. 306s Autofilling 2-3...success. 306s Autofilling 3-3...unexpected conflict. Backtracking... 306s Autofilling 1-3...success. 306s Autofilling 2-1...success. 306s Autofilling 2-2...success. 306s Autofilling 2-3 (first way)...success. 306s Autofilling 2-3 (second way)...success. 306s The two ways of autofilling 2-3 agree. 306s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 306s Autofilling 3-2...unexpected conflict. Backtracking... 306s Autofilling 3-1...unexpected conflict. Backtracking... 306s Switched to branch 'imerge/a' 306s Auto-merging a.txt 306s CONFLICT (content): Merge conflict in a.txt 306s Automatic merge failed; fix conflicts and then commit the result. 306s 306s Original first commit: 306s commit d40495ed379f376841e517047f90b663e8c7c7e1 306s Author: Loú User 306s Date: Thu Apr 7 22:13:20 2005 +0000 306s 306s b⇒3 and a⇒X on branch b 306s 306s Original second commit: 306s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 306s Author: Loú User 306s Date: Thu Apr 7 22:13:15 2005 +0000 306s 306s a⇒1 on branch a 306s 306s There was a conflict merging commit 3-1, shown above. 306s Please resolve the conflict, commit the result, then type 306s 306s git-imerge continue 306s + git-imerge diagram --commits --frontier 306s 0 4 306s | | 306s 0 - ***** - b 306s *?.#? 306s *?.?? 306s 3 - *..?? 306s | 306s a 306s 306s 0 4 306s | | 306s 0 - ***** - b 306s *?|#? 306s *?|?? 306s 3 - *-+?? 306s | 306s a 306s 306s Key: 306s |,-,+ = rectangles forming current merge frontier 306s * = merge done manually 306s . = merge done automatically 306s # = conflict that is currently blocking progress 306s @ = merge was blocked but has been resolved 306s ? = no merge recorded 306s 306s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 306s + echo 1 306s + git add a.txt 306s + + git-imerge continue --no-edit 306s tee imerge-a-into-b-3-2.out 306s [imerge/a 94014c9] imerge 'a': manual merge 3-1 306s Merge has been recorded for merge 3-1. 306s Attempting automerge of 3-3...success. 306s Autofilling 3-2...success. 306s Autofilling 3-3...success. 306s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 306s Attempting automerge of 4-3...failure. 306s Attempting automerge of 4-1...failure. 307s Switched to branch 'imerge/a' 307s Auto-merging a.txt 307s CONFLICT (content): Merge conflict in a.txt 307s Automatic merge failed; fix conflicts and then commit the result. 307s 307s Original first commit: 307s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 307s Author: Loú User 307s Date: Thu Apr 7 22:13:21 2005 +0000 307s 307s b⇒4 and a⇒0 on branch b 307s 307s Original second commit: 307s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 307s Author: Loú User 307s Date: Thu Apr 7 22:13:15 2005 +0000 307s 307s a⇒1 on branch a 307s 307s There was a conflict merging commit 4-1, shown above. 307s Please resolve the conflict, commit the result, then type 307s 307s git-imerge continue 307s + git-imerge diagram --commits --frontier 307s 0 4 307s | | 307s 0 - ***** - b 307s *?.*# 307s *?..? 307s 3 - *...? 307s | 307s a 307s 307s 0 4 307s | | 307s 0 - ***** - b 307s *?.*# 307s *?.|? 307s 3 - *--+? 307s | 307s a 307s 307s Key: 307s |,-,+ = rectangles forming current merge frontier 307s * = merge done manually 307s . = merge done automatically 307s # = conflict that is currently blocking progress 307s @ = merge was blocked but has been resolved 307s ? = no merge recorded 307s 307s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 307s + echo 1 307s + git add a.txt 307s + git-imerge continue --no-edit 307s + tee imerge-a-into-b-3-3.out 307s [imerge/a c6d6c71] imerge 'a': manual merge 4-1 307s Merge has been recorded for merge 4-1. 307s Attempting automerge of 4-3...success. 307s Autofilling 4-2...success. 307s Autofilling 4-3...success. 307s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 307s Merge is complete! 307s + grep -q Merge is complete imerge-a-into-b-3-3.out 307s + git-imerge diagram --commits --frontier 307s 0 4 307s | | 307s 0 - ***** - b 307s *?.** 307s *?... 307s 3 - *.... 307s | 307s a 307s 307s 0 4 307s | | 307s 0 - ***** - b 307s *?.** 307s *?..| 307s 3 - *---+ 307s | 307s a 307s 307s Key: 307s |,-,+ = rectangles forming current merge frontier 307s * = merge done manually 307s . = merge done automatically 307s # = conflict that is currently blocking progress 307s @ = merge was blocked but has been resolved 307s ? = no merge recorded 307s 307s + GIT_EDITOR=cat git-imerge finish 307s Merge a into b (using imerge) 307s 307s # Please enter the commit message for your changes. Lines starting 307s # with '#' will be ignored, and an empty message aborts the commit. 307s # 307s # Date: Thu Mar 21 22:48:19 2024 +0000 307s # 307s # On branch a-into-b-3 307s # Changes to be committed: 307s # modified: a.txt 307s # 307s [a-into-b-3 53b277d] Merge a into b (using imerge) 307s Date: Thu Mar 21 22:48:19 2024 +0000 308s py312: commands[5] /tmp/autopkgtest.S6VHsS/build.sHY/src> /bin/sh t/test-drop 308s + dirname t/test-drop 308s + cd t 308s + pwd 308s + dirname /tmp/autopkgtest.S6VHsS/build.sHY/src/t 308s + BASE=/tmp/autopkgtest.S6VHsS/build.sHY/src 308s + . /tmp/autopkgtest.S6VHsS/build.sHY/src/t/test-lib.sh 308s + GIT_IMERGE=git-imerge 308s + TMP=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s + DESCRIPTION=git-imerge drop test repository 308s + init_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop git-imerge drop test repository 308s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s + local description=git-imerge drop test repository 308s + delete_test_repo /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop git-imerge drop test repository 308s + local path=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s + local description=git-imerge drop test repository 308s + test -d /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s + mkdir -p /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s + git init /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s hint: Using 'master' as the name for the initial branch. This default branch name 308s hint: is subject to change. To configure the initial branch name to use in all 308s hint: of your new repositories, which will suppress this warning, call: 308s hint: 308s hint: git config --global init.defaultBranch 308s hint: 308s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 308s hint: 'development'. The just-created branch can be renamed via this command: 308s hint: 308s hint: git branch -m 308s Initialized empty Git repository in /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop/.git/ 308s + echo git-imerge drop test repository 308s + printf %s\n /*.out /*.css /*.html 308s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop/.git config user.name Loú User 308s + git --git-dir=/tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop/.git config user.email luser@example.com 308s + TIME=1112911993 308s + ln -s /tmp/autopkgtest.S6VHsS/build.sHY/src/imerge.css /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s + cd /tmp/autopkgtest.S6VHsS/build.sHY/src/t/tmp/drop 308s + modify a.txt 0 308s + filename=a.txt 308s + text=0 308s + echo 0 308s + git add a.txt 308s + commit -m m⇒0 308s + TIME=1112911994 308s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 308s [master (root-commit) a733afa] m⇒0 308s 1 file changed, 1 insertion(+) 308s create mode 100644 a.txt 308s + seq 6 308s + modify a1.txt 1 308s + filename=a1.txt 308s + text=1 308s + echo 1 308s + git add a1.txt 308s + commit -m a1⇒1 308s + TIME=1112911995 308s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 308s [master 389a4ba] a1⇒1 308s 1 file changed, 1 insertion(+) 308s create mode 100644 a1.txt 308s + modify a2.txt 2 308s + filename=a2.txt 308s + text=2 308s + echo 2 308s + git add a2.txt 308s + commit -m a2⇒2 308s + TIME=1112911996 308s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 308s [master 4785218] a2⇒2 308s 1 file changed, 1 insertion(+) 308s create mode 100644 a2.txt 308s + modify a3.txt 3 308s + filename=a3.txt 308s + text=3 308s + echo 3 308s + git add a3.txt 308s + commit -m a3⇒3 308s + TIME=1112911997 308s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 308s [master 34bdde3] a3⇒3 308s 1 file changed, 1 insertion(+) 308s create mode 100644 a3.txt 308s + modify a4.txt 4 308s + filename=a4.txt 308s + text=4 308s + echo 4 308s + git add a4.txt 308s + commit -m a4⇒4 308s + TIME=1112911998 308s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 308s [master c793a5a] a4⇒4 308s 1 file changed, 1 insertion(+) 308s create mode 100644 a4.txt 308s + modify a5.txt 5 308s + filename=a5.txt 308s + text=5 308s + echo 5 308s + git add a5.txt 308s + commit -m a5⇒5 308s + TIME=1112911999 308s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 308s [master b42f60c] a5⇒5 308s 1 file changed, 1 insertion(+) 308s create mode 100644 a5.txt 308s + modify a6.txt 6 308s + filename=a6.txt 308s + text=6 308s + echo 6 308s + git add a6.txt 308s + commit -m a6⇒6 308s + TIME=1112912000 308s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 308s [master 9d6aec5] a6⇒6 308s 1 file changed, 1 insertion(+) 308s create mode 100644 a6.txt 308s + git checkout -b dropped master 308s Switched to a new branch 'dropped' 308s + git-imerge drop HEAD~5..HEAD~3 308s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 308s 308s You are in 'detached HEAD' state. You can look around, make experimental 308s changes and commit them, and you can discard any commits you make in this 308s state without impacting any branches by switching back to a branch. 308s 308s If you want to create a new branch to retain commits you create, you may 308s do so (now or later) by using -c with the switch command. Example: 308s 308s git switch -c 308s 308s Or undo this operation with: 308s 308s git switch - 308s 308s Turn off this advice by setting config variable advice.detachedHead to false 308s 308s HEAD is now at 34bdde3 a3⇒3 308s [detached HEAD f44da5d] Revert "a3⇒3" 308s Date: Thu Mar 21 22:48:20 2024 +0000 308s 1 file changed, 1 deletion(-) 308s delete mode 100644 a3.txt 308s [detached HEAD a2836d4] Revert "a2⇒2" 308s Date: Thu Mar 21 22:48:20 2024 +0000 308s 1 file changed, 1 deletion(-) 308s delete mode 100644 a2.txt 308s Attempting automerge of 3-2...success. 308s Autofilling 1-2...success. 308s Autofilling 2-2...success. 308s Autofilling 3-1...success. 308s Autofilling 3-2 (first way)...success. 308s Autofilling 3-2 (second way)...success. 308s The two ways of autofilling 3-2 agree. 308s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='a2836d4c31a5f20c5873a911229a483e95b18b78', goal='drop')[0:4,0:3]. 308s Merge is complete! 308s + git-imerge diagram --commits --frontier --html=imerge-drop.html 308s 0 3 308s | | 308s 0 - **** - dropped 308s *??. 308s 2 - *... 308s | 308s a2836d4c31a5f20c5873a911229a483e95b18b78 308s 308s 0 3 308s | | 308s 0 - **** - dropped 308s *??| 308s 2 - *--+ 308s | 308s a2836d4c31a5f20c5873a911229a483e95b18b78 308s 308s Key: 308s |,-,+ = rectangles forming current merge frontier 308s * = merge done manually 308s . = merge done automatically 308s # = conflict that is currently blocking progress 308s @ = merge was blocked but has been resolved 308s ? = no merge recorded 308s 308s + git-imerge finish 309s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 309s + local refname=dropped 309s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 309s + git rev-parse dropped^{tree} 309s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 309s + git checkout -b reverted master 309s Switched to a new branch 'reverted' 309s + git-imerge revert HEAD~5..HEAD~3 309s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 309s 309s You are in 'detached HEAD' state. You can look around, make experimental 309s changes and commit them, and you can discard any commits you make in this 309s state without impacting any branches by switching back to a branch. 309s 309s If you want to create a new branch to retain commits you create, you may 309s do so (now or later) by using -c with the switch command. Example: 309s 309s git switch -c 309s 309s Or undo this operation with: 309s 309s git switch - 309s 309s Turn off this advice by setting config variable advice.detachedHead to false 309s 309s HEAD is now at 34bdde3 a3⇒3 309s [detached HEAD 022bc86] Revert "a3⇒3" 309s Date: Thu Mar 21 22:48:21 2024 +0000 309s 1 file changed, 1 deletion(-) 309s delete mode 100644 a3.txt 309s [detached HEAD 36705a6] Revert "a2⇒2" 309s Date: Thu Mar 21 22:48:21 2024 +0000 309s 1 file changed, 1 deletion(-) 309s delete mode 100644 a2.txt 309s Attempting automerge of 3-2...success. 309s Autofilling 1-2...success. 309s Autofilling 2-2...success. 309s Autofilling 3-1...success. 309s Autofilling 3-2 (first way)...success. 309s Autofilling 3-2 (second way)...success. 309s The two ways of autofilling 3-2 agree. 309s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='36705a641055492015a9de87d17d41c1987cfe96', goal='revert')[0:4,0:3]. 309s Merge is complete! 309s + git-imerge diagram --commits --frontier --html=imerge-revert.html 309s 0 3 309s | | 309s 0 - **** - reverted 309s *??. 309s 2 - *... 309s | 309s 36705a641055492015a9de87d17d41c1987cfe96 309s 309s 0 3 309s | | 309s 0 - **** - reverted 309s *??| 309s 2 - *--+ 309s | 309s 36705a641055492015a9de87d17d41c1987cfe96 309s 309s Key: 309s |,-,+ = rectangles forming current merge frontier 309s * = merge done manually 309s . = merge done automatically 309s # = conflict that is currently blocking progress 309s @ = merge was blocked but has been resolved 309s ? = no merge recorded 309s 309s + git-imerge finish 310s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 310s + local refname=reverted 310s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 310s + git rev-parse reverted^{tree} 310s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 310s py312: OK (90.63=setup[0.33]+cmd[3.95,59.72,10.41,2.90,11.36,1.96] seconds) 310s congratulations :) (90.72 seconds) 310s autopkgtest [22:48:22]: test pybuild-autopkgtest: -----------------------] 311s pybuild-autopkgtest PASS 311s autopkgtest [22:48:23]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 311s autopkgtest [22:48:23]: @@@@@@@@@@@@@@@@@@@@ summary 311s pybuild-autopkgtest PASS 323s Creating nova instance adt-noble-s390x-git-imerge-20240321-224312-juju-7f2275-prod-proposed-migration-environment-2 from image adt/ubuntu-noble-s390x-server-20240321.img (UUID f7ee8f0f-480f-4014-94f0-3be2a19e259d)...