0s autopkgtest [09:21:46]: starting date and time: 2024-03-20 09:21:46+0000 0s autopkgtest [09:21:46]: git checkout: 4a1cd702 l/adt_testbed: don't blame the testbed for unsolvable build deps 0s autopkgtest [09:21:46]: host juju-7f2275-prod-proposed-migration-environment-3; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.cy1kdmy6/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-3@bos02-ppc64el-11.secgroup --name adt-noble-ppc64el-git-imerge-20240320-092146-juju-7f2275-prod-proposed-migration-environment-3 --image adt/ubuntu-noble-ppc64el-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-3 --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/ 363s autopkgtest [09:27:49]: testbed dpkg architecture: ppc64el 363s autopkgtest [09:27:49]: testbed apt version: 2.7.12 363s autopkgtest [09:27:49]: @@@@@@@@@@@@@@@@@@@@ test bed setup 364s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB] 364s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/multiverse Sources [52.7 kB] 364s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/universe Sources [3810 kB] 364s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/restricted Sources [6540 B] 364s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/main Sources [497 kB] 364s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el Packages [659 kB] 364s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main ppc64el c-n-f Metadata [3116 B] 364s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/restricted ppc64el Packages [1372 B] 364s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/restricted ppc64el c-n-f Metadata [116 B] 364s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el Packages [4169 kB] 365s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/universe ppc64el c-n-f Metadata [8652 B] 365s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/multiverse ppc64el Packages [47.7 kB] 365s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/multiverse ppc64el c-n-f Metadata [116 B] 368s Fetched 9372 kB in 2s (3870 kB/s) 369s Reading package lists... 371s Reading package lists... 372s Building dependency tree... 372s Reading state information... 372s Calculating upgrade... 372s The following packages have been kept back: 372s curl 372s 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 372s Reading package lists... 372s Building dependency tree... 372s Reading state information... 372s 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded. 373s sh: Attempting to set up Debian/Ubuntu apt sources automatically 373s sh: Distribution appears to be Ubuntu 374s Reading package lists... 374s Building dependency tree... 374s Reading state information... 375s eatmydata is already the newest version (131-1). 375s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 375s Reading package lists... 375s Building dependency tree... 375s Reading state information... 375s dbus is already the newest version (1.14.10-4ubuntu1). 375s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 375s Reading package lists... 375s Building dependency tree... 375s Reading state information... 375s rng-tools-debian is already the newest version (2.4). 375s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 375s Reading package lists... 375s Building dependency tree... 375s Reading state information... 376s The following packages will be REMOVED: 376s cloud-init* python3-configobj* python3-debconf* 376s 0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded. 376s After this operation, 3252 kB disk space will be freed. 376s (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 ... 70095 files and directories currently installed.) 376s Removing cloud-init (24.1.1-0ubuntu1) ... 376s Removing python3-configobj (5.0.8-3) ... 377s Removing python3-debconf (1.5.86) ... 377s Processing triggers for man-db (2.12.0-3) ... 377s (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 ... 69706 files and directories currently installed.) 377s Purging configuration files for cloud-init (24.1.1-0ubuntu1) ... 378s dpkg: warning: while removing cloud-init, directory '/etc/cloud/cloud.cfg.d' not empty so not removed 378s Processing triggers for rsyslog (8.2312.0-3ubuntu3) ... 378s invoke-rc.d: policy-rc.d denied execution of try-restart. 378s Reading package lists... 378s Building dependency tree... 378s Reading state information... 378s linux-generic is already the newest version (6.8.0-11.11+1). 378s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 379s Hit:1 http://ftpmaster.internal/ubuntu noble InRelease 379s Hit:2 http://ftpmaster.internal/ubuntu noble-updates InRelease 379s Hit:3 http://ftpmaster.internal/ubuntu noble-security InRelease 382s Reading package lists... 382s Reading package lists... 382s Building dependency tree... 382s Reading state information... 382s Calculating upgrade... 382s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 382s Reading package lists... 382s Building dependency tree... 382s Reading state information... 382s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 383s autopkgtest [09:28:09]: rebooting testbed after setup commands that affected boot 420s autopkgtest [09:28:46]: testbed running kernel: Linux 6.8.0-11-generic #11-Ubuntu SMP Wed Feb 14 00:33:03 UTC 2024 422s autopkgtest [09:28:48]: @@@@@@@@@@@@@@@@@@@@ apt-source git-imerge 424s Get:1 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (dsc) [1896 B] 424s Get:2 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (tar) [64.4 kB] 424s Get:3 http://ftpmaster.internal/ubuntu noble/universe git-imerge 1.2.0-5 (diff) [3144 B] 424s gpgv: Signature made Sat Aug 19 06:17:53 2023 UTC 424s gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 424s gpgv: Can't check signature: No public key 424s dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-5.dsc: no acceptable signature found 424s autopkgtest [09:28:50]: testing package git-imerge version 1.2.0-5 424s autopkgtest [09:28:50]: build not needed 425s autopkgtest [09:28:51]: test pybuild-autopkgtest: preparing testbed 426s Reading package lists... 426s Building dependency tree... 426s Reading state information... 426s Starting pkgProblemResolver with broken count: 0 426s Starting 2 pkgProblemResolver with broken count: 0 426s Done 426s The following additional packages will be installed: 426s autoconf automake autopoint autotools-dev build-essential cpp cpp-13 426s cpp-13-powerpc64le-linux-gnu cpp-powerpc64le-linux-gnu debhelper debugedit 426s dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 426s g++-13-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu gcc gcc-13 426s gcc-13-powerpc64le-linux-gnu gcc-powerpc64le-linux-gnu gettext git 426s git-imerge git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 426s libc-dev-bin libc6-dev libcc1-0 libcrypt-dev libdebhelper-perl libdw1 426s liberror-perl libfile-stripnondeterminism-perl libgcc-13-dev libgomp1 426s libisl23 libitm1 libjs-jquery libjs-sphinxdoc libjs-underscore liblsan0 426s libmpc3 libnsl-dev libpkgconf3 libquadmath0 libstdc++-13-dev 426s libsub-override-perl libtirpc-dev libtool libtsan2 libubsan1 linux-libc-dev 426s m4 pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest 426s python3-cachetools python3-colorama python3-distlib python3-filelock 426s python3-packaging python3-pip-whl python3-platformdirs python3-pluggy 426s python3-pyproject-api python3-setuptools-whl python3-virtualenv 426s python3-wheel python3-wheel-whl rpcsvc-proto tox 426s Suggested packages: 426s autoconf-archive gnu-standards autoconf-doc cpp-doc gcc-13-locales 426s cpp-13-doc dh-make flit python3-build python3-installer gcc-13-doc 426s gcc-multilib manpages-dev flex bison gdb gcc-doc gdb-powerpc64le-linux-gnu 426s gettext-doc libasprintf-dev libgettextpo-dev git-daemon-run 426s | git-daemon-sysvinit git-doc git-email git-gui gitk gitweb git-cvs 426s git-mediawiki git-svn git-mergify-rebase mergify glibc-doc libstdc++-13-doc 426s libtool-doc gfortran | fortran95-compiler gcj-jdk m4-doc libmail-box-perl 426s Recommended packages: 426s manpages manpages-dev libc-devtools libarchive-cpio-perl javascript-common 426s libltdl-dev libmail-sendmail-perl python3-dev 426s The following NEW packages will be installed: 426s autoconf automake autopkgtest-satdep autopoint autotools-dev build-essential 426s cpp cpp-13 cpp-13-powerpc64le-linux-gnu cpp-powerpc64le-linux-gnu debhelper 426s debugedit dh-autoreconf dh-python dh-strip-nondeterminism dwz g++ g++-13 426s g++-13-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu gcc gcc-13 426s gcc-13-powerpc64le-linux-gnu gcc-powerpc64le-linux-gnu gettext git 426s git-imerge git-man intltool-debian libarchive-zip-perl libasan8 libatomic1 426s libc-dev-bin libc6-dev libcc1-0 libcrypt-dev libdebhelper-perl libdw1 426s liberror-perl libfile-stripnondeterminism-perl libgcc-13-dev libgomp1 426s libisl23 libitm1 libjs-jquery libjs-sphinxdoc libjs-underscore liblsan0 426s libmpc3 libnsl-dev libpkgconf3 libquadmath0 libstdc++-13-dev 426s libsub-override-perl libtirpc-dev libtool libtsan2 libubsan1 linux-libc-dev 426s m4 pkg-config pkgconf pkgconf-bin po-debconf pybuild-plugin-autopkgtest 426s python3-cachetools python3-colorama python3-distlib python3-filelock 426s python3-packaging python3-pip-whl python3-platformdirs python3-pluggy 426s python3-pyproject-api python3-setuptools-whl python3-virtualenv 426s python3-wheel python3-wheel-whl rpcsvc-proto tox 426s 0 upgraded, 80 newly installed, 0 to remove and 0 not upgraded. 426s Need to get 76.7 MB/76.7 MB of archives. 426s After this operation, 298 MB of additional disk space will be used. 426s Get:1 /tmp/autopkgtest.Q8MZaX/1-autopkgtest-satdep.deb autopkgtest-satdep ppc64el 0 [816 B] 427s Get:2 http://ftpmaster.internal/ubuntu noble/main ppc64el m4 ppc64el 1.4.19-4 [275 kB] 427s Get:3 http://ftpmaster.internal/ubuntu noble/main ppc64el autoconf all 2.71-3 [339 kB] 427s Get:4 http://ftpmaster.internal/ubuntu noble/main ppc64el autotools-dev all 20220109.1 [44.9 kB] 427s Get:5 http://ftpmaster.internal/ubuntu noble/main ppc64el automake all 1:1.16.5-1.3ubuntu1 [558 kB] 427s Get:6 http://ftpmaster.internal/ubuntu noble/main ppc64el autopoint all 0.21-14ubuntu1 [422 kB] 427s Get:7 http://ftpmaster.internal/ubuntu noble/main ppc64el libc-dev-bin ppc64el 2.39-0ubuntu2 [21.3 kB] 427s Get:8 http://ftpmaster.internal/ubuntu noble/main ppc64el linux-libc-dev ppc64el 6.8.0-11.11 [1585 kB] 427s Get:9 http://ftpmaster.internal/ubuntu noble/main ppc64el libcrypt-dev ppc64el 1:4.4.36-4 [167 kB] 427s Get:10 http://ftpmaster.internal/ubuntu noble/main ppc64el libtirpc-dev ppc64el 1.3.4+ds-1build1 [262 kB] 427s Get:11 http://ftpmaster.internal/ubuntu noble/main ppc64el libnsl-dev ppc64el 1.3.0-3 [79.2 kB] 427s Get:12 http://ftpmaster.internal/ubuntu noble/main ppc64el rpcsvc-proto ppc64el 1.4.2-0ubuntu6 [82.3 kB] 427s Get:13 http://ftpmaster.internal/ubuntu noble/main ppc64el libc6-dev ppc64el 2.39-0ubuntu2 [2102 kB] 427s Get:14 http://ftpmaster.internal/ubuntu noble/main ppc64el libisl23 ppc64el 0.26-3 [864 kB] 427s Get:15 http://ftpmaster.internal/ubuntu noble/main ppc64el libmpc3 ppc64el 1.3.1-1 [61.2 kB] 427s Get:16 http://ftpmaster.internal/ubuntu noble/main ppc64el cpp-13-powerpc64le-linux-gnu ppc64el 13.2.0-17ubuntu2 [10.7 MB] 428s Get:17 http://ftpmaster.internal/ubuntu noble/main ppc64el cpp-13 ppc64el 13.2.0-17ubuntu2 [1038 B] 428s Get:18 http://ftpmaster.internal/ubuntu noble/main ppc64el cpp-powerpc64le-linux-gnu ppc64el 4:13.2.0-7ubuntu1 [5330 B] 428s Get:19 http://ftpmaster.internal/ubuntu noble/main ppc64el cpp ppc64el 4:13.2.0-7ubuntu1 [22.5 kB] 428s Get:20 http://ftpmaster.internal/ubuntu noble/main ppc64el libcc1-0 ppc64el 14-20240303-1ubuntu1 [48.1 kB] 428s Get:21 http://ftpmaster.internal/ubuntu noble/main ppc64el libgomp1 ppc64el 14-20240303-1ubuntu1 [161 kB] 428s Get:22 http://ftpmaster.internal/ubuntu noble/main ppc64el libitm1 ppc64el 14-20240303-1ubuntu1 [32.4 kB] 428s Get:23 http://ftpmaster.internal/ubuntu noble/main ppc64el libatomic1 ppc64el 14-20240303-1ubuntu1 [10.7 kB] 428s Get:24 http://ftpmaster.internal/ubuntu noble/main ppc64el libasan8 ppc64el 14-20240303-1ubuntu1 [2973 kB] 428s Get:25 http://ftpmaster.internal/ubuntu noble/main ppc64el liblsan0 ppc64el 14-20240303-1ubuntu1 [1325 kB] 428s Get:26 http://ftpmaster.internal/ubuntu noble/main ppc64el libtsan2 ppc64el 14-20240303-1ubuntu1 [2734 kB] 428s Get:27 http://ftpmaster.internal/ubuntu noble/main ppc64el libubsan1 ppc64el 14-20240303-1ubuntu1 [1194 kB] 428s Get:28 http://ftpmaster.internal/ubuntu noble/main ppc64el libquadmath0 ppc64el 14-20240303-1ubuntu1 [158 kB] 428s Get:29 http://ftpmaster.internal/ubuntu noble/main ppc64el libgcc-13-dev ppc64el 13.2.0-17ubuntu2 [1581 kB] 428s Get:30 http://ftpmaster.internal/ubuntu noble/main ppc64el gcc-13-powerpc64le-linux-gnu ppc64el 13.2.0-17ubuntu2 [20.6 MB] 428s Get:31 http://ftpmaster.internal/ubuntu noble/main ppc64el gcc-13 ppc64el 13.2.0-17ubuntu2 [477 kB] 428s Get:32 http://ftpmaster.internal/ubuntu noble/main ppc64el gcc-powerpc64le-linux-gnu ppc64el 4:13.2.0-7ubuntu1 [1224 B] 428s Get:33 http://ftpmaster.internal/ubuntu noble/main ppc64el gcc ppc64el 4:13.2.0-7ubuntu1 [5022 B] 428s Get:34 http://ftpmaster.internal/ubuntu noble/main ppc64el libstdc++-13-dev ppc64el 13.2.0-17ubuntu2 [2445 kB] 428s Get:35 http://ftpmaster.internal/ubuntu noble/main ppc64el g++-13-powerpc64le-linux-gnu ppc64el 13.2.0-17ubuntu2 [12.2 MB] 429s Get:36 http://ftpmaster.internal/ubuntu noble/main ppc64el g++-13 ppc64el 13.2.0-17ubuntu2 [14.5 kB] 429s Get:37 http://ftpmaster.internal/ubuntu noble/main ppc64el g++-powerpc64le-linux-gnu ppc64el 4:13.2.0-7ubuntu1 [968 B] 429s Get:38 http://ftpmaster.internal/ubuntu noble/main ppc64el g++ ppc64el 4:13.2.0-7ubuntu1 [1086 B] 429s Get:39 http://ftpmaster.internal/ubuntu noble/main ppc64el build-essential ppc64el 12.10ubuntu1 [4936 B] 429s Get:40 http://ftpmaster.internal/ubuntu noble/main ppc64el libdebhelper-perl all 13.14.1ubuntu1 [89.5 kB] 429s Get:41 http://ftpmaster.internal/ubuntu noble/main ppc64el libtool all 2.4.7-7 [166 kB] 429s Get:42 http://ftpmaster.internal/ubuntu noble/main ppc64el dh-autoreconf all 20 [16.1 kB] 429s Get:43 http://ftpmaster.internal/ubuntu noble/main ppc64el libarchive-zip-perl all 1.68-1 [90.2 kB] 429s Get:44 http://ftpmaster.internal/ubuntu noble/main ppc64el libsub-override-perl all 0.10-1 [10.0 kB] 429s Get:45 http://ftpmaster.internal/ubuntu noble/main ppc64el libfile-stripnondeterminism-perl all 1.13.1-1 [18.1 kB] 429s Get:46 http://ftpmaster.internal/ubuntu noble/main ppc64el dh-strip-nondeterminism all 1.13.1-1 [5362 B] 429s Get:47 http://ftpmaster.internal/ubuntu noble/main ppc64el libdw1 ppc64el 0.190-1 [294 kB] 429s Get:48 http://ftpmaster.internal/ubuntu noble/main ppc64el debugedit ppc64el 1:5.0-5 [51.1 kB] 429s Get:49 http://ftpmaster.internal/ubuntu noble/main ppc64el dwz ppc64el 0.15-1 [139 kB] 429s Get:50 http://ftpmaster.internal/ubuntu noble/main ppc64el gettext ppc64el 0.21-14ubuntu1 [979 kB] 429s Get:51 http://ftpmaster.internal/ubuntu noble/main ppc64el intltool-debian all 0.35.0+20060710.6 [23.2 kB] 429s Get:52 http://ftpmaster.internal/ubuntu noble/main ppc64el po-debconf all 1.0.21+nmu1 [233 kB] 429s Get:53 http://ftpmaster.internal/ubuntu noble/main ppc64el debhelper all 13.14.1ubuntu1 [869 kB] 429s Get:54 http://ftpmaster.internal/ubuntu noble/universe ppc64el dh-python all 6.20231223ubuntu2 [111 kB] 429s Get:55 http://ftpmaster.internal/ubuntu noble/main ppc64el liberror-perl all 0.17029-2 [25.6 kB] 429s Get:56 http://ftpmaster.internal/ubuntu noble/main ppc64el git-man all 1:2.43.0-1ubuntu1 [1100 kB] 429s Get:57 http://ftpmaster.internal/ubuntu noble/main ppc64el git ppc64el 1:2.43.0-1ubuntu1 [4748 kB] 429s Get:58 http://ftpmaster.internal/ubuntu noble/universe ppc64el git-imerge all 1.2.0-5 [49.5 kB] 429s Get:59 http://ftpmaster.internal/ubuntu noble/main ppc64el libjs-jquery all 3.6.1+dfsg+~3.5.14-1 [328 kB] 429s Get:60 http://ftpmaster.internal/ubuntu noble/main ppc64el libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [118 kB] 429s Get:61 http://ftpmaster.internal/ubuntu noble/main ppc64el libjs-sphinxdoc all 7.2.6-4 [149 kB] 429s Get:62 http://ftpmaster.internal/ubuntu noble/main ppc64el libpkgconf3 ppc64el 1.8.1-2 [36.9 kB] 429s Get:63 http://ftpmaster.internal/ubuntu noble/main ppc64el pkgconf-bin ppc64el 1.8.1-2 [22.0 kB] 429s Get:64 http://ftpmaster.internal/ubuntu noble/main ppc64el pkgconf ppc64el 1.8.1-2 [16.7 kB] 429s Get:65 http://ftpmaster.internal/ubuntu noble/main ppc64el pkg-config ppc64el 1.8.1-2 [7170 B] 429s Get:66 http://ftpmaster.internal/ubuntu noble/universe ppc64el pybuild-plugin-autopkgtest all 6.20231223ubuntu2 [1760 B] 429s Get:67 http://ftpmaster.internal/ubuntu noble/main ppc64el python3-cachetools all 5.3.0-2 [10.6 kB] 429s Get:68 http://ftpmaster.internal/ubuntu noble/main ppc64el python3-colorama all 0.4.6-4 [32.1 kB] 429s Get:69 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-distlib all 0.3.8-1 [318 kB] 429s Get:70 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-filelock all 3.13.1-1 [10.8 kB] 429s Get:71 http://ftpmaster.internal/ubuntu noble/main ppc64el python3-packaging all 23.2-1 [40.6 kB] 429s Get:72 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-pip-whl all 24.0+dfsg-1 [1702 kB] 429s Get:73 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-platformdirs all 4.2.0-1 [16.1 kB] 429s Get:74 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-pluggy all 1.4.0-1 [20.4 kB] 429s Get:75 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-pyproject-api all 1.6.1-1 [50.9 kB] 429s Get:76 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-setuptools-whl all 68.1.2-2 [715 kB] 429s Get:77 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-wheel-whl all 0.42.0-1 [67.8 kB] 429s Get:78 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-virtualenv all 20.25.0+ds-1 [70.7 kB] 429s Get:79 http://ftpmaster.internal/ubuntu noble/universe ppc64el python3-wheel all 0.42.0-1 [53.1 kB] 429s Get:80 http://ftpmaster.internal/ubuntu noble/universe ppc64el tox all 4.13.0-1 [302 kB] 430s Fetched 76.7 MB in 3s (26.8 MB/s) 430s Selecting previously unselected package m4. 430s (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 ... 69651 files and directories currently installed.) 430s Preparing to unpack .../00-m4_1.4.19-4_ppc64el.deb ... 430s Unpacking m4 (1.4.19-4) ... 430s Selecting previously unselected package autoconf. 430s Preparing to unpack .../01-autoconf_2.71-3_all.deb ... 430s Unpacking autoconf (2.71-3) ... 430s Selecting previously unselected package autotools-dev. 430s Preparing to unpack .../02-autotools-dev_20220109.1_all.deb ... 430s Unpacking autotools-dev (20220109.1) ... 430s Selecting previously unselected package automake. 430s Preparing to unpack .../03-automake_1%3a1.16.5-1.3ubuntu1_all.deb ... 430s Unpacking automake (1:1.16.5-1.3ubuntu1) ... 430s Selecting previously unselected package autopoint. 430s Preparing to unpack .../04-autopoint_0.21-14ubuntu1_all.deb ... 430s Unpacking autopoint (0.21-14ubuntu1) ... 430s Selecting previously unselected package libc-dev-bin. 430s Preparing to unpack .../05-libc-dev-bin_2.39-0ubuntu2_ppc64el.deb ... 430s Unpacking libc-dev-bin (2.39-0ubuntu2) ... 430s Selecting previously unselected package linux-libc-dev:ppc64el. 430s Preparing to unpack .../06-linux-libc-dev_6.8.0-11.11_ppc64el.deb ... 430s Unpacking linux-libc-dev:ppc64el (6.8.0-11.11) ... 430s Selecting previously unselected package libcrypt-dev:ppc64el. 430s Preparing to unpack .../07-libcrypt-dev_1%3a4.4.36-4_ppc64el.deb ... 430s Unpacking libcrypt-dev:ppc64el (1:4.4.36-4) ... 430s Selecting previously unselected package libtirpc-dev:ppc64el. 430s Preparing to unpack .../08-libtirpc-dev_1.3.4+ds-1build1_ppc64el.deb ... 430s Unpacking libtirpc-dev:ppc64el (1.3.4+ds-1build1) ... 430s Selecting previously unselected package libnsl-dev:ppc64el. 430s Preparing to unpack .../09-libnsl-dev_1.3.0-3_ppc64el.deb ... 430s Unpacking libnsl-dev:ppc64el (1.3.0-3) ... 430s Selecting previously unselected package rpcsvc-proto. 430s Preparing to unpack .../10-rpcsvc-proto_1.4.2-0ubuntu6_ppc64el.deb ... 430s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 430s Selecting previously unselected package libc6-dev:ppc64el. 430s Preparing to unpack .../11-libc6-dev_2.39-0ubuntu2_ppc64el.deb ... 430s Unpacking libc6-dev:ppc64el (2.39-0ubuntu2) ... 430s Selecting previously unselected package libisl23:ppc64el. 430s Preparing to unpack .../12-libisl23_0.26-3_ppc64el.deb ... 430s Unpacking libisl23:ppc64el (0.26-3) ... 430s Selecting previously unselected package libmpc3:ppc64el. 430s Preparing to unpack .../13-libmpc3_1.3.1-1_ppc64el.deb ... 430s Unpacking libmpc3:ppc64el (1.3.1-1) ... 430s Selecting previously unselected package cpp-13-powerpc64le-linux-gnu. 430s Preparing to unpack .../14-cpp-13-powerpc64le-linux-gnu_13.2.0-17ubuntu2_ppc64el.deb ... 430s Unpacking cpp-13-powerpc64le-linux-gnu (13.2.0-17ubuntu2) ... 431s Selecting previously unselected package cpp-13. 431s Preparing to unpack .../15-cpp-13_13.2.0-17ubuntu2_ppc64el.deb ... 431s Unpacking cpp-13 (13.2.0-17ubuntu2) ... 431s Selecting previously unselected package cpp-powerpc64le-linux-gnu. 431s Preparing to unpack .../16-cpp-powerpc64le-linux-gnu_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 431s Unpacking cpp-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 431s Selecting previously unselected package cpp. 431s Preparing to unpack .../17-cpp_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 431s Unpacking cpp (4:13.2.0-7ubuntu1) ... 431s Selecting previously unselected package libcc1-0:ppc64el. 431s Preparing to unpack .../18-libcc1-0_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libcc1-0:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libgomp1:ppc64el. 431s Preparing to unpack .../19-libgomp1_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libgomp1:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libitm1:ppc64el. 431s Preparing to unpack .../20-libitm1_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libitm1:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libatomic1:ppc64el. 431s Preparing to unpack .../21-libatomic1_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libatomic1:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libasan8:ppc64el. 431s Preparing to unpack .../22-libasan8_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libasan8:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package liblsan0:ppc64el. 431s Preparing to unpack .../23-liblsan0_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking liblsan0:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libtsan2:ppc64el. 431s Preparing to unpack .../24-libtsan2_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libtsan2:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libubsan1:ppc64el. 431s Preparing to unpack .../25-libubsan1_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libubsan1:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libquadmath0:ppc64el. 431s Preparing to unpack .../26-libquadmath0_14-20240303-1ubuntu1_ppc64el.deb ... 431s Unpacking libquadmath0:ppc64el (14-20240303-1ubuntu1) ... 431s Selecting previously unselected package libgcc-13-dev:ppc64el. 431s Preparing to unpack .../27-libgcc-13-dev_13.2.0-17ubuntu2_ppc64el.deb ... 431s Unpacking libgcc-13-dev:ppc64el (13.2.0-17ubuntu2) ... 431s Selecting previously unselected package gcc-13-powerpc64le-linux-gnu. 431s Preparing to unpack .../28-gcc-13-powerpc64le-linux-gnu_13.2.0-17ubuntu2_ppc64el.deb ... 431s Unpacking gcc-13-powerpc64le-linux-gnu (13.2.0-17ubuntu2) ... 432s Selecting previously unselected package gcc-13. 432s Preparing to unpack .../29-gcc-13_13.2.0-17ubuntu2_ppc64el.deb ... 432s Unpacking gcc-13 (13.2.0-17ubuntu2) ... 432s Selecting previously unselected package gcc-powerpc64le-linux-gnu. 432s Preparing to unpack .../30-gcc-powerpc64le-linux-gnu_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 432s Unpacking gcc-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 432s Selecting previously unselected package gcc. 432s Preparing to unpack .../31-gcc_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 432s Unpacking gcc (4:13.2.0-7ubuntu1) ... 432s Selecting previously unselected package libstdc++-13-dev:ppc64el. 432s Preparing to unpack .../32-libstdc++-13-dev_13.2.0-17ubuntu2_ppc64el.deb ... 432s Unpacking libstdc++-13-dev:ppc64el (13.2.0-17ubuntu2) ... 432s Selecting previously unselected package g++-13-powerpc64le-linux-gnu. 432s Preparing to unpack .../33-g++-13-powerpc64le-linux-gnu_13.2.0-17ubuntu2_ppc64el.deb ... 432s Unpacking g++-13-powerpc64le-linux-gnu (13.2.0-17ubuntu2) ... 432s Selecting previously unselected package g++-13. 432s Preparing to unpack .../34-g++-13_13.2.0-17ubuntu2_ppc64el.deb ... 432s Unpacking g++-13 (13.2.0-17ubuntu2) ... 432s Selecting previously unselected package g++-powerpc64le-linux-gnu. 432s Preparing to unpack .../35-g++-powerpc64le-linux-gnu_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 432s Unpacking g++-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 432s Selecting previously unselected package g++. 432s Preparing to unpack .../36-g++_4%3a13.2.0-7ubuntu1_ppc64el.deb ... 432s Unpacking g++ (4:13.2.0-7ubuntu1) ... 432s Selecting previously unselected package build-essential. 432s Preparing to unpack .../37-build-essential_12.10ubuntu1_ppc64el.deb ... 432s Unpacking build-essential (12.10ubuntu1) ... 432s Selecting previously unselected package libdebhelper-perl. 432s Preparing to unpack .../38-libdebhelper-perl_13.14.1ubuntu1_all.deb ... 432s Unpacking libdebhelper-perl (13.14.1ubuntu1) ... 433s Selecting previously unselected package libtool. 433s Preparing to unpack .../39-libtool_2.4.7-7_all.deb ... 433s Unpacking libtool (2.4.7-7) ... 433s Selecting previously unselected package dh-autoreconf. 433s Preparing to unpack .../40-dh-autoreconf_20_all.deb ... 433s Unpacking dh-autoreconf (20) ... 433s Selecting previously unselected package libarchive-zip-perl. 433s Preparing to unpack .../41-libarchive-zip-perl_1.68-1_all.deb ... 433s Unpacking libarchive-zip-perl (1.68-1) ... 433s Selecting previously unselected package libsub-override-perl. 433s Preparing to unpack .../42-libsub-override-perl_0.10-1_all.deb ... 433s Unpacking libsub-override-perl (0.10-1) ... 433s Selecting previously unselected package libfile-stripnondeterminism-perl. 433s Preparing to unpack .../43-libfile-stripnondeterminism-perl_1.13.1-1_all.deb ... 433s Unpacking libfile-stripnondeterminism-perl (1.13.1-1) ... 433s Selecting previously unselected package dh-strip-nondeterminism. 433s Preparing to unpack .../44-dh-strip-nondeterminism_1.13.1-1_all.deb ... 433s Unpacking dh-strip-nondeterminism (1.13.1-1) ... 433s Selecting previously unselected package libdw1:ppc64el. 433s Preparing to unpack .../45-libdw1_0.190-1_ppc64el.deb ... 433s Unpacking libdw1:ppc64el (0.190-1) ... 433s Selecting previously unselected package debugedit. 433s Preparing to unpack .../46-debugedit_1%3a5.0-5_ppc64el.deb ... 433s Unpacking debugedit (1:5.0-5) ... 433s Selecting previously unselected package dwz. 433s Preparing to unpack .../47-dwz_0.15-1_ppc64el.deb ... 433s Unpacking dwz (0.15-1) ... 433s Selecting previously unselected package gettext. 433s Preparing to unpack .../48-gettext_0.21-14ubuntu1_ppc64el.deb ... 433s Unpacking gettext (0.21-14ubuntu1) ... 433s Selecting previously unselected package intltool-debian. 433s Preparing to unpack .../49-intltool-debian_0.35.0+20060710.6_all.deb ... 433s Unpacking intltool-debian (0.35.0+20060710.6) ... 433s Selecting previously unselected package po-debconf. 433s Preparing to unpack .../50-po-debconf_1.0.21+nmu1_all.deb ... 433s Unpacking po-debconf (1.0.21+nmu1) ... 433s Selecting previously unselected package debhelper. 433s Preparing to unpack .../51-debhelper_13.14.1ubuntu1_all.deb ... 433s Unpacking debhelper (13.14.1ubuntu1) ... 433s Selecting previously unselected package dh-python. 433s Preparing to unpack .../52-dh-python_6.20231223ubuntu2_all.deb ... 433s Unpacking dh-python (6.20231223ubuntu2) ... 433s Selecting previously unselected package liberror-perl. 433s Preparing to unpack .../53-liberror-perl_0.17029-2_all.deb ... 433s Unpacking liberror-perl (0.17029-2) ... 433s Selecting previously unselected package git-man. 433s Preparing to unpack .../54-git-man_1%3a2.43.0-1ubuntu1_all.deb ... 433s Unpacking git-man (1:2.43.0-1ubuntu1) ... 433s Selecting previously unselected package git. 433s Preparing to unpack .../55-git_1%3a2.43.0-1ubuntu1_ppc64el.deb ... 433s Unpacking git (1:2.43.0-1ubuntu1) ... 433s Selecting previously unselected package git-imerge. 433s Preparing to unpack .../56-git-imerge_1.2.0-5_all.deb ... 433s Unpacking git-imerge (1.2.0-5) ... 433s Selecting previously unselected package libjs-jquery. 433s Preparing to unpack .../57-libjs-jquery_3.6.1+dfsg+~3.5.14-1_all.deb ... 433s Unpacking libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 433s Selecting previously unselected package libjs-underscore. 433s Preparing to unpack .../58-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ... 433s Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 433s Selecting previously unselected package libjs-sphinxdoc. 433s Preparing to unpack .../59-libjs-sphinxdoc_7.2.6-4_all.deb ... 433s Unpacking libjs-sphinxdoc (7.2.6-4) ... 433s Selecting previously unselected package libpkgconf3:ppc64el. 433s Preparing to unpack .../60-libpkgconf3_1.8.1-2_ppc64el.deb ... 433s Unpacking libpkgconf3:ppc64el (1.8.1-2) ... 433s Selecting previously unselected package pkgconf-bin. 433s Preparing to unpack .../61-pkgconf-bin_1.8.1-2_ppc64el.deb ... 433s Unpacking pkgconf-bin (1.8.1-2) ... 433s Selecting previously unselected package pkgconf:ppc64el. 433s Preparing to unpack .../62-pkgconf_1.8.1-2_ppc64el.deb ... 433s Unpacking pkgconf:ppc64el (1.8.1-2) ... 433s Selecting previously unselected package pkg-config:ppc64el. 433s Preparing to unpack .../63-pkg-config_1.8.1-2_ppc64el.deb ... 433s Unpacking pkg-config:ppc64el (1.8.1-2) ... 433s Selecting previously unselected package pybuild-plugin-autopkgtest. 433s Preparing to unpack .../64-pybuild-plugin-autopkgtest_6.20231223ubuntu2_all.deb ... 433s Unpacking pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 433s Selecting previously unselected package python3-cachetools. 433s Preparing to unpack .../65-python3-cachetools_5.3.0-2_all.deb ... 433s Unpacking python3-cachetools (5.3.0-2) ... 433s Selecting previously unselected package python3-colorama. 433s Preparing to unpack .../66-python3-colorama_0.4.6-4_all.deb ... 433s Unpacking python3-colorama (0.4.6-4) ... 433s Selecting previously unselected package python3-distlib. 433s Preparing to unpack .../67-python3-distlib_0.3.8-1_all.deb ... 433s Unpacking python3-distlib (0.3.8-1) ... 434s Selecting previously unselected package python3-filelock. 434s Preparing to unpack .../68-python3-filelock_3.13.1-1_all.deb ... 434s Unpacking python3-filelock (3.13.1-1) ... 434s Selecting previously unselected package python3-packaging. 434s Preparing to unpack .../69-python3-packaging_23.2-1_all.deb ... 434s Unpacking python3-packaging (23.2-1) ... 434s Selecting previously unselected package python3-pip-whl. 434s Preparing to unpack .../70-python3-pip-whl_24.0+dfsg-1_all.deb ... 434s Unpacking python3-pip-whl (24.0+dfsg-1) ... 434s Selecting previously unselected package python3-platformdirs. 434s Preparing to unpack .../71-python3-platformdirs_4.2.0-1_all.deb ... 434s Unpacking python3-platformdirs (4.2.0-1) ... 434s Selecting previously unselected package python3-pluggy. 434s Preparing to unpack .../72-python3-pluggy_1.4.0-1_all.deb ... 434s Unpacking python3-pluggy (1.4.0-1) ... 434s Selecting previously unselected package python3-pyproject-api. 434s Preparing to unpack .../73-python3-pyproject-api_1.6.1-1_all.deb ... 434s Unpacking python3-pyproject-api (1.6.1-1) ... 434s Selecting previously unselected package python3-setuptools-whl. 434s Preparing to unpack .../74-python3-setuptools-whl_68.1.2-2_all.deb ... 434s Unpacking python3-setuptools-whl (68.1.2-2) ... 434s Selecting previously unselected package python3-wheel-whl. 434s Preparing to unpack .../75-python3-wheel-whl_0.42.0-1_all.deb ... 434s Unpacking python3-wheel-whl (0.42.0-1) ... 434s Selecting previously unselected package python3-virtualenv. 434s Preparing to unpack .../76-python3-virtualenv_20.25.0+ds-1_all.deb ... 434s Unpacking python3-virtualenv (20.25.0+ds-1) ... 434s Selecting previously unselected package python3-wheel. 434s Preparing to unpack .../77-python3-wheel_0.42.0-1_all.deb ... 434s Unpacking python3-wheel (0.42.0-1) ... 434s Selecting previously unselected package tox. 434s Preparing to unpack .../78-tox_4.13.0-1_all.deb ... 434s Unpacking tox (4.13.0-1) ... 434s Selecting previously unselected package autopkgtest-satdep. 434s Preparing to unpack .../79-1-autopkgtest-satdep.deb ... 434s Unpacking autopkgtest-satdep (0) ... 434s Setting up dh-python (6.20231223ubuntu2) ... 434s Setting up libdw1:ppc64el (0.190-1) ... 434s Setting up python3-setuptools-whl (68.1.2-2) ... 434s Setting up python3-filelock (3.13.1-1) ... 434s Setting up python3-cachetools (5.3.0-2) ... 434s Setting up python3-colorama (0.4.6-4) ... 434s Setting up python3-pip-whl (24.0+dfsg-1) ... 434s Setting up libarchive-zip-perl (1.68-1) ... 434s Setting up libdebhelper-perl (13.14.1ubuntu1) ... 434s Setting up linux-libc-dev:ppc64el (6.8.0-11.11) ... 434s Setting up m4 (1.4.19-4) ... 434s Setting up python3-distlib (0.3.8-1) ... 435s Setting up libgomp1:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up python3-wheel (0.42.0-1) ... 435s Setting up python3-platformdirs (4.2.0-1) ... 435s Setting up liberror-perl (0.17029-2) ... 435s Setting up autotools-dev (20220109.1) ... 435s Setting up python3-packaging (23.2-1) ... 435s Setting up libtirpc-dev:ppc64el (1.3.4+ds-1build1) ... 435s Setting up libpkgconf3:ppc64el (1.8.1-2) ... 435s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 435s Setting up libquadmath0:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up libmpc3:ppc64el (1.3.1-1) ... 435s Setting up libatomic1:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up autopoint (0.21-14ubuntu1) ... 435s Setting up pkgconf-bin (1.8.1-2) ... 435s Setting up autoconf (2.71-3) ... 435s Setting up python3-pluggy (1.4.0-1) ... 435s Setting up libubsan1:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up dwz (0.15-1) ... 435s Setting up libnsl-dev:ppc64el (1.3.0-3) ... 435s Setting up libcrypt-dev:ppc64el (1:4.4.36-4) ... 435s Setting up libasan8:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up debugedit (1:5.0-5) ... 435s Setting up libsub-override-perl (0.10-1) ... 435s Setting up git-man (1:2.43.0-1ubuntu1) ... 435s Setting up libtsan2:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up libjs-jquery (3.6.1+dfsg+~3.5.14-1) ... 435s Setting up libisl23:ppc64el (0.26-3) ... 435s Setting up libc-dev-bin (2.39-0ubuntu2) ... 435s Setting up cpp-13-powerpc64le-linux-gnu (13.2.0-17ubuntu2) ... 435s Setting up python3-wheel-whl (0.42.0-1) ... 435s Setting up libcc1-0:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up liblsan0:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up libitm1:ppc64el (14-20240303-1ubuntu1) ... 435s Setting up cpp-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 435s Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ... 435s Setting up automake (1:1.16.5-1.3ubuntu1) ... 435s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 435s Setting up libfile-stripnondeterminism-perl (1.13.1-1) ... 435s Setting up gettext (0.21-14ubuntu1) ... 435s Setting up cpp-13 (13.2.0-17ubuntu2) ... 435s Setting up python3-virtualenv (20.25.0+ds-1) ... 435s Setting up pkgconf:ppc64el (1.8.1-2) ... 435s Setting up intltool-debian (0.35.0+20060710.6) ... 435s Setting up pkg-config:ppc64el (1.8.1-2) ... 435s Setting up git (1:2.43.0-1ubuntu1) ... 435s Setting up libjs-sphinxdoc (7.2.6-4) ... 435s Setting up dh-strip-nondeterminism (1.13.1-1) ... 435s Setting up libgcc-13-dev:ppc64el (13.2.0-17ubuntu2) ... 435s Setting up cpp (4:13.2.0-7ubuntu1) ... 435s Setting up libc6-dev:ppc64el (2.39-0ubuntu2) ... 435s Setting up libstdc++-13-dev:ppc64el (13.2.0-17ubuntu2) ... 435s Setting up po-debconf (1.0.21+nmu1) ... 435s Setting up python3-pyproject-api (1.6.1-1) ... 436s Setting up git-imerge (1.2.0-5) ... 436s Setting up gcc-13-powerpc64le-linux-gnu (13.2.0-17ubuntu2) ... 436s Setting up gcc-13 (13.2.0-17ubuntu2) ... 436s Setting up tox (4.13.0-1) ... 436s Setting up libtool (2.4.7-7) ... 436s Setting up g++-13-powerpc64le-linux-gnu (13.2.0-17ubuntu2) ... 436s Setting up dh-autoreconf (20) ... 436s Setting up gcc-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 436s Setting up g++-powerpc64le-linux-gnu (4:13.2.0-7ubuntu1) ... 436s Setting up g++-13 (13.2.0-17ubuntu2) ... 436s Setting up debhelper (13.14.1ubuntu1) ... 436s Setting up gcc (4:13.2.0-7ubuntu1) ... 436s Setting up g++ (4:13.2.0-7ubuntu1) ... 436s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 436s Setting up build-essential (12.10ubuntu1) ... 436s Setting up pybuild-plugin-autopkgtest (6.20231223ubuntu2) ... 436s Setting up autopkgtest-satdep (0) ... 436s Processing triggers for man-db (2.12.0-3) ... 437s Processing triggers for install-info (7.1-3) ... 437s Processing triggers for libc-bin (2.39-0ubuntu2) ... 440s (Reading database ... 75466 files and directories currently installed.) 440s Removing autopkgtest-satdep (0) ... 441s autopkgtest [09:29:07]: test pybuild-autopkgtest: pybuild-autopkgtest 441s autopkgtest [09:29:07]: test pybuild-autopkgtest: [----------------------- 441s pybuild-autopkgtest 442s I: pybuild base:305: cd /tmp/autopkgtest.Q8MZaX/autopkgtest_tmp/build; tox -c /tmp/autopkgtest.Q8MZaX/build.vm7/src/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --skip-pkg-install 442s py312: skip building and installing the package 442s py312: commands[0] /tmp/autopkgtest.Q8MZaX/build.vm7/src> /bin/sh t/test-unconflicted 442s + dirname t/test-unconflicted 442s + cd t 442s + pwd 442s + dirname /tmp/autopkgtest.Q8MZaX/build.vm7/src/t 442s + BASE=/tmp/autopkgtest.Q8MZaX/build.vm7/src 442s + . /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/test-lib.sh 442s + GIT_IMERGE=git-imerge 442s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s + DESCRIPTION=git-imerge test repository without conflicts 442s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted git-imerge test repository without conflicts 442s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s + local description=git-imerge test repository without conflicts 442s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted git-imerge test repository without conflicts 442s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s + local description=git-imerge test repository without conflicts 442s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s hint: Using 'master' as the name for the initial branch. This default branch name 442s hint: is subject to change. To configure the initial branch name to use in all 442s hint: of your new repositories, which will suppress this warning, call: 442s hint: 442s hint: git config --global init.defaultBranch 442s hint: 442s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 442s hint: 'development'. The just-created branch can be renamed via this command: 442s hint: 442s hint: git branch -m 442s + echo git-imerge test repository without conflicts 442s + printf %s\n /*.out /*.css /*.html 442s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted/.git config user.name Loú User 442s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted/.git config user.email luser@example.com 442s + TIME=1112911993 442s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted 442s + modify a.txt 0 442s + filename=a.txt 442s + text=0 442s + echo 0 442s + git add a.txt 442s + modify b.txt 0 442s + filename=b.txt 442s + text=0 442s + echo 0 442s + git add b.txt 442s + commit -m m⇒0 442s + TIME=1112911994 442s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 442s + git checkout -b a -- 442s Switched to a new branch 'a' 442s + seq 8 442s + modify a.txt 1 442s + filename=a.txt 442s + text=1 442s + echo 1 442s + git add a.txt 442s + commit -m a⇒1 442s + TIME=1112911995 442s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 442s + modify a.txt 2 442s + filename=a.txt 442s + text=2 442s + echo 2 442s + git add a.txt 442s + commit -m a⇒2 442s + TIME=1112911996 442s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 442s + modify a.txt 3 442s + filename=a.txt 442s + text=3 442s + echo 3 442s + git add a.txt 442s + commit -m a⇒3 442s + TIME=1112911997 442s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 442s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/unconflicted/.git/ 442s [master (root-commit) 780ddf5] m⇒0 442s 2 files changed, 2 insertions(+) 442s create mode 100644 a.txt 442s create mode 100644 b.txt 442s [a b862e30] a⇒1 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s [a dcbe282] a⇒2 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s [a ecd8647] a⇒3 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s [a 1634bab] a⇒4 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s [a 909ce12] a⇒5 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s + modify a.txt 4 442s + filename=a.txt 442s + text=4 442s + echo 4 442s + git add a.txt 442s + commit -m a⇒4 442s + TIME=1112911998 442s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 442s + modify a.txt 5 442s + filename=a.txt 442s + text=5 442s + echo 5 442s + git add a.txt 442s + commit -m a⇒5 442s + TIME=1112911999 442s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 442s + modify a.txt 6 442s + filename=a.txt 442s + text=6 442s + echo 6 442s + git add a.txt 442s + commit -m a⇒6 442s + TIME=1112912000 442s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 442s [a f6520bf] a⇒6 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s + modify a.txt 7 442s + filename=a.txt 442s + text=7 442s + echo 7 442s + git add a.txt 442s + commit -m a⇒7 442s + TIME=1112912001 442s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 442s [a 6797186] a⇒7 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s + modify a.txt 8 442s + filename=a.txt 442s + text=8 442s + echo 8 442s + git add a.txt 442s + commit -m a⇒8 442s + TIME=1112912002 442s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 442s [a 49643dd] a⇒8 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s + git checkout -b b master -- 442s Switched to a new branch 'b' 442s + seq 5 442s + modify b.txt 1 442s + filename=b.txt 442s + text=1 442s + echo 1 442s + git add b.txt 442s + commit -m b⇒1 442s + TIME=1112912003 442s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 442s + modify b.txt 2 442s + filename=b.txt 442s + text=2 442s + echo 2 442s + git add b.txt 442s + commit -m b⇒2 442s + TIME=1112912004 442s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 442s + modify b.txt 3 442s + filename=b.txt 442s + text=3 442s + echo 3 442s + git add b.txt 442s + commit -m b⇒3 442s + TIME=1112912005 442s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 442s + modify b.txt 4 442s + filename=b.txt 442s + text=4 442s + echo 4 442s + git add b.txt 442s + commit -m b⇒4 442s + TIME=1112912006 442s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 442s + modify b.txt 5 442s + filename=b.txt 442s [b d43305b] b⇒1 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s [b 853ee68] b⇒2 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s [b 03a2455] b⇒3 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s [b 484ea85] b⇒4 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s + text=5 442s + echo 5 442s + git add b.txt 442s + commit -m b⇒5 442s + TIME=1112912007 442s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 442s [b e22cd97] b⇒5 442s 1 file changed, 1 insertion(+), 1 deletion(-) 442s + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 442s + git checkout a 442s Switched to branch 'a' 442s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 443s Attempting automerge of 8-5...success. 443s Autofilling 1-5...success. 443s Autofilling 2-5...success. 443s Autofilling 3-5...success. 443s Autofilling 4-5...success. 443s Autofilling 5-5...success. 443s Autofilling 6-5...success. 443s Autofilling 7-5...success. 443s Autofilling 8-1...success. 443s Autofilling 8-2...success. 443s Autofilling 8-3...success. 443s Autofilling 8-4...success. 443s Autofilling 8-5 (first way)...success. 443s Autofilling 8-5 (second way)...success. 443s The two ways of autofilling 8-5 agree. 443s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. 443s Merge is complete! 443s + git-imerge list 443s * a-b 443s + git-imerge diagram --commits --frontier --html=imerge3.html 443s 0 5 8 443s | | | 443s 0 - ********* - a 443s *???????. 443s *???????. 443s *???????. 443s *???????. 443s 5 - *........ 443s | 443s b 443s 443s 0 5 8 443s | | | 443s 0 - ********* - a 443s *???????| 443s *???????| 443s *???????| 443s *???????| 443s 5 - *-------+ 443s | 443s b 443s 443s Key: 443s |,-,+ = rectangles forming current merge frontier 443s * = merge done manually 443s . = merge done automatically 443s # = conflict that is currently blocking progress 443s @ = merge was blocked but has been resolved 443s ? = no merge recorded 443s 443s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 443s Merge b into a (using imerge) 443s 443s # Please enter the commit message for your changes. Lines starting 443s # with '#' will be ignored, and an empty message aborts the commit. 443s # 443s # Date: Wed Mar 20 09:29:10 2024 +0000 443s # 443s # On branch a-b-merge 443s # Changes to be committed: 443s # modified: b.txt 443s # 443s [a-b-merge d9b4f2a] Merge b into a (using imerge) 443s Date: Wed Mar 20 09:29:10 2024 +0000 443s + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + local refname=a-b-merge 443s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git rev-parse a-b-merge^{tree} 443s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git-imerge simplify --goal=rebase --branch=a-b-rebase 443s + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + local refname=a-b-rebase 443s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git rev-parse a-b-rebase^{tree} 443s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 443s + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + local refname=a-b-rebase-with-history 443s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git rev-parse a-b-rebase-with-history^{tree} 443s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git-imerge simplify --goal=border --branch=a-b-border 443s + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + local refname=a-b-border 443s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git rev-parse a-b-border^{tree} 443s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 443s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 444s + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 444s + local refname=a-b-border-with-history 444s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 444s + git rev-parse a-b-border-with-history^{tree} 444s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 444s + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 444s + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 444s + local refname=a-b-border-with-history2 444s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 444s + git rev-parse a-b-border-with-history2^{tree} 444s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 444s + git-imerge remove 444s + git checkout a 444s Switched to branch 'a' 444s + git-imerge start --goal=full --name=a-b b 444s Attempting to merge 1-1...success. 444s Attempting to merge 1-2...success. 444s Attempting to merge 1-3...success. 444s Attempting to merge 1-4...success. 444s Attempting to merge 1-5...success. 444s Attempting to merge 2-1...success. 444s Attempting to merge 2-2...success. 444s Attempting to merge 2-3...success. 444s Attempting to merge 2-4...success. 444s Attempting to merge 2-5...success. 444s Attempting to merge 3-1...success. 444s Attempting to merge 3-2...success. 444s Attempting to merge 3-3...success. 444s Attempting to merge 3-4...success. 444s Attempting to merge 3-5...success. 444s Attempting to merge 4-1...success. 444s Attempting to merge 4-2...success. 444s Attempting to merge 4-3...success. 444s Attempting to merge 4-4...success. 444s Attempting to merge 4-5...success. 444s Attempting to merge 5-1...success. 444s Attempting to merge 5-2...success. 444s Attempting to merge 5-3...success. 444s Attempting to merge 5-4...success. 444s Attempting to merge 5-5...success. 444s Attempting to merge 6-1...success. 444s Attempting to merge 6-2...success. 444s Attempting to merge 6-3...success. 444s Attempting to merge 6-4...success. 444s Attempting to merge 6-5...success. 444s Attempting to merge 7-1...success. 444s Attempting to merge 7-2...success. 444s Attempting to merge 7-3...success. 445s Attempting to merge 7-4...success. 445s Attempting to merge 7-5...success. 445s Attempting to merge 8-1...success. 445s Attempting to merge 8-2...success. 445s Attempting to merge 8-3...success. 445s Attempting to merge 8-4...success. 445s Attempting to merge 8-5...success. 445s Merge is complete! 445s + git-imerge list 445s * a-b 445s + git-imerge diagram --commits --frontier --html=imerge4.html 445s 0 5 8 445s | | | 445s 0 - ********* - a 445s *........ 445s *........ 445s *........ 445s *........ 445s 5 - *........ 445s | 445s b 445s 445s 0 5 8 445s | | | 445s 0 - ********* - a 445s *.......| 445s *.......| 445s *.......| 445s *.......| 445s 5 - *-------+ 445s | 445s b 445s 445s Key: 445s |,-,+ = rectangles forming current merge frontier 445s * = merge done manually 445s . = merge done automatically 445s # = conflict that is currently blocking progress 445s @ = merge was blocked but has been resolved 445s ? = no merge recorded 445s 445s + git-imerge finish --branch=a-b-full 445s + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 445s + local refname=a-b-full 445s + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 445s + git rev-parse a-b-full^{tree} 445s + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 445s py312: commands[1] /tmp/autopkgtest.Q8MZaX/build.vm7/src> /bin/sh t/test-conflicted 445s + dirname t/test-conflicted 445s + cd t 445s + pwd 445s + dirname /tmp/autopkgtest.Q8MZaX/build.vm7/src/t 445s + BASE=/tmp/autopkgtest.Q8MZaX/build.vm7/src 445s + . /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/test-lib.sh 445s + GIT_IMERGE=git-imerge 445s + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 445s + test_conflict 4-3 445s + local conflict=4-3 445s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s + DESCRIPTION=git-imerge test repository with conflict at 4-3 445s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 445s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s + local description=git-imerge test repository with conflict at 4-3 445s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 445s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s + local description=git-imerge test repository with conflict at 4-3 445s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s hint: Using 'master' as the name for the initial branch. This default branch name 445s hint: is subject to change. To configure the initial branch name to use in all 445s hint: of your new repositories, which will suppress this warning, call: 445s hint: 445s hint: git config --global init.defaultBranch 445s hint: 445s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 445s hint: 'development'. The just-created branch can be renamed via this command: 445s hint: 445s hint: git branch -m 445s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3/.git/ 445s + echo git-imerge test repository with conflict at 4-3 445s + printf %s\n /*.out /*.css /*.html 445s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3/.git config user.name Loú User 445s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3/.git config user.email luser@example.com 445s + TIME=1112911993 445s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-4-3 445s + modify c.txt 0 445s + filename=c.txt 445s + text=0 445s + echo 0 445s + git add c.txt 445s + modify d.txt 0 445s + filename=d.txt 445s + text=0 445s + echo 0 445s + git add d.txt 445s + modify conflict.txt original version 445s + filename=conflict.txt 445s + text=original version 445s + echo original version 445s + git add conflict.txt 445s + commit -m m⇒0 445s + TIME=1112911994 445s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 445s [master (root-commit) d70e04b] m⇒0 445s 3 files changed, 3 insertions(+) 445s create mode 100644 c.txt 445s create mode 100644 conflict.txt 445s create mode 100644 d.txt 445s + git checkout -b c master -- 445s Switched to a new branch 'c' 445s + seq 9 445s + modify c.txt 1 445s + filename=c.txt 445s + text=1 445s + echo 1 445s + git add c.txt 445s + commit -m c⇒1 445s + TIME=1112911995 445s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 445s [c 89e2141] c⇒1 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify c.txt 2 445s + filename=c.txt 445s + text=2 445s + echo 2 445s + git add c.txt 445s + commit -m c⇒2 445s + TIME=1112911996 445s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 445s [c 7c431f2] c⇒2 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify c.txt 3 445s + filename=c.txt 445s + text=3 445s + echo 3 445s + git add c.txt 445s + commit -m c⇒3 445s + TIME=1112911997 445s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 445s [c f02ab24] c⇒3 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify c.txt 4 445s + filename=c.txt 445s + text=4 445s + echo 4 445s + git add c.txt 445s + modify conflict.txt c version 445s + filename=conflict.txt 445s + text=c version 445s + echo c version 445s + git add conflict.txt 445s + commit -m c⇒4 445s + TIME=1112911998 445s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 445s [c 3c091de] c⇒4 445s 2 files changed, 2 insertions(+), 2 deletions(-) 445s + modify c.txt 5 445s + filename=c.txt 445s + text=5 445s + echo 5 445s + git add c.txt 445s + commit -m c⇒5 445s + TIME=1112911999 445s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 445s [c a0ac37a] c⇒5 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify c.txt 6 445s + filename=c.txt 445s + text=6 445s + echo 6 445s + git add c.txt 445s + commit -m c⇒6 445s + TIME=1112912000 445s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 445s [c ed9fdfa] c⇒6 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify c.txt 7 445s + filename=c.txt 445s + text=7 445s + echo 7 445s + git add c.txt 445s + commit -m c⇒7 445s + TIME=1112912001 445s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 445s + modify c.txt 8 445s + filename=c.txt 445s + text=8 445s + echo 8 445s + git add c.txt 445s + commit -m c⇒8 445s + TIME=1112912002 445s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 445s [c 1da7bf5] c⇒7 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s [c d8de99f] c⇒8 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify c.txt 9 445s + filename=c.txt 445s + text=9 445s + echo 9 445s + git add c.txt 445s + commit -m c⇒9 445s + TIME=1112912003 445s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 445s [c 9cde605] c⇒9 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + git checkout -b d master -- 445s Switched to a new branch 'd' 445s + seq 6 445s + modify d.txt 1 445s + filename=d.txt 445s + text=1 445s + echo 1 445s + git add d.txt 445s + commit -m d⇒1 445s + TIME=1112912004 445s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 445s [d bd5368a] d⇒1 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify d.txt 2 445s + filename=d.txt 445s + text=2 445s + echo 2 445s + git add d.txt 445s + commit -m d⇒2 445s + TIME=1112912005 445s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 445s [d 93e27e6] d⇒2 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify d.txt 3 445s + filename=d.txt 445s + text=3 445s + echo 3 445s + git add d.txt 445s + modify conflict.txt d version 445s + filename=conflict.txt 445s + text=d version 445s + echo d version 445s + git add conflict.txt 445s + commit -m d⇒3 445s + TIME=1112912006 445s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 445s + modify d.txt 4 445s + filename=d.txt 445s + text=4 445s + echo 4 445s + git add d.txt 445s [d 2bb1a7e] d⇒3 445s 2 files changed, 2 insertions(+), 2 deletions(-) 445s + commit -m d⇒4 445s + TIME=1112912007 445s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 445s [d 81f9c80] d⇒4 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify d.txt 5 445s + filename=d.txt 445s + text=5 445s + echo 5 445s + git add d.txt 445s + commit -m d⇒5 445s + TIME=1112912008 445s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 445s [d 3690dde] d⇒5 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + modify d.txt 6 445s + filename=d.txt 445s + text=6 445s + echo 6 445s + git add d.txt 445s + commit -m d⇒6 445s + TIME=1112912009 445s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 445s [d 8085853] d⇒6 445s 1 file changed, 1 insertion(+), 1 deletion(-) 445s + git checkout c 445s Switched to branch 'c' 445s + git-imerge init --name=c-d d 445s + git-imerge list 445s * c-d 445s + git-imerge diagram --commits --frontier --html=imerge0.html 445s 0 5 9 445s | | | 445s 0 - ********** - c 445s *????????? 445s *????????? 445s *????????? 445s *????????? 445s 5 - *????????? 445s 6 - *????????? 445s | 445s d 445s 445s 0 5 9 445s | | | 445s 0 - ********** - c 445s *????????? 445s *????????? 445s *????????? 445s *????????? 445s 5 - *????????? 445s 6 - *????????? 445s | 445s d 445s 445s Key: 445s |,-,+ = rectangles forming current merge frontier 445s * = merge done manually 445s . = merge done automatically 445s # = conflict that is currently blocking progress 445s @ = merge was blocked but has been resolved 445s ? = no merge recorded 445s 445s + git-imerge autofill 445s + tee autofill.out 446s Attempting automerge of 9-6...failure. 446s Attempting automerge of 1-1...success. 446s Attempting automerge of 1-4...success. 446s Attempting automerge of 1-6...success. 446s Attempting automerge of 9-6...failure. 446s Attempting automerge of 5-6...failure. 446s Attempting automerge of 3-6...success. 446s Attempting automerge of 4-6...failure. 446s Attempting automerge of 4-1...success. 446s Attempting automerge of 4-4...failure. 446s Attempting automerge of 4-3...failure. 446s Attempting automerge of 4-2...success. 446s Attempting automerge of 9-2...success. 446s Autofilling 1-6...success. 446s Autofilling 2-6...success. 446s Autofilling 3-1...success. 446s Autofilling 3-2...success. 446s Autofilling 3-3...success. 446s Autofilling 3-4...success. 446s Autofilling 3-5...success. 446s Autofilling 3-6 (first way)...success. 446s Autofilling 3-6 (second way)...success. 446s The two ways of autofilling 3-6 agree. 446s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. 446s Autofilling 4-2...success. 446s Autofilling 5-2...success. 446s Autofilling 6-2...success. 446s Autofilling 7-2...success. 446s Autofilling 8-2...success. 446s Autofilling 9-1...success. 446s Autofilling 9-2 (first way)...success. 446s Autofilling 9-2 (second way)...success. 446s The two ways of autofilling 9-2 agree. 446s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. 446s Attempting automerge of 9-6...failure. 446s Attempting automerge of 4-3...failure. 446s HEAD is now at 9cde605 c⇒9 446s Conflict; suggest manual merge of 4-3 446s + grep -q Traceback autofill.out 446s + grep -q suggest manual merge of 4-3 autofill.out 446s + git-imerge diagram --commits --frontier --html=imerge1.html 446s 0 5 9 446s | | | 446s 0 - ********** - c 446s *??.?????. 446s *??....... 446s *??.#????? 446s *??.?????? 446s 5 - *??.?????? 446s 6 - *...?????? 446s | 446s d 446s 446s 0 5 9 446s | | | 446s 0 - ********** - c 446s *??.?????| 446s *??.-----+ 446s *??|#????? 446s *??|?????? 446s 5 - *??|?????? 446s 6 - *--+?????? 446s | 446s d 446s 446s Key: 446s |,-,+ = rectangles forming current merge frontier 446s * = merge done manually 446s . = merge done automatically 446s # = conflict that is currently blocking progress 446s @ = merge was blocked but has been resolved 446s ? = no merge recorded 446s 446s + git-imerge continue --edit 446s Switched to branch 'imerge/c-d' 446s Auto-merging conflict.txt 446s CONFLICT (content): Merge conflict in conflict.txt 446s 446s Original first commit: 446s Automatic merge failed; fix conflicts and then commit the result. 446s commit 3c091ded129a5edf9061360bab867edade996c93 446s Author: Loú User 446s Date: Thu Apr 7 22:13:18 2005 +0000 446s 446s c⇒4 446s 446s Original second commit: 446s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 446s Author: Loú User 446s Date: Thu Apr 7 22:13:26 2005 +0000 446s 446s d⇒3 446s 446s There was a conflict merging commit 4-3, shown above. 446s Please resolve the conflict, commit the result, then type 446s 446s git-imerge continue 446s + echo merged version 446s + git add conflict.txt 446s + git-imerge continue --no-edit 446s [imerge/c-d ee3f92d] imerge 'c-d': manual merge 4-3 446s Merge has been recorded for merge 4-3. 446s Attempting automerge of 4-6...success. 446s Autofilling 4-4...success. 446s Autofilling 4-5...success. 446s Autofilling 4-6...success. 446s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. 446s Attempting automerge of 9-6...success. 446s Autofilling 5-6...success. 446s Autofilling 6-6...success. 446s Autofilling 7-6...success. 446s Autofilling 8-6...success. 446s Autofilling 9-3...success. 446s Autofilling 9-4...success. 446s Autofilling 9-5...success. 446s Autofilling 9-6 (first way)...success. 446s Autofilling 9-6 (second way)...success. 446s The two ways of autofilling 9-6 agree. 446s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. 446s Merge is complete! 446s + git-imerge diagram --commits --frontier --html=imerge2.html 447s 0 5 9 447s | | | 447s 0 - ********** - c 447s *??.?????. 447s *??....... 447s *??.*????. 447s *??..????. 447s 5 - *??..????. 447s 6 - *......... 447s | 447s d 447s 447s 0 5 9 447s | | | 447s 0 - ********** - c 447s *??.?????| 447s *??......| 447s *??.*????| 447s *??..????| 447s 5 - *??..????| 447s 6 - *--------+ 447s | 447s d 447s 447s Key: 447s |,-,+ = rectangles forming current merge frontier 447s * = merge done manually 447s . = merge done automatically 447s # = conflict that is currently blocking progress 447s @ = merge was blocked but has been resolved 447s ? = no merge recorded 447s 447s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 447s Merge d into c (using imerge) 447s 447s # Please enter the commit message for your changes. Lines starting 447s # with '#' will be ignored, and an empty message aborts the commit. 447s # 447s # Date: Wed Mar 20 09:29:13 2024 +0000 447s # 447s # On branch c-d-merge 447s # Changes to be committed: 447s # modified: conflict.txt 447s # modified: d.txt 447s # 447s [c-d-merge f81e7f8] Merge d into c (using imerge) 447s Date: Wed Mar 20 09:29:13 2024 +0000 447s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + local refname=c-d-merge 447s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git rev-parse c-d-merge^{tree} 447s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git-imerge simplify --goal=rebase --branch=c-d-rebase 447s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + local refname=c-d-rebase 447s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git rev-parse c-d-rebase^{tree} 447s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 447s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + local refname=c-d-rebase-with-history 447s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git rev-parse c-d-rebase-with-history^{tree} 447s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git-imerge simplify --goal=border --branch=c-d-border 447s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + local refname=c-d-border 447s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git rev-parse c-d-border^{tree} 447s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 447s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + local refname=c-d-border-with-history 447s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git rev-parse c-d-border-with-history^{tree} 447s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 447s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 448s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 448s + local refname=c-d-border-with-history2 448s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 448s + git rev-parse c-d-border-with-history2^{tree} 448s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 448s + git-imerge remove 448s + git checkout c 448s Switched to branch 'c' 448s + + git-imerge start --goal=full --first-parent --name=c-d d 448s tee start.out 448s Attempting to merge 1-1...success. 448s Attempting to merge 1-2...success. 448s Attempting to merge 1-3...success. 448s Attempting to merge 1-4...success. 448s Attempting to merge 1-5...success. 448s Attempting to merge 1-6...success. 448s Attempting to merge 2-1...success. 448s Attempting to merge 2-2...success. 448s Attempting to merge 2-3...success. 448s Attempting to merge 2-4...success. 448s Attempting to merge 2-5...success. 448s Attempting to merge 2-6...success. 448s Attempting to merge 3-1...success. 448s Attempting to merge 3-2...success. 448s Attempting to merge 3-3...success. 448s Attempting to merge 3-4...success. 448s Attempting to merge 3-5...success. 448s Attempting to merge 3-6...success. 448s Attempting to merge 4-1...success. 448s Attempting to merge 4-2...success. 448s Attempting to merge 4-3...conflict. 448s Attempting to merge 5-1...success. 448s Attempting to merge 5-2...success. 448s Attempting to merge 6-1...success. 448s Attempting to merge 6-2...success. 448s Attempting to merge 7-1...success. 448s Attempting to merge 7-2...success. 448s Attempting to merge 8-1...success. 448s Attempting to merge 8-2...success. 448s Attempting to merge 9-1...success. 448s Attempting to merge 9-2...success. 448s Previous HEAD position was 843ac84 imerge 'c-d': automatic merge 9-2 448s Switched to branch 'imerge/c-d' 448s Auto-merging conflict.txt 448s CONFLICT (content): Merge conflict in conflict.txt 448s Automatic merge failed; fix conflicts and then commit the result. 448s 448s Original first commit: 448s commit 3c091ded129a5edf9061360bab867edade996c93 448s Author: Loú User 448s Date: Thu Apr 7 22:13:18 2005 +0000 448s 448s c⇒4 448s 448s Original second commit: 448s commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b 448s Author: Loú User 448s Date: Thu Apr 7 22:13:26 2005 +0000 448s 448s d⇒3 448s 448s There was a conflict merging commit 4-3, shown above. 448s Please resolve the conflict, commit the result, then type 448s 448s git-imerge continue 448s + grep -q Traceback start.out 448s + grep -q suggest manual merge of 4-3 autofill.out 448s + git-imerge diagram --commits --frontier --html=imerge3.html 448s 0 5 9 448s | | | 448s 0 - ********** - c 448s *......... 448s *......... 448s *...#????? 448s *...?????? 448s 5 - *...?????? 448s 6 - *...?????? 448s | 448s d 448s 448s 0 5 9 448s | | | 448s 0 - ********** - c 448s *........| 448s *...-----+ 448s *..|#????? 448s *..|?????? 448s 5 - *..|?????? 448s 6 - *--+?????? 448s | 448s d 448s 448s Key: 448s |,-,+ = rectangles forming current merge frontier 448s * = merge done manually 448s . = merge done automatically 448s # = conflict that is currently blocking progress 448s @ = merge was blocked but has been resolved 448s ? = no merge recorded 448s 448s + echo merged version 448s + git add conflict.txt 448s imerge 'c-d': manual merge 4-3 448s 448s # Conflicts: 448s # conflict.txt 448s # 448s # It looks like you may be committing a merge. 448s # If this is not correct, please run 448s # git update-ref -d MERGE_HEAD 448s # and try again. 448s 448s 448s # Please enter the commit message for your changes. Lines starting 448s # with '#' will be ignored, and an empty message aborts the commit. 448s # 448s # On branch imerge/c-d 448s # All conflicts fixed but you are still merging. 448s # 448s # Changes to be committed: 448s # modified: conflict.txt 448s # modified: d.txt 448s # 448s [imerge/c-d 73e21bc] imerge 'c-d': manual merge 4-3 448s + GIT_EDITOR=cat git commit 448s + git-imerge continue --edit 448s Merge has been recorded for merge 4-3. 448s Attempting to merge 4-4...success. 448s Attempting to merge 4-5...success. 449s Attempting to merge 4-6...success. 449s Attempting to merge 5-3...success. 449s Attempting to merge 5-4...success. 449s Attempting to merge 5-5...success. 449s Attempting to merge 5-6...success. 449s Attempting to merge 6-3...success. 449s Attempting to merge 6-4...success. 449s Attempting to merge 6-5...success. 449s Attempting to merge 6-6...success. 449s Attempting to merge 7-3...success. 449s Attempting to merge 7-4...success. 449s Attempting to merge 7-5...success. 449s Attempting to merge 7-6...success. 449s Attempting to merge 8-3...success. 449s Attempting to merge 8-4...success. 449s Attempting to merge 8-5...success. 449s Attempting to merge 8-6...success. 449s Attempting to merge 9-3...success. 449s Attempting to merge 9-4...success. 449s Attempting to merge 9-5...success. 449s Attempting to merge 9-6...success. 449s Merge is complete! 449s + git-imerge diagram --commits --frontier --html=imerge4.html 449s 0 5 9 449s | | | 449s 0 - ********** - c 449s *......... 449s *......... 449s *...*..... 449s *......... 449s 5 - *......... 449s 6 - *......... 449s | 449s d 449s 449s 0 5 9 449s | | | 449s 0 - ********** - c 449s *........| 449s *........| 449s *...*....| 449s *........| 449s 5 - *........| 449s 6 - *--------+ 449s | 449s d 449s 449s Key: 449s |,-,+ = rectangles forming current merge frontier 449s * = merge done manually 449s . = merge done automatically 449s # = conflict that is currently blocking progress 449s @ = merge was blocked but has been resolved 449s ? = no merge recorded 449s 449s + git-imerge finish --branch=c-d-full 449s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 449s + local refname=c-d-full 449s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 449s + git rev-parse c-d-full^{tree} 449s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 449s + test_conflict 1-1 449s + local conflict=1-1 449s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s + DESCRIPTION=git-imerge test repository with conflict at 1-1 449s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 449s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s + local description=git-imerge test repository with conflict at 1-1 449s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 449s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s + local description=git-imerge test repository with conflict at 1-1 449s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s hint: Using 'master' as the name for the initial branch. This default branch name 449s hint: is subject to change. To configure the initial branch name to use in all 449s hint: of your new repositories, which will suppress this warning, call: 449s hint: 449s hint: git config --global init.defaultBranch 449s hint: 449s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 449s hint: 'development'. The just-created branch can be renamed via this command: 449s hint: 449s hint: git branch -m 449s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1/.git/ 449s + echo git-imerge test repository with conflict at 1-1 449s + printf %s\n /*.out /*.css /*.html 449s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1/.git config user.name Loú User 449s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1/.git config user.email luser@example.com 449s + TIME=1112911993 449s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-1 449s + modify c.txt 0 449s + filename=c.txt 449s + text=0 449s + echo 0 449s + git add c.txt 449s + modify d.txt 0 449s + filename=d.txt 449s + text=0 449s + echo 0 449s + git add d.txt 449s + modify conflict.txt original version 449s + filename=conflict.txt 449s + text=original version 449s + echo original version 449s + git add conflict.txt 449s [master (root-commit) d70e04b] m⇒0 449s 3 files changed, 3 insertions(+) 449s create mode 100644 c.txt 449s create mode 100644 conflict.txt 449s create mode 100644 d.txt 449s + commit -m m⇒0 449s + TIME=1112911994 449s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 449s + git checkout -b c master -- 449s Switched to a new branch 'c' 449s + seq 9 449s + modify c.txt 1 449s + filename=c.txt 449s + text=1 449s + echo 1 449s + git add c.txt 449s + modify conflict.txt c version 449s + filename=conflict.txt 449s + text=c version 449s + echo c version 449s + git add conflict.txt 449s + commit -m c⇒1 449s + TIME=1112911995 449s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 449s [c 2120f40] c⇒1 449s 2 files changed, 2 insertions(+), 2 deletions(-) 449s + modify c.txt 2 449s + filename=c.txt 449s + text=2 449s + echo 2 449s + git add c.txt 449s + commit -m c⇒2 449s + TIME=1112911996 449s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 449s [c 90cc7de] c⇒2 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify c.txt 3 449s + filename=c.txt 449s + text=3 449s + echo 3 449s + git add c.txt 449s + commit -m c⇒3 449s + TIME=1112911997 449s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 449s + modify c.txt 4 449s + filename=c.txt 449s + text=4 449s + echo 4 449s + git add c.txt 449s + commit -m c⇒4 449s + TIME=1112911998 449s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 449s [c 2046ed2] c⇒3 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s [c 8a2cee9] c⇒4 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify c.txt 5 449s + filename=c.txt 449s + text=5 449s + echo 5 449s + git add c.txt 449s + commit -m c⇒5 449s + TIME=1112911999 449s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 449s [c ac16a05] c⇒5 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify c.txt 6 449s + filename=c.txt 449s + text=6 449s + echo 6 449s + git add c.txt 449s + commit -m c⇒6 449s + TIME=1112912000 449s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 449s [c 30dd2ae] c⇒6 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify c.txt 7 449s + filename=c.txt 449s + text=7 449s + echo 7 449s + git add c.txt 449s + commit -m c⇒7 449s + TIME=1112912001 449s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 449s [c 0883eb9] c⇒7 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify c.txt 8 449s + filename=c.txt 449s + text=8 449s + echo 8 449s + git add c.txt 449s + commit -m c⇒8 449s + TIME=1112912002 449s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 449s [c f661c06] c⇒8 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify c.txt 9 449s + filename=c.txt 449s + text=9 449s + echo 9 449s + git add c.txt 449s + commit -m c⇒9 449s + TIME=1112912003 449s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 449s [c 243e8ed] c⇒9 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + git checkout -b d master -- 449s Switched to a new branch 'd' 449s + seq 6 449s + modify d.txt 1 449s + filename=d.txt 449s + text=1 449s + echo 1 449s + git add d.txt 449s + modify conflict.txt d version 449s + filename=conflict.txt 449s + text=d version 449s + echo d version 449s + git add conflict.txt 449s + commit -m d⇒1 449s + TIME=1112912004 449s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 449s [d ac0427a] d⇒1 449s 2 files changed, 2 insertions(+), 2 deletions(-) 449s + modify d.txt 2 449s + filename=d.txt 449s + text=2 449s + echo 2 449s + git add d.txt 449s + commit -m d⇒2 449s + TIME=1112912005 449s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 449s [d 43c38c0] d⇒2 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify d.txt 3 449s + filename=d.txt 449s + text=3 449s + echo 3 449s + git add d.txt 449s [d 0260058] d⇒3 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + commit -m d⇒3 449s + TIME=1112912006 449s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 449s + modify d.txt 4 449s + filename=d.txt 449s + text=4 449s + echo 4 449s + git add d.txt 449s + commit -m d⇒4 449s + TIME=1112912007 449s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 449s [d 40fef44] d⇒4 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify d.txt 5 449s + filename=d.txt 449s + text=5 449s + echo 5 449s + git add d.txt 449s + commit -m d⇒5 449s + TIME=1112912008 449s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 449s [d b080a65] d⇒5 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + modify d.txt 6 449s + filename=d.txt 449s + text=6 449s + echo 6 449s + git add d.txt 449s + commit -m d⇒6 449s + TIME=1112912009 449s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 449s [d 200ce5c] d⇒6 449s 1 file changed, 1 insertion(+), 1 deletion(-) 449s + git checkout c 449s Switched to branch 'c' 449s + git-imerge init --name=c-d d 449s + git-imerge list 449s * c-d 449s + git-imerge diagram --commits --frontier --html=imerge0.html 450s 0 5 9 450s | | | 450s 0 - ********** - c 450s *????????? 450s *????????? 450s *????????? 450s *????????? 450s 5 - *????????? 450s 6 - *????????? 450s | 450s d 450s 450s 0 5 9 450s | | | 450s 0 - ********** - c 450s *????????? 450s *????????? 450s *????????? 450s *????????? 450s 5 - *????????? 450s 6 - *????????? 450s | 450s d 450s 450s Key: 450s |,-,+ = rectangles forming current merge frontier 450s * = merge done manually 450s . = merge done automatically 450s # = conflict that is currently blocking progress 450s @ = merge was blocked but has been resolved 450s ? = no merge recorded 450s 450s + + tee autofill.out 450s git-imerge autofill 450s Attempting automerge of 9-6...failure. 450s Attempting automerge of 1-1...failure. 450s HEAD is now at 243e8ed c⇒9 450s No progress was possible; suggest manual merge of 1-1 450s + grep -q Traceback autofill.out 450s + grep -q suggest manual merge of 1-1 autofill.out 450s + git-imerge diagram --commits --frontier --html=imerge1.html 450s 0 5 9 450s | | | 450s 0 - ********** - c 450s *#???????? 450s *????????? 450s *????????? 450s *????????? 450s 5 - *????????? 450s 6 - *????????? 450s | 450s d 450s 450s 0 5 9 450s | | | 450s 0 - ********** - c 450s *#???????? 450s *????????? 450s *????????? 450s *????????? 450s 5 - *????????? 450s 6 - *????????? 450s | 450s d 450s 450s Key: 450s |,-,+ = rectangles forming current merge frontier 450s * = merge done manually 450s . = merge done automatically 450s # = conflict that is currently blocking progress 450s @ = merge was blocked but has been resolved 450s ? = no merge recorded 450s 450s + git-imerge continue --edit 450s Switched to branch 'imerge/c-d' 450s Auto-merging conflict.txt 450s CONFLICT (content): Merge conflict in conflict.txt 450s Automatic merge failed; fix conflicts and then commit the result. 450s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 450s Author: Loú User 450s Date: Thu Apr 7 22:13:15 2005 +0000 450s 450s c⇒1 450s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 450s Author: Loú User 450s Date: Thu Apr 7 22:13:24 2005 +0000 450s 450s d⇒1 450s 450s Original first commit: 450s 450s Original second commit: 450s 450s There was a conflict merging commit 1-1, shown above. 450s Please resolve the conflict, commit the result, then type 450s 450s git-imerge continue 450s + echo merged version 450s + git add conflict.txt 450s + git-imerge continue --no-edit 450s [imerge/c-d d9f4ebc] imerge 'c-d': manual merge 1-1 450s Merge has been recorded for merge 1-1. 450s Attempting automerge of 1-6...success. 450s Autofilling 1-2...success. 450s Autofilling 1-3...success. 450s Autofilling 1-4...success. 450s Autofilling 1-5...success. 450s Autofilling 1-6...success. 450s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. 450s Attempting automerge of 9-6...success. 450s Autofilling 2-6...success. 450s Autofilling 3-6...success. 450s Autofilling 4-6...success. 450s Autofilling 5-6...success. 450s Autofilling 6-6...success. 450s Autofilling 7-6...success. 450s Autofilling 8-6...success. 450s Autofilling 9-1...success. 450s Autofilling 9-2...success. 450s Autofilling 9-3...success. 450s Autofilling 9-4...success. 450s Autofilling 9-5...success. 450s Autofilling 9-6 (first way)...success. 450s Autofilling 9-6 (second way)...success. 450s The two ways of autofilling 9-6 agree. 450s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. 450s Merge is complete! 450s + git-imerge diagram --commits --frontier --html=imerge2.html 450s 0 5 9 450s | | | 450s 0 - ********** - c 450s **???????. 450s *.???????. 450s *.???????. 450s *.???????. 450s 5 - *.???????. 450s 6 - *......... 450s | 450s d 450s 450s 0 5 9 450s | | | 450s 0 - ********** - c 450s **???????| 450s *.???????| 450s *.???????| 450s *.???????| 450s 5 - *.???????| 450s 6 - *--------+ 450s | 450s d 450s 450s Key: 450s |,-,+ = rectangles forming current merge frontier 450s * = merge done manually 450s . = merge done automatically 450s # = conflict that is currently blocking progress 450s @ = merge was blocked but has been resolved 450s ? = no merge recorded 450s 450s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 450s Merge d into c (using imerge) 450s 450s # Please enter the commit message for your changes. Lines starting 450s # with '#' will be ignored, and an empty message aborts the commit. 450s # 450s # Date: Wed Mar 20 09:29:16 2024 +0000 450s # 450s # On branch c-d-merge 450s # Changes to be committed: 450s # modified: conflict.txt 450s # modified: d.txt 450s # 450s [c-d-merge 250da0d] Merge d into c (using imerge) 450s Date: Wed Mar 20 09:29:16 2024 +0000 450s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 450s + local refname=c-d-merge 450s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 450s + git rev-parse c-d-merge^{tree} 451s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git-imerge simplify --goal=rebase --branch=c-d-rebase 451s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + local refname=c-d-rebase 451s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git rev-parse c-d-rebase^{tree} 451s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 451s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + local refname=c-d-rebase-with-history 451s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git rev-parse c-d-rebase-with-history^{tree} 451s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git-imerge simplify --goal=border --branch=c-d-border 451s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + local refname=c-d-border 451s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git rev-parse c-d-border^{tree} 451s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 451s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + local refname=c-d-border-with-history 451s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git rev-parse c-d-border-with-history^{tree} 451s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 451s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + local refname=c-d-border-with-history2 451s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git rev-parse c-d-border-with-history2^{tree} 451s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 451s + git-imerge remove 451s + git checkout c 451s Switched to branch 'c' 451s + + git-imerge start --goal=full --first-parent --name=c-d d 451s tee start.out 452s Attempting to merge 1-1...conflict. 452s Switched to branch 'imerge/c-d' 452s Auto-merging conflict.txt 452s CONFLICT (content): Merge conflict in conflict.txt 452s Automatic merge failed; fix conflicts and then commit the result. 452s 452s Original first commit: 452s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 452s Author: Loú User 452s Date: Thu Apr 7 22:13:15 2005 +0000 452s 452s c⇒1 452s 452s Original second commit: 452s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 452s Author: Loú User 452s Date: Thu Apr 7 22:13:24 2005 +0000 452s 452s d⇒1 452s 452s There was a conflict merging commit 1-1, shown above. 452s Please resolve the conflict, commit the result, then type 452s 452s git-imerge continue 452s + grep -q Traceback start.out 452s + grep -q suggest manual merge of 1-1 autofill.out 452s + git-imerge diagram --commits --frontier --html=imerge3.html 452s 0 5 9 452s | | | 452s 0 - ********** - c 452s *#???????? 452s *????????? 452s *????????? 452s *????????? 452s 5 - *????????? 452s 6 - *????????? 452s | 452s d 452s 452s 0 5 9 452s | | | 452s 0 - ********** - c 452s *#???????? 452s *????????? 452s *????????? 452s *????????? 452s 5 - *????????? 452s 6 - *????????? 452s | 452s d 452s 452s Key: 452s |,-,+ = rectangles forming current merge frontier 452s * = merge done manually 452s . = merge done automatically 452s # = conflict that is currently blocking progress 452s @ = merge was blocked but has been resolved 452s ? = no merge recorded 452s 452s + echo merged version 452s + git add conflict.txt 452s + GIT_EDITOR=cat git commit 452s imerge 'c-d': manual merge 1-1 452s 452s # Conflicts: 452s # conflict.txt 452s # 452s # It looks like you may be committing a merge. 452s # If this is not correct, please run 452s # git update-ref -d MERGE_HEAD 452s # and try again. 452s 452s 452s # Please enter the commit message for your changes. Lines starting 452s # with '#' will be ignored, and an empty message aborts the commit. 452s # 452s # On branch imerge/c-d 452s # All conflicts fixed but you are still merging. 452s # 452s # Changes to be committed: 452s # modified: conflict.txt 452s # modified: d.txt 452s # 452s [imerge/c-d 5050737] imerge 'c-d': manual merge 1-1 452s + git-imerge continue --edit 452s Merge has been recorded for merge 1-1. 452s Attempting to merge 1-2...success. 452s Attempting to merge 1-3...success. 452s Attempting to merge 1-4...success. 452s Attempting to merge 1-5...success. 452s Attempting to merge 1-6...success. 452s Attempting to merge 2-1...success. 452s Attempting to merge 2-2...success. 452s Attempting to merge 2-3...success. 452s Attempting to merge 2-4...success. 452s Attempting to merge 2-5...success. 452s Attempting to merge 2-6...success. 452s Attempting to merge 3-1...success. 452s Attempting to merge 3-2...success. 452s Attempting to merge 3-3...success. 452s Attempting to merge 3-4...success. 452s Attempting to merge 3-5...success. 452s Attempting to merge 3-6...success. 452s Attempting to merge 4-1...success. 452s Attempting to merge 4-2...success. 452s Attempting to merge 4-3...success. 452s Attempting to merge 4-4...success. 452s Attempting to merge 4-5...success. 452s Attempting to merge 4-6...success. 452s Attempting to merge 5-1...success. 452s Attempting to merge 5-2...success. 452s Attempting to merge 5-3...success. 452s Attempting to merge 5-4...success. 452s Attempting to merge 5-5...success. 452s Attempting to merge 5-6...success. 452s Attempting to merge 6-1...success. 452s Attempting to merge 6-2...success. 452s Attempting to merge 6-3...success. 452s Attempting to merge 6-4...success. 452s Attempting to merge 6-5...success. 452s Attempting to merge 6-6...success. 452s Attempting to merge 7-1...success. 452s Attempting to merge 7-2...success. 452s Attempting to merge 7-3...success. 452s Attempting to merge 7-4...success. 452s Attempting to merge 7-5...success. 452s Attempting to merge 7-6...success. 452s Attempting to merge 8-1...success. 452s Attempting to merge 8-2...success. 452s Attempting to merge 8-3...success. 452s Attempting to merge 8-4...success. 452s Attempting to merge 8-5...success. 452s Attempting to merge 8-6...success. 453s Attempting to merge 9-1...success. 453s Attempting to merge 9-2...success. 453s Attempting to merge 9-3...success. 453s Attempting to merge 9-4...success. 453s Attempting to merge 9-5...success. 453s Attempting to merge 9-6...success. 453s Merge is complete! 453s + git-imerge diagram --commits --frontier --html=imerge4.html 453s 0 5 9 453s | | | 453s 0 - ********** - c 453s **........ 453s *......... 453s *......... 453s *......... 453s 5 - *......... 453s 6 - *......... 453s | 453s d 453s 453s 0 5 9 453s | | | 453s 0 - ********** - c 453s **.......| 453s *........| 453s *........| 453s *........| 453s 5 - *........| 453s 6 - *--------+ 453s | 453s d 453s 453s Key: 453s |,-,+ = rectangles forming current merge frontier 453s * = merge done manually 453s . = merge done automatically 453s # = conflict that is currently blocking progress 453s @ = merge was blocked but has been resolved 453s ? = no merge recorded 453s 453s + git-imerge finish --branch=c-d-full 453s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 453s + local refname=c-d-full 453s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 453s + git rev-parse c-d-full^{tree} 453s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 453s + test_conflict 9-1 453s + local conflict=9-1 453s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s + DESCRIPTION=git-imerge test repository with conflict at 9-1 453s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 453s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s + local description=git-imerge test repository with conflict at 9-1 453s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 453s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s + local description=git-imerge test repository with conflict at 9-1 453s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s hint: Using 'master' as the name for the initial branch. This default branch name 453s hint: is subject to change. To configure the initial branch name to use in all 453s hint: of your new repositories, which will suppress this warning, call: 453s hint: 453s hint: git config --global init.defaultBranch 453s hint: 453s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 453s hint: 'development'. The just-created branch can be renamed via this command: 453s hint: 453s hint: git branch -m 453s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1/.git/ 453s + echo git-imerge test repository with conflict at 9-1 453s + printf %s\n /*.out /*.css /*.html 453s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1/.git config user.name Loú User 453s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1/.git config user.email luser@example.com 453s + TIME=1112911993 453s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-1 453s + modify c.txt 0 453s + filename=c.txt 453s + text=0 453s + echo 0 453s + git add c.txt 453s + modify d.txt 0 453s + filename=d.txt 453s + text=0 453s + echo 0 453s + git add d.txt 453s + modify conflict.txt original version 453s + filename=conflict.txt 453s + text=original version 453s + echo original version 453s + git add conflict.txt 453s + commit -m m⇒0 453s + TIME=1112911994 453s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 453s [master (root-commit) d70e04b] m⇒0 453s 3 files changed, 3 insertions(+) 453s create mode 100644 c.txt 453s create mode 100644 conflict.txt 453s create mode 100644 d.txt 453s + git checkout -b c master -- 453s Switched to a new branch 'c' 453s + seq 9 453s + modify c.txt 1 453s + filename=c.txt 453s + text=1 453s + echo 1 453s + git add c.txt 453s + commit -m c⇒1 453s + TIME=1112911995 453s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 453s [c 89e2141] c⇒1 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 2 453s + filename=c.txt 453s + text=2 453s + echo 2 453s + git add c.txt 453s + commit -m c⇒2 453s + TIME=1112911996 453s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 453s [c 7c431f2] c⇒2 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 3 453s + filename=c.txt 453s + text=3 453s + echo 3 453s + git add c.txt 453s + commit -m c⇒3 453s + TIME=1112911997 453s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 453s [c f02ab24] c⇒3 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 4 453s + filename=c.txt 453s + text=4 453s + echo 4 453s + git add c.txt 453s + commit -m c⇒4 453s + TIME=1112911998 453s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 453s [c ed9122f] c⇒4 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 5 453s + filename=c.txt 453s + text=5 453s + echo 5 453s + git add c.txt 453s + commit -m c⇒5 453s + TIME=1112911999 453s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 453s [c 1d3bf09] c⇒5 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 6 453s + filename=c.txt 453s + text=6 453s + echo 6 453s + git add c.txt 453s + commit -m c⇒6 453s + TIME=1112912000 453s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 453s [c f999ecd] c⇒6 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 7 453s + filename=c.txt 453s + text=7 453s + echo 7 453s + git add c.txt 453s + commit -m c⇒7 453s + TIME=1112912001 453s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 453s [c 7050a8a] c⇒7 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 8 453s + filename=c.txt 453s + text=8 453s + echo 8 453s + git add c.txt 453s + commit -m c⇒8 453s + TIME=1112912002 453s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 453s [c 9732e77] c⇒8 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify c.txt 9 453s + filename=c.txt 453s + text=9 453s + echo 9 453s + git add c.txt 453s + modify conflict.txt c version 453s + filename=conflict.txt 453s + text=c version 453s + echo c version 453s + git add conflict.txt 453s + commit -m c⇒9 453s + TIME=1112912003 453s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 453s [c 73a5eed] c⇒9 453s 2 files changed, 2 insertions(+), 2 deletions(-) 453s + git checkout -b d master -- 453s Switched to a new branch 'd' 453s + seq 6 453s + modify d.txt 1 453s + filename=d.txt 453s + text=1 453s + echo 1 453s + git add d.txt 453s + modify conflict.txt d version 453s + filename=conflict.txt 453s + text=d version 453s + echo d version 453s + git add conflict.txt 453s + commit -m d⇒1 453s + TIME=1112912004 453s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 453s [d ac0427a] d⇒1 453s 2 files changed, 2 insertions(+), 2 deletions(-) 453s + modify d.txt 2 453s + filename=d.txt 453s + text=2 453s + echo 2 453s + git add d.txt 453s + commit -m d⇒2 453s + TIME=1112912005 453s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 453s [d 43c38c0] d⇒2 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify d.txt 3 453s + filename=d.txt 453s + text=3 453s + echo 3 453s + git add d.txt 453s + commit -m d⇒3 453s + TIME=1112912006 453s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 453s [d 0260058] d⇒3 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify d.txt 4 453s + filename=d.txt 453s + text=4 453s + echo 4 453s + git add d.txt 453s + commit -m d⇒4 453s + TIME=1112912007 453s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 453s [d 40fef44] d⇒4 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify d.txt 5 453s + filename=d.txt 453s + text=5 453s + echo 5 453s + git add d.txt 453s + commit -m d⇒5 453s + TIME=1112912008 453s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 453s [d b080a65] d⇒5 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + modify d.txt 6 453s + filename=d.txt 453s + text=6 453s + echo 6 453s + git add d.txt 453s + commit -m d⇒6 453s + TIME=1112912009 453s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 453s [d 200ce5c] d⇒6 453s 1 file changed, 1 insertion(+), 1 deletion(-) 453s + git checkout c 453s Switched to branch 'c' 453s + git-imerge init --name=c-d d 453s + git-imerge list 453s * c-d 453s + git-imerge diagram --commits --frontier --html=imerge0.html 453s 0 5 9 453s | | | 453s 0 - ********** - c 453s *????????? 453s *????????? 453s *????????? 453s *????????? 453s 5 - *????????? 453s 6 - *????????? 453s | 453s d 453s 453s 0 5 9 453s | | | 453s 0 - ********** - c 453s *????????? 453s *????????? 453s *????????? 453s *????????? 453s 5 - *????????? 453s 6 - *????????? 453s | 453s d 453s 453s Key: 453s |,-,+ = rectangles forming current merge frontier 453s * = merge done manually 453s . = merge done automatically 453s # = conflict that is currently blocking progress 453s @ = merge was blocked but has been resolved 453s ? = no merge recorded 453s 453s + + tee autofill.out 453s git-imerge autofill 453s Attempting automerge of 9-6...failure. 453s Attempting automerge of 1-1...success. 453s Attempting automerge of 1-4...success. 453s Attempting automerge of 1-6...success. 453s Attempting automerge of 9-6...failure. 453s Attempting automerge of 5-6...success. 453s Attempting automerge of 7-6...success. 454s Attempting automerge of 8-6...success. 454s Attempting automerge of 9-1...failure. 454s Autofilling 1-6...success. 454s Autofilling 2-6...success. 454s Autofilling 3-6...success. 454s Autofilling 4-6...success. 454s Autofilling 5-6...success. 454s Autofilling 6-6...success. 454s Autofilling 7-6...success. 454s Autofilling 8-1...success. 454s Autofilling 8-2...success. 454s Autofilling 8-3...success. 454s Autofilling 8-4...success. 454s Autofilling 8-5...success. 454s Autofilling 8-6 (first way)...success. 454s Autofilling 8-6 (second way)...success. 454s The two ways of autofilling 8-6 agree. 454s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 454s Attempting automerge of 9-6...failure. 454s Attempting automerge of 9-1...failure. 454s HEAD is now at 73a5eed c⇒9 454s Conflict; suggest manual merge of 9-1 454s + grep -q Traceback autofill.out 454s + grep -q suggest manual merge of 9-1 autofill.out 454s + git-imerge diagram --commits --frontier --html=imerge1.html 454s 0 5 9 454s | | | 454s 0 - ********** - c 454s *???????.# 454s *???????.? 454s *???????.? 454s *???????.? 454s 5 - *???????.? 454s 6 - *........? 454s | 454s d 454s 454s 0 5 9 454s | | | 454s 0 - ********** - c 454s *???????|# 454s *???????|? 454s *???????|? 454s *???????|? 454s 5 - *???????|? 454s 6 - *-------+? 454s | 454s d 454s 454s Key: 454s |,-,+ = rectangles forming current merge frontier 454s * = merge done manually 454s . = merge done automatically 454s # = conflict that is currently blocking progress 454s @ = merge was blocked but has been resolved 454s ? = no merge recorded 454s 454s + git-imerge continue --edit 454s Switched to branch 'imerge/c-d' 454s Auto-merging conflict.txt 454s CONFLICT (content): Merge conflict in conflict.txt 454s Automatic merge failed; fix conflicts and then commit the result. 454s 454s Original first commit: 454s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 454s Author: Loú User 454s Date: Thu Apr 7 22:13:23 2005 +0000 454s 454s c⇒9 454s 454s Original second commit: 454s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 454s Author: Loú User 454s Date: Thu Apr 7 22:13:24 2005 +0000 454s 454s d⇒1 454s 454s There was a conflict merging commit 9-1, shown above. 454s Please resolve the conflict, commit the result, then type 454s 454s git-imerge continue 454s + echo merged version 454s + git add conflict.txt 454s + git-imerge continue --no-edit 454s [imerge/c-d 39b495f] imerge 'c-d': manual merge 9-1 454s Merge has been recorded for merge 9-1. 454s Attempting automerge of 9-6...success. 454s Autofilling 9-2...success. 454s Autofilling 9-3...success. 454s Autofilling 9-4...success. 454s Autofilling 9-5...success. 454s Autofilling 9-6...success. 454s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. 454s Merge is complete! 454s + git-imerge diagram --commits --frontier --html=imerge2.html 454s 0 5 9 454s | | | 454s 0 - ********** - c 454s *???????.* 454s *???????.. 454s *???????.. 454s *???????.. 454s 5 - *???????.. 454s 6 - *......... 454s | 454s d 454s 454s 0 5 9 454s | | | 454s 0 - ********** - c 454s *???????.* 454s *???????.| 454s *???????.| 454s *???????.| 454s 5 - *???????.| 454s 6 - *--------+ 454s | 454s d 454s 454s Key: 454s |,-,+ = rectangles forming current merge frontier 454s * = merge done manually 454s . = merge done automatically 454s # = conflict that is currently blocking progress 454s @ = merge was blocked but has been resolved 454s ? = no merge recorded 454s 454s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 454s Merge d into c (using imerge) 454s 454s # Please enter the commit message for your changes. Lines starting 454s # with '#' will be ignored, and an empty message aborts the commit. 454s # 454s # Date: Wed Mar 20 09:29:20 2024 +0000 454s # 454s # On branch c-d-merge 454s # Changes to be committed: 454s # modified: conflict.txt 454s # modified: d.txt 454s # 454s [c-d-merge 2b9c727] Merge d into c (using imerge) 454s Date: Wed Mar 20 09:29:20 2024 +0000 454s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 454s + local refname=c-d-merge 454s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 454s + git rev-parse c-d-merge^{tree} 454s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 454s + git-imerge simplify --goal=rebase --branch=c-d-rebase 455s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + local refname=c-d-rebase 455s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git rev-parse c-d-rebase^{tree} 455s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 455s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + local refname=c-d-rebase-with-history 455s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git rev-parse c-d-rebase-with-history^{tree} 455s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git-imerge simplify --goal=border --branch=c-d-border 455s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + local refname=c-d-border 455s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git rev-parse c-d-border^{tree} 455s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 455s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + local refname=c-d-border-with-history 455s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git rev-parse c-d-border-with-history^{tree} 455s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 455s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + local refname=c-d-border-with-history2 455s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git rev-parse c-d-border-with-history2^{tree} 455s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 455s + git-imerge remove 455s + git checkout c 455s Switched to branch 'c' 455s + + git-imerge start --goal=fulltee --first-parent --name=c-d d 455s start.out 455s Attempting to merge 1-1...success. 455s Attempting to merge 1-2...success. 456s Attempting to merge 1-3...success. 456s Attempting to merge 1-4...success. 456s Attempting to merge 1-5...success. 456s Attempting to merge 1-6...success. 456s Attempting to merge 2-1...success. 456s Attempting to merge 2-2...success. 456s Attempting to merge 2-3...success. 456s Attempting to merge 2-4...success. 456s Attempting to merge 2-5...success. 456s Attempting to merge 2-6...success. 456s Attempting to merge 3-1...success. 456s Attempting to merge 3-2...success. 456s Attempting to merge 3-3...success. 456s Attempting to merge 3-4...success. 456s Attempting to merge 3-5...success. 456s Attempting to merge 3-6...success. 456s Attempting to merge 4-1...success. 456s Attempting to merge 4-2...success. 456s Attempting to merge 4-3...success. 456s Attempting to merge 4-4...success. 456s Attempting to merge 4-5...success. 456s Attempting to merge 4-6...success. 456s Attempting to merge 5-1...success. 456s Attempting to merge 5-2...success. 456s Attempting to merge 5-3...success. 456s Attempting to merge 5-4...success. 456s Attempting to merge 5-5...success. 456s Attempting to merge 5-6...success. 456s Attempting to merge 6-1...success. 456s Attempting to merge 6-2...success. 456s Attempting to merge 6-3...success. 456s Attempting to merge 6-4...success. 456s Attempting to merge 6-5...success. 456s Attempting to merge 6-6...success. 456s Attempting to merge 7-1...success. 456s Attempting to merge 7-2...success. 456s Attempting to merge 7-3...success. 456s Attempting to merge 7-4...success. 456s Attempting to merge 7-5...success. 456s Attempting to merge 7-6...success. 456s Attempting to merge 8-1...success. 456s Attempting to merge 8-2...success. 456s Attempting to merge 8-3...success. 456s Attempting to merge 8-4...success. 456s Attempting to merge 8-5...success. 456s Attempting to merge 8-6...success. 456s Attempting to merge 9-1...conflict. 456s Switched to branch 'imerge/c-d' 456s Auto-merging conflict.txt 456s CONFLICT (content): Merge conflict in conflict.txt 456s Automatic merge failed; fix conflicts and then commit the result. 456s 456s Original first commit: 456s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 456s Author: Loú User 456s Date: Thu Apr 7 22:13:23 2005 +0000 456s 456s c⇒9 456s 456s Original second commit: 456s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 456s Author: Loú User 456s Date: Thu Apr 7 22:13:24 2005 +0000 456s 456s d⇒1 456s 456s There was a conflict merging commit 9-1, shown above. 456s Please resolve the conflict, commit the result, then type 456s 456s git-imerge continue 456s + grep -q Traceback start.out 456s + grep -q suggest manual merge of 9-1 autofill.out 456s + git-imerge diagram --commits --frontier --html=imerge3.html 456s 0 5 9 456s | | | 456s 0 - ********** - c 456s *........# 456s *........? 456s *........? 456s *........? 456s 5 - *........? 456s 6 - *........? 456s | 456s d 456s 456s 0 5 9 456s | | | 456s 0 - ********** - c 456s *.......|# 456s *.......|? 456s *.......|? 456s *.......|? 456s 5 - *.......|? 456s 6 - *-------+? 456s | 456s d 456s 456s Key: 456s |,-,+ = rectangles forming current merge frontier 456s * = merge done manually 456s . = merge done automatically 456s # = conflict that is currently blocking progress 456s @ = merge was blocked but has been resolved 456s ? = no merge recorded 456s 456s + echo merged version 456s + git add conflict.txt 456s + GIT_EDITOR=cat git commit 456s imerge 'c-d': manual merge 9-1 456s 456s # Conflicts: 456s # conflict.txt 456s # 456s # It looks like you may be committing a merge. 456s # If this is not correct, please run 456s # git update-ref -d MERGE_HEAD 456s # and try again. 456s 456s 456s # Please enter the commit message for your changes. Lines starting 456s # with '#' will be ignored, and an empty message aborts the commit. 456s # 456s # On branch imerge/c-d 456s # All conflicts fixed but you are still merging. 456s # 456s # Changes to be committed: 456s # modified: conflict.txt 456s # modified: d.txt 456s # 456s [imerge/c-d 0da8d86] imerge 'c-d': manual merge 9-1 456s + git-imerge continue --edit 456s Merge has been recorded for merge 9-1. 456s Attempting to merge 9-2...success. 456s Attempting to merge 9-3...success. 456s Attempting to merge 9-4...success. 456s Attempting to merge 9-5...success. 456s Attempting to merge 9-6...success. 456s Merge is complete! 456s + git-imerge diagram --commits --frontier --html=imerge4.html 457s 0 5 9 457s | | | 457s 0 - ********** - c 457s *........* 457s *......... 457s *......... 457s *......... 457s 5 - *......... 457s 6 - *......... 457s | 457s d 457s 457s 0 5 9 457s | | | 457s 0 - ********** - c 457s *........* 457s *........| 457s *........| 457s *........| 457s 5 - *........| 457s 6 - *--------+ 457s | 457s d 457s 457s Key: 457s |,-,+ = rectangles forming current merge frontier 457s * = merge done manually 457s . = merge done automatically 457s # = conflict that is currently blocking progress 457s @ = merge was blocked but has been resolved 457s ? = no merge recorded 457s 457s + git-imerge finish --branch=c-d-full 457s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 457s + local refname=c-d-full 457s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 457s + git rev-parse c-d-full^{tree} 457s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 457s + test_conflict 1-6 457s + local conflict=1-6 457s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s + DESCRIPTION=git-imerge test repository with conflict at 1-6 457s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 457s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s + local description=git-imerge test repository with conflict at 1-6 457s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 457s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s + local description=git-imerge test repository with conflict at 1-6 457s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s hint: Using 'master' as the name for the initial branch. This default branch name 457s hint: is subject to change. To configure the initial branch name to use in all 457s hint: of your new repositories, which will suppress this warning, call: 457s hint: 457s hint: git config --global init.defaultBranch 457s hint: 457s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 457s hint: 'development'. The just-created branch can be renamed via this command: 457s hint: 457s hint: git branch -m 457s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6/.git/ 457s + echo git-imerge test repository with conflict at 1-6 457s + printf %s\n /*.out /*.css /*.html 457s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6/.git config user.name Loú User 457s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6/.git config user.email luser@example.com 457s + TIME=1112911993 457s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-6 457s + modify c.txt 0 457s + filename=c.txt 457s + text=0 457s + echo 0 457s + git add c.txt 457s + modify d.txt 0 457s + filename=d.txt 457s + text=0 457s + echo 0 457s + git add d.txt 457s + modify conflict.txt original version 457s + filename=conflict.txt 457s + text=original version 457s + echo original version 457s + git add conflict.txt 457s + commit -m m⇒0 457s + TIME=1112911994 457s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 457s [master (root-commit) d70e04b] m⇒0 457s 3 files changed, 3 insertions(+) 457s create mode 100644 c.txt 457s create mode 100644 conflict.txt 457s create mode 100644 d.txt 457s + git checkout -b c master -- 457s Switched to a new branch 'c' 457s + seq 9 457s + modify c.txt 1 457s + filename=c.txt 457s + text=1 457s + echo 1 457s + git add c.txt 457s + modify conflict.txt c version 457s + filename=conflict.txt 457s + text=c version 457s + echo c version 457s + git add conflict.txt 457s + commit -m c⇒1 457s + TIME=1112911995 457s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 457s [c 2120f40] c⇒1 457s 2 files changed, 2 insertions(+), 2 deletions(-) 457s + modify c.txt 2 457s + filename=c.txt 457s + text=2 457s + echo 2 457s + git add c.txt 457s + commit -m c⇒2 457s + TIME=1112911996 457s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 457s [c 90cc7de] c⇒2 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify c.txt 3 457s + filename=c.txt 457s + text=3 457s + echo 3 457s + git add c.txt 457s + commit -m c⇒3 457s + TIME=1112911997 457s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 457s [c 2046ed2] c⇒3 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify c.txt 4 457s + filename=c.txt 457s + text=4 457s + echo 4 457s + git add c.txt 457s + commit -m c⇒4 457s + TIME=1112911998 457s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 457s [c 8a2cee9] c⇒4 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify c.txt 5 457s + filename=c.txt 457s + text=5 457s + echo 5 457s + git add c.txt 457s + commit -m c⇒5 457s + TIME=1112911999 457s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 457s [c ac16a05] c⇒5 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify c.txt 6 457s + filename=c.txt 457s + text=6 457s + echo 6 457s + git add c.txt 457s + commit -m c⇒6 457s + TIME=1112912000 457s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 457s [c 30dd2ae] c⇒6 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify c.txt 7 457s + filename=c.txt 457s + text=7 457s + echo 7 457s + git add c.txt 457s + commit -m c⇒7 457s + TIME=1112912001 457s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 457s + modify c.txt 8 457s + filename=c.txt 457s + text=8 457s + echo 8 457s + git add c.txt 457s [c 0883eb9] c⇒7 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + commit -m c⇒8 457s + TIME=1112912002 457s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 457s [c f661c06] c⇒8 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify c.txt 9 457s + filename=c.txt 457s + text=9 457s + echo 9 457s + git add c.txt 457s + commit -m c⇒9 457s + TIME=1112912003 457s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 457s + git checkout -b d master -- 457s [c 243e8ed] c⇒9 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s Switched to a new branch 'd' 457s + seq 6 457s + modify d.txt 1 457s + filename=d.txt 457s + text=1 457s + echo 1 457s + git add d.txt 457s + commit -m d⇒1 457s + TIME=1112912004 457s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 457s [d bd5368a] d⇒1 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify d.txt 2 457s + filename=d.txt 457s + text=2 457s + echo 2 457s + git add d.txt 457s + commit -m d⇒2 457s + TIME=1112912005 457s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 457s [d 93e27e6] d⇒2 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify d.txt 3 457s + filename=d.txt 457s + text=3 457s + echo 3 457s + git add d.txt 457s + commit -m d⇒3 457s + TIME=1112912006 457s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 457s [d 133f385] d⇒3 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify d.txt 4 457s + filename=d.txt 457s + text=4 457s + echo 4 457s + git add d.txt 457s + commit -m d⇒4 457s + TIME=1112912007 457s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 457s [d 586472a] d⇒4 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify d.txt 5 457s + filename=d.txt 457s + text=5 457s + echo 5 457s + git add d.txt 457s + commit -m d⇒5 457s + TIME=1112912008 457s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 457s [d 9522207] d⇒5 457s 1 file changed, 1 insertion(+), 1 deletion(-) 457s + modify d.txt 6 457s + filename=d.txt 457s + text=6 457s + echo 6 457s + git add d.txt 457s + modify conflict.txt d version 457s + filename=conflict.txt 457s + text=d version 457s + echo d version 457s + git add conflict.txt 457s + commit -m d⇒6 457s + TIME=1112912009 457s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 457s [d f7e451a] d⇒6 457s 2 files changed, 2 insertions(+), 2 deletions(-) 457s + git checkout c 457s Switched to branch 'c' 457s + git-imerge init --name=c-d d 457s + git-imerge list 457s * c-d 457s + git-imerge diagram --commits --frontier --html=imerge0.html 457s 0 5 9 457s | | | 457s 0 - ********** - c 457s *????????? 457s *????????? 457s *????????? 457s *????????? 457s 5 - *????????? 457s 6 - *????????? 457s | 457s d 457s 457s 0 5 9 457s | | | 457s 0 - ********** - c 457s *????????? 457s *????????? 457s *????????? 457s *????????? 457s 5 - *????????? 457s 6 - *????????? 457s | 457s d 457s 457s Key: 457s |,-,+ = rectangles forming current merge frontier 457s * = merge done manually 457s . = merge done automatically 457s # = conflict that is currently blocking progress 457s @ = merge was blocked but has been resolved 457s ? = no merge recorded 457s 457s + + git-imerge autofill 457s tee autofill.out 457s Attempting automerge of 9-6...failure. 457s Attempting automerge of 1-1...success. 457s Attempting automerge of 1-4...success. 457s Attempting automerge of 1-6...failure. 457s Attempting automerge of 1-5...success. 457s Attempting automerge of 9-5...success. 457s Autofilling 1-5...success. 457s Autofilling 2-5...success. 457s Autofilling 3-5...success. 457s Autofilling 4-5...success. 457s Autofilling 5-5...success. 457s Autofilling 6-5...success. 457s Autofilling 7-5...success. 457s Autofilling 8-5...success. 458s Autofilling 9-1...success. 458s Autofilling 9-2...success. 458s Autofilling 9-3...success. 458s Autofilling 9-4...success. 458s Autofilling 9-5 (first way)...success. 458s Autofilling 9-5 (second way)...success. 458s The two ways of autofilling 9-5 agree. 458s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. 458s Attempting automerge of 9-6...failure. 458s Attempting automerge of 1-6...failure. 458s HEAD is now at 243e8ed c⇒9 458s Conflict; suggest manual merge of 1-6 458s + grep -q Traceback autofill.out 458s + grep -q suggest manual merge of 1-6 autofill.out 458s + git-imerge diagram --commits --frontier --html=imerge1.html 458s 0 5 9 458s | | | 458s 0 - ********** - c 458s *????????. 458s *????????. 458s *????????. 458s *????????. 458s 5 - *......... 458s 6 - *#???????? 458s | 458s d 458s 458s 0 5 9 458s | | | 458s 0 - ********** - c 458s *????????| 458s *????????| 458s *????????| 458s *????????| 458s 5 - *--------+ 458s 6 - *#???????? 458s | 458s d 458s 458s Key: 458s |,-,+ = rectangles forming current merge frontier 458s * = merge done manually 458s . = merge done automatically 458s # = conflict that is currently blocking progress 458s @ = merge was blocked but has been resolved 458s ? = no merge recorded 458s 458s + git-imerge continue --edit 458s Switched to branch 'imerge/c-d' 458s Auto-merging conflict.txt 458s CONFLICT (content): Merge conflict in conflict.txt 458s Automatic merge failed; fix conflicts and then commit the result. 458s 458s Original first commit: 458s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 458s Author: Loú User 458s Date: Thu Apr 7 22:13:15 2005 +0000 458s 458s c⇒1 458s 458s Original second commit: 458s commit f7e451a6c9656dda15641a9fbc591a602f158692 458s Author: Loú User 458s Date: Thu Apr 7 22:13:29 2005 +0000 458s 458s d⇒6 458s 458s There was a conflict merging commit 1-6, shown above. 458s Please resolve the conflict, commit the result, then type 458s 458s git-imerge continue 458s + echo merged version 458s + git add conflict.txt 458s + git-imerge continue --no-edit 458s [imerge/c-d 55357a7] imerge 'c-d': manual merge 1-6 458s Merge has been recorded for merge 1-6. 458s Attempting automerge of 9-6...success. 458s Autofilling 2-6...success. 458s Autofilling 3-6...success. 458s Autofilling 4-6...success. 458s Autofilling 5-6...success. 458s Autofilling 6-6...success. 458s Autofilling 7-6...success. 458s Autofilling 8-6...success. 458s Autofilling 9-6...success. 458s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. 458s Merge is complete! 458s + git-imerge diagram --commits --frontier --html=imerge2.html 458s 0 5 9 458s | | | 458s 0 - ********** - c 458s *????????. 458s *????????. 458s *????????. 458s *????????. 458s 5 - *......... 458s 6 - **........ 458s | 458s d 458s 458s 0 5 9 458s | | | 458s 0 - ********** - c 458s *????????| 458s *????????| 458s *????????| 458s *????????| 458s 5 - *........| 458s 6 - **-------+ 458s | 458s d 458s 458s Key: 458s |,-,+ = rectangles forming current merge frontier 458s * = merge done manually 458s . = merge done automatically 458s # = conflict that is currently blocking progress 458s @ = merge was blocked but has been resolved 458s ? = no merge recorded 458s 458s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 458s Merge d into c (using imerge) 458s 458s # Please enter the commit message for your changes. Lines starting 458s # with '#' will be ignored, and an empty message aborts the commit. 458s # 458s # Date: Wed Mar 20 09:29:24 2024 +0000 458s # 458s # On branch c-d-merge 458s # Changes to be committed: 458s # modified: conflict.txt 458s # modified: d.txt 458s # 458s [c-d-merge b7cce15] Merge d into c (using imerge) 458s Date: Wed Mar 20 09:29:24 2024 +0000 458s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 458s + local refname=c-d-merge 458s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 458s + git rev-parse c-d-merge^{tree} 458s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 458s + git-imerge simplify --goal=rebase --branch=c-d-rebase 458s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 458s + local refname=c-d-rebase 458s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 458s + git rev-parse c-d-rebase^{tree} 458s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 458s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 459s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + local refname=c-d-rebase-with-history 459s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git rev-parse c-d-rebase-with-history^{tree} 459s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git-imerge simplify --goal=border --branch=c-d-border 459s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + local refname=c-d-border 459s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git rev-parse c-d-border^{tree} 459s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 459s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + local refname=c-d-border-with-history 459s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git rev-parse c-d-border-with-history^{tree} 459s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 459s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + local refname=c-d-border-with-history2 459s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git rev-parse c-d-border-with-history2^{tree} 459s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 459s + git-imerge remove 459s + git checkout c 459s Switched to branch 'c' 459s + + git-imerge starttee --goal=full --first-parent start.out --name=c-d 459s d 459s Attempting to merge 1-1...success. 459s Attempting to merge 1-2...success. 459s Attempting to merge 1-3...success. 459s Attempting to merge 1-4...success. 459s Attempting to merge 1-5...success. 459s Attempting to merge 1-6...conflict. 459s Attempting to merge 2-1...success. 460s Attempting to merge 2-2...success. 460s Attempting to merge 2-3...success. 460s Attempting to merge 2-4...success. 460s Attempting to merge 2-5...success. 460s Attempting to merge 3-1...success. 460s Attempting to merge 3-2...success. 460s Attempting to merge 3-3...success. 460s Attempting to merge 3-4...success. 460s Attempting to merge 3-5...success. 460s Attempting to merge 4-1...success. 460s Attempting to merge 4-2...success. 460s Attempting to merge 4-3...success. 460s Attempting to merge 4-4...success. 460s Attempting to merge 4-5...success. 460s Attempting to merge 5-1...success. 460s Attempting to merge 5-2...success. 460s Attempting to merge 5-3...success. 460s Attempting to merge 5-4...success. 460s Attempting to merge 5-5...success. 460s Attempting to merge 6-1...success. 460s Attempting to merge 6-2...success. 460s Attempting to merge 6-3...success. 460s Attempting to merge 6-4...success. 460s Attempting to merge 6-5...success. 460s Attempting to merge 7-1...success. 460s Attempting to merge 7-2...success. 460s Attempting to merge 7-3...success. 460s Attempting to merge 7-4...success. 460s Attempting to merge 7-5...success. 460s Attempting to merge 8-1...success. 460s Attempting to merge 8-2...success. 460s Attempting to merge 8-3...success. 460s Attempting to merge 8-4...success. 460s Attempting to merge 8-5...success. 460s Attempting to merge 9-1...success. 460s Attempting to merge 9-2...success. 460s Attempting to merge 9-3...success. 460s Attempting to merge 9-4...success. 460s Attempting to merge 9-5...success. 460s Previous HEAD position was 9f3d44d imerge 'c-d': automatic merge 9-5 460s Switched to branch 'imerge/c-d' 460s Auto-merging conflict.txt 460s CONFLICT (content): Merge conflict in conflict.txt 460s Automatic merge failed; fix conflicts and then commit the result. 460s 460s Original first commit: 460s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 460s Author: Loú User 460s Date: Thu Apr 7 22:13:15 2005 +0000 460s 460s c⇒1 460s 460s Original second commit: 460s commit f7e451a6c9656dda15641a9fbc591a602f158692 460s Author: Loú User 460s Date: Thu Apr 7 22:13:29 2005 +0000 460s 460s d⇒6 460s 460s There was a conflict merging commit 1-6, shown above. 460s Please resolve the conflict, commit the result, then type 460s 460s git-imerge continue 460s + grep -q Traceback start.out 460s + grep -q suggest manual merge of 1-6 autofill.out 460s + git-imerge diagram --commits --frontier --html=imerge3.html 460s 0 5 9 460s | | | 460s 0 - ********** - c 460s *......... 460s *......... 460s *......... 460s *......... 460s 5 - *......... 460s 6 - *#???????? 460s | 460s d 460s 460s 0 5 9 460s | | | 460s 0 - ********** - c 460s *........| 460s *........| 460s *........| 460s *........| 460s 5 - *--------+ 460s 6 - *#???????? 460s | 460s d 460s 460s Key: 460s |,-,+ = rectangles forming current merge frontier 460s * = merge done manually 460s . = merge done automatically 460s # = conflict that is currently blocking progress 460s @ = merge was blocked but has been resolved 460s ? = no merge recorded 460s 460s + echo merged version 460s + git add conflict.txt 460s imerge 'c-d': manual merge 1-6 460s 460s # Conflicts: 460s # conflict.txt 460s # 460s # It looks like you may be committing a merge. 460s # If this is not correct, please run 460s # git update-ref -d MERGE_HEAD 460s # and try again. 460s 460s 460s # Please enter the commit message for your changes. Lines starting 460s # with '#' will be ignored, and an empty message aborts the commit. 460s # 460s # On branch imerge/c-d 460s # All conflicts fixed but you are still merging. 460s # 460s # Changes to be committed: 460s # modified: conflict.txt 460s # modified: d.txt 460s # 460s + GIT_EDITOR=cat git commit 460s [imerge/c-d eef0ddd] imerge 'c-d': manual merge 1-6 460s + git-imerge continue --edit 460s Merge has been recorded for merge 1-6. 460s Attempting to merge 2-6...success. 460s Attempting to merge 3-6...success. 460s Attempting to merge 4-6...success. 460s Attempting to merge 5-6...success. 460s Attempting to merge 6-6...success. 460s Attempting to merge 7-6...success. 460s Attempting to merge 8-6...success. 460s Attempting to merge 9-6...success. 460s Merge is complete! 460s + git-imerge diagram --commits --frontier --html=imerge4.html 461s 0 5 9 461s | | | 461s 0 - ********** - c 461s *......... 461s *......... 461s *......... 461s *......... 461s 5 - *......... 461s 6 - **........ 461s | 461s d 461s 461s 0 5 9 461s | | | 461s 0 - ********** - c 461s *........| 461s *........| 461s *........| 461s *........| 461s 5 - *........| 461s 6 - **-------+ 461s | 461s d 461s 461s Key: 461s |,-,+ = rectangles forming current merge frontier 461s * = merge done manually 461s . = merge done automatically 461s # = conflict that is currently blocking progress 461s @ = merge was blocked but has been resolved 461s ? = no merge recorded 461s 461s + git-imerge finish --branch=c-d-full 461s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 461s + local refname=c-d-full 461s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 461s + git rev-parse c-d-full^{tree} 461s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 461s + test_conflict 9-6 461s + local conflict=9-6 461s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s + DESCRIPTION=git-imerge test repository with conflict at 9-6 461s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 461s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s + local description=git-imerge test repository with conflict at 9-6 461s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 461s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s + local description=git-imerge test repository with conflict at 9-6 461s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s hint: Using 'master' as the name for the initial branch. This default branch name 461s hint: is subject to change. To configure the initial branch name to use in all 461s hint: of your new repositories, which will suppress this warning, call: 461s hint: 461s hint: git config --global init.defaultBranch 461s hint: 461s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 461s hint: 'development'. The just-created branch can be renamed via this command: 461s hint: 461s hint: git branch -m 461s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6/.git/ 461s + echo git-imerge test repository with conflict at 9-6 461s + printf %s\n /*.out /*.css /*.html 461s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6/.git config user.name Loú User 461s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6/.git config user.email luser@example.com 461s + TIME=1112911993 461s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-6 461s + modify c.txt 0 461s + filename=c.txt 461s + text=0 461s + echo 0 461s + git add c.txt 461s + modify d.txt 0 461s + filename=d.txt 461s + text=0 461s + echo 0 461s + git add d.txt 461s + modify conflict.txt original version 461s + filename=conflict.txt 461s + text=original version 461s + echo original version 461s + git add conflict.txt 461s + commit -m m⇒0 461s + TIME=1112911994 461s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 461s [master (root-commit) d70e04b] m⇒0 461s 3 files changed, 3 insertions(+) 461s create mode 100644 c.txt 461s create mode 100644 conflict.txt 461s create mode 100644 d.txt 461s + git checkout -b c master -- 461s Switched to a new branch 'c' 461s + seq 9 461s + modify c.txt 1 461s + filename=c.txt 461s + text=1 461s + echo 1 461s + git add c.txt 461s + commit -m c⇒1 461s + TIME=1112911995 461s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 461s [c 89e2141] c⇒1 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify c.txt 2 461s + filename=c.txt 461s + text=2 461s + echo 2 461s + git add c.txt 461s + commit -m c⇒2 461s + TIME=1112911996 461s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 461s [c 7c431f2] c⇒2 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify c.txt 3 461s + filename=c.txt 461s + text=3 461s + echo 3 461s + git add c.txt 461s + commit -m c⇒3 461s + TIME=1112911997 461s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 461s [c f02ab24] c⇒3 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify c.txt 4 461s + filename=c.txt 461s + text=4 461s + echo 4 461s + git add c.txt 461s + commit -m c⇒4 461s + TIME=1112911998 461s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 461s [c ed9122f] c⇒4 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify c.txt 5 461s + filename=c.txt 461s + text=5 461s + echo 5 461s + git add c.txt 461s + commit -m c⇒5 461s + TIME=1112911999 461s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 461s [c 1d3bf09] c⇒5 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify c.txt 6 461s + filename=c.txt 461s + text=6 461s + echo 6 461s + git add c.txt 461s + commit -m c⇒6 461s + TIME=1112912000 461s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 461s [c f999ecd] c⇒6 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify c.txt 7 461s + filename=c.txt 461s + text=7 461s + echo 7 461s + git add c.txt 461s + commit -m c⇒7 461s + TIME=1112912001 461s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 461s + modify c.txt 8 461s + filename=c.txt 461s + text=8 461s + echo 8 461s + git add c.txt 461s [c 7050a8a] c⇒7 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + commit -m c⇒8 461s + TIME=1112912002 461s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 461s [c 9732e77] c⇒8 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify c.txt 9 461s + filename=c.txt 461s + text=9 461s + echo 9 461s + git add c.txt 461s + modify conflict.txt c version 461s + filename=conflict.txt 461s + text=c version 461s + echo c version 461s + git add conflict.txt 461s + commit -m c⇒9 461s + TIME=1112912003 461s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 461s [c 73a5eed] c⇒9 461s 2 files changed, 2 insertions(+), 2 deletions(-) 461s + git checkout -b d master -- 461s Switched to a new branch 'd' 461s + seq 6 461s + modify d.txt 1 461s + filename=d.txt 461s + text=1 461s + echo 1 461s + git add d.txt 461s + commit -m d⇒1 461s + TIME=1112912004 461s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 461s [d bd5368a] d⇒1 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify d.txt 2 461s + filename=d.txt 461s + text=2 461s + echo 2 461s + git add d.txt 461s + commit -m d⇒2 461s + TIME=1112912005 461s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 461s + modify d.txt 3 461s + filename=d.txt 461s [d 93e27e6] d⇒2 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + text=3 461s + echo 3 461s + git add d.txt 461s + commit -m d⇒3 461s + TIME=1112912006 461s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 461s [d 133f385] d⇒3 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify d.txt 4 461s + filename=d.txt 461s + text=4 461s + echo 4 461s + git add d.txt 461s + commit -m d⇒4 461s + TIME=1112912007 461s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 461s [d 586472a] d⇒4 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify d.txt 5 461s + filename=d.txt 461s + text=5 461s + echo 5 461s + git add d.txt 461s + commit -m d⇒5 461s + TIME=1112912008 461s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 461s + modify d.txt 6 461s + filename=d.txt 461s + text=6 461s + echo 6 461s + git add d.txt 461s [d 9522207] d⇒5 461s 1 file changed, 1 insertion(+), 1 deletion(-) 461s + modify conflict.txt d version 461s + filename=conflict.txt 461s + text=d version 461s + echo d version 461s + git add conflict.txt 461s + commit -m d⇒6 461s + TIME=1112912009 461s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 461s [d f7e451a] d⇒6 461s 2 files changed, 2 insertions(+), 2 deletions(-) 461s + git checkout c 461s Switched to branch 'c' 461s + git-imerge init --name=c-d d 461s + git-imerge list 461s * c-d 461s + git-imerge diagram --commits --frontier --html=imerge0.html 461s 0 5 9 461s | | | 461s 0 - ********** - c 461s *????????? 461s *????????? 461s *????????? 461s *????????? 461s 5 - *????????? 461s 6 - *????????? 461s | 461s d 461s 461s 0 5 9 461s | | | 461s 0 - ********** - c 461s *????????? 461s *????????? 461s *????????? 461s *????????? 461s 5 - *????????? 461s 6 - *????????? 461s | 461s d 461s 461s Key: 461s |,-,+ = rectangles forming current merge frontier 461s * = merge done manually 461s . = merge done automatically 461s # = conflict that is currently blocking progress 461s @ = merge was blocked but has been resolved 461s ? = no merge recorded 461s 461s + git-imerge autofill 461s + tee autofill.out 461s Attempting automerge of 9-6...failure. 461s Attempting automerge of 1-1...success. 461s Attempting automerge of 1-4...success. 461s Attempting automerge of 1-6...success. 461s Attempting automerge of 9-6...failure. 461s Attempting automerge of 5-6...success. 461s Attempting automerge of 7-6...success. 461s Attempting automerge of 8-6...success. 461s Attempting automerge of 9-1...success. 461s Attempting automerge of 9-4...success. 461s Attempting automerge of 9-5...success. 461s Autofilling 1-6...success. 461s Autofilling 2-6...success. 461s Autofilling 3-6...success. 461s Autofilling 4-6...success. 461s Autofilling 5-6...success. 461s Autofilling 6-6...success. 461s Autofilling 7-6...success. 462s Autofilling 8-1...success. 462s Autofilling 8-2...success. 462s Autofilling 8-3...success. 462s Autofilling 8-4...success. 462s Autofilling 8-5...success. 462s Autofilling 8-6 (first way)...success. 462s Autofilling 8-6 (second way)...success. 462s The two ways of autofilling 8-6 agree. 462s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 462s Autofilling 9-1...success. 462s Autofilling 9-2...success. 462s Autofilling 9-3...success. 462s Autofilling 9-4...success. 462s Autofilling 9-5...success. 462s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. 462s Attempting automerge of 9-6...failure. 462s Attempting automerge of 9-6...failure. 462s HEAD is now at 73a5eed c⇒9 462s Conflict; suggest manual merge of 9-6 462s + grep -q Traceback autofill.out 462s + grep -q suggest manual merge of 9-6 autofill.out 462s + git-imerge diagram --commits --frontier --html=imerge1.html 462s 0 5 9 462s | | | 462s 0 - ********** - c 462s *???????.. 462s *???????.. 462s *???????.. 462s *???????.. 462s 5 - *???????.. 462s 6 - *........# 462s | 462s d 462s 462s 0 5 9 462s | | | 462s 0 - ********** - c 462s *???????.| 462s *???????.| 462s *???????.| 462s *???????.| 462s 5 - *???????.+ 462s 6 - *-------+# 462s | 462s d 462s 462s Key: 462s |,-,+ = rectangles forming current merge frontier 462s * = merge done manually 462s . = merge done automatically 462s # = conflict that is currently blocking progress 462s @ = merge was blocked but has been resolved 462s ? = no merge recorded 462s 462s + git-imerge continue --edit 462s Switched to branch 'imerge/c-d' 462s Auto-merging conflict.txt 462s CONFLICT (content): Merge conflict in conflict.txt 462s Automatic merge failed; fix conflicts and then commit the result. 462s 462s Original first commit: 462s 462s Original second commit: 462s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 462s Author: Loú User 462s Date: Thu Apr 7 22:13:23 2005 +0000 462s 462s c⇒9 462s commit f7e451a6c9656dda15641a9fbc591a602f158692 462s Author: Loú User 462s Date: Thu Apr 7 22:13:29 2005 +0000 462s 462s d⇒6 462s 462s There was a conflict merging commit 9-6, shown above. 462s Please resolve the conflict, commit the result, then type 462s 462s git-imerge continue 462s + echo merged version 462s + git add conflict.txt 462s + git-imerge continue --no-edit 462s [imerge/c-d 452138e] imerge 'c-d': manual merge 9-6 462s Merge has been recorded for merge 9-6. 462s Merge is complete! 462s + git-imerge diagram --commits --frontier --html=imerge2.html 462s 0 5 9 462s | | | 462s 0 - ********** - c 462s *???????.. 462s *???????.. 462s *???????.. 462s *???????.. 462s 5 - *???????.. 462s 6 - *........* 462s | 462s d 462s 462s 0 5 9 462s | | | 462s 0 - ********** - c 462s *???????.| 462s *???????.| 462s *???????.| 462s *???????.| 462s 5 - *???????.| 462s 6 - *--------* 462s | 462s d 462s 462s Key: 462s |,-,+ = rectangles forming current merge frontier 462s * = merge done manually 462s . = merge done automatically 462s # = conflict that is currently blocking progress 462s @ = merge was blocked but has been resolved 462s ? = no merge recorded 462s 462s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 462s Merge d into c (using imerge) 462s 462s # Please enter the commit message for your changes. Lines starting 462s # with '#' will be ignored, and an empty message aborts the commit. 462s # 462s # Date: Wed Mar 20 09:29:28 2024 +0000 462s # 462s # On branch c-d-merge 462s # Changes to be committed: 462s # modified: conflict.txt 462s # modified: d.txt 462s # 462s [c-d-merge 86b4910] Merge d into c (using imerge) 462s Date: Wed Mar 20 09:29:28 2024 +0000 462s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 462s + local refname=c-d-merge 462s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 462s + git rev-parse c-d-merge^{tree} 462s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 462s + git-imerge simplify --goal=rebase --branch=c-d-rebase 462s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 462s + local refname=c-d-rebase 462s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 462s + git rev-parse c-d-rebase^{tree} 462s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 462s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 463s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + local refname=c-d-rebase-with-history 463s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git rev-parse c-d-rebase-with-history^{tree} 463s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git-imerge simplify --goal=border --branch=c-d-border 463s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + local refname=c-d-border 463s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git rev-parse c-d-border^{tree} 463s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 463s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + local refname=c-d-border-with-history 463s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git rev-parse c-d-border-with-history^{tree} 463s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 463s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + local refname=c-d-border-with-history2 463s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git rev-parse c-d-border-with-history2^{tree} 463s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 463s + git-imerge remove 463s + git checkout c 463s Switched to branch 'c' 463s + git-imerge start --goal=full --first-parent --name=c-d d 463s + tee start.out 463s Attempting to merge 1-1...success. 463s Attempting to merge 1-2...success. 463s Attempting to merge 1-3...success. 463s Attempting to merge 1-4...success. 463s Attempting to merge 1-5...success. 463s Attempting to merge 1-6...success. 463s Attempting to merge 2-1...success. 463s Attempting to merge 2-2...success. 463s Attempting to merge 2-3...success. 463s Attempting to merge 2-4...success. 463s Attempting to merge 2-5...success. 464s Attempting to merge 2-6...success. 464s Attempting to merge 3-1...success. 464s Attempting to merge 3-2...success. 464s Attempting to merge 3-3...success. 464s Attempting to merge 3-4...success. 464s Attempting to merge 3-5...success. 464s Attempting to merge 3-6...success. 464s Attempting to merge 4-1...success. 464s Attempting to merge 4-2...success. 464s Attempting to merge 4-3...success. 464s Attempting to merge 4-4...success. 464s Attempting to merge 4-5...success. 464s Attempting to merge 4-6...success. 464s Attempting to merge 5-1...success. 464s Attempting to merge 5-2...success. 464s Attempting to merge 5-3...success. 464s Attempting to merge 5-4...success. 464s Attempting to merge 5-5...success. 464s Attempting to merge 5-6...success. 464s Attempting to merge 6-1...success. 464s Attempting to merge 6-2...success. 464s Attempting to merge 6-3...success. 464s Attempting to merge 6-4...success. 464s Attempting to merge 6-5...success. 464s Attempting to merge 6-6...success. 464s Attempting to merge 7-1...success. 464s Attempting to merge 7-2...success. 464s Attempting to merge 7-3...success. 464s Attempting to merge 7-4...success. 464s Attempting to merge 7-5...success. 464s Attempting to merge 7-6...success. 464s Attempting to merge 8-1...success. 464s Attempting to merge 8-2...success. 464s Attempting to merge 8-3...success. 464s Attempting to merge 8-4...success. 464s Attempting to merge 8-5...success. 464s Attempting to merge 8-6...success. 464s Attempting to merge 9-1...success. 464s Attempting to merge 9-2...success. 464s Attempting to merge 9-3...success. 464s Attempting to merge 9-4...success. 464s Attempting to merge 9-5...success. 464s Attempting to merge 9-6...conflict. 464s Switched to branch 'imerge/c-d' 464s Auto-merging conflict.txt 464s CONFLICT (content): Merge conflict in conflict.txt 464s Automatic merge failed; fix conflicts and then commit the result. 464s 464s Original first commit: 464s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 464s Author: Loú User 464s Date: Thu Apr 7 22:13:23 2005 +0000 464s 464s c⇒9 464s 464s Original second commit: 464s commit f7e451a6c9656dda15641a9fbc591a602f158692 464s Author: Loú User 464s Date: Thu Apr 7 22:13:29 2005 +0000 464s 464s d⇒6 464s 464s There was a conflict merging commit 9-6, shown above. 464s Please resolve the conflict, commit the result, then type 464s 464s git-imerge continue 464s + grep -q Traceback start.out 464s + grep -q suggest manual merge of 9-6 autofill.out 464s + git-imerge diagram --commits --frontier --html=imerge3.html 464s 0 5 9 464s | | | 464s 0 - ********** - c 464s *......... 464s *......... 464s *......... 464s *......... 464s 5 - *......... 464s 6 - *........# 464s | 464s d 464s 464s 0 5 9 464s | | | 464s 0 - ********** - c 464s *........| 464s *........| 464s *........| 464s *........| 464s 5 - *........+ 464s 6 - *-------+# 464s | 464s d 464s 464s Key: 464s |,-,+ = rectangles forming current merge frontier 464s * = merge done manually 464s . = merge done automatically 464s # = conflict that is currently blocking progress 464s @ = merge was blocked but has been resolved 464s ? = no merge recorded 464s 464s + echo merged version 464s + git add conflict.txt 464s imerge 'c-d': manual merge 9-6 464s 464s # Conflicts: 464s # conflict.txt 464s # 464s # It looks like you may be committing a merge. 464s # If this is not correct, please run 464s # git update-ref -d MERGE_HEAD 464s # and try again. 464s 464s 464s # Please enter the commit message for your changes. Lines starting 464s # with '#' will be ignored, and an empty message aborts the commit. 464s # 464s # On branch imerge/c-d 464s # All conflicts fixed but you are still merging. 464s # 464s # Changes to be committed: 464s # modified: conflict.txt 464s # modified: d.txt 464s # 464s + GIT_EDITOR=cat git commit 464s + git-imerge continue --edit 464s [imerge/c-d 401f7ed] imerge 'c-d': manual merge 9-6 464s Merge has been recorded for merge 9-6. 464s Merge is complete! 465s + git-imerge diagram --commits --frontier --html=imerge4.html 465s 0 5 9 465s | | | 465s 0 - ********** - c 465s *......... 465s *......... 465s *......... 465s *......... 465s 5 - *......... 465s 6 - *........* 465s | 465s d 465s 465s 0 5 9 465s | | | 465s 0 - ********** - c 465s *........| 465s *........| 465s *........| 465s *........| 465s 5 - *........| 465s 6 - *--------* 465s | 465s d 465s 465s Key: 465s |,-,+ = rectangles forming current merge frontier 465s * = merge done manually 465s . = merge done automatically 465s # = conflict that is currently blocking progress 465s @ = merge was blocked but has been resolved 465s ? = no merge recorded 465s 465s + git-imerge finish --branch=c-d-full 465s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 465s + local refname=c-d-full 465s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 465s + git rev-parse c-d-full^{tree} 465s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 465s + test_conflict 1-2 465s + local conflict=1-2 465s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s + DESCRIPTION=git-imerge test repository with conflict at 1-2 465s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 465s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s + local description=git-imerge test repository with conflict at 1-2 465s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 465s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s + local description=git-imerge test repository with conflict at 1-2 465s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s hint: Using 'master' as the name for the initial branch. This default branch name 465s hint: is subject to change. To configure the initial branch name to use in all 465s hint: of your new repositories, which will suppress this warning, call: 465s hint: 465s hint: git config --global init.defaultBranch 465s hint: 465s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 465s hint: 'development'. The just-created branch can be renamed via this command: 465s hint: 465s hint: git branch -m 465s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2/.git/ 465s + echo git-imerge test repository with conflict at 1-2 465s + printf %s\n /*.out /*.css /*.html 465s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2/.git config user.name Loú User 465s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2/.git config user.email luser@example.com 465s + TIME=1112911993 465s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-1-2 465s + modify c.txt 0 465s + filename=c.txt 465s + text=0 465s + echo 0 465s + git add c.txt 465s + modify d.txt 0 465s + filename=d.txt 465s + text=0 465s + echo 0 465s + git add d.txt 465s + modify conflict.txt original version 465s + filename=conflict.txt 465s + text=original version 465s + echo original version 465s + git add conflict.txt 465s [master (root-commit) d70e04b] m⇒0 465s 3 files changed, 3 insertions(+) 465s create mode 100644 c.txt 465s create mode 100644 conflict.txt 465s create mode 100644 d.txt 465s + commit -m m⇒0 465s + TIME=1112911994 465s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 465s + git checkout -b c master -- 465s Switched to a new branch 'c' 465s + seq 9 465s + modify c.txt 1 465s + filename=c.txt 465s + text=1 465s + echo 1 465s + git add c.txt 465s + modify conflict.txt c version 465s + filename=conflict.txt 465s + text=c version 465s + echo c version 465s + git add conflict.txt 465s + commit -m c⇒1 465s + TIME=1112911995 465s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 465s [c 2120f40] c⇒1 465s 2 files changed, 2 insertions(+), 2 deletions(-) 465s + modify c.txt 2 465s + filename=c.txt 465s + text=2 465s + echo 2 465s + git add c.txt 465s + commit -m c⇒2 465s + TIME=1112911996 465s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 465s [c 90cc7de] c⇒2 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify c.txt 3 465s + filename=c.txt 465s + text=3 465s + echo 3 465s + git add c.txt 465s + commit -m c⇒3 465s + TIME=1112911997 465s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 465s [c 2046ed2] c⇒3 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify c.txt 4 465s + filename=c.txt 465s + text=4 465s + echo 4 465s + git add c.txt 465s + commit -m c⇒4 465s + TIME=1112911998 465s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 465s + modify c.txt 5 465s + filename=c.txt 465s + text=5 465s [c 8a2cee9] c⇒4 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + echo 5 465s + git add c.txt 465s + commit -m c⇒5 465s + TIME=1112911999 465s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 465s + modify c.txt 6 465s + filename=c.txt 465s + text=6 465s + echo 6 465s + git add c.txt 465s [c ac16a05] c⇒5 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + commit -m c⇒6 465s + TIME=1112912000 465s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 465s [c 30dd2ae] c⇒6 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify c.txt 7 465s + filename=c.txt 465s + text=7 465s + echo 7 465s + git add c.txt 465s + commit -m c⇒7 465s + TIME=1112912001 465s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 465s [c 0883eb9] c⇒7 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify c.txt 8 465s + filename=c.txt 465s + text=8 465s + echo 8 465s + git add c.txt 465s + commit -m c⇒8 465s + TIME=1112912002 465s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 465s [c f661c06] c⇒8 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify c.txt 9 465s + filename=c.txt 465s + text=9 465s + echo 9 465s + git add c.txt 465s + commit -m c⇒9 465s + TIME=1112912003 465s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 465s + git checkout -b d master -- 465s [c 243e8ed] c⇒9 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s Switched to a new branch 'd' 465s + seq 6 465s + modify d.txt 1 465s + filename=d.txt 465s + text=1 465s + echo 1 465s + git add d.txt 465s + commit -m d⇒1 465s + TIME=1112912004 465s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 465s [d bd5368a] d⇒1 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify d.txt 2 465s + filename=d.txt 465s + text=2 465s + echo 2 465s + git add d.txt 465s + modify conflict.txt d version 465s + filename=conflict.txt 465s + text=d version 465s + echo d version 465s + git add conflict.txt 465s + commit -m d⇒2 465s + TIME=1112912005 465s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 465s [d 69efde8] d⇒2 465s 2 files changed, 2 insertions(+), 2 deletions(-) 465s + modify d.txt 3 465s + filename=d.txt 465s + text=3 465s + echo 3 465s + git add d.txt 465s + commit -m d⇒3 465s + TIME=1112912006 465s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 465s [d 3169557] d⇒3 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify d.txt 4 465s + filename=d.txt 465s + text=4 465s + echo 4 465s + git add d.txt 465s + commit -m d⇒4 465s + TIME=1112912007 465s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 465s [d 86c8052] d⇒4 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify d.txt 5 465s + filename=d.txt 465s + text=5 465s + echo 5 465s + git add d.txt 465s + commit -m d⇒5 465s + TIME=1112912008 465s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 465s [d 1700773] d⇒5 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s + modify d.txt 6 465s + filename=d.txt 465s + text=6 465s + echo 6 465s + git add d.txt 465s + commit -m d⇒6 465s + TIME=1112912009 465s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 465s + git checkout c 465s [d df2e493] d⇒6 465s 1 file changed, 1 insertion(+), 1 deletion(-) 465s Switched to branch 'c' 465s + git-imerge init --name=c-d d 465s + git-imerge list 465s * c-d 465s + git-imerge diagram --commits --frontier --html=imerge0.html 465s 0 5 9 465s | | | 465s 0 - ********** - c 465s *????????? 465s *????????? 465s *????????? 465s *????????? 465s 5 - *????????? 465s 6 - *????????? 465s | 465s d 465s 465s 0 5 9 465s | | | 465s 0 - ********** - c 465s *????????? 465s *????????? 465s *????????? 465s *????????? 465s 5 - *????????? 465s 6 - *????????? 465s | 465s d 465s 465s Key: 465s |,-,+ = rectangles forming current merge frontier 465s * = merge done manually 465s . = merge done automatically 465s # = conflict that is currently blocking progress 465s @ = merge was blocked but has been resolved 465s ? = no merge recorded 465s 465s + + git-imerge autofill 465s tee autofill.out 465s Attempting automerge of 9-6...failure. 465s Attempting automerge of 1-1...success. 465s Attempting automerge of 1-4...failure. 465s Attempting automerge of 1-3...failure. 465s Attempting automerge of 1-2...failure. 465s Attempting automerge of 9-1...success. 465s Autofilling 1-1...success. 465s Autofilling 2-1...success. 465s Autofilling 3-1...success. 465s Autofilling 4-1...success. 465s Autofilling 5-1...success. 465s Autofilling 6-1...success. 465s Autofilling 7-1...success. 465s Autofilling 8-1...success. 465s Autofilling 9-1...success. 465s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. 465s Attempting automerge of 9-6...failure. 465s Attempting automerge of 1-2...failure. 465s HEAD is now at 243e8ed c⇒9 465s Conflict; suggest manual merge of 1-2 465s + grep -q Traceback autofill.out 465s + grep -q suggest manual merge of 1-2 autofill.out 465s + git-imerge diagram --commits --frontier --html=imerge1.html 465s 0 5 9 465s | | | 465s 0 - ********** - c 465s *......... 465s *#???????? 465s *????????? 465s *????????? 465s 5 - *????????? 465s 6 - *????????? 465s | 465s d 465s 465s 0 5 9 465s | | | 465s 0 - ********** - c 465s *--------+ 465s *#???????? 465s *????????? 465s *????????? 465s 5 - *????????? 465s 6 - *????????? 465s | 465s d 465s 465s Key: 465s |,-,+ = rectangles forming current merge frontier 465s * = merge done manually 465s . = merge done automatically 465s # = conflict that is currently blocking progress 465s @ = merge was blocked but has been resolved 465s ? = no merge recorded 465s 465s + git-imerge continue --edit 466s Switched to branch 'imerge/c-d' 466s Auto-merging conflict.txt 466s CONFLICT (content): Merge conflict in conflict.txt 466s Automatic merge failed; fix conflicts and then commit the result. 466s 466s Original first commit: 466s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 466s Author: Loú User 466s Date: Thu Apr 7 22:13:15 2005 +0000 466s 466s c⇒1 466s 466s Original second commit: 466s commit 69efde8f66d581a765a3909ffacb9f895f95c345 466s Author: Loú User 466s Date: Thu Apr 7 22:13:25 2005 +0000 466s 466s d⇒2 466s 466s There was a conflict merging commit 1-2, shown above. 466s Please resolve the conflict, commit the result, then type 466s 466s git-imerge continue 466s + echo merged version 466s + git add conflict.txt 466s + git-imerge continue --no-edit 466s [imerge/c-d a9955f1] imerge 'c-d': manual merge 1-2 466s Merge has been recorded for merge 1-2. 466s Attempting automerge of 1-6...success. 466s Autofilling 1-3...success. 466s Autofilling 1-4...success. 466s Autofilling 1-5...success. 466s Autofilling 1-6...success. 466s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. 466s Attempting automerge of 9-6...success. 466s Autofilling 2-6...success. 466s Autofilling 3-6...success. 466s Autofilling 4-6...success. 466s Autofilling 5-6...success. 466s Autofilling 6-6...success. 466s Autofilling 7-6...success. 466s Autofilling 8-6...success. 466s Autofilling 9-2...success. 466s Autofilling 9-3...success. 466s Autofilling 9-4...success. 466s Autofilling 9-5...success. 466s Autofilling 9-6 (first way)...success. 466s Autofilling 9-6 (second way)...success. 466s The two ways of autofilling 9-6 agree. 466s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. 466s Merge is complete! 466s + git-imerge diagram --commits --frontier --html=imerge2.html 466s 0 5 9 466s | | | 466s 0 - ********** - c 466s *......... 466s **???????. 466s *.???????. 466s *.???????. 466s 5 - *.???????. 466s 6 - *......... 466s | 466s d 466s 466s 0 5 9 466s | | | 466s 0 - ********** - c 466s *........| 466s **???????| 466s *.???????| 466s *.???????| 466s 5 - *.???????| 466s 6 - *--------+ 466s | 466s d 466s 466s Key: 466s |,-,+ = rectangles forming current merge frontier 466s * = merge done manually 466s . = merge done automatically 466s # = conflict that is currently blocking progress 466s @ = merge was blocked but has been resolved 466s ? = no merge recorded 466s 466s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 466s Merge d into c (using imerge) 466s 466s # Please enter the commit message for your changes. Lines starting 466s # with '#' will be ignored, and an empty message aborts the commit. 466s # 466s # Date: Wed Mar 20 09:29:32 2024 +0000 466s # 466s # On branch c-d-merge 466s # Changes to be committed: 466s # modified: conflict.txt 466s # modified: d.txt 466s # 466s [c-d-merge 637988c] Merge d into c (using imerge) 466s Date: Wed Mar 20 09:29:32 2024 +0000 466s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + local refname=c-d-merge 466s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + git rev-parse c-d-merge^{tree} 466s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + git-imerge simplify --goal=rebase --branch=c-d-rebase 466s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + local refname=c-d-rebase 466s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + git rev-parse c-d-rebase^{tree} 466s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 466s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + local refname=c-d-rebase-with-history 466s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + git rev-parse c-d-rebase-with-history^{tree} 466s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 466s + git-imerge simplify --goal=border --branch=c-d-border 467s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + local refname=c-d-border 467s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + git rev-parse c-d-border^{tree} 467s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 467s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + local refname=c-d-border-with-history 467s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + git rev-parse c-d-border-with-history^{tree} 467s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 467s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + local refname=c-d-border-with-history2 467s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + git rev-parse c-d-border-with-history2^{tree} 467s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 467s + git-imerge remove 467s + git checkout c 467s Switched to branch 'c' 467s + + git-imerge start --goal=fulltee start.out 467s --first-parent --name=c-d d 467s Attempting to merge 1-1...success. 467s Attempting to merge 1-2...conflict. 467s Attempting to merge 2-1...success. 467s Attempting to merge 3-1...success. 467s Attempting to merge 4-1...success. 467s Attempting to merge 5-1...success. 467s Attempting to merge 6-1...success. 467s Attempting to merge 7-1...success. 467s Attempting to merge 8-1...success. 467s Attempting to merge 9-1...success. 467s Previous HEAD position was ff30d30 imerge 'c-d': automatic merge 9-1 467s Switched to branch 'imerge/c-d' 467s Auto-merging conflict.txt 467s CONFLICT (content): Merge conflict in conflict.txt 467s Automatic merge failed; fix conflicts and then commit the result. 467s 467s Original first commit: 467s commit 2120f40dc39d28052a5279b645124e8ed7e5de73 467s Author: Loú User 467s Date: Thu Apr 7 22:13:15 2005 +0000 467s 467s c⇒1 467s 467s Original second commit: 467s commit 69efde8f66d581a765a3909ffacb9f895f95c345 467s Author: Loú User 467s Date: Thu Apr 7 22:13:25 2005 +0000 467s 467s d⇒2 467s 467s There was a conflict merging commit 1-2, shown above. 467s Please resolve the conflict, commit the result, then type 467s 467s git-imerge continue 467s + grep -q Traceback start.out 467s + grep -q suggest manual merge of 1-2 autofill.out 467s + git-imerge diagram --commits --frontier --html=imerge3.html 468s 0 5 9 468s | | | 468s 0 - ********** - c 468s *......... 468s *#???????? 468s *????????? 468s *????????? 468s 5 - *????????? 468s 6 - *????????? 468s | 468s d 468s 468s 0 5 9 468s | | | 468s 0 - ********** - c 468s *--------+ 468s *#???????? 468s *????????? 468s *????????? 468s 5 - *????????? 468s 6 - *????????? 468s | 468s d 468s 468s Key: 468s |,-,+ = rectangles forming current merge frontier 468s * = merge done manually 468s . = merge done automatically 468s # = conflict that is currently blocking progress 468s @ = merge was blocked but has been resolved 468s ? = no merge recorded 468s 468s + echo merged version 468s + git add conflict.txt 468s imerge 'c-d': manual merge 1-2 468s 468s # Conflicts: 468s # conflict.txt 468s # 468s # It looks like you may be committing a merge. 468s # If this is not correct, please run 468s # git update-ref -d MERGE_HEAD 468s # and try again. 468s 468s 468s # Please enter the commit message for your changes. Lines starting 468s # with '#' will be ignored, and an empty message aborts the commit. 468s # 468s # On branch imerge/c-d 468s # All conflicts fixed but you are still merging. 468s # 468s # Changes to be committed: 468s # modified: conflict.txt 468s # modified: d.txt 468s # 468s + GIT_EDITOR=cat git commit 468s [imerge/c-d ff01931] imerge 'c-d': manual merge 1-2 468s + git-imerge continue --edit 468s Merge has been recorded for merge 1-2. 468s Attempting to merge 1-3...success. 468s Attempting to merge 1-4...success. 468s Attempting to merge 1-5...success. 468s Attempting to merge 1-6...success. 468s Attempting to merge 2-2...success. 468s Attempting to merge 2-3...success. 468s Attempting to merge 2-4...success. 468s Attempting to merge 2-5...success. 468s Attempting to merge 2-6...success. 468s Attempting to merge 3-2...success. 468s Attempting to merge 3-3...success. 468s Attempting to merge 3-4...success. 468s Attempting to merge 3-5...success. 468s Attempting to merge 3-6...success. 468s Attempting to merge 4-2...success. 468s Attempting to merge 4-3...success. 468s Attempting to merge 4-4...success. 468s Attempting to merge 4-5...success. 468s Attempting to merge 4-6...success. 468s Attempting to merge 5-2...success. 468s Attempting to merge 5-3...success. 468s Attempting to merge 5-4...success. 468s Attempting to merge 5-5...success. 468s Attempting to merge 5-6...success. 468s Attempting to merge 6-2...success. 468s Attempting to merge 6-3...success. 468s Attempting to merge 6-4...success. 468s Attempting to merge 6-5...success. 468s Attempting to merge 6-6...success. 468s Attempting to merge 7-2...success. 468s Attempting to merge 7-3...success. 468s Attempting to merge 7-4...success. 468s Attempting to merge 7-5...success. 468s Attempting to merge 7-6...success. 468s Attempting to merge 8-2...success. 468s Attempting to merge 8-3...success. 468s Attempting to merge 8-4...success. 468s Attempting to merge 8-5...success. 468s Attempting to merge 8-6...success. 468s Attempting to merge 9-2...success. 468s Attempting to merge 9-3...success. 468s Attempting to merge 9-4...success. 468s Attempting to merge 9-5...success. 468s Attempting to merge 9-6...success. 468s Merge is complete! 468s + git-imerge diagram --commits --frontier --html=imerge4.html 468s 0 5 9 468s | | | 468s 0 - ********** - c 468s *......... 468s **........ 468s *......... 468s *......... 468s 5 - *......... 468s 6 - *......... 468s | 468s d 468s 468s 0 5 9 468s | | | 468s 0 - ********** - c 468s *........| 468s **.......| 468s *........| 468s *........| 468s 5 - *........| 468s 6 - *--------+ 468s | 468s d 468s 468s Key: 468s |,-,+ = rectangles forming current merge frontier 468s * = merge done manually 468s . = merge done automatically 468s # = conflict that is currently blocking progress 468s @ = merge was blocked but has been resolved 468s ? = no merge recorded 468s 468s + git-imerge finish --branch=c-d-full 468s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 468s + local refname=c-d-full 468s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 468s + git rev-parse c-d-full^{tree} 469s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 469s + test_conflict 9-5 469s + local conflict=9-5 469s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s + DESCRIPTION=git-imerge test repository with conflict at 9-5 469s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 469s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s + local description=git-imerge test repository with conflict at 9-5 469s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 469s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s + local description=git-imerge test repository with conflict at 9-5 469s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s hint: Using 'master' as the name for the initial branch. This default branch name 469s hint: is subject to change. To configure the initial branch name to use in all 469s hint: of your new repositories, which will suppress this warning, call: 469s hint: 469s hint: git config --global init.defaultBranch 469s hint: 469s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 469s hint: 'development'. The just-created branch can be renamed via this command: 469s hint: 469s hint: git branch -m 469s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5/.git/ 469s + echo git-imerge test repository with conflict at 9-5 469s + printf %s\n /*.out /*.css /*.html 469s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5/.git config user.name Loú User 469s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5/.git config user.email luser@example.com 469s + TIME=1112911993 469s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-9-5 469s + modify c.txt 0 469s + filename=c.txt 469s + text=0 469s + echo 0 469s + git add c.txt 469s + modify d.txt 0 469s + filename=d.txt 469s + text=0 469s + echo 0 469s + git add d.txt 469s + modify conflict.txt original version 469s + filename=conflict.txt 469s + text=original version 469s + echo original version 469s + git add conflict.txt 469s + commit -m m⇒0 469s + TIME=1112911994 469s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 469s [master (root-commit) d70e04b] m⇒0 469s 3 files changed, 3 insertions(+) 469s create mode 100644 c.txt 469s create mode 100644 conflict.txt 469s create mode 100644 d.txt 469s + git checkout -b c master -- 469s Switched to a new branch 'c' 469s + seq 9 469s + modify c.txt 1 469s + filename=c.txt 469s + text=1 469s + echo 1 469s + git add c.txt 469s + commit -m c⇒1 469s + TIME=1112911995 469s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 469s [c 89e2141] c⇒1 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify c.txt 2 469s + filename=c.txt 469s + text=2 469s + echo 2 469s + git add c.txt 469s + commit -m c⇒2 469s + TIME=1112911996 469s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 469s [c 7c431f2] c⇒2 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify c.txt 3 469s + filename=c.txt 469s + text=3 469s + echo 3 469s + git add c.txt 469s + commit -m c⇒3 469s + TIME=1112911997 469s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 469s + modify c.txt 4 469s + filename=c.txt 469s + text=4 469s + echo 4 469s + git add c.txt 469s [c f02ab24] c⇒3 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + commit -m c⇒4 469s + TIME=1112911998 469s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 469s [c ed9122f] c⇒4 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify c.txt 5 469s + filename=c.txt 469s + text=5 469s + echo 5 469s + git add c.txt 469s + commit -m c⇒5 469s + TIME=1112911999 469s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 469s [c 1d3bf09] c⇒5 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify c.txt 6 469s + filename=c.txt 469s + text=6 469s + echo 6 469s + git add c.txt 469s + commit -m c⇒6 469s + TIME=1112912000 469s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 469s [c f999ecd] c⇒6 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify c.txt 7 469s + filename=c.txt 469s + text=7 469s + echo 7 469s + git add c.txt 469s + commit -m c⇒7 469s + TIME=1112912001 469s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 469s [c 7050a8a] c⇒7 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify c.txt 8 469s + filename=c.txt 469s + text=8 469s + echo 8 469s + git add c.txt 469s + commit -m c⇒8 469s + TIME=1112912002 469s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 469s [c 9732e77] c⇒8 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify c.txt 9 469s + filename=c.txt 469s + text=9 469s + echo 9 469s + git add c.txt 469s + modify conflict.txt c version 469s + filename=conflict.txt 469s + text=c version 469s + echo c version 469s + git add conflict.txt 469s + commit -m c⇒9 469s + TIME=1112912003 469s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 469s [c 73a5eed] c⇒9 469s 2 files changed, 2 insertions(+), 2 deletions(-) 469s + git checkout -b d master -- 469s Switched to a new branch 'd' 469s + seq 6 469s + modify d.txt 1 469s + filename=d.txt 469s + text=1 469s + echo 1 469s + git add d.txt 469s + commit -m d⇒1 469s + TIME=1112912004 469s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 469s [d bd5368a] d⇒1 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify d.txt 2 469s + filename=d.txt 469s + text=2 469s + echo 2 469s + git add d.txt 469s + commit -m d⇒2 469s + TIME=1112912005 469s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 469s [d 93e27e6] d⇒2 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify d.txt 3 469s + filename=d.txt 469s + text=3 469s + echo 3 469s + git add d.txt 469s + commit -m d⇒3 469s + TIME=1112912006 469s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 469s [d 133f385] d⇒3 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify d.txt 4 469s + filename=d.txt 469s + text=4 469s + echo 4 469s + git add d.txt 469s + commit -m d⇒4 469s + TIME=1112912007 469s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 469s [d 586472a] d⇒4 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + modify d.txt 5 469s + filename=d.txt 469s + text=5 469s + echo 5 469s + git add d.txt 469s + modify conflict.txt d version 469s + filename=conflict.txt 469s + text=d version 469s + echo d version 469s + git add conflict.txt 469s + commit -m d⇒5 469s + TIME=1112912008 469s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 469s [d 0a6f956] d⇒5 469s 2 files changed, 2 insertions(+), 2 deletions(-) 469s + modify d.txt 6 469s + filename=d.txt 469s + text=6 469s + echo 6 469s + git add d.txt 469s + commit -m d⇒6 469s + TIME=1112912009 469s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 469s [d bfb30f0] d⇒6 469s 1 file changed, 1 insertion(+), 1 deletion(-) 469s + git checkout c 469s Switched to branch 'c' 469s + git-imerge init --name=c-d d 469s + git-imerge list 469s * c-d 469s + git-imerge diagram --commits --frontier --html=imerge0.html 469s 0 5 9 469s | | | 469s 0 - ********** - c 469s *????????? 469s *????????? 469s *????????? 469s *????????? 469s 5 - *????????? 469s 6 - *????????? 469s | 469s d 469s 469s 0 5 9 469s | | | 469s 0 - ********** - c 469s *????????? 469s *????????? 469s *????????? 469s *????????? 469s 5 - *????????? 469s 6 - *????????? 469s | 469s d 469s 469s Key: 469s |,-,+ = rectangles forming current merge frontier 469s * = merge done manually 469s . = merge done automatically 469s # = conflict that is currently blocking progress 469s @ = merge was blocked but has been resolved 469s ? = no merge recorded 469s 469s + + git-imerge autofill 469s tee autofill.out 469s Attempting automerge of 9-6...failure. 469s Attempting automerge of 1-1...success. 469s Attempting automerge of 1-4...success. 469s Attempting automerge of 1-6...success. 469s Attempting automerge of 9-6...failure. 469s Attempting automerge of 5-6...success. 469s Attempting automerge of 7-6...success. 469s Attempting automerge of 8-6...success. 469s Attempting automerge of 9-1...success. 469s Attempting automerge of 9-4...success. 469s Attempting automerge of 9-5...failure. 469s Autofilling 1-6...success. 469s Autofilling 2-6...success. 469s Autofilling 3-6...success. 469s Autofilling 4-6...success. 469s Autofilling 5-6...success. 469s Autofilling 6-6...success. 469s Autofilling 7-6...success. 469s Autofilling 8-1...success. 469s Autofilling 8-2...success. 469s Autofilling 8-3...success. 469s Autofilling 8-4...success. 469s Autofilling 8-5...success. 469s Autofilling 8-6 (first way)...success. 469s Autofilling 8-6 (second way)...success. 469s The two ways of autofilling 8-6 agree. 469s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. 469s Autofilling 9-1...success. 469s Autofilling 9-2...success. 469s Autofilling 9-3...success. 469s Autofilling 9-4...success. 469s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. 469s Attempting automerge of 9-6...failure. 469s Attempting automerge of 9-5...failure. 469s HEAD is now at 73a5eed c⇒9 469s Conflict; suggest manual merge of 9-5 469s + grep -q Traceback autofill.out 469s + grep -q suggest manual merge of 9-5 autofill.out 469s + git-imerge diagram --commits --frontier --html=imerge1.html 470s 0 5 9 470s | | | 470s 0 - ********** - c 470s *???????.. 470s *???????.. 470s *???????.. 470s *???????.. 470s 5 - *???????.# 470s 6 - *........? 470s | 470s d 470s 470s 0 5 9 470s | | | 470s 0 - ********** - c 470s *???????.| 470s *???????.| 470s *???????.| 470s *???????.+ 470s 5 - *???????|# 470s 6 - *-------+? 470s | 470s d 470s 470s Key: 470s |,-,+ = rectangles forming current merge frontier 470s * = merge done manually 470s . = merge done automatically 470s # = conflict that is currently blocking progress 470s @ = merge was blocked but has been resolved 470s ? = no merge recorded 470s 470s + git-imerge continue --edit 470s Switched to branch 'imerge/c-d' 470s Auto-merging conflict.txt 470s CONFLICT (content): Merge conflict in conflict.txt 470s Automatic merge failed; fix conflicts and then commit the result. 470s 470s Original first commit: 470s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 470s Author: Loú User 470s Date: Thu Apr 7 22:13:23 2005 +0000 470s 470s c⇒9 470s 470s Original second commit: 470s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 470s Author: Loú User 470s Date: Thu Apr 7 22:13:28 2005 +0000 470s 470s d⇒5 470s 470s There was a conflict merging commit 9-5, shown above. 470s Please resolve the conflict, commit the result, then type 470s 470s git-imerge continue 470s + echo merged version 470s + git add conflict.txt 470s + git-imerge continue --no-edit 470s [imerge/c-d 0db7c12] imerge 'c-d': manual merge 9-5 470s Merge has been recorded for merge 9-5. 470s Attempting automerge of 9-6...success. 470s Autofilling 9-6...success. 470s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. 470s Merge is complete! 470s + git-imerge diagram --commits --frontier --html=imerge2.html 470s 0 5 9 470s | | | 470s 0 - ********** - c 470s *???????.. 470s *???????.. 470s *???????.. 470s *???????.. 470s 5 - *???????.* 470s 6 - *......... 470s | 470s d 470s 470s 0 5 9 470s | | | 470s 0 - ********** - c 470s *???????.| 470s *???????.| 470s *???????.| 470s *???????.| 470s 5 - *???????.* 470s 6 - *--------+ 470s | 470s d 470s 470s Key: 470s |,-,+ = rectangles forming current merge frontier 470s * = merge done manually 470s . = merge done automatically 470s # = conflict that is currently blocking progress 470s @ = merge was blocked but has been resolved 470s ? = no merge recorded 470s 470s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 470s Merge d into c (using imerge) 470s 470s # Please enter the commit message for your changes. Lines starting 470s # with '#' will be ignored, and an empty message aborts the commit. 470s # 470s # Date: Wed Mar 20 09:29:36 2024 +0000 470s # 470s # On branch c-d-merge 470s # Changes to be committed: 470s # modified: conflict.txt 470s # modified: d.txt 470s # 470s [c-d-merge 4fdfe12] Merge d into c (using imerge) 470s Date: Wed Mar 20 09:29:36 2024 +0000 470s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + local refname=c-d-merge 470s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + git rev-parse c-d-merge^{tree} 470s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + git-imerge simplify --goal=rebase --branch=c-d-rebase 470s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + local refname=c-d-rebase 470s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + git rev-parse c-d-rebase^{tree} 470s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 470s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + local refname=c-d-rebase-with-history 470s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + git rev-parse c-d-rebase-with-history^{tree} 470s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 470s + git-imerge simplify --goal=border --branch=c-d-border 471s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + local refname=c-d-border 471s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + git rev-parse c-d-border^{tree} 471s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 471s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + local refname=c-d-border-with-history 471s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + git rev-parse c-d-border-with-history^{tree} 471s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 471s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + local refname=c-d-border-with-history2 471s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + git rev-parse c-d-border-with-history2^{tree} 471s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 471s + git-imerge remove 471s + git checkout c 471s Switched to branch 'c' 471s + + git-imerge start --goal=fulltee --first-parent --name=c-d start.out 471s d 471s Attempting to merge 1-1...success. 471s Attempting to merge 1-2...success. 471s Attempting to merge 1-3...success. 471s Attempting to merge 1-4...success. 471s Attempting to merge 1-5...success. 471s Attempting to merge 1-6...success. 471s Attempting to merge 2-1...success. 471s Attempting to merge 2-2...success. 471s Attempting to merge 2-3...success. 471s Attempting to merge 2-4...success. 471s Attempting to merge 2-5...success. 471s Attempting to merge 2-6...success. 471s Attempting to merge 3-1...success. 471s Attempting to merge 3-2...success. 471s Attempting to merge 3-3...success. 471s Attempting to merge 3-4...success. 471s Attempting to merge 3-5...success. 471s Attempting to merge 3-6...success. 471s Attempting to merge 4-1...success. 471s Attempting to merge 4-2...success. 471s Attempting to merge 4-3...success. 471s Attempting to merge 4-4...success. 471s Attempting to merge 4-5...success. 471s Attempting to merge 4-6...success. 471s Attempting to merge 5-1...success. 471s Attempting to merge 5-2...success. 471s Attempting to merge 5-3...success. 471s Attempting to merge 5-4...success. 471s Attempting to merge 5-5...success. 472s Attempting to merge 5-6...success. 472s Attempting to merge 6-1...success. 472s Attempting to merge 6-2...success. 472s Attempting to merge 6-3...success. 472s Attempting to merge 6-4...success. 472s Attempting to merge 6-5...success. 472s Attempting to merge 6-6...success. 472s Attempting to merge 7-1...success. 472s Attempting to merge 7-2...success. 472s Attempting to merge 7-3...success. 472s Attempting to merge 7-4...success. 472s Attempting to merge 7-5...success. 472s Attempting to merge 7-6...success. 472s Attempting to merge 8-1...success. 472s Attempting to merge 8-2...success. 472s Attempting to merge 8-3...success. 472s Attempting to merge 8-4...success. 472s Attempting to merge 8-5...success. 472s Attempting to merge 8-6...success. 472s Attempting to merge 9-1...success. 472s Attempting to merge 9-2...success. 472s Attempting to merge 9-3...success. 472s Attempting to merge 9-4...success. 472s Attempting to merge 9-5...conflict. 472s Switched to branch 'imerge/c-d' 472s Auto-merging conflict.txt 472s CONFLICT (content): Merge conflict in conflict.txt 472s Automatic merge failed; fix conflicts and then commit the result. 472s 472s Original first commit: 472s commit 73a5eedb087a0f656d730831b8def7943b40f3cf 472s Author: Loú User 472s Date: Thu Apr 7 22:13:23 2005 +0000 472s 472s c⇒9 472s 472s Original second commit: 472s commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f 472s Author: Loú User 472s Date: Thu Apr 7 22:13:28 2005 +0000 472s 472s d⇒5 472s 472s There was a conflict merging commit 9-5, shown above. 472s Please resolve the conflict, commit the result, then type 472s 472s git-imerge continue 472s + grep -q Traceback start.out 472s + grep -q suggest manual merge of 9-5 autofill.out 472s + git-imerge diagram --commits --frontier --html=imerge3.html 472s 0 5 9 472s | | | 472s 0 - ********** - c 472s *......... 472s *......... 472s *......... 472s *......... 472s 5 - *........# 472s 6 - *........? 472s | 472s d 472s 472s 0 5 9 472s | | | 472s 0 - ********** - c 472s *........| 472s *........| 472s *........| 472s *........+ 472s 5 - *.......|# 472s 6 - *-------+? 472s | 472s d 472s 472s Key: 472s |,-,+ = rectangles forming current merge frontier 472s * = merge done manually 472s . = merge done automatically 472s # = conflict that is currently blocking progress 472s @ = merge was blocked but has been resolved 472s ? = no merge recorded 472s 472s + echo merged version 472s + git add conflict.txt 472s + GIT_EDITOR=cat git commit 472s imerge 'c-d': manual merge 9-5 472s 472s # Conflicts: 472s # conflict.txt 472s # 472s # It looks like you may be committing a merge. 472s # If this is not correct, please run 472s # git update-ref -d MERGE_HEAD 472s # and try again. 472s 472s 472s # Please enter the commit message for your changes. Lines starting 472s # with '#' will be ignored, and an empty message aborts the commit. 472s # 472s # On branch imerge/c-d 472s # All conflicts fixed but you are still merging. 472s # 472s # Changes to be committed: 472s # modified: conflict.txt 472s # modified: d.txt 472s # 472s [imerge/c-d 5e6dccf] imerge 'c-d': manual merge 9-5 472s + git-imerge continue --edit 472s Merge has been recorded for merge 9-5. 472s Attempting to merge 9-6...success. 472s Merge is complete! 472s + git-imerge diagram --commits --frontier --html=imerge4.html 472s 0 5 9 472s | | | 472s 0 - ********** - c 472s *......... 472s *......... 472s *......... 472s *......... 472s 5 - *........* 472s 6 - *......... 472s | 472s d 472s 472s 0 5 9 472s | | | 472s 0 - ********** - c 472s *........| 472s *........| 472s *........| 472s *........| 472s 5 - *........* 472s 6 - *--------+ 472s | 472s d 472s 472s Key: 472s |,-,+ = rectangles forming current merge frontier 472s * = merge done manually 472s . = merge done automatically 472s # = conflict that is currently blocking progress 472s @ = merge was blocked but has been resolved 472s ? = no merge recorded 472s 472s + git-imerge finish --branch=c-d-full 472s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 472s + local refname=c-d-full 472s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 472s + git rev-parse c-d-full^{tree} 472s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 472s + test_conflict 5-1 472s + local conflict=5-1 472s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s + DESCRIPTION=git-imerge test repository with conflict at 5-1 472s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 472s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s + local description=git-imerge test repository with conflict at 5-1 472s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 472s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s + local description=git-imerge test repository with conflict at 5-1 472s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s hint: Using 'master' as the name for the initial branch. This default branch name 472s hint: is subject to change. To configure the initial branch name to use in all 472s hint: of your new repositories, which will suppress this warning, call: 472s hint: 472s hint: git config --global init.defaultBranch 472s hint: 472s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 472s hint: 'development'. The just-created branch can be renamed via this command: 472s hint: 472s hint: git branch -m 472s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1/.git/ 472s + echo git-imerge test repository with conflict at 5-1 472s + printf %s\n /*.out /*.css /*.html 472s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1/.git config user.name Loú User 472s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1/.git config user.email luser@example.com 472s + TIME=1112911993 472s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-5-1 472s + modify c.txt 0 472s + filename=c.txt 472s + text=0 472s + echo 0 472s + git add c.txt 472s + modify d.txt 0 472s + filename=d.txt 472s + text=0 472s + echo 0 472s + git add d.txt 472s + modify conflict.txt original version 472s + filename=conflict.txt 472s + text=original version 472s + echo original version 472s + git add conflict.txt 472s + commit -m m⇒0 472s + TIME=1112911994 472s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 472s [master (root-commit) d70e04b] m⇒0 472s 3 files changed, 3 insertions(+) 472s create mode 100644 c.txt 472s create mode 100644 conflict.txt 472s create mode 100644 d.txt 472s + git checkout -b c master -- 472s Switched to a new branch 'c' 472s + seq 9 472s + modify c.txt 1 472s + filename=c.txt 472s + text=1 472s + echo 1 472s + git add c.txt 472s + commit -m c⇒1 472s + TIME=1112911995 472s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 472s [c 89e2141] c⇒1 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + modify c.txt 2 472s + filename=c.txt 472s + text=2 472s + echo 2 472s + git add c.txt 472s + commit -m c⇒2 472s + TIME=1112911996 472s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 472s [c 7c431f2] c⇒2 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + modify c.txt 3 472s + filename=c.txt 472s + text=3 472s + echo 3 472s + git add c.txt 472s + commit -m c⇒3 472s + TIME=1112911997 472s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 472s [c f02ab24] c⇒3 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + modify c.txt 4 472s + filename=c.txt 472s + text=4 472s + echo 4 472s + git add c.txt 472s + commit -m c⇒4 472s + TIME=1112911998 472s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 472s [c ed9122f] c⇒4 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + modify c.txt 5 472s + filename=c.txt 472s + text=5 472s + echo 5 472s + git add c.txt 472s + modify conflict.txt c version 472s + filename=conflict.txt 472s + text=c version 472s + echo c version 472s + git add conflict.txt 472s + commit -m c⇒5 472s + TIME=1112911999 472s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 472s [c 7e31f25] c⇒5 472s 2 files changed, 2 insertions(+), 2 deletions(-) 472s + modify c.txt 6 472s + filename=c.txt 472s + text=6 472s + echo 6 472s + git add c.txt 472s + commit -m c⇒6 472s + TIME=1112912000 472s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 472s [c df3c57a] c⇒6 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + modify c.txt 7 472s + filename=c.txt 472s + text=7 472s + echo 7 472s + git add c.txt 472s + commit -m c⇒7 472s + TIME=1112912001 472s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 472s [c ea32d81] c⇒7 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + modify c.txt 8 472s + filename=c.txt 472s + text=8 472s + echo 8 472s + git add c.txt 472s + commit -m c⇒8 472s + TIME=1112912002 472s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 472s [c 44473d6] c⇒8 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + modify c.txt 9 472s + filename=c.txt 472s + text=9 472s + echo 9 472s + git add c.txt 472s + commit -m c⇒9 472s + TIME=1112912003 472s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 472s [c d8d80cf] c⇒9 472s 1 file changed, 1 insertion(+), 1 deletion(-) 472s + git checkout -b d master -- 472s Switched to a new branch 'd' 472s + seq 6 472s + modify d.txt 1 472s + filename=d.txt 472s + text=1 472s + echo 1 472s + git add d.txt 472s + modify conflict.txt d version 472s + filename=conflict.txt 472s + text=d version 472s + echo d version 472s + git add conflict.txt 472s + commit -m d⇒1 472s + TIME=1112912004 472s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 472s [d ac0427a] d⇒1 472s 2 files changed, 2 insertions(+), 2 deletions(-) 473s + modify d.txt 2 473s + filename=d.txt 473s + text=2 473s + echo 2 473s + git add d.txt 473s [d 43c38c0] d⇒2 473s 1 file changed, 1 insertion(+), 1 deletion(-) 473s [d 0260058] d⇒3 473s 1 file changed, 1 insertion(+), 1 deletion(-) 473s [d 40fef44] d⇒4 473s 1 file changed, 1 insertion(+), 1 deletion(-) 473s [d b080a65] d⇒5 473s 1 file changed, 1 insertion(+), 1 deletion(-) 473s [d 200ce5c] d⇒6 473s 1 file changed, 1 insertion(+), 1 deletion(-) 473s + commit -m d⇒2 473s + TIME=1112912005 473s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 473s + modify d.txt 3 473s + filename=d.txt 473s + text=3 473s + echo 3 473s + git add d.txt 473s + commit -m d⇒3 473s + TIME=1112912006 473s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 473s + modify d.txt 4 473s + filename=d.txt 473s + text=4 473s + echo 4 473s + git add d.txt 473s + commit -m d⇒4 473s + TIME=1112912007 473s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 473s + modify d.txt 5 473s + filename=d.txt 473s + text=5 473s + echo 5 473s + git add d.txt 473s + commit -m d⇒5 473s + TIME=1112912008 473s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 473s + modify d.txt 6 473s + filename=d.txt 473s + text=6 473s + echo 6 473s + git add d.txt 473s + commit -m d⇒6 473s + TIME=1112912009 473s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 473s + git checkout c 473s Switched to branch 'c' 473s + git-imerge init --name=c-d d 473s + git-imerge list 473s * c-d 473s + git-imerge diagram --commits --frontier --html=imerge0.html 473s 0 5 9 473s | | | 473s 0 - ********** - c 473s *????????? 473s *????????? 473s *????????? 473s *????????? 473s 5 - *????????? 473s 6 - *????????? 473s | 473s d 473s 473s 0 5 9 473s | | | 473s 0 - ********** - c 473s *????????? 473s *????????? 473s *????????? 473s *????????? 473s 5 - *????????? 473s 6 - *????????? 473s | 473s d 473s 473s Key: 473s |,-,+ = rectangles forming current merge frontier 473s * = merge done manually 473s . = merge done automatically 473s # = conflict that is currently blocking progress 473s @ = merge was blocked but has been resolved 473s ? = no merge recorded 473s 473s + git-imerge autofill 473s + tee autofill.out 473s Attempting automerge of 9-6...failure. 473s Attempting automerge of 1-1...success. 473s Attempting automerge of 1-4...success. 473s Attempting automerge of 1-6...success. 473s Attempting automerge of 9-6...failure. 473s Attempting automerge of 5-6...failure. 473s Attempting automerge of 3-6...success. 473s Attempting automerge of 4-6...success. 473s Attempting automerge of 5-1...failure. 473s Autofilling 1-6...success. 473s Autofilling 2-6...success. 473s Autofilling 3-6...success. 473s Autofilling 4-1...success. 473s Autofilling 4-2...success. 473s Autofilling 4-3...success. 473s Autofilling 4-4...success. 473s Autofilling 4-5...success. 473s Autofilling 4-6 (first way)...success. 473s Autofilling 4-6 (second way)...success. 473s The two ways of autofilling 4-6 agree. 473s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. 473s Attempting automerge of 9-6...failure. 473s Attempting automerge of 5-1...failure. 473s HEAD is now at d8d80cf c⇒9 473s Conflict; suggest manual merge of 5-1 473s + grep -q Traceback autofill.out 473s + grep -q suggest manual merge of 5-1 autofill.out 473s + git-imerge diagram --commits --frontier --html=imerge1.html 473s 0 5 9 473s | | | 473s 0 - ********** - c 473s *???.#???? 473s *???.????? 473s *???.????? 473s *???.????? 473s 5 - *???.????? 473s 6 - *....????? 473s | 473s d 473s 473s 0 5 9 473s | | | 473s 0 - ********** - c 473s *???|#???? 473s *???|????? 473s *???|????? 473s *???|????? 473s 5 - *???|????? 473s 6 - *---+????? 473s | 473s d 473s 473s Key: 473s |,-,+ = rectangles forming current merge frontier 473s * = merge done manually 473s . = merge done automatically 473s # = conflict that is currently blocking progress 473s @ = merge was blocked but has been resolved 473s ? = no merge recorded 473s 473s + git-imerge continue --edit 473s Switched to branch 'imerge/c-d' 473s Auto-merging conflict.txt 473s CONFLICT (content): Merge conflict in conflict.txt 473s Automatic merge failed; fix conflicts and then commit the result. 473s 473s Original first commit: 473s commit 7e31f254c318decc434628f023dac0703f3d2b9e 473s Author: Loú User 473s Date: Thu Apr 7 22:13:19 2005 +0000 473s 473s c⇒5 473s 473s Original second commit: 473s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 473s Author: Loú User 473s Date: Thu Apr 7 22:13:24 2005 +0000 473s 473s d⇒1 473s 473s There was a conflict merging commit 5-1, shown above. 473s Please resolve the conflict, commit the result, then type 473s 473s git-imerge continue 473s + echo merged version 473s + git add conflict.txt 473s + git-imerge continue --no-edit 473s [imerge/c-d 409aa25] imerge 'c-d': manual merge 5-1 473s Merge has been recorded for merge 5-1. 474s Attempting automerge of 5-6...success. 474s Autofilling 5-2...success. 474s Autofilling 5-3...success. 474s Autofilling 5-4...success. 474s Autofilling 5-5...success. 474s Autofilling 5-6...success. 474s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. 474s Attempting automerge of 9-6...success. 474s Autofilling 6-6...success. 474s Autofilling 7-6...success. 474s Autofilling 8-6...success. 474s Autofilling 9-1...success. 474s Autofilling 9-2...success. 474s Autofilling 9-3...success. 474s Autofilling 9-4...success. 474s Autofilling 9-5...success. 474s Autofilling 9-6 (first way)...success. 474s Autofilling 9-6 (second way)...success. 474s The two ways of autofilling 9-6 agree. 474s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. 474s Merge is complete! 474s + git-imerge diagram --commits --frontier --html=imerge2.html 474s 0 5 9 474s | | | 474s 0 - ********** - c 474s *???.*???. 474s *???..???. 474s *???..???. 474s *???..???. 474s 5 - *???..???. 474s 6 - *......... 474s | 474s d 474s 474s 0 5 9 474s | | | 474s 0 - ********** - c 474s *???.*???| 474s *???..???| 474s *???..???| 474s *???..???| 474s 5 - *???..???| 474s 6 - *--------+ 474s | 474s d 474s 474s Key: 474s |,-,+ = rectangles forming current merge frontier 474s * = merge done manually 474s . = merge done automatically 474s # = conflict that is currently blocking progress 474s @ = merge was blocked but has been resolved 474s ? = no merge recorded 474s 474s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 474s Merge d into c (using imerge) 474s 474s # Please enter the commit message for your changes. Lines starting 474s # with '#' will be ignored, and an empty message aborts the commit. 474s # 474s # Date: Wed Mar 20 09:29:40 2024 +0000 474s # 474s # On branch c-d-merge 474s # Changes to be committed: 474s # modified: conflict.txt 474s # modified: d.txt 474s # 474s [c-d-merge 7ffe4d9] Merge d into c (using imerge) 474s Date: Wed Mar 20 09:29:40 2024 +0000 474s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + local refname=c-d-merge 474s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git rev-parse c-d-merge^{tree} 474s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git-imerge simplify --goal=rebase --branch=c-d-rebase 474s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + local refname=c-d-rebase 474s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git rev-parse c-d-rebase^{tree} 474s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 474s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + local refname=c-d-rebase-with-history 474s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git rev-parse c-d-rebase-with-history^{tree} 474s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git-imerge simplify --goal=border --branch=c-d-border 474s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + local refname=c-d-border 474s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git rev-parse c-d-border^{tree} 474s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 474s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 475s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 475s + local refname=c-d-border-with-history 475s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 475s + git rev-parse c-d-border-with-history^{tree} 475s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 475s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 475s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 475s + local refname=c-d-border-with-history2 475s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 475s + git rev-parse c-d-border-with-history2^{tree} 475s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 475s + git-imerge remove 475s + git checkout c 475s Switched to branch 'c' 475s + + git-imerge start --goal=fulltee --first-parent start.out --name=c-d d 475s 475s Attempting to merge 1-1...success. 475s Attempting to merge 1-2...success. 475s Attempting to merge 1-3...success. 475s Attempting to merge 1-4...success. 475s Attempting to merge 1-5...success. 475s Attempting to merge 1-6...success. 475s Attempting to merge 2-1...success. 475s Attempting to merge 2-2...success. 475s Attempting to merge 2-3...success. 475s Attempting to merge 2-4...success. 475s Attempting to merge 2-5...success. 475s Attempting to merge 2-6...success. 475s Attempting to merge 3-1...success. 475s Attempting to merge 3-2...success. 475s Attempting to merge 3-3...success. 475s Attempting to merge 3-4...success. 475s Attempting to merge 3-5...success. 475s Attempting to merge 3-6...success. 475s Attempting to merge 4-1...success. 475s Attempting to merge 4-2...success. 475s Attempting to merge 4-3...success. 475s Attempting to merge 4-4...success. 475s Attempting to merge 4-5...success. 475s Attempting to merge 4-6...success. 475s Attempting to merge 5-1...conflict. 475s Switched to branch 'imerge/c-d' 475s Auto-merging conflict.txt 475s CONFLICT (content): Merge conflict in conflict.txt 475s Automatic merge failed; fix conflicts and then commit the result. 475s 475s Original first commit: 475s commit 7e31f254c318decc434628f023dac0703f3d2b9e 475s Author: Loú User 475s Date: Thu Apr 7 22:13:19 2005 +0000 475s 475s c⇒5 475s 475s Original second commit: 475s commit ac0427a285b64f2815ebd6eb83880f309600d0c7 475s Author: Loú User 475s Date: Thu Apr 7 22:13:24 2005 +0000 475s 475s d⇒1 475s 475s There was a conflict merging commit 5-1, shown above. 475s Please resolve the conflict, commit the result, then type 475s 475s git-imerge continue 475s + grep -q Traceback start.out 475s + grep -q suggest manual merge of 5-1 autofill.out 475s + git-imerge diagram --commits --frontier --html=imerge3.html 475s 0 5 9 475s | | | 475s 0 - ********** - c 475s *....#???? 475s *....????? 475s *....????? 475s *....????? 475s 5 - *....????? 475s 6 - *....????? 475s | 475s d 475s 475s 0 5 9 475s | | | 475s 0 - ********** - c 475s *...|#???? 475s *...|????? 475s *...|????? 475s *...|????? 475s 5 - *...|????? 475s 6 - *---+????? 475s | 475s d 475s 475s Key: 475s |,-,+ = rectangles forming current merge frontier 475s * = merge done manually 475s . = merge done automatically 475s # = conflict that is currently blocking progress 475s @ = merge was blocked but has been resolved 475s ? = no merge recorded 475s 475s + echo merged version 475s + git add conflict.txt 475s + GIT_EDITOR=cat git commit 475s imerge 'c-d': manual merge 5-1 475s 475s # Conflicts: 475s # conflict.txt 475s # 475s # It looks like you may be committing a merge. 475s # If this is not correct, please run 475s # git update-ref -d MERGE_HEAD 475s # and try again. 475s 475s 475s # Please enter the commit message for your changes. Lines starting 475s # with '#' will be ignored, and an empty message aborts the commit. 475s # 475s # On branch imerge/c-d 475s # All conflicts fixed but you are still merging. 475s # 475s # Changes to be committed: 475s # modified: conflict.txt 475s # modified: d.txt 475s # 475s [imerge/c-d a26c443] imerge 'c-d': manual merge 5-1 475s + git-imerge continue --edit 476s Merge has been recorded for merge 5-1. 476s Attempting to merge 5-2...success. 476s Attempting to merge 5-3...success. 476s Attempting to merge 5-4...success. 476s Attempting to merge 5-5...success. 476s Attempting to merge 5-6...success. 476s Attempting to merge 6-1...success. 476s Attempting to merge 6-2...success. 476s Attempting to merge 6-3...success. 476s Attempting to merge 6-4...success. 476s Attempting to merge 6-5...success. 476s Attempting to merge 6-6...success. 476s Attempting to merge 7-1...success. 476s Attempting to merge 7-2...success. 476s Attempting to merge 7-3...success. 476s Attempting to merge 7-4...success. 476s Attempting to merge 7-5...success. 476s Attempting to merge 7-6...success. 476s Attempting to merge 8-1...success. 476s Attempting to merge 8-2...success. 476s Attempting to merge 8-3...success. 476s Attempting to merge 8-4...success. 476s Attempting to merge 8-5...success. 476s Attempting to merge 8-6...success. 476s Attempting to merge 9-1...success. 476s Attempting to merge 9-2...success. 476s Attempting to merge 9-3...success. 476s Attempting to merge 9-4...success. 476s Attempting to merge 9-5...success. 476s Attempting to merge 9-6...success. 476s Merge is complete! 476s + git-imerge diagram --commits --frontier --html=imerge4.html 476s 0 5 9 476s | | | 476s 0 - ********** - c 476s *....*.... 476s *......... 476s *......... 476s *......... 476s 5 - *......... 476s 6 - *......... 476s | 476s d 476s 476s 0 5 9 476s | | | 476s 0 - ********** - c 476s *....*...| 476s *........| 476s *........| 476s *........| 476s 5 - *........| 476s 6 - *--------+ 476s | 476s d 476s 476s Key: 476s |,-,+ = rectangles forming current merge frontier 476s * = merge done manually 476s . = merge done automatically 476s # = conflict that is currently blocking progress 476s @ = merge was blocked but has been resolved 476s ? = no merge recorded 476s 476s + git-imerge finish --branch=c-d-full 476s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 476s + local refname=c-d-full 476s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 476s + git rev-parse c-d-full^{tree} 476s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 476s + test_conflict 6-6 476s + local conflict=6-6 476s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s + DESCRIPTION=git-imerge test repository with conflict at 6-6 476s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 476s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s + local description=git-imerge test repository with conflict at 6-6 476s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 476s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s + local description=git-imerge test repository with conflict at 6-6 476s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s hint: Using 'master' as the name for the initial branch. This default branch name 476s hint: is subject to change. To configure the initial branch name to use in all 476s hint: of your new repositories, which will suppress this warning, call: 476s hint: 476s hint: git config --global init.defaultBranch 476s hint: 476s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 476s hint: 'development'. The just-created branch can be renamed via this command: 476s hint: 476s hint: git branch -m 476s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6/.git/ 476s + echo git-imerge test repository with conflict at 6-6 476s + printf %s\n /*.out /*.css /*.html 476s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6/.git config user.name Loú User 476s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6/.git config user.email luser@example.com 476s + TIME=1112911993 476s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/conflicted-6-6 476s + modify c.txt 0 476s + filename=c.txt 476s + text=0 476s + echo 0 476s + git add c.txt 476s + modify d.txt 0 476s + filename=d.txt 476s + text=0 476s + echo 0 476s + git add d.txt 476s + modify conflict.txt original version 476s + filename=conflict.txt 476s + text=original version 476s + echo original version 476s + git add conflict.txt 476s + commit -m m⇒0 476s + TIME=1112911994 476s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 476s [master (root-commit) d70e04b] m⇒0 476s 3 files changed, 3 insertions(+) 476s create mode 100644 c.txt 476s create mode 100644 conflict.txt 476s create mode 100644 d.txt 476s + git checkout -b c master -- 476s Switched to a new branch 'c' 476s + seq 9 476s + modify c.txt 1 476s + filename=c.txt 476s + text=1 476s + echo 1 476s + git add c.txt 476s + commit -m c⇒1 476s + TIME=1112911995 476s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 476s [c 89e2141] c⇒1 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify c.txt 2 476s + filename=c.txt 476s + text=2 476s + echo 2 476s + git add c.txt 476s + commit -m c⇒2 476s + TIME=1112911996 476s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 476s [c 7c431f2] c⇒2 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify c.txt 3 476s + filename=c.txt 476s + text=3 476s + echo 3 476s + git add c.txt 476s + commit -m c⇒3 476s + TIME=1112911997 476s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 476s [c f02ab24] c⇒3 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify c.txt 4 476s + filename=c.txt 476s + text=4 476s + echo 4 476s + git add c.txt 476s [c ed9122f] c⇒4 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + commit -m c⇒4 476s + TIME=1112911998 476s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 476s + modify c.txt 5 476s + filename=c.txt 476s + text=5 476s + echo 5 476s + git add c.txt 476s + commit -m c⇒5 476s + TIME=1112911999 476s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 476s [c 1d3bf09] c⇒5 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify c.txt 6 476s + filename=c.txt 476s + text=6 476s + echo 6 476s + git add c.txt 476s + modify conflict.txt c version 476s + filename=conflict.txt 476s + text=c version 476s + echo c version 476s + git add conflict.txt 476s + commit -m c⇒6 476s + TIME=1112912000 476s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 476s [c fe4fed8] c⇒6 476s 2 files changed, 2 insertions(+), 2 deletions(-) 476s + modify c.txt 7 476s + filename=c.txt 476s + text=7 476s + echo 7 476s + git add c.txt 476s + commit -m c⇒7 476s + TIME=1112912001 476s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 476s [c ec255ea] c⇒7 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify c.txt 8 476s + filename=c.txt 476s + text=8 476s + echo 8 476s + git add c.txt 476s + commit -m c⇒8 476s + TIME=1112912002 476s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 476s [c 7459ac3] c⇒8 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify c.txt 9 476s + filename=c.txt 476s + text=9 476s + echo 9 476s + git add c.txt 476s + commit -m c⇒9 476s + TIME=1112912003 476s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 476s [c 70408c8] c⇒9 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + git checkout -b d master -- 476s Switched to a new branch 'd' 476s + seq 6 476s + modify d.txt 1 476s + filename=d.txt 476s + text=1 476s + echo 1 476s + git add d.txt 476s + commit -m d⇒1 476s + TIME=1112912004 476s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 476s [d bd5368a] d⇒1 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify d.txt 2 476s + filename=d.txt 476s + text=2 476s + echo 2 476s + git add d.txt 476s + commit -m d⇒2 476s + TIME=1112912005 476s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 476s [d 93e27e6] d⇒2 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify d.txt 3 476s + filename=d.txt 476s + text=3 476s + echo 3 476s + git add d.txt 476s + commit -m d⇒3 476s + TIME=1112912006 476s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 476s [d 133f385] d⇒3 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify d.txt 4 476s + filename=d.txt 476s + text=4 476s + echo 4 476s + git add d.txt 476s + commit -m d⇒4 476s + TIME=1112912007 476s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 476s [d 586472a] d⇒4 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify d.txt 5 476s + filename=d.txt 476s + text=5 476s + echo 5 476s + git add d.txt 476s + commit -m d⇒5 476s + TIME=1112912008 476s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 476s [d 9522207] d⇒5 476s 1 file changed, 1 insertion(+), 1 deletion(-) 476s + modify d.txt 6 476s + filename=d.txt 476s + text=6 476s + echo 6 476s + git add d.txt 476s + modify conflict.txt d version 476s + filename=conflict.txt 476s + text=d version 476s + echo d version 476s + git add conflict.txt 476s + commit -m d⇒6 476s + TIME=1112912009 476s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 476s [d f7e451a] d⇒6 476s 2 files changed, 2 insertions(+), 2 deletions(-) 476s + git checkout c 476s Switched to branch 'c' 476s + git-imerge init --name=c-d d 477s + git-imerge list 477s * c-d 477s + git-imerge diagram --commits --frontier --html=imerge0.html 477s 0 5 9 477s | | | 477s 0 - ********** - c 477s *????????? 477s *????????? 477s *????????? 477s *????????? 477s 5 - *????????? 477s 6 - *????????? 477s | 477s d 477s 477s 0 5 9 477s | | | 477s 0 - ********** - c 477s *????????? 477s *????????? 477s *????????? 477s *????????? 477s 5 - *????????? 477s 6 - *????????? 477s | 477s d 477s 477s Key: 477s |,-,+ = rectangles forming current merge frontier 477s * = merge done manually 477s . = merge done automatically 477s # = conflict that is currently blocking progress 477s @ = merge was blocked but has been resolved 477s ? = no merge recorded 477s 477s + + teegit-imerge autofill.out autofill 477s 477s Attempting automerge of 9-6...failure. 477s Attempting automerge of 1-1...success. 477s Attempting automerge of 1-4...success. 477s Attempting automerge of 1-6...success. 477s Attempting automerge of 9-6...failure. 477s Attempting automerge of 5-6...success. 477s Attempting automerge of 7-6...failure. 477s Attempting automerge of 6-6...failure. 477s Attempting automerge of 6-1...success. 477s Attempting automerge of 6-4...success. 477s Attempting automerge of 6-5...success. 477s Attempting automerge of 9-5...success. 477s Autofilling 1-6...success. 477s Autofilling 2-6...success. 477s Autofilling 3-6...success. 477s Autofilling 4-6...success. 477s Autofilling 5-1...success. 477s Autofilling 5-2...success. 477s Autofilling 5-3...success. 477s Autofilling 5-4...success. 477s Autofilling 5-5...success. 477s Autofilling 5-6 (first way)...success. 477s Autofilling 5-6 (second way)...success. 477s The two ways of autofilling 5-6 agree. 477s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. 477s Autofilling 6-5...success. 477s Autofilling 7-5...success. 477s Autofilling 8-5...success. 477s Autofilling 9-1...success. 477s Autofilling 9-2...success. 477s Autofilling 9-3...success. 477s Autofilling 9-4...success. 477s Autofilling 9-5 (first way)...success. 477s Autofilling 9-5 (second way)...success. 477s The two ways of autofilling 9-5 agree. 477s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. 477s Attempting automerge of 9-6...failure. 477s Attempting automerge of 6-6...failure. 477s HEAD is now at 70408c8 c⇒9 477s Conflict; suggest manual merge of 6-6 477s + grep -q Traceback autofill.out 477s + grep -q suggest manual merge of 6-6 autofill.out 477s + git-imerge diagram --commits --frontier --html=imerge1.html 477s 0 5 9 477s | | | 477s 0 - ********** - c 477s *????.???. 477s *????.???. 477s *????.???. 477s *????.???. 477s 5 - *????..... 477s 6 - *.....#??? 477s | 477s d 477s 477s 0 5 9 477s | | | 477s 0 - ********** - c 477s *????.???| 477s *????.???| 477s *????.???| 477s *????.???| 477s 5 - *????.---+ 477s 6 - *----+#??? 477s | 477s d 477s 477s Key: 477s |,-,+ = rectangles forming current merge frontier 477s * = merge done manually 477s . = merge done automatically 477s # = conflict that is currently blocking progress 477s @ = merge was blocked but has been resolved 477s ? = no merge recorded 477s 477s + git-imerge continue --edit 477s Switched to branch 'imerge/c-d' 477s Auto-merging conflict.txt 477s CONFLICT (content): Merge conflict in conflict.txt 477s Automatic merge failed; fix conflicts and then commit the result. 477s 477s Original first commit: 477s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 477s Author: Loú User 477s Date: Thu Apr 7 22:13:20 2005 +0000 477s 477s c⇒6 477s 477s Original second commit: 477s commit f7e451a6c9656dda15641a9fbc591a602f158692 477s Author: Loú User 477s Date: Thu Apr 7 22:13:29 2005 +0000 477s 477s d⇒6 477s 477s There was a conflict merging commit 6-6, shown above. 477s Please resolve the conflict, commit the result, then type 477s 477s git-imerge continue 477s + echo merged version 477s + git add conflict.txt 477s + git-imerge continue --no-edit 478s [imerge/c-d a66991e] imerge 'c-d': manual merge 6-6 478s Merge has been recorded for merge 6-6. 478s Attempting automerge of 9-6...success. 478s Autofilling 7-6...success. 478s Autofilling 8-6...success. 478s Autofilling 9-6...success. 478s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. 478s Merge is complete! 478s + git-imerge diagram --commits --frontier --html=imerge2.html 478s 0 5 9 478s | | | 478s 0 - ********** - c 478s *????.???. 478s *????.???. 478s *????.???. 478s *????.???. 478s 5 - *????..... 478s 6 - *.....*... 478s | 478s d 478s 478s 0 5 9 478s | | | 478s 0 - ********** - c 478s *????.???| 478s *????.???| 478s *????.???| 478s *????.???| 478s 5 - *????....| 478s 6 - *-----*--+ 478s | 478s d 478s 478s Key: 478s |,-,+ = rectangles forming current merge frontier 478s * = merge done manually 478s . = merge done automatically 478s # = conflict that is currently blocking progress 478s @ = merge was blocked but has been resolved 478s ? = no merge recorded 478s 478s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 478s Merge d into c (using imerge) 478s 478s # Please enter the commit message for your changes. Lines starting 478s # with '#' will be ignored, and an empty message aborts the commit. 478s # 478s # Date: Wed Mar 20 09:29:44 2024 +0000 478s # 478s # On branch c-d-merge 478s # Changes to be committed: 478s # modified: conflict.txt 478s # modified: d.txt 478s # 478s [c-d-merge 165bcc6] Merge d into c (using imerge) 478s Date: Wed Mar 20 09:29:44 2024 +0000 478s + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + local refname=c-d-merge 478s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git rev-parse c-d-merge^{tree} 478s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git-imerge simplify --goal=rebase --branch=c-d-rebase 478s + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + local refname=c-d-rebase 478s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git rev-parse c-d-rebase^{tree} 478s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 478s + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + local refname=c-d-rebase-with-history 478s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git rev-parse c-d-rebase-with-history^{tree} 478s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git-imerge simplify --goal=border --branch=c-d-border 478s + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + local refname=c-d-border 478s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git rev-parse c-d-border^{tree} 478s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 478s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 479s + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 479s + local refname=c-d-border-with-history 479s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 479s + git rev-parse c-d-border-with-history^{tree} 479s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 479s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 479s + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 479s + local refname=c-d-border-with-history2 479s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 479s + git rev-parse c-d-border-with-history2^{tree} 479s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 479s + git-imerge remove 479s + git checkout c 479s Switched to branch 'c' 479s + git-imerge start --goal=full --first-parent --name=c-d d 479s + tee start.out 479s Attempting to merge 1-1...success. 479s Attempting to merge 1-2...success. 479s Attempting to merge 1-3...success. 479s Attempting to merge 1-4...success. 479s Attempting to merge 1-5...success. 479s Attempting to merge 1-6...success. 479s Attempting to merge 2-1...success. 479s Attempting to merge 2-2...success. 479s Attempting to merge 2-3...success. 479s Attempting to merge 2-4...success. 479s Attempting to merge 2-5...success. 479s Attempting to merge 2-6...success. 479s Attempting to merge 3-1...success. 479s Attempting to merge 3-2...success. 479s Attempting to merge 3-3...success. 479s Attempting to merge 3-4...success. 479s Attempting to merge 3-5...success. 479s Attempting to merge 3-6...success. 479s Attempting to merge 4-1...success. 479s Attempting to merge 4-2...success. 479s Attempting to merge 4-3...success. 479s Attempting to merge 4-4...success. 479s Attempting to merge 4-5...success. 479s Attempting to merge 4-6...success. 479s Attempting to merge 5-1...success. 479s Attempting to merge 5-2...success. 479s Attempting to merge 5-3...success. 479s Attempting to merge 5-4...success. 479s Attempting to merge 5-5...success. 479s Attempting to merge 5-6...success. 479s Attempting to merge 6-1...success. 479s Attempting to merge 6-2...success. 479s Attempting to merge 6-3...success. 479s Attempting to merge 6-4...success. 479s Attempting to merge 6-5...success. 479s Attempting to merge 6-6...conflict. 479s Attempting to merge 7-1...success. 479s Attempting to merge 7-2...success. 479s Attempting to merge 7-3...success. 480s Attempting to merge 7-4...success. 480s Attempting to merge 7-5...success. 480s Attempting to merge 8-1...success. 480s Attempting to merge 8-2...success. 480s Attempting to merge 8-3...success. 480s Attempting to merge 8-4...success. 480s Attempting to merge 8-5...success. 480s Attempting to merge 9-1...success. 480s Attempting to merge 9-2...success. 480s Attempting to merge 9-3...success. 480s Attempting to merge 9-4...success. 480s Attempting to merge 9-5...success. 480s Previous HEAD position was 4a34871 imerge 'c-d': automatic merge 9-5 480s Switched to branch 'imerge/c-d' 480s Auto-merging conflict.txt 480s CONFLICT (content): Merge conflict in conflict.txt 480s Automatic merge failed; fix conflicts and then commit the result. 480s 480s Original first commit: 480s commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 480s Author: Loú User 480s Date: Thu Apr 7 22:13:20 2005 +0000 480s 480s c⇒6 480s 480s Original second commit: 480s commit f7e451a6c9656dda15641a9fbc591a602f158692 480s Author: Loú User 480s Date: Thu Apr 7 22:13:29 2005 +0000 480s 480s d⇒6 480s 480s There was a conflict merging commit 6-6, shown above. 480s Please resolve the conflict, commit the result, then type 480s 480s git-imerge continue 480s + grep -q Traceback start.out 480s + grep -q suggest manual merge of 6-6 autofill.out 480s + git-imerge diagram --commits --frontier --html=imerge3.html 480s 0 5 9 480s | | | 480s 0 - ********** - c 480s *......... 480s *......... 480s *......... 480s *......... 480s 5 - *......... 480s 6 - *.....#??? 480s | 480s d 480s 480s 0 5 9 480s | | | 480s 0 - ********** - c 480s *........| 480s *........| 480s *........| 480s *........| 480s 5 - *.....---+ 480s 6 - *----+#??? 480s | 480s d 480s 480s Key: 480s |,-,+ = rectangles forming current merge frontier 480s * = merge done manually 480s . = merge done automatically 480s # = conflict that is currently blocking progress 480s @ = merge was blocked but has been resolved 480s ? = no merge recorded 480s 480s + echo merged version 480s + git add conflict.txt 480s + GIT_EDITOR=cat git commit 480s imerge 'c-d': manual merge 6-6 480s 480s # Conflicts: 480s # conflict.txt 480s # 480s # It looks like you may be committing a merge. 480s # If this is not correct, please run 480s # git update-ref -d MERGE_HEAD 480s # and try again. 480s 480s 480s # Please enter the commit message for your changes. Lines starting 480s # with '#' will be ignored, and an empty message aborts the commit. 480s # 480s # On branch imerge/c-d 480s # All conflicts fixed but you are still merging. 480s # 480s # Changes to be committed: 480s # modified: conflict.txt 480s # modified: d.txt 480s # 480s [imerge/c-d 2bbe455] imerge 'c-d': manual merge 6-6 480s + git-imerge continue --edit 480s Merge has been recorded for merge 6-6. 480s Attempting to merge 7-6...success. 480s Attempting to merge 8-6...success. 480s Attempting to merge 9-6...success. 480s Merge is complete! 480s + git-imerge diagram --commits --frontier --html=imerge4.html 480s 0 5 9 480s | | | 480s 0 - ********** - c 480s *......... 480s *......... 480s *......... 480s *......... 480s 5 - *......... 480s 6 - *.....*... 480s | 480s d 480s 480s 0 5 9 480s | | | 480s 0 - ********** - c 480s *........| 480s *........| 480s *........| 480s *........| 480s 5 - *........| 480s 6 - *-----*--+ 480s | 480s d 480s 480s Key: 480s |,-,+ = rectangles forming current merge frontier 480s * = merge done manually 480s . = merge done automatically 480s # = conflict that is currently blocking progress 480s @ = merge was blocked but has been resolved 480s ? = no merge recorded 480s 480s + git-imerge finish --branch=c-d-full 480s + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 480s + local refname=c-d-full 480s + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 480s + git rev-parse c-d-full^{tree} 480s + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 480s py312: commands[2] /tmp/autopkgtest.Q8MZaX/build.vm7/src> /bin/sh t/test-really-conflicted 480s + dirname t/test-really-conflicted 480s + cd t 480s + pwd 480s + dirname /tmp/autopkgtest.Q8MZaX/build.vm7/src/t 480s + BASE=/tmp/autopkgtest.Q8MZaX/build.vm7/src 480s + . /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/test-lib.sh 480s + GIT_IMERGE=git-imerge 480s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s + DESCRIPTION=git-imerge test repository with multiple conflicts 480s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 480s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s + local description=git-imerge test repository with multiple conflicts 480s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted git-imerge test repository with multiple conflicts 480s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s + local description=git-imerge test repository with multiple conflicts 480s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s hint: Using 'master' as the name for the initial branch. This default branch name 480s hint: is subject to change. To configure the initial branch name to use in all 480s hint: of your new repositories, which will suppress this warning, call: 480s hint: 480s hint: git config --global init.defaultBranch 480s hint: 480s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 480s hint: 'development'. The just-created branch can be renamed via this command: 480s hint: 480s hint: git branch -m 480s + echo git-imerge test repository with multiple conflicts 480s + printf %s\n /*.out /*.css /*.html 480s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted/.git/ 480s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted/.git config user.name Loú User 480s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted/.git config user.email luser@example.com 480s + TIME=1112911993 480s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/really-conflicted 480s + modify c.txt 0 480s + filename=c.txt 480s + text=0 480s + echo 0 480s + git add c.txt 480s + modify d.txt 0 480s + filename=d.txt 480s + text=0 480s + echo 0 480s + git add d.txt 480s + seq 0 7 480s + modify conflict0.txt original version 480s + filename=conflict0.txt 480s + text=original version 480s + echo original version 480s + git add conflict0.txt 480s + modify conflict1.txt original version 480s + filename=conflict1.txt 480s + text=original version 480s + echo original version 480s + git add conflict1.txt 480s + modify conflict2.txt original version 480s + filename=conflict2.txt 480s + text=original version 480s + echo original version 480s + git add conflict2.txt 480s + modify conflict3.txt original version 480s + filename=conflict3.txt 480s + text=original version 480s + echo original version 480s + git add conflict3.txt 480s + modify conflict4.txt original version 480s + filename=conflict4.txt 480s + text=original version 480s + echo original version 480s + git add conflict4.txt 480s [master (root-commit) 8e21fbd] m⇒0 480s 10 files changed, 10 insertions(+) 480s create mode 100644 c.txt 480s create mode 100644 conflict0.txt 480s create mode 100644 conflict1.txt 480s create mode 100644 conflict2.txt 480s create mode 100644 conflict3.txt 480s create mode 100644 conflict4.txt 480s create mode 100644 conflict5.txt 480s create mode 100644 conflict6.txt 480s create mode 100644 conflict7.txt 480s create mode 100644 d.txt 480s + modify conflict5.txt original version 480s + filename=conflict5.txt 480s + text=original version 480s + echo original version 480s + git add conflict5.txt 480s + modify conflict6.txt original version 480s + filename=conflict6.txt 480s + text=original version 480s + echo original version 480s + git add conflict6.txt 480s + modify conflict7.txt original version 480s + filename=conflict7.txt 480s + text=original version 480s + echo original version 480s + git add conflict7.txt 480s + commit -m m⇒0 480s + TIME=1112911994 480s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 480s + git checkout -b c master -- 480s Switched to a new branch 'c' 480s + modify c.txt 1 480s + filename=c.txt 480s + text=1 480s + echo 1 480s + git add c.txt 480s + modify conflict0.txt c version 480s + filename=conflict0.txt 480s + text=c version 480s + echo c version 480s + git add conflict0.txt 480s + modify conflict4.txt c version 480s + filename=conflict4.txt 480s + text=c version 480s + echo c version 480s + git add conflict4.txt 480s + commit -m c⇒1 480s + TIME=1112911995 480s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 480s [c 4e6007a] c⇒1 480s 3 files changed, 3 insertions(+), 3 deletions(-) 480s + modify c.txt 2 480s + filename=c.txt 480s + text=2 480s + echo 2 480s + git add c.txt 480s + commit -m c⇒2 480s + TIME=1112911996 480s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 480s [c c2b7c49] c⇒2 480s 1 file changed, 1 insertion(+), 1 deletion(-) 480s + modify c.txt 3 480s + filename=c.txt 480s + text=3 480s + echo 3 480s + git add c.txt 480s + commit -m c⇒3 480s + TIME=1112911997 480s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 480s [c 42ad55a] c⇒3 480s 1 file changed, 1 insertion(+), 1 deletion(-) 480s + modify c.txt 4 480s + filename=c.txt 480s + text=4 480s + echo 4 480s + git add c.txt 480s + modify conflict1.txt c version 480s + filename=conflict1.txt 480s + text=c version 480s + echo c version 480s + git add conflict1.txt 480s + commit -m c⇒4 480s + TIME=1112911998 480s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 480s [c a891793] c⇒4 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + modify c.txt 5 480s + filename=c.txt 480s + text=5 480s + echo 5 480s + git add c.txt 480s + modify conflict3.txt c version 480s + filename=conflict3.txt 480s + text=c version 480s + echo c version 480s + git add conflict3.txt 480s + modify conflict6.txt c version 480s + filename=conflict6.txt 480s + text=c version 480s + echo c version 480s + git add conflict6.txt 480s + commit -m c⇒5 480s + TIME=1112911999 480s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 480s + modify c.txt 6 480s + filename=c.txt 480s + text=6 480s + echo 6 480s + git add c.txt 480s [c c21441d] c⇒5 480s 3 files changed, 3 insertions(+), 3 deletions(-) 480s + modify conflict5.txt c version 480s + filename=conflict5.txt 480s + text=c version 480s + echo c version 480s + git add conflict5.txt 480s + commit -m c⇒6 480s + TIME=1112912000 480s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 480s [c a797a66] c⇒6 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + modify c.txt 7 480s + filename=c.txt 480s + text=7 480s + echo 7 480s + git add c.txt 480s + modify conflict2.txt c version 480s + filename=conflict2.txt 480s + text=c version 480s + echo c version 480s + git add conflict2.txt 480s [c c0e1537] c⇒7 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + commit -m c⇒7 480s + TIME=1112912001 480s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 480s + modify c.txt 8 480s + filename=c.txt 480s + text=8 480s + echo 8 480s + git add c.txt 480s + commit -m c⇒8 480s + TIME=1112912002 480s + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 480s + modify c.txt 9 480s + filename=c.txt 480s + text=9 480s + echo 9 480s + git add c.txt 480s [c 9f3e7c8] c⇒8 480s 1 file changed, 1 insertion(+), 1 deletion(-) 480s + modify conflict7.txt c version 480s + filename=conflict7.txt 480s + text=c version 480s + echo c version 480s + git add conflict7.txt 480s + commit -m c⇒9 480s + TIME=1112912003 480s + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 480s [c ccbfccb] c⇒9 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + git checkout -b d master -- 480s Switched to a new branch 'd' 480s + modify d.txt 1 480s + filename=d.txt 480s + text=1 480s + echo 1 480s + git add d.txt 480s + modify conflict0.txt d version 480s + filename=conflict0.txt 480s + text=d version 480s + echo d version 480s + git add conflict0.txt 480s + modify conflict6.txt d version 480s + filename=conflict6.txt 480s + text=d version 480s + echo d version 480s + git add conflict6.txt 480s + commit -m d⇒1 480s + TIME=1112912004 480s + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 480s [d 8c3c065] d⇒1 480s 3 files changed, 3 insertions(+), 3 deletions(-) 480s + modify d.txt 2 480s + filename=d.txt 480s + text=2 480s + echo 2 480s + git add d.txt 480s + modify conflict1.txt d version 480s + filename=conflict1.txt 480s + text=d version 480s + echo d version 480s + git add conflict1.txt 480s + modify conflict2.txt d version 480s + filename=conflict2.txt 480s + text=d version 480s + echo d version 480s + git add conflict2.txt 480s + commit -m d⇒2 480s + TIME=1112912005 480s + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 480s [d 820b787] d⇒2 480s 3 files changed, 3 insertions(+), 3 deletions(-) 480s + modify d.txt 3 480s + filename=d.txt 480s + text=3 480s + echo 3 480s + git add d.txt 480s + commit -m d⇒3 480s + TIME=1112912006 480s + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 480s [d 821c792] d⇒3 480s 1 file changed, 1 insertion(+), 1 deletion(-) 480s + modify d.txt 4 480s + filename=d.txt 480s + text=4 480s + echo 4 480s + git add d.txt 480s + commit -m d⇒4 480s + TIME=1112912007 480s + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 480s [d c2a1456] d⇒4 480s 1 file changed, 1 insertion(+), 1 deletion(-) 480s + modify d.txt 5 480s + filename=d.txt 480s + text=5 480s + echo 5 480s + git add d.txt 480s + modify conflict3.txt d version 480s + filename=conflict3.txt 480s + text=d version 480s + echo d version 480s + git add conflict3.txt 480s + commit -m d⇒5 480s + TIME=1112912008 480s + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 480s [d c3e3890] d⇒5 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + modify d.txt 6 480s + filename=d.txt 480s + text=6 480s + echo 6 480s + git add d.txt 480s + modify conflict4.txt d version 480s + filename=conflict4.txt 480s + text=d version 480s + echo d version 480s + git add conflict4.txt 480s + commit -m d⇒6 480s + TIME=1112912009 480s + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 480s [d b2f5c5e] d⇒6 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + modify d.txt 7 480s + filename=d.txt 480s + text=7 480s + echo 7 480s + git add d.txt 480s + modify conflict5.txt d version 480s + filename=conflict5.txt 480s + text=d version 480s + echo d version 480s + git add conflict5.txt 480s + commit -m d⇒7 480s + TIME=1112912010 480s + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 480s [d 892af56] d⇒7 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + modify d.txt 8 480s + filename=d.txt 480s + text=8 480s + echo 8 480s + git add d.txt 480s + modify conflict7.txt d version 480s + filename=conflict7.txt 480s + text=d version 480s + echo d version 480s + git add conflict7.txt 480s + commit -m d⇒8 480s + TIME=1112912011 480s + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 480s [d 67099d0] d⇒8 480s 2 files changed, 2 insertions(+), 2 deletions(-) 480s + git checkout c 480s Switched to branch 'c' 480s + git-imerge init --name=c-d d 481s + git-imerge diagram --commits --frontier 481s 0 5 9 481s | | | 481s 0 - ********** - c 481s *????????? 481s *????????? 481s *????????? 481s *????????? 481s 5 - *????????? 481s *????????? 481s *????????? 481s 8 - *????????? 481s | 481s d 481s 481s 0 5 9 481s | | | 481s 0 - ********** - c 481s *????????? 481s *????????? 481s *????????? 481s *????????? 481s 5 - *????????? 481s *????????? 481s *????????? 481s 8 - *????????? 481s | 481s d 481s 481s Key: 481s |,-,+ = rectangles forming current merge frontier 481s * = merge done manually 481s . = merge done automatically 481s # = conflict that is currently blocking progress 481s @ = merge was blocked but has been resolved 481s ? = no merge recorded 481s 481s + conflict_count=0 481s + true 481s + git-imerge continue --no-edit 481s + tee autofill.out 481s Attempting automerge of 9-8...failure. 481s Attempting automerge of 1-1...failure. 481s Switched to branch 'imerge/c-d' 481s Auto-merging conflict0.txt 481s CONFLICT (content): Merge conflict in conflict0.txt 481s Automatic merge failed; fix conflicts and then commit the result. 481s 481s Original first commit: 481s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 481s Author: Loú User 481s Date: Thu Apr 7 22:13:15 2005 +0000 481s 481s c⇒1 481s 481s Original second commit: 481s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 481s Author: Loú User 481s Date: Thu Apr 7 22:13:24 2005 +0000 481s 481s d⇒1 481s 481s There was a conflict merging commit 1-1, shown above. 481s Please resolve the conflict, commit the result, then type 481s 481s git-imerge continue 481s + grep -q Traceback autofill.out 481s + git-imerge diagram --frontier 481s 0 5 9 481s | | | 481s 0 - ********** - c 481s *#???????? 481s *????????? 481s *????????? 481s *????????? 481s 5 - *????????? 481s *????????? 481s *????????? 481s 8 - *????????? 481s | 481s d 481s 481s Key: 481s |,-,+ = rectangles forming current merge frontier 481s * = merge done manually 481s . = merge done automatically 481s # = conflict that is currently blocking progress 481s @ = merge was blocked but has been resolved 481s ? = no merge recorded 481s 481s + grep -q There was a conflict merging autofill.out 481s + seq 0 7 481s + grep -q ==== conflict0.txt 481s + modify conflict0.txt merged version 481s + filename=conflict0.txt 481s + text=merged version 481s + echo merged version 481s + git add conflict0.txt 481s + conflict_count=1 481s + grep -q ==== conflict1.txt 481s + grep -q ==== conflict2.txt 481s + grep -q ==== conflict3.txt 481s + grep -q ==== conflict4.txt 481s + grep -q ==== conflict5.txt 481s + grep -q ==== conflict6.txt 481s + grep -q ==== conflict7.txt 481s + true 481s + git-imerge continue --no-edit 481s + tee autofill.out 481s [imerge/c-d 2e0fe05] imerge 'c-d': manual merge 1-1 481s Merge has been recorded for merge 1-1. 481s Attempting automerge of 1-8...failure. 481s Attempting automerge of 1-2...success. 481s Attempting automerge of 1-6...failure. 481s Attempting automerge of 1-4...success. 481s Attempting automerge of 1-5...success. 481s Autofilling 1-2...success. 481s Autofilling 1-3...success. 481s Autofilling 1-4...success. 481s Autofilling 1-5...success. 481s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. 481s Attempting automerge of 1-8...failure. 481s Attempting automerge of 1-6...failure. 481s Attempting automerge of 9-5...failure. 481s Attempting automerge of 2-1...success. 481s Attempting automerge of 2-4...success. 481s Attempting automerge of 2-5...success. 481s Attempting automerge of 9-5...failure. 481s Attempting automerge of 6-5...failure. 481s Attempting automerge of 4-5...failure. 481s Attempting automerge of 3-5...success. 481s Attempting automerge of 4-1...success. 481s Attempting automerge of 4-3...failure. 481s Attempting automerge of 4-2...failure. 481s Attempting automerge of 9-1...failure. 481s Attempting automerge of 7-1...failure. 481s Attempting automerge of 6-1...failure. 481s Attempting automerge of 5-1...failure. 481s Autofilling 2-5...success. 481s Autofilling 3-1...success. 481s Autofilling 3-2...success. 481s Autofilling 3-3...success. 481s Autofilling 3-4...success. 481s Autofilling 3-5 (first way)...success. 481s Autofilling 3-5 (second way)...success. 482s The two ways of autofilling 3-5 agree. 482s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. 482s Autofilling 4-1...success. 482s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. 482s Attempting automerge of 4-5...failure. 482s Attempting automerge of 4-2...failure. 482s Attempting automerge of 9-1...failure. 482s Attempting automerge of 5-1...failure. 482s Previous HEAD position was c21441d c⇒5 482s Switched to branch 'imerge/c-d' 482s Auto-merging conflict4.txt 482s CONFLICT (content): Merge conflict in conflict4.txt 482s Automatic merge failed; fix conflicts and then commit the result. 482s 482s Original first commit: 482s commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 482s Author: Loú User 482s Date: Thu Apr 7 22:13:15 2005 +0000 482s 482s c⇒1 482s 482s Original second commit: 482s commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff 482s Author: Loú User 482s Date: Thu Apr 7 22:13:29 2005 +0000 482s 482s d⇒6 482s 482s There was a conflict merging commit 1-6, shown above. 482s Please resolve the conflict, commit the result, then type 482s 482s git-imerge continue 482s + grep -q Traceback autofill.out 482s + git-imerge diagram --frontier 482s 0 5 9 482s | | | 482s 0 - ********** - c 482s **?.+#???? 482s *.?|#????? 482s *.?|?????? 482s *.?|?????? 482s 5 - *--+?????? 482s *#???????? 482s *????????? 482s 8 - *????????? 482s | 482s d 482s 482s Key: 482s |,-,+ = rectangles forming current merge frontier 482s * = merge done manually 482s . = merge done automatically 482s # = conflict that is currently blocking progress 482s @ = merge was blocked but has been resolved 482s ? = no merge recorded 482s 482s + grep -q There was a conflict merging autofill.out 482s + seq 0 7 482s + grep -q ==== conflict0.txt 482s + grep -q ==== conflict1.txt 482s + grep -q ==== conflict2.txt 482s + grep -q ==== conflict3.txt 482s + grep -q ==== conflict4.txt 482s + modify conflict4.txt merged version 482s + filename=conflict4.txt 482s + text=merged version 482s + echo merged version 482s + git add conflict4.txt 482s + conflict_count=2 482s + grep -q ==== conflict5.txt 482s + grep -q ==== conflict6.txt 482s + grep -q ==== conflict7.txt 482s + true 482s + git-imerge continue --no-edit 482s + tee autofill.out 482s [imerge/c-d 9dd3e80] imerge 'c-d': manual merge 1-6 482s Merge has been recorded for merge 1-6. 482s Attempting automerge of 1-8...success. 482s Autofilling 1-7...success. 482s Autofilling 1-8...success. 482s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. 482s Attempting automerge of 3-8...success. 482s + grep -q Traceback autofill.out 482s Autofilling 2-8...success. 482s Autofilling 3-6...success. 482s Autofilling 3-7...success. 482s Autofilling 3-8 (first way)...success. 482s Autofilling 3-8 (second way)...success. 482s The two ways of autofilling 3-8 agree. 482s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. 482s Warning: you are leaving 1 commit behind, not connected to 482s any of your branches: 482s 482s 85b98c5 imerge 'c-d': automatic merge 3-8 482s 482s If you want to keep it by creating a new branch, this may be a good time 482s to do so with: 482s 482s git branch 85b98c5 482s 482s Switched to branch 'imerge/c-d' 482s Auto-merging conflict1.txt 482s CONFLICT (content): Merge conflict in conflict1.txt 482s Automatic merge failed; fix conflicts and then commit the result. 482s 482s Original first commit: 482s commit a89179336bb40a4ca90903425239a9ef3ce659bd 482s Author: Loú User 482s Date: Thu Apr 7 22:13:18 2005 +0000 482s 482s c⇒4 482s 482s Original second commit: 482s commit 820b787e86e22612af7a061db842dc95e9f1d49f 482s Author: Loú User 482s Date: Thu Apr 7 22:13:25 2005 +0000 482s 482s d⇒2 482s 482s There was a conflict merging commit 4-2, shown above. 482s Please resolve the conflict, commit the result, then type 482s 482s git-imerge continue 482s + git-imerge diagram --frontier 482s 0 5 9 482s | | | 482s 0 - ********** - c 482s **?.+#???? 482s *.?|#????? 482s *.?|?????? 482s *.?|?????? 482s 5 - *..|?????? 482s **?|?????? 482s *.?|?????? 482s 8 - *--+?????? 482s | 482s d 482s 482s Key: 482s |,-,+ = rectangles forming current merge frontier 482s * = merge done manually 482s . = merge done automatically 482s # = conflict that is currently blocking progress 482s @ = merge was blocked but has been resolved 482s ? = no merge recorded 482s 482s + grep -q There was a conflict merging autofill.out 482s + seq 0 7 482s + grep -q ==== conflict0.txt 482s + grep -q ==== conflict1.txt 482s + modify conflict1.txt merged version 482s + filename=conflict1.txt 482s + text=merged version 482s + echo merged version 482s + git add conflict1.txt 482s + conflict_count=3 482s + grep -q ==== conflict2.txt 482s + grep -q ==== conflict3.txt 482s + grep -q ==== conflict4.txt 482s + grep -q ==== conflict5.txt 482s + grep -q ==== conflict6.txt 482s + grep -q ==== conflict7.txt 482s + true 482s + git-imerge continue --no-edit 482s + tee autofill.out 482s [imerge/c-d 2a03cf3] imerge 'c-d': manual merge 4-2 482s Merge has been recorded for merge 4-2. 482s Attempting automerge of 4-8...success. 482s Autofilling 4-3...success. 482s Autofilling 4-4...success. 482s Autofilling 4-5...success. 482s Autofilling 4-6...success. 482s Autofilling 4-7...success. 482s Autofilling 4-8...success. 482s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. 482s Previous HEAD position was f24e617 imerge 'c-d': automatic merge 4-8 482s Switched to branch 'imerge/c-d' 482s Auto-merging conflict6.txt 482s CONFLICT (content): Merge conflict in conflict6.txt 482s Automatic merge failed; fix conflicts and then commit the result. 482s 482s Original first commit: 482s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 482s Author: Loú User 482s Date: Thu Apr 7 22:13:19 2005 +0000 482s 482s c⇒5 482s 482s Original second commit: 482s commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc 482s Author: Loú User 482s Date: Thu Apr 7 22:13:24 2005 +0000 482s 482s d⇒1 482s 482s There was a conflict merging commit 5-1, shown above. 482s Please resolve the conflict, commit the result, then type 482s 482s git-imerge continue 482s + grep -q Traceback autofill.out 482s + git-imerge diagram --frontier 482s 0 5 9 482s | | | 482s 0 - ********** - c 482s **?.|#???? 482s *.?.*????? 482s *.?.|????? 482s *.?.|????? 482s 5 - *...|????? 482s **?.|????? 482s *.?.|????? 482s 8 - *---+????? 482s | 482s d 482s 482s Key: 482s |,-,+ = rectangles forming current merge frontier 482s * = merge done manually 482s . = merge done automatically 482s # = conflict that is currently blocking progress 482s @ = merge was blocked but has been resolved 482s ? = no merge recorded 482s 482s + grep -q There was a conflict merging autofill.out 482s + seq 0 7 482s + grep -q ==== conflict0.txt 482s + grep -q ==== conflict1.txt 482s + grep -q ==== conflict2.txt 482s + grep -q ==== conflict3.txt 482s + grep -q ==== conflict4.txt 482s + grep -q ==== conflict5.txt 482s + grep -q ==== conflict6.txt 482s + modify conflict6.txt merged version 482s + filename=conflict6.txt 482s + text=merged version 482s + echo merged version 482s + git add conflict6.txt 482s + conflict_count=4 482s + grep -q ==== conflict7.txt 482s + true 482s + git-imerge continue --no-edit 482s + tee autofill.out 483s [imerge/c-d 870190a] imerge 'c-d': manual merge 5-1 483s Merge has been recorded for merge 5-1. 483s Attempting automerge of 5-8...failure. 483s Attempting automerge of 5-2...success. 483s Attempting automerge of 5-6...failure. 483s Attempting automerge of 5-4...success. 483s Attempting automerge of 5-5...failure. 483s Autofilling 5-2...success. 483s Autofilling 5-3...success. 483s Autofilling 5-4...success. 483s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. 483s Attempting automerge of 5-8...failure. 483s Attempting automerge of 5-5...failure. 483s Attempting automerge of 9-4...failure. 483s Attempting automerge of 6-1...success. 483s Attempting automerge of 6-3...success. 483s Attempting automerge of 6-4...success. 483s Attempting automerge of 9-4...failure. 483s Attempting automerge of 8-4...failure. 483s Attempting automerge of 7-4...failure. 483s Attempting automerge of 7-1...success. 483s Attempting automerge of 7-3...failure. 483s Attempting automerge of 7-2...failure. 483s Attempting automerge of 9-1...success. 483s Autofilling 6-1...success. 483s Autofilling 6-2...success. 483s Autofilling 6-3...success. 483s Autofilling 6-4...success. 483s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. 483s Autofilling 7-1...success. 483s Autofilling 8-1...success. 483s Autofilling 9-1...success. 483s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. 483s Attempting automerge of 9-4...failure. 483s Attempting automerge of 7-2...failure. 483s Previous HEAD position was 0dd2c08 imerge 'c-d': automatic merge 7-1 483s Switched to branch 'imerge/c-d' 483s Auto-merging conflict3.txt 483s CONFLICT (content): Merge conflict in conflict3.txt 483s Automatic merge failed; fix conflicts and then commit the result. 483s 483s Original first commit: 483s commit c21441db0b1abc10e3caf5024d19976bd7f9b469 483s Author: Loú User 483s Date: Thu Apr 7 22:13:19 2005 +0000 483s 483s c⇒5 483s 483s Original second commit: 483s commit c3e3890b9e3c756c1d8f7e345184d576739be079 483s Author: Loú User 483s Date: Thu Apr 7 22:13:28 2005 +0000 483s 483s d⇒5 483s 483s There was a conflict merging commit 5-5, shown above. 483s Please resolve the conflict, commit the result, then type 483s 483s git-imerge continue 483s + grep -q Traceback autofill.out 483s + git-imerge diagram --frontier 483s 0 5 9 483s | | | 483s 0 - ********** - c 483s **?..*.--+ 483s *.?.*.|#?? 483s *.?...|??? 483s *.?..-+??? 483s 5 - *...|#???? 483s **?.|????? 483s *.?.|????? 483s 8 - *---+????? 483s | 483s d 483s 483s Key: 483s |,-,+ = rectangles forming current merge frontier 483s * = merge done manually 483s . = merge done automatically 483s # = conflict that is currently blocking progress 483s @ = merge was blocked but has been resolved 483s ? = no merge recorded 483s 483s + grep -q There was a conflict merging autofill.out 483s + seq 0 7 483s + grep -q ==== conflict0.txt 483s + grep -q ==== conflict1.txt 483s + grep -q ==== conflict2.txt 483s + grep -q ==== conflict3.txt 483s + modify conflict3.txt merged version 483s + filename=conflict3.txt 483s + text=merged version 483s + echo merged version 483s + git add conflict3.txt 483s + conflict_count=5 483s + grep -q ==== conflict4.txt 483s + grep -q ==== conflict5.txt 483s + grep -q ==== conflict6.txt 483s + grep -q ==== conflict7.txt 483s + true 483s + git-imerge continue --no-edit 483s + tee autofill.out 483s [imerge/c-d c74d164] imerge 'c-d': manual merge 5-5 483s Merge has been recorded for merge 5-5. 483s Attempting automerge of 5-8...success. 483s Autofilling 5-6...success. 483s Autofilling 5-7...success. 483s Autofilling 5-8...success. 483s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. 483s Attempting automerge of 6-8...failure. 483s Attempting automerge of 6-5...success. 483s Attempting automerge of 6-7...failure. 483s Attempting automerge of 6-6...success. 483s Autofilling 6-5...success. 483s Autofilling 6-6...success. 483s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. 483s Attempting automerge of 6-8...failure. 483s Attempting automerge of 6-7...failure. 483s Switched to branch 'imerge/c-d' 483s Auto-merging conflict5.txt 483s CONFLICT (content): Merge conflict in conflict5.txt 483s Automatic merge failed; fix conflicts and then commit the result. 483s 483s Original first commit: 483s commit a797a66a0e4b89690099557280641efeac302bcf 483s Author: Loú User 483s Date: Thu Apr 7 22:13:20 2005 +0000 483s 483s c⇒6 483s 483s Original second commit: 483s commit 892af56ace54c97776e84dff9e6fba7312efe5d0 483s Author: Loú User 483s Date: Thu Apr 7 22:13:30 2005 +0000 483s 483s d⇒7 483s 483s There was a conflict merging commit 6-7, shown above. 483s Please resolve the conflict, commit the result, then type 483s 483s git-imerge continue 483s + grep -q Traceback autofill.out 483s + git-imerge diagram --frontier 484s 0 5 9 484s | | | 484s 0 - ********** - c 484s **?..*.--+ 484s *.?.*.|#?? 484s *.?...|??? 484s *.?...|??? 484s 5 - *....*|??? 484s **?...+??? 484s *.?..|#??? 484s 8 - *----+???? 484s | 484s d 484s 484s Key: 484s |,-,+ = rectangles forming current merge frontier 484s * = merge done manually 484s . = merge done automatically 484s # = conflict that is currently blocking progress 484s @ = merge was blocked but has been resolved 484s ? = no merge recorded 484s 484s + grep -q There was a conflict merging autofill.out 484s + seq 0 7 484s + grep -q ==== conflict0.txt 484s + grep -q ==== conflict1.txt 484s + grep -q ==== conflict2.txt 484s + grep -q ==== conflict3.txt 484s + grep -q ==== conflict4.txt 484s + grep -q ==== conflict5.txt 484s + modify conflict5.txt merged version 484s + filename=conflict5.txt 484s + text=merged version 484s + echo merged version 484s + git add conflict5.txt 484s + conflict_count=6 484s + grep -q ==== conflict6.txt 484s + grep -q ==== conflict7.txt 484s + true 484s + git-imerge continue --no-edit 484s + tee autofill.out 484s [imerge/c-d 09d65ab] imerge 'c-d': manual merge 6-7 484s Merge has been recorded for merge 6-7. 484s Attempting automerge of 6-8...success. 484s Autofilling 6-8...success. 484s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. 484s Previous HEAD position was cbac495 imerge 'c-d': automatic merge 6-8 484s Switched to branch 'imerge/c-d' 484s Auto-merging conflict2.txt 484s CONFLICT (content): Merge conflict in conflict2.txt 484s Automatic merge failed; fix conflicts and then commit the result. 484s 484s Original first commit: 484s commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 484s Author: Loú User 484s Date: Thu Apr 7 22:13:21 2005 +0000 484s 484s c⇒7 484s 484s Original second commit: 484s commit 820b787e86e22612af7a061db842dc95e9f1d49f 484s Author: Loú User 484s Date: Thu Apr 7 22:13:25 2005 +0000 484s 484s d⇒2 484s 484s There was a conflict merging commit 7-2, shown above. 484s Please resolve the conflict, commit the result, then type 484s 484s git-imerge continue 484s + grep -q Traceback autofill.out 484s + git-imerge diagram --frontier 484s 0 5 9 484s | | | 484s 0 - ********** - c 484s **?..*.--+ 484s *.?.*.|#?? 484s *.?...|??? 484s *.?...|??? 484s 5 - *....*|??? 484s **?...|??? 484s *.?...*??? 484s 8 - *-----+??? 484s | 484s d 484s 484s Key: 484s |,-,+ = rectangles forming current merge frontier 484s * = merge done manually 484s . = merge done automatically 484s # = conflict that is currently blocking progress 484s @ = merge was blocked but has been resolved 484s ? = no merge recorded 484s 484s + grep -q There was a conflict merging autofill.out 484s + seq 0 7 484s + grep -q ==== conflict0.txt 484s + grep -q ==== conflict1.txt 484s + grep -q ==== conflict2.txt 484s + modify conflict2.txt merged version 484s + filename=conflict2.txt 484s + text=merged version 484s + echo merged version 484s + git add conflict2.txt 484s + conflict_count=7 484s + grep -q ==== conflict3.txt 484s + grep -q ==== conflict4.txt 484s + grep -q ==== conflict5.txt 484s + grep -q ==== conflict6.txt 484s + grep -q ==== conflict7.txt 484s + true 484s + git-imerge continue --no-edit 484s + tee autofill.out 484s [imerge/c-d 30f2e63] imerge 'c-d': manual merge 7-2 484s Merge has been recorded for merge 7-2. 484s Attempting automerge of 7-8...success. 484s Autofilling 7-3...success. 484s Autofilling 7-4...success. 484s Autofilling 7-5...success. 484s Autofilling 7-6...success. 484s Autofilling 7-7...success. 484s Autofilling 7-8...success. 484s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. 484s Attempting automerge of 9-8...failure. 484s Attempting automerge of 8-2...success. 484s Attempting automerge of 8-6...success. 484s Attempting automerge of 8-8...success. 484s Attempting automerge of 9-8...failure. 484s Attempting automerge of 9-2...success. 484s Attempting automerge of 9-5...success. 484s Attempting automerge of 9-7...success. 484s Autofilling 8-2...success. 484s Autofilling 8-3...success. 484s Autofilling 8-4...success. 484s Autofilling 8-5...success. 484s Autofilling 8-6...success. 484s Autofilling 8-7...success. 484s Autofilling 8-8...success. 484s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. 484s Autofilling 9-2...success. 484s Autofilling 9-3...success. 484s Autofilling 9-4...success. 484s Autofilling 9-5...success. 484s Autofilling 9-6...success. 484s Autofilling 9-7...success. 484s Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. 484s Attempting automerge of 9-8...failure. 484s Attempting automerge of 9-8...failure. 484s Switched to branch 'imerge/c-d' 484s Auto-merging conflict7.txt 484s CONFLICT (content): Merge conflict in conflict7.txt 484s Automatic merge failed; fix conflicts and then commit the result. 484s 484s Original first commit: 484s commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 484s Author: Loú User 484s Date: Thu Apr 7 22:13:23 2005 +0000 484s 484s c⇒9 484s 484s Original second commit: 484s commit 67099d078100141fbe4063d46a6408200f4ff311 484s Author: Loú User 484s Date: Thu Apr 7 22:13:31 2005 +0000 484s 484s d⇒8 484s 484s There was a conflict merging commit 9-8, shown above. 484s Please resolve the conflict, commit the result, then type 484s 484s git-imerge continue 484s + grep -q Traceback autofill.out 484s + git-imerge diagram --frontier 485s 0 5 9 485s | | | 485s 0 - ********** - c 485s **?..*...| 485s *.?.*..*.| 485s *.?......| 485s *.?......| 485s 5 - *....*...| 485s **?......| 485s *.?...*..+ 485s 8 - *-------+# 485s | 485s d 485s 485s Key: 485s |,-,+ = rectangles forming current merge frontier 485s * = merge done manually 485s . = merge done automatically 485s # = conflict that is currently blocking progress 485s @ = merge was blocked but has been resolved 485s ? = no merge recorded 485s 485s + grep -q There was a conflict merging autofill.out 485s + seq 0 7 485s + grep -q ==== conflict0.txt 485s + grep -q ==== conflict1.txt 485s + grep -q ==== conflict2.txt 485s + grep -q ==== conflict3.txt 485s + grep -q ==== conflict4.txt 485s + grep -q ==== conflict5.txt 485s + grep -q ==== conflict6.txt 485s + grep -q ==== conflict7.txt 485s + modify conflict7.txt merged version 485s + filename=conflict7.txt 485s + text=merged version 485s + echo merged version 485s + git add conflict7.txt 485s + conflict_count=8 485s + true 485s + git-imerge continue --no-edit 485s + tee autofill.out 485s [imerge/c-d 421369b] imerge 'c-d': manual merge 9-8 485s Merge has been recorded for merge 9-8. 485s Merge is complete! 485s + grep -q Traceback autofill.out 485s + git-imerge diagram --frontier 485s 0 5 9 485s | | | 485s 0 - ********** - c 485s **?..*...| 485s *.?.*..*.| 485s *.?......| 485s *.?......| 485s 5 - *....*...| 485s **?......| 485s *.?...*..| 485s 8 - *--------* 485s | 485s d 485s 485s Key: 485s |,-,+ = rectangles forming current merge frontier 485s * = merge done manually 485s . = merge done automatically 485s # = conflict that is currently blocking progress 485s @ = merge was blocked but has been resolved 485s ? = no merge recorded 485s 485s + grep -q There was a conflict merging autofill.out 485s + break 485s + test 8 -ne 8 485s + git-imerge diagram --commits 485s + cat 485s + diff -u - diagram.out 485s + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge 485s Merge d into c (using imerge) 485s 485s # Please enter the commit message for your changes. Lines starting 485s # with '#' will be ignored, and an empty message aborts the commit. 485s # 485s # Date: Wed Mar 20 09:29:51 2024 +0000 485s # 485s # On branch c-d-merge 485s # Changes to be committed: 485s # modified: conflict0.txt 485s # modified: conflict1.txt 485s # modified: conflict2.txt 485s # modified: conflict3.txt 485s # modified: conflict4.txt 485s # modified: conflict5.txt 485s # modified: conflict6.txt 485s # modified: conflict7.txt 485s # modified: d.txt 485s # 485s [c-d-merge 4e365cb] Merge d into c (using imerge) 485s Date: Wed Mar 20 09:29:51 2024 +0000 485s + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + local refname=c-d-merge 485s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + git rev-parse c-d-merge^{tree} 485s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + git-imerge simplify --goal=rebase --branch=c-d-rebase 485s + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + local refname=c-d-rebase 485s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + git rev-parse c-d-rebase^{tree} 485s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history 485s + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + local refname=c-d-rebase-with-history 485s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + git rev-parse c-d-rebase-with-history^{tree} 485s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 485s + git-imerge simplify --goal=border --branch=c-d-border 486s + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + local refname=c-d-border 486s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + git rev-parse c-d-border^{tree} 486s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history 486s + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + local refname=c-d-border-with-history 486s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + git rev-parse c-d-border-with-history^{tree} 486s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 486s + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + local refname=c-d-border-with-history2 486s + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + git rev-parse c-d-border-with-history2^{tree} 486s + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f 486s + git-imerge remove 486s py312: commands[3] /tmp/autopkgtest.Q8MZaX/build.vm7/src> /bin/sh t/test-duplicated 486s + dirname t/test-duplicated 486s + cd t 486s + pwd 486s + dirname /tmp/autopkgtest.Q8MZaX/build.vm7/src/t 486s + BASE=/tmp/autopkgtest.Q8MZaX/build.vm7/src 486s + . /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/test-lib.sh 486s + GIT_IMERGE=git-imerge 486s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s + DESCRIPTION=git-imerge test repository with duplicate commits 486s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated git-imerge test repository with duplicate commits 486s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s + local description=git-imerge test repository with duplicate commits 486s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated git-imerge test repository with duplicate commits 486s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s + local description=git-imerge test repository with duplicate commits 486s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s hint: Using 'master' as the name for the initial branch. This default branch name 486s hint: is subject to change. To configure the initial branch name to use in all 486s hint: of your new repositories, which will suppress this warning, call: 486s hint: 486s hint: git config --global init.defaultBranch 486s hint: 486s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 486s hint: 'development'. The just-created branch can be renamed via this command: 486s hint: 486s hint: git branch -m 486s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated/.git/ 486s + echo git-imerge test repository with duplicate commits 486s + printf %s\n /*.out /*.css /*.html 486s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated/.git config user.name Loú User 486s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated/.git config user.email luser@example.com 486s + TIME=1112911993 486s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/duplicated 486s + modify a.txt 0 486s + filename=a.txt 486s + text=0 486s + echo 0 486s + git add a.txt 486s + commit -m m⇒0 486s + TIME=1112911994 486s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 486s + git checkout -b a -- 486s [master (root-commit) a733afa] m⇒0 486s 1 file changed, 1 insertion(+) 486s create mode 100644 a.txt 486s Switched to a new branch 'a' 486s + seq 3 486s + modify a.txt 1 486s + filename=a.txt 486s + text=1 486s + echo 1 486s + git add a.txt 486s + commit -m a⇒1 on branch a 486s + TIME=1112911995 486s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 486s [a 2f1f75a] a⇒1 on branch a 486s 1 file changed, 1 insertion(+), 1 deletion(-) 486s + modify a.txt 2 486s + filename=a.txt 486s + text=2 486s + echo 2 486s + git add a.txt 486s + commit -m a⇒2 on branch a 486s + TIME=1112911996 486s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 486s [a 4700669] a⇒2 on branch a 486s 1 file changed, 1 insertion(+), 1 deletion(-) 486s + modify a.txt 3 486s + filename=a.txt 486s + text=3 486s + echo 3 486s + git add a.txt 486s + commit -m a⇒3 on branch a 486s + TIME=1112911997 486s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 486s [a 621c381] a⇒3 on branch a 486s 1 file changed, 1 insertion(+), 1 deletion(-) 486s + git checkout -b b master -- 486s Switched to a new branch 'b' 486s + seq 4 486s + modify a.txt 1 486s + filename=a.txt 486s + text=1 486s + echo 1 486s + git add a.txt 486s + commit -m a⇒1 on branch b 486s + TIME=1112911998 486s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b 486s [b 62a5c56] a⇒1 on branch b 486s 1 file changed, 1 insertion(+), 1 deletion(-) 486s + modify a.txt 2 486s + filename=a.txt 486s + text=2 486s + echo 2 486s + git add a.txt 486s + commit -m a⇒2 on branch b 486s + TIME=1112911999 486s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b 486s [b f846281] a⇒2 on branch b 486s 1 file changed, 1 insertion(+), 1 deletion(-) 486s + modify a.txt 3 486s + filename=a.txt 486s + text=3 486s + echo 3 486s + git add a.txt 486s + commit -m a⇒3 on branch b 486s + TIME=1112912000 486s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b 486s [b a4b2c2b] a⇒3 on branch b 486s 1 file changed, 1 insertion(+), 1 deletion(-) 486s + modify a.txt 4 486s + filename=a.txt 486s + text=4 486s + echo 4 486s + git add a.txt 486s + commit -m a⇒4 on branch b 486s + TIME=1112912001 486s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b 486s + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 486s + git checkout a 486s [b 5b24553] a⇒4 on branch b 486s 1 file changed, 1 insertion(+), 1 deletion(-) 486s Switched to branch 'a' 486s + git-imerge start --first-parent --name=a-b --branch=a-b-merge b 486s Attempting automerge of 3-4...failure. 486s Attempting automerge of 1-1...success. 486s Attempting automerge of 1-3...failure. 486s Attempting automerge of 1-2...failure. 486s Attempting automerge of 3-1...failure. 486s Attempting automerge of 2-1...failure. 486s Autofilling 1-1...success. 486s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. 486s Attempting automerge of 1-4...success. 486s Autofilling 1-2...success. 486s Autofilling 1-3...success. 486s Autofilling 1-4...success. 486s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. 486s Attempting automerge of 3-4...failure. 486s Attempting automerge of 2-1...success. 486s Attempting automerge of 2-3...failure. 486s Attempting automerge of 2-2...success. 486s Attempting automerge of 3-2...failure. 486s Attempting automerge of 3-1...success. 486s Autofilling 2-1...success. 486s Autofilling 2-2...success. 486s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. 486s Autofilling 3-1...success. 486s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. 487s Attempting automerge of 2-4...success. 487s Autofilling 2-3...success. 487s Autofilling 2-4...success. 487s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. 487s Attempting automerge of 3-4...failure. 487s Attempting automerge of 3-2...success. 487s Attempting automerge of 3-4...failure. 487s Attempting automerge of 3-3...success. 487s Autofilling 3-2...success. 487s Autofilling 3-3...success. 487s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. 487s Attempting automerge of 3-4...success. 487s Autofilling 3-4...success. 487s Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. 487s Merge is complete! 487s + git-imerge diagram --commits --frontier --html=imerge5.html 487s 0 3 487s | | 487s 0 - **** - a 487s *... 487s *... 487s *... 487s 4 - *... 487s | 487s b 487s 487s 0 3 487s | | 487s 0 - **** - a 487s *..| 487s *..| 487s *..| 487s 4 - *--+ 487s | 487s b 487s 487s Key: 487s |,-,+ = rectangles forming current merge frontier 487s * = merge done manually 487s . = merge done automatically 487s # = conflict that is currently blocking progress 487s @ = merge was blocked but has been resolved 487s ? = no merge recorded 487s 487s + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge 487s Merge b into a (using imerge) 487s 487s # Please enter the commit message for your changes. Lines starting 487s # with '#' will be ignored, and an empty message aborts the commit. 487s # 487s # Date: Wed Mar 20 09:29:53 2024 +0000 487s # 487s # On branch a-b-merge 487s # Changes to be committed: 487s # modified: a.txt 487s # 487s [a-b-merge 090fe7e] Merge b into a (using imerge) 487s Date: Wed Mar 20 09:29:53 2024 +0000 487s + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + local refname=a-b-merge 487s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git rev-parse a-b-merge^{tree} 487s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git-imerge simplify --goal=rebase --branch=a-b-rebase 487s + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + local refname=a-b-rebase 487s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git rev-parse a-b-rebase^{tree} 487s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history 487s + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + local refname=a-b-rebase-with-history 487s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git rev-parse a-b-rebase-with-history^{tree} 487s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git-imerge simplify --goal=border --branch=a-b-border 487s + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + local refname=a-b-border 487s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git rev-parse a-b-border^{tree} 487s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history 487s + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + local refname=a-b-border-with-history 487s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git rev-parse a-b-border-with-history^{tree} 487s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 487s + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 488s + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 488s + local refname=a-b-border-with-history2 488s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 488s + git rev-parse a-b-border-with-history2^{tree} 488s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 488s + git checkout a 488s Switched to branch 'a' 488s + git-imerge start --goal=full --name=a-b b 488s Attempting to merge 1-1...success. 488s Attempting to merge 1-2...success. 488s Attempting to merge 1-3...success. 488s Attempting to merge 1-4...success. 488s Attempting to merge 2-1...success. 488s Attempting to merge 2-2...success. 488s Attempting to merge 2-3...success. 488s Attempting to merge 2-4...success. 488s Attempting to merge 3-1...success. 488s Attempting to merge 3-2...success. 488s Attempting to merge 3-3...success. 488s Attempting to merge 3-4...success. 488s Merge is complete! 488s + git-imerge list 488s * a-b 488s + git-imerge diagram --commits --frontier --html=imerge6.html 488s 0 3 488s | | 488s 0 - **** - a 488s *... 488s *... 488s *... 488s 4 - *... 488s | 488s b 488s 488s 0 3 488s | | 488s 0 - **** - a 488s *..| 488s *..| 488s *..| 488s 4 - *--+ 488s | 488s b 488s 488s Key: 488s |,-,+ = rectangles forming current merge frontier 488s * = merge done manually 488s . = merge done automatically 488s # = conflict that is currently blocking progress 488s @ = merge was blocked but has been resolved 488s ? = no merge recorded 488s 488s + git-imerge finish --branch=a-b-full 488s + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 488s + local refname=a-b-full 488s + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 488s + git rev-parse a-b-full^{tree} 488s + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 488s py312: commands[4] /tmp/autopkgtest.Q8MZaX/build.vm7/src> /bin/sh t/test-flip-flop 488s + dirname t/test-flip-flop 488s + cd t 488s + pwd 488s + dirname /tmp/autopkgtest.Q8MZaX/build.vm7/src/t 488s + BASE=/tmp/autopkgtest.Q8MZaX/build.vm7/src 488s + . /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/test-lib.sh 488s + GIT_IMERGE=git-imerge 488s + flip_flop_test 1 488s + local n=1 488s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 488s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 488s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s + local description=git-imerge test repository with a commit and its revert at n=1 488s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 488s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s + local description=git-imerge test repository with a commit and its revert at n=1 488s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s hint: Using 'master' as the name for the initial branch. This default branch name 488s hint: is subject to change. To configure the initial branch name to use in all 488s hint: of your new repositories, which will suppress this warning, call: 488s hint: 488s hint: git config --global init.defaultBranch 488s hint: 488s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 488s hint: 'development'. The just-created branch can be renamed via this command: 488s hint: 488s hint: git branch -m 488s + echo git-imerge test repository with a commit and its revert at n=1 488s + printf %s\n /*.out /*.css /*.html 488s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1/.git config user.name Loú User 488s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1/.git config user.email luser@example.com 488s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1/.git/ 488s + TIME=1112911993 488s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-1 488s + modify a.txt 0 488s + filename=a.txt 488s + text=0 488s + echo 0 488s + git add a.txt 488s + commit -m m⇒0 488s + TIME=1112911994 488s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 488s [master (root-commit) a733afa] m⇒0 488s 1 file changed, 1 insertion(+) 488s create mode 100644 a.txt 488s + git checkout -b a -- 488s Switched to a new branch 'a' 488s + modify a.txt 1 488s + filename=a.txt 488s + text=1 488s + echo 1 488s + git add a.txt 488s + commit -m a⇒1 on branch a 488s + TIME=1112911995 488s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 488s [a 2f1f75a] a⇒1 on branch a 488s 1 file changed, 1 insertion(+), 1 deletion(-) 488s + modify a.txt 2 488s + filename=a.txt 488s + text=2 488s + echo 2 488s + git add a.txt 488s + commit -m a⇒2 on branch a 488s + TIME=1112911996 488s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 488s + modify a.txt 3 488s + filename=a.txt 488s + text=3 488s + echo 3 488s + git add a.txt 488s [a 4700669] a⇒2 on branch a 488s 1 file changed, 1 insertion(+), 1 deletion(-) 488s + commit -m a⇒3 on branch a 488s + TIME=1112911997 488s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 488s [a 621c381] a⇒3 on branch a 488s 1 file changed, 1 insertion(+), 1 deletion(-) 488s + git checkout -b b master -- 488s Switched to a new branch 'b' 488s + modify b.txt 1 488s + filename=b.txt 488s + text=1 488s + echo 1 488s + git add b.txt 488s + msg=b⇒1 488s + test 1 = 1 488s + modify a.txt X 488s + filename=a.txt 488s + text=X 488s + echo X 488s + git add a.txt 488s + msg=b⇒1 and a⇒X 488s + test 1 = 2 488s + commit -m b⇒1 and a⇒X on branch b 488s + TIME=1112911998 488s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b 488s [b 044a3fa] b⇒1 and a⇒X on branch b 488s 2 files changed, 2 insertions(+), 1 deletion(-) 488s create mode 100644 b.txt 488s + modify b.txt 2 488s + filename=b.txt 488s + text=2 488s + echo 2 488s + git add b.txt 488s + msg=b⇒2 488s + test 2 = 1 488s + test 2 = 2 488s + modify a.txt 0 488s + filename=a.txt 488s + text=0 488s + echo 0 488s + git add a.txt 488s + msg=b⇒2 and a⇒0 488s + commit -m b⇒2 and a⇒0 on branch b 488s + TIME=1112911999 488s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b 488s [b 7851975] b⇒2 and a⇒0 on branch b 488s 2 files changed, 2 insertions(+), 2 deletions(-) 488s + modify b.txt 3 488s + filename=b.txt 488s + text=3 488s + echo 3 488s + git add b.txt 488s + msg=b⇒3 488s + test 3 = 1 488s + test 3 = 2 488s + commit -m b⇒3 on branch b 488s + TIME=1112912000 488s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b 488s [b 6fe24f0] b⇒3 on branch b 488s 1 file changed, 1 insertion(+), 1 deletion(-) 488s + modify b.txt 4 488s + filename=b.txt 488s + text=4 488s + echo 4 488s + git add b.txt 488s + msg=b⇒4 488s + test 4 = 1 488s + test 4 = 2 488s + commit -m b⇒4 on branch b 488s + TIME=1112912001 488s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 488s [b 2dc5eb7] b⇒4 on branch b 488s 1 file changed, 1 insertion(+), 1 deletion(-) 488s + test_merge b-into-a-1 a b 1-1 1-2 488s + local name=b-into-a-1 488s + local dst=a 488s + local src=b 488s + local conflict1=1-1 488s + local conflict2=1-2 488s + git checkout a 488s Switched to branch 'a' 488s + git-imerge merge --branch=b-into-a-1 b 488s + tee imerge-b-into-a-1-1.out 488s Attempting automerge of 3-4...success. 488s Autofilling 1-4...success. 488s Autofilling 2-4...success. 488s Autofilling 3-1...unexpected conflict. Backtracking... 488s Autofilling 1-4...success. 488s Autofilling 2-1...unexpected conflict. Backtracking... 488s Autofilling 1-1...unexpected conflict. Backtracking... 488s Switched to branch 'imerge/b' 488s Auto-merging a.txt 488s CONFLICT (content): Merge conflict in a.txt 488s Automatic merge failed; fix conflicts and then commit the result. 488s 488s Original first commit: 488s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 488s Author: Loú User 488s Date: Thu Apr 7 22:13:15 2005 +0000 488s 488s a⇒1 on branch a 488s 488s Original second commit: 488s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 488s Author: Loú User 488s Date: Thu Apr 7 22:13:18 2005 +0000 488s 488s b⇒1 and a⇒X on branch b 488s 488s There was a conflict merging commit 1-1, shown above. 488s Please resolve the conflict, commit the result, then type 488s 488s git-imerge continue 488s + git-imerge diagram --commits --frontier 489s 0 3 489s | | 489s 0 - **** - a 489s *#?? 489s *??? 489s *??? 489s 4 - *??? 489s | 489s b 489s 489s 0 3 489s | | 489s 0 - **** - a 489s *#?? 489s *??? 489s *??? 489s 4 - *??? 489s | 489s b 489s 489s Key: 489s |,-,+ = rectangles forming current merge frontier 489s * = merge done manually 489s . = merge done automatically 489s # = conflict that is currently blocking progress 489s @ = merge was blocked but has been resolved 489s ? = no merge recorded 489s 489s + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out 489s + echo 1 489s + git add a.txt 489s + + git-imerge continue --no-edit 489s tee imerge-b-into-a-1-2.out 489s [imerge/b 35c5e89] imerge 'b': manual merge 1-1 489s Merge has been recorded for merge 1-1. 489s Attempting automerge of 1-4...failure. 489s Attempting automerge of 1-2...failure. 489s Attempting automerge of 3-1...success. 489s Autofilling 2-1...success. 489s Autofilling 3-1...success. 489s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. 489s Previous HEAD position was 5e72072 imerge 'b': automatic merge 3-1 489s Switched to branch 'imerge/b' 489s Auto-merging a.txt 489s CONFLICT (content): Merge conflict in a.txt 489s Automatic merge failed; fix conflicts and then commit the result. 489s 489s Original first commit: 489s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 489s Author: Loú User 489s Date: Thu Apr 7 22:13:15 2005 +0000 489s 489s a⇒1 on branch a 489s 489s Original second commit: 489s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 489s Author: Loú User 489s Date: Thu Apr 7 22:13:19 2005 +0000 489s 489s b⇒2 and a⇒0 on branch b 489s 489s There was a conflict merging commit 1-2, shown above. 489s Please resolve the conflict, commit the result, then type 489s 489s git-imerge continue 489s + git-imerge diagram --commits --frontier 489s 0 3 489s | | 489s 0 - **** - a 489s **.. 489s *#?? 489s *??? 489s 4 - *??? 489s | 489s b 489s 489s 0 3 489s | | 489s 0 - **** - a 489s **-+ 489s *#?? 489s *??? 489s 4 - *??? 489s | 489s b 489s 489s Key: 489s |,-,+ = rectangles forming current merge frontier 489s * = merge done manually 489s . = merge done automatically 489s # = conflict that is currently blocking progress 489s @ = merge was blocked but has been resolved 489s ? = no merge recorded 489s 489s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out 489s + echo 1 489s + git add a.txt 489s + + git-imerge continue --no-edit 489s tee imerge-b-into-a-1-3.out 489s [imerge/b fa72fdb] imerge 'b': manual merge 1-2 489s Merge has been recorded for merge 1-2. 489s Attempting automerge of 1-4...success. 489s Autofilling 1-3...success. 489s Autofilling 1-4...success. 489s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. 489s Attempting automerge of 3-4...success. 489s Autofilling 2-4...success. 489s Autofilling 3-2...success. 489s Autofilling 3-3...success. 489s Autofilling 3-4 (first way)...success. 489s Autofilling 3-4 (second way)...success. 489s The two ways of autofilling 3-4 agree. 489s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. 489s Merge is complete! 489s + grep -q Merge is complete imerge-b-into-a-1-3.out 489s + git-imerge diagram --commits --frontier 489s 0 3 489s | | 489s 0 - **** - a 489s **.. 489s **?. 489s *.?. 489s 4 - *... 489s | 489s b 489s 489s 0 3 489s | | 489s 0 - **** - a 489s **.| 489s **?| 489s *.?| 489s 4 - *--+ 489s | 489s b 489s 489s Key: 489s |,-,+ = rectangles forming current merge frontier 489s * = merge done manually 489s . = merge done automatically 489s # = conflict that is currently blocking progress 489s @ = merge was blocked but has been resolved 489s ? = no merge recorded 489s 489s + GIT_EDITOR=cat git-imerge finish 489s Merge b into a (using imerge) 489s 489s # Please enter the commit message for your changes. Lines starting 489s # with '#' will be ignored, and an empty message aborts the commit. 489s # 489s # Date: Wed Mar 20 09:29:55 2024 +0000 489s # 489s # On branch b-into-a-1 489s # Changes to be committed: 489s # new file: b.txt 489s # 489s [b-into-a-1 b14e1cd] Merge b into a (using imerge) 489s Date: Wed Mar 20 09:29:55 2024 +0000 489s + test_merge a-into-b-1 b a 1-1 2-1 489s + local name=a-into-b-1 489s + local dst=b 489s + local src=a 489s + local conflict1=1-1 489s + local conflict2=2-1 489s + git checkout b 489s Switched to branch 'b' 489s + + git-imerge merge --branch=a-into-b-1 a 489s tee imerge-a-into-b-1-1.out 489s Attempting automerge of 4-3...success. 489s Autofilling 1-3...unexpected conflict. Backtracking... 489s Autofilling 1-2...unexpected conflict. Backtracking... 490s Autofilling 1-1...unexpected conflict. Backtracking... 490s Switched to branch 'imerge/a' 490s Auto-merging a.txt 490s CONFLICT (content): Merge conflict in a.txt 490s Automatic merge failed; fix conflicts and then commit the result. 490s 490s Original first commit: 490s commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 490s Author: Loú User 490s Date: Thu Apr 7 22:13:18 2005 +0000 490s 490s b⇒1 and a⇒X on branch b 490s 490s Original second commit: 490s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 490s Author: Loú User 490s Date: Thu Apr 7 22:13:15 2005 +0000 490s 490s a⇒1 on branch a 490s 490s There was a conflict merging commit 1-1, shown above. 490s Please resolve the conflict, commit the result, then type 490s 490s git-imerge continue 490s + git-imerge diagram --commits --frontier 490s 0 4 490s | | 490s 0 - ***** - b 490s *#??? 490s *???? 490s 3 - *???? 490s | 490s a 490s 490s 0 4 490s | | 490s 0 - ***** - b 490s *#??? 490s *???? 490s 3 - *???? 490s | 490s a 490s 490s Key: 490s |,-,+ = rectangles forming current merge frontier 490s * = merge done manually 490s . = merge done automatically 490s # = conflict that is currently blocking progress 490s @ = merge was blocked but has been resolved 490s ? = no merge recorded 490s 490s + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out 490s + echo 1 490s + git add a.txt 490s + + git-imerge continue --no-edit 490s tee imerge-a-into-b-1-2.out 490s [imerge/a a5eefe4] imerge 'a': manual merge 1-1 490s Merge has been recorded for merge 1-1. 490s Attempting automerge of 1-3...success. 490s Autofilling 1-2...success. 490s Autofilling 1-3...success. 490s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. 490s Attempting automerge of 4-3...failure. 490s Attempting automerge of 2-1...failure. 490s Switched to branch 'imerge/a' 490s Auto-merging a.txt 490s CONFLICT (content): Merge conflict in a.txt 490s Automatic merge failed; fix conflicts and then commit the result. 490s 490s Original first commit: 490s commit 7851975ee7d12ef0a256db7ebd029aab51f895ab 490s Author: Loú User 490s Date: Thu Apr 7 22:13:19 2005 +0000 490s 490s b⇒2 and a⇒0 on branch b 490s 490s Original second commit: 490s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 490s Author: Loú User 490s Date: Thu Apr 7 22:13:15 2005 +0000 490s 490s a⇒1 on branch a 490s 490s There was a conflict merging commit 2-1, shown above. 490s Please resolve the conflict, commit the result, then type 490s 490s git-imerge continue 490s + git-imerge diagram --commits --frontier 490s 0 4 490s | | 490s 0 - ***** - b 490s **#?? 490s *.??? 490s 3 - *.??? 490s | 490s a 490s 490s 0 4 490s | | 490s 0 - ***** - b 490s **#?? 490s *|??? 490s 3 - *+??? 490s | 490s a 490s 490s Key: 490s |,-,+ = rectangles forming current merge frontier 490s * = merge done manually 490s . = merge done automatically 490s # = conflict that is currently blocking progress 490s @ = merge was blocked but has been resolved 490s ? = no merge recorded 490s 490s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out 490s + echo 1 490s + git add a.txt 490s + + tee imerge-a-into-b-1-3.out 490s git-imerge continue --no-edit 490s [imerge/a 28fd69b] imerge 'a': manual merge 2-1 490s Merge has been recorded for merge 2-1. 490s Attempting automerge of 2-3...success. 490s Autofilling 2-2...success. 490s Autofilling 2-3...success. 490s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 490s Attempting automerge of 4-3...success. 490s Autofilling 3-3...success. 490s Autofilling 4-1...success. 490s Autofilling 4-2...success. 490s Autofilling 4-3 (first way)...success. 490s Autofilling 4-3 (second way)...success. 490s The two ways of autofilling 4-3 agree. 490s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. 490s Merge is complete! 490s + grep -q Merge is complete imerge-a-into-b-1-3.out 490s + git-imerge diagram --commits --frontier 491s 0 4 491s | | 491s 0 - ***** - b 491s ***?. 491s *..?. 491s 3 - *.... 491s | 491s a 491s 491s 0 4 491s | | 491s 0 - ***** - b 491s ***?| 491s *..?| 491s 3 - *---+ 491s | 491s a 491s 491s Key: 491s |,-,+ = rectangles forming current merge frontier 491s * = merge done manually 491s . = merge done automatically 491s # = conflict that is currently blocking progress 491s @ = merge was blocked but has been resolved 491s ? = no merge recorded 491s 491s + GIT_EDITOR=cat git-imerge finish 491s Merge a into b (using imerge) 491s 491s # Please enter the commit message for your changes. Lines starting 491s # with '#' will be ignored, and an empty message aborts the commit. 491s # 491s # Date: Wed Mar 20 09:29:56 2024 +0000 491s # 491s # On branch a-into-b-1 491s # Changes to be committed: 491s # modified: a.txt 491s # 491s [a-into-b-1 62b6e89] Merge a into b (using imerge) 491s Date: Wed Mar 20 09:29:56 2024 +0000 491s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2/.git/ 491s [master (root-commit) a733afa] m⇒0 491s 1 file changed, 1 insertion(+) 491s create mode 100644 a.txt 491s [a 2f1f75a] a⇒1 on branch a 491s 1 file changed, 1 insertion(+), 1 deletion(-) 491s [a 4700669] a⇒2 on branch a 491s 1 file changed, 1 insertion(+), 1 deletion(-) 491s [a 621c381] a⇒3 on branch a 491s 1 file changed, 1 insertion(+), 1 deletion(-) 491s [b 1f7d097] b⇒1 on branch b 491s 1 file changed, 1 insertion(+) 491s create mode 100644 b.txt 491s [b 48df77d] b⇒2 and a⇒X on branch b 491s 2 files changed, 2 insertions(+), 2 deletions(-) 491s [b f3ef019] b⇒3 and a⇒0 on branch b 491s 2 files changed, 2 insertions(+), 2 deletions(-) 491s [b 69d0c21] b⇒4 on branch b 491s 1 file changed, 1 insertion(+), 1 deletion(-) 491s + flip_flop_test 2 491s + local n=2 491s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 491s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 491s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s + local description=git-imerge test repository with a commit and its revert at n=2 491s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 491s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s + local description=git-imerge test repository with a commit and its revert at n=2 491s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s hint: Using 'master' as the name for the initial branch. This default branch name 491s hint: is subject to change. To configure the initial branch name to use in all 491s hint: of your new repositories, which will suppress this warning, call: 491s hint: 491s hint: git config --global init.defaultBranch 491s hint: 491s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 491s hint: 'development'. The just-created branch can be renamed via this command: 491s hint: 491s hint: git branch -m 491s + echo git-imerge test repository with a commit and its revert at n=2 491s + printf %s\n /*.out /*.css /*.html 491s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2/.git config user.name Loú User 491s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2/.git config user.email luser@example.com 491s + TIME=1112911993 491s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-2 491s + modify a.txt 0 491s + filename=a.txt 491s + text=0 491s + echo 0 491s + git add a.txt 491s + commit -m m⇒0 491s + TIME=1112911994 491s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 491s + git checkout -b a -- 491s Switched to a new branch 'a' 491s + modify a.txt 1 491s + filename=a.txt 491s + text=1 491s + echo 1 491s + git add a.txt 491s + commit -m a⇒1 on branch a 491s + TIME=1112911995 491s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 491s + modify a.txt 2 491s + filename=a.txt 491s + text=2 491s + echo 2 491s + git add a.txt 491s + commit -m a⇒2 on branch a 491s + TIME=1112911996 491s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 491s + modify a.txt 3 491s + filename=a.txt 491s + text=3 491s + echo 3 491s + git add a.txt 491s + commit -m a⇒3 on branch a 491s + TIME=1112911997 491s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 491s + git checkout -b b master -- 491s Switched to a new branch 'b' 491s + modify b.txt 1 491s + filename=b.txt 491s + text=1 491s + echo 1 491s + git add b.txt 491s + msg=b⇒1 491s + test 1 = 2 491s + test 1 = 3 491s + commit -m b⇒1 on branch b 491s + TIME=1112911998 491s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 491s + modify b.txt 2 491s + filename=b.txt 491s + text=2 491s + echo 2 491s + git add b.txt 491s + msg=b⇒2 491s + test 2 = 2 491s + modify a.txt X 491s + filename=a.txt 491s + text=X 491s + echo X 491s + git add a.txt 491s + msg=b⇒2 and a⇒X 491s + test 2 = 3 491s + commit -m b⇒2 and a⇒X on branch b 491s + TIME=1112911999 491s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b 491s + modify b.txt 3 491s + filename=b.txt 491s + text=3 491s + echo 3 491s + git add b.txt 491s + msg=b⇒3 491s + test 3 = 2 491s + test 3 = 3 491s + modify a.txt 0 491s + filename=a.txt 491s + text=0 491s + echo 0 491s + git add a.txt 491s + msg=b⇒3 and a⇒0 491s + commit -m b⇒3 and a⇒0 on branch b 491s + TIME=1112912000 491s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b 491s + modify b.txt 4 491s + filename=b.txt 491s + text=4 491s + echo 4 491s + git add b.txt 491s + msg=b⇒4 491s + test 4 = 2 491s + test 4 = 3 491s + commit -m b⇒4 on branch b 491s + TIME=1112912001 491s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b 491s + test_merge b-into-a-2 a b 1-2 1-3 491s + local name=b-into-a-2 491s + local dst=a 491s + local src=b 491s + local conflict1=1-2 491s + local conflict2=1-3 491s + git checkout a 491s Switched to branch 'a' 491s + git-imerge merge --branch=b-into-a-2 b 491s + tee imerge-b-into-a-2-1.out 491s Attempting automerge of 3-4...success. 491s Autofilling 1-4...success. 491s Autofilling 2-4...success. 491s Autofilling 3-1...success. 491s Autofilling 3-2...unexpected conflict. Backtracking... 491s Autofilling 1-4...success. 491s Autofilling 2-1...success. 491s Autofilling 2-2...unexpected conflict. Backtracking... 491s Autofilling 1-1...success. 491s Autofilling 1-2...unexpected conflict. Backtracking... 491s Autofilling 1-1...success. 491s Autofilling 2-1...success. 491s Autofilling 3-1...success. 491s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. 491s Attempting automerge of 3-4...success. 491s Autofilling 1-4...success. 491s Autofilling 2-4...success. 491s Autofilling 3-2...unexpected conflict. Backtracking... 491s Autofilling 1-4...success. 491s Autofilling 2-2...unexpected conflict. Backtracking... 491s Autofilling 1-2...unexpected conflict. Backtracking... 491s Switched to branch 'imerge/b' 491s Auto-merging a.txt 491s CONFLICT (content): Merge conflict in a.txt 491s Automatic merge failed; fix conflicts and then commit the result. 491s 491s Original first commit: 491s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 491s Author: Loú User 491s Date: Thu Apr 7 22:13:15 2005 +0000 491s 491s a⇒1 on branch a 491s 491s Original second commit: 491s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 491s Author: Loú User 491s Date: Thu Apr 7 22:13:19 2005 +0000 491s 491s b⇒2 and a⇒X on branch b 491s 491s There was a conflict merging commit 1-2, shown above. 491s Please resolve the conflict, commit the result, then type 491s 491s git-imerge continue 491s + git-imerge diagram --commits --frontier 491s 0 3 491s | | 491s 0 - **** - a 491s *... 491s *#?? 491s *??? 491s 4 - *??? 491s | 491s b 491s 491s 0 3 491s | | 491s 0 - **** - a 491s *--+ 491s *#?? 491s *??? 491s 4 - *??? 491s | 491s b 491s 491s Key: 491s |,-,+ = rectangles forming current merge frontier 491s * = merge done manually 491s . = merge done automatically 491s # = conflict that is currently blocking progress 491s @ = merge was blocked but has been resolved 491s ? = no merge recorded 491s 491s + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out 491s + echo 1 491s + git add a.txt 491s + + git-imerge continue --no-edit 491s tee imerge-b-into-a-2-2.out 491s [imerge/b c7a857b] imerge 'b': manual merge 1-2 491s Merge has been recorded for merge 1-2. 491s Attempting automerge of 1-4...failure. 491s Attempting automerge of 1-3...failure. 491s Attempting automerge of 3-2...success. 491s Autofilling 2-2...success. 491s Autofilling 3-2...success. 491s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. 491s Previous HEAD position was 048b46a imerge 'b': automatic merge 3-2 491s Switched to branch 'imerge/b' 491s Auto-merging a.txt 491s CONFLICT (content): Merge conflict in a.txt 491s Automatic merge failed; fix conflicts and then commit the result. 491s 491s Original first commit: 491s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 491s Author: Loú User 491s Date: Thu Apr 7 22:13:15 2005 +0000 491s 491s a⇒1 on branch a 491s 491s Original second commit: 491s commit f3ef01986be02ef5e40589b283c0385471ecca7d 491s Author: Loú User 491s Date: Thu Apr 7 22:13:20 2005 +0000 491s 491s b⇒3 and a⇒0 on branch b 491s 491s There was a conflict merging commit 1-3, shown above. 491s Please resolve the conflict, commit the result, then type 491s 491s git-imerge continue 491s + git-imerge diagram --commits --frontier 491s 0 3 491s | | 491s 0 - **** - a 491s *... 491s **.. 491s *#?? 491s 4 - *??? 491s | 491s b 491s 491s 0 3 491s | | 491s 0 - **** - a 491s *..| 491s **-+ 491s *#?? 491s 4 - *??? 491s | 491s b 491s 491s Key: 491s |,-,+ = rectangles forming current merge frontier 491s * = merge done manually 491s . = merge done automatically 491s # = conflict that is currently blocking progress 491s @ = merge was blocked but has been resolved 491s ? = no merge recorded 491s 491s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out 491s + echo 1 491s + git add a.txt 491s + + git-imerge continue --no-edit 491s tee imerge-b-into-a-2-3.out 491s [imerge/b 7c273c7] imerge 'b': manual merge 1-3 491s Merge has been recorded for merge 1-3. 491s Attempting automerge of 1-4...success. 491s Autofilling 1-4...success. 491s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. 491s Attempting automerge of 3-4...success. 491s Autofilling 2-4...success. 491s Autofilling 3-3...success. 491s Autofilling 3-4 (first way)...success. 491s Autofilling 3-4 (second way)...success. 491s The two ways of autofilling 3-4 agree. 491s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. 491s Merge is complete! 491s + grep -q Merge is complete imerge-b-into-a-2-3.out 491s + git-imerge diagram --commits --frontier 492s 0 3 492s | | 492s 0 - **** - a 492s *... 492s **.. 492s **?. 492s 4 - *... 492s | 492s b 492s 492s 0 3 492s | | 492s 0 - **** - a 492s *..| 492s **.| 492s **?| 492s 4 - *--+ 492s | 492s b 492s 492s Key: 492s |,-,+ = rectangles forming current merge frontier 492s * = merge done manually 492s . = merge done automatically 492s # = conflict that is currently blocking progress 492s @ = merge was blocked but has been resolved 492s ? = no merge recorded 492s 492s + GIT_EDITOR=cat git-imerge finish 492s Merge b into a (using imerge) 492s 492s # Please enter the commit message for your changes. Lines starting 492s # with '#' will be ignored, and an empty message aborts the commit. 492s # 492s # Date: Wed Mar 20 09:29:58 2024 +0000 492s # 492s # On branch b-into-a-2 492s # Changes to be committed: 492s # new file: b.txt 492s # 492s [b-into-a-2 e2f060f] Merge b into a (using imerge) 492s Date: Wed Mar 20 09:29:58 2024 +0000 492s + test_merge a-into-b-2 b a 2-1 3-1 492s + local name=a-into-b-2 492s + local dst=b 492s + local src=a 492s + local conflict1=2-1 492s + local conflict2=3-1 492s + git checkout b 492s Switched to branch 'b' 492s + git-imerge merge --branch=a-into-b-2 a 492s + tee imerge-a-into-b-2-1.out 492s Attempting automerge of 4-3...success. 492s Autofilling 1-3...success. 492s Autofilling 2-3...unexpected conflict. Backtracking... 492s Autofilling 1-1...success. 492s Autofilling 1-2...success. 492s Autofilling 1-3...success. 492s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. 492s Autofilling 2-2...unexpected conflict. Backtracking... 492s Autofilling 2-1...unexpected conflict. Backtracking... 492s Switched to branch 'imerge/a' 492s Auto-merging a.txt 492s CONFLICT (content): Merge conflict in a.txt 492s Automatic merge failed; fix conflicts and then commit the result. 492s 492s Original first commit: 492s commit 48df77d20a6d16fe330e32ba17d5472d3868a622 492s Author: Loú User 492s Date: Thu Apr 7 22:13:19 2005 +0000 492s 492s b⇒2 and a⇒X on branch b 492s 492s Original second commit: 492s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 492s Author: Loú User 492s Date: Thu Apr 7 22:13:15 2005 +0000 492s 492s a⇒1 on branch a 492s 492s There was a conflict merging commit 2-1, shown above. 492s Please resolve the conflict, commit the result, then type 492s 492s git-imerge continue 492s + git-imerge diagram --commits --frontier 492s 0 4 492s | | 492s 0 - ***** - b 492s *.#?? 492s *.??? 492s 3 - *.??? 492s | 492s a 492s 492s 0 4 492s | | 492s 0 - ***** - b 492s *|#?? 492s *|??? 492s 3 - *+??? 492s | 492s a 492s 492s Key: 492s |,-,+ = rectangles forming current merge frontier 492s * = merge done manually 492s . = merge done automatically 492s # = conflict that is currently blocking progress 492s @ = merge was blocked but has been resolved 492s ? = no merge recorded 492s 492s + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out 492s + echo 1 492s + git add a.txt 492s + + tee imerge-a-into-b-2-2.out 492s git-imerge continue --no-edit 492s [imerge/a 25a5739] imerge 'a': manual merge 2-1 492s Merge has been recorded for merge 2-1. 492s Attempting automerge of 2-3...success. 492s Autofilling 2-2...success. 492s Autofilling 2-3...success. 492s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. 492s Attempting automerge of 4-3...failure. 492s Attempting automerge of 3-1...failure. 492s Switched to branch 'imerge/a' 492s Auto-merging a.txt 492s CONFLICT (content): Merge conflict in a.txt 492s Automatic merge failed; fix conflicts and then commit the result. 492s 492s Original first commit: 492s commit f3ef01986be02ef5e40589b283c0385471ecca7d 492s Author: Loú User 492s Date: Thu Apr 7 22:13:20 2005 +0000 492s 492s b⇒3 and a⇒0 on branch b 492s 492s Original second commit: 492s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 492s Author: Loú User 492s Date: Thu Apr 7 22:13:15 2005 +0000 492s 492s a⇒1 on branch a 492s 492s There was a conflict merging commit 3-1, shown above. 492s Please resolve the conflict, commit the result, then type 492s 492s git-imerge continue 492s + git-imerge diagram --commits --frontier 492s 0 4 492s | | 492s 0 - ***** - b 492s *.*#? 492s *..?? 492s 3 - *..?? 492s | 492s a 492s 492s 0 4 492s | | 492s 0 - ***** - b 492s *.*#? 492s *.|?? 492s 3 - *-+?? 492s | 492s a 492s 492s Key: 492s |,-,+ = rectangles forming current merge frontier 492s * = merge done manually 492s . = merge done automatically 492s # = conflict that is currently blocking progress 492s @ = merge was blocked but has been resolved 492s ? = no merge recorded 492s 492s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out 492s + echo 1 492s + git add a.txt 492s + + tee imerge-a-into-b-2-3.out 492s git-imerge continue --no-edit 492s [imerge/a c1808b2] imerge 'a': manual merge 3-1 492s Merge has been recorded for merge 3-1. 492s Attempting automerge of 3-3...success. 492s Autofilling 3-2...success. 493s Autofilling 3-3...success. 493s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 493s Attempting automerge of 4-3...success. 493s Autofilling 4-1...success. 493s Autofilling 4-2...success. 493s Autofilling 4-3...success. 493s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. 493s Merge is complete! 493s + grep -q Merge is complete imerge-a-into-b-2-3.out 493s + git-imerge diagram --commits --frontier 493s 0 4 493s | | 493s 0 - ***** - b 493s *.**. 493s *.... 493s 3 - *.... 493s | 493s a 493s 493s 0 4 493s | | 493s 0 - ***** - b 493s *.**| 493s *...| 493s 3 - *---+ 493s | 493s a 493s 493s Key: 493s |,-,+ = rectangles forming current merge frontier 493s * = merge done manually 493s . = merge done automatically 493s # = conflict that is currently blocking progress 493s @ = merge was blocked but has been resolved 493s ? = no merge recorded 493s 493s + GIT_EDITOR=cat git-imerge finish 493s Merge a into b (using imerge) 493s 493s # Please enter the commit message for your changes. Lines starting 493s # with '#' will be ignored, and an empty message aborts the commit. 493s # 493s # Date: Wed Mar 20 09:29:59 2024 +0000 493s # 493s # On branch a-into-b-2 493s # Changes to be committed: 493s # modified: a.txt 493s # 493s [a-into-b-2 0fff2a3] Merge a into b (using imerge) 493s Date: Wed Mar 20 09:29:59 2024 +0000 493s + flip_flop_test 3 493s + local n=3 493s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 493s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 493s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s + local description=git-imerge test repository with a commit and its revert at n=3 493s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 493s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s + local description=git-imerge test repository with a commit and its revert at n=3 493s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3/.git/ 493s hint: Using 'master' as the name for the initial branch. This default branch name 493s hint: is subject to change. To configure the initial branch name to use in all 493s hint: of your new repositories, which will suppress this warning, call: 493s hint: 493s hint: git config --global init.defaultBranch 493s hint: 493s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 493s hint: 'development'. The just-created branch can be renamed via this command: 493s hint: 493s hint: git branch -m 493s + echo git-imerge test repository with a commit and its revert at n=3 493s + printf %s\n /*.out /*.css /*.html 493s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3/.git config user.name Loú User 493s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3/.git config user.email luser@example.com 493s + TIME=1112911993 493s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/flip-flop-3 493s + modify a.txt 0 493s + filename=a.txt 493s + text=0 493s + echo 0 493s + git add a.txt 493s + commit -m m⇒0 493s + TIME=1112911994 493s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 493s [master (root-commit) a733afa] m⇒0 493s 1 file changed, 1 insertion(+) 493s create mode 100644 a.txt 493s + git checkout -b a -- 493s Switched to a new branch 'a' 493s + modify a.txt 1 493s + filename=a.txt 493s + text=1 493s + echo 1 493s + git add a.txt 493s + commit -m a⇒1 on branch a 493s + TIME=1112911995 493s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a 493s [a 2f1f75a] a⇒1 on branch a 493s 1 file changed, 1 insertion(+), 1 deletion(-) 493s + modify a.txt 2 493s + filename=a.txt 493s + text=2 493s + echo 2 493s + git add a.txt 493s + commit -m a⇒2 on branch a 493s + TIME=1112911996 493s [a 4700669] a⇒2 on branch a 493s 1 file changed, 1 insertion(+), 1 deletion(-) 493s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a 493s + modify a.txt 3 493s + filename=a.txt 493s + text=3 493s + echo 3 493s + git add a.txt 493s + commit -m a⇒3 on branch a 493s + TIME=1112911997 493s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a 493s [a 621c381] a⇒3 on branch a 493s 1 file changed, 1 insertion(+), 1 deletion(-) 493s + git checkout -b b master -- 493s Switched to a new branch 'b' 493s + modify b.txt 1 493s + filename=b.txt 493s + text=1 493s + echo 1 493s + git add b.txt 493s + msg=b⇒1 493s + test 1 = 3 493s + test 1 = 4 493s + commit -m b⇒1 on branch b 493s + TIME=1112911998 493s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b 493s + modify b.txt 2 493s + filename=b.txt 493s + text=2 493s + echo 2 493s + git add b.txt 493s [b 1f7d097] b⇒1 on branch b 493s 1 file changed, 1 insertion(+) 493s create mode 100644 b.txt 493s + msg=b⇒2 493s + test 2 = 3 493s + test 2 = 4 493s + commit -m b⇒2 on branch b 493s + TIME=1112911999 493s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b 493s [b ce671e9] b⇒2 on branch b 493s 1 file changed, 1 insertion(+), 1 deletion(-) 493s + modify b.txt 3 493s + filename=b.txt 493s + text=3 493s + echo 3 493s + git add b.txt 493s + msg=b⇒3 493s + test 3 = 3 493s + modify a.txt X 493s + filename=a.txt 493s + text=X 493s + echo X 493s + git add a.txt 493s + msg=b⇒3 and a⇒X 493s + test 3 = 4 493s + commit -m b⇒3 and a⇒X on branch b 493s + TIME=1112912000 493s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b 493s [b d40495e] b⇒3 and a⇒X on branch b 493s 2 files changed, 2 insertions(+), 2 deletions(-) 493s + modify b.txt 4 493s + filename=b.txt 493s + text=4 493s + echo 4 493s + git add b.txt 493s + msg=b⇒4 493s + test 4 = 3 493s + test 4 = 4 493s + modify a.txt 0 493s + filename=a.txt 493s + text=0 493s + echo 0 493s + git add a.txt 493s + msg=b⇒4 and a⇒0 493s + commit -m b⇒4 and a⇒0 on branch b 493s + TIME=1112912001 493s + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b 493s [b eb736f2] b⇒4 and a⇒0 on branch b 493s 2 files changed, 2 insertions(+), 2 deletions(-) 493s + test_merge b-into-a-3 a b 1-3 1-4 493s + local name=b-into-a-3 493s + local dst=a 493s + local src=b 493s + local conflict1=1-3 493s + local conflict2=1-4 493s + git checkout a 493s Switched to branch 'a' 493s + + git-imerge merge --branch=b-into-a-3 btee imerge-b-into-a-3-1.out 493s 493s Attempting automerge of 3-4...success. 493s Autofilling 1-4...success. 493s Autofilling 2-4...success. 493s Autofilling 3-1...success. 493s Autofilling 3-2...success. 493s Autofilling 3-3...unexpected conflict. Backtracking... 493s Autofilling 1-4...success. 493s Autofilling 2-1...success. 493s Autofilling 2-2...success. 493s Autofilling 2-3...unexpected conflict. Backtracking... 493s Autofilling 1-1...success. 493s Autofilling 1-2...success. 493s Autofilling 1-3...unexpected conflict. Backtracking... 493s Autofilling 1-2...success. 493s Autofilling 2-2...success. 493s Autofilling 3-1...success. 493s Autofilling 3-2 (first way)...success. 493s Autofilling 3-2 (second way)...success. 493s The two ways of autofilling 3-2 agree. 493s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. 493s Attempting automerge of 3-4...success. 493s Autofilling 1-4...success. 493s Autofilling 2-4...success. 493s Autofilling 3-3...unexpected conflict. Backtracking... 493s Autofilling 1-4...success. 493s Autofilling 2-3...unexpected conflict. Backtracking... 493s Autofilling 1-3...unexpected conflict. Backtracking... 493s Switched to branch 'imerge/b' 493s Auto-merging a.txt 493s CONFLICT (content): Merge conflict in a.txt 493s Automatic merge failed; fix conflicts and then commit the result. 493s 493s Original first commit: 493s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 493s Author: Loú User 493s Date: Thu Apr 7 22:13:15 2005 +0000 493s 493s a⇒1 on branch a 493s 493s Original second commit: 493s commit d40495ed379f376841e517047f90b663e8c7c7e1 493s Author: Loú User 493s Date: Thu Apr 7 22:13:20 2005 +0000 493s 493s b⇒3 and a⇒X on branch b 493s 493s There was a conflict merging commit 1-3, shown above. 493s Please resolve the conflict, commit the result, then type 493s 493s git-imerge continue 493s + git-imerge diagram --commits --frontier 493s 0 3 493s | | 493s 0 - **** - a 493s *??. 493s *... 493s *#?? 493s 4 - *??? 493s | 493s b 493s 493s 0 3 493s | | 493s 0 - **** - a 493s *??| 493s *--+ 493s *#?? 493s 4 - *??? 493s | 493s b 493s 493s Key: 493s |,-,+ = rectangles forming current merge frontier 493s * = merge done manually 493s . = merge done automatically 493s # = conflict that is currently blocking progress 493s @ = merge was blocked but has been resolved 493s ? = no merge recorded 493s 493s + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out 493s + echo 1 493s + git add a.txt 493s + + git-imerge continue --no-edit 493s tee imerge-b-into-a-3-2.out 494s [imerge/b c0756c2] imerge 'b': manual merge 1-3 494s Merge has been recorded for merge 1-3. 494s Attempting automerge of 1-4...failure. 494s Attempting automerge of 1-4...failure. 494s Attempting automerge of 3-3...success. 494s Autofilling 2-3...success. 494s Autofilling 3-3...success. 494s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. 494s Previous HEAD position was 274e889 imerge 'b': automatic merge 3-3 494s Switched to branch 'imerge/b' 494s Auto-merging a.txt 494s CONFLICT (content): Merge conflict in a.txt 494s Automatic merge failed; fix conflicts and then commit the result. 494s 494s Original first commit: 494s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 494s Author: Loú User 494s Date: Thu Apr 7 22:13:15 2005 +0000 494s 494s a⇒1 on branch a 494s 494s Original second commit: 494s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 494s Author: Loú User 494s Date: Thu Apr 7 22:13:21 2005 +0000 494s 494s b⇒4 and a⇒0 on branch b 494s 494s There was a conflict merging commit 1-4, shown above. 494s Please resolve the conflict, commit the result, then type 494s 494s git-imerge continue 494s + git-imerge diagram --commits --frontier 494s 0 3 494s | | 494s 0 - **** - a 494s *??. 494s *... 494s **.. 494s 4 - *#?? 494s | 494s b 494s 494s 0 3 494s | | 494s 0 - **** - a 494s *??| 494s *..| 494s **-+ 494s 4 - *#?? 494s | 494s b 494s 494s Key: 494s |,-,+ = rectangles forming current merge frontier 494s * = merge done manually 494s . = merge done automatically 494s # = conflict that is currently blocking progress 494s @ = merge was blocked but has been resolved 494s ? = no merge recorded 494s 494s + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out 494s + echo 1 494s + git add a.txt 494s + + git-imerge continue --no-edit 494s tee imerge-b-into-a-3-3.out 494s [imerge/b 0d5b080] imerge 'b': manual merge 1-4 494s Merge has been recorded for merge 1-4. 494s Attempting automerge of 3-4...success. 494s Autofilling 2-4...success. 494s Autofilling 3-4...success. 494s Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. 494s Merge is complete! 494s + grep -q Merge is complete imerge-b-into-a-3-3.out 494s + git-imerge diagram --commits --frontier 494s 0 3 494s | | 494s 0 - **** - a 494s *??. 494s *... 494s **.. 494s 4 - **.. 494s | 494s b 494s 494s 0 3 494s | | 494s 0 - **** - a 494s *??| 494s *..| 494s **.| 494s 4 - **-+ 494s | 494s b 494s 494s Key: 494s |,-,+ = rectangles forming current merge frontier 494s * = merge done manually 494s . = merge done automatically 494s # = conflict that is currently blocking progress 494s @ = merge was blocked but has been resolved 494s ? = no merge recorded 494s 494s + GIT_EDITOR=cat git-imerge finish 494s Merge b into a (using imerge) 494s 494s # Please enter the commit message for your changes. Lines starting 494s # with '#' will be ignored, and an empty message aborts the commit. 494s # 494s # Date: Wed Mar 20 09:30:00 2024 +0000 494s # 494s # On branch b-into-a-3 494s # Changes to be committed: 494s # new file: b.txt 494s # 494s [b-into-a-3 4aa1007] Merge b into a (using imerge) 494s Date: Wed Mar 20 09:30:00 2024 +0000 494s + test_merge a-into-b-3 b a 3-1 4-1 494s + local name=a-into-b-3 494s + local dst=b 494s + local src=a 494s + local conflict1=3-1 494s + local conflict2=4-1 494s + git checkout b 494s Switched to branch 'b' 494s + + git-imerge merge --branch=a-into-b-3 a 494s tee imerge-a-into-b-3-1.out 494s Attempting automerge of 4-3...success. 494s Autofilling 1-3...success. 494s Autofilling 2-3...success. 494s Autofilling 3-3...unexpected conflict. Backtracking... 494s Autofilling 1-3...success. 494s Autofilling 2-1...success. 494s Autofilling 2-2...success. 494s Autofilling 2-3 (first way)...success. 494s Autofilling 2-3 (second way)...success. 494s The two ways of autofilling 2-3 agree. 494s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. 494s Autofilling 3-2...unexpected conflict. Backtracking... 494s Autofilling 3-1...unexpected conflict. Backtracking... 494s Switched to branch 'imerge/a' 494s Auto-merging a.txt 494s CONFLICT (content): Merge conflict in a.txt 494s Automatic merge failed; fix conflicts and then commit the result. 494s 494s Original first commit: 494s commit d40495ed379f376841e517047f90b663e8c7c7e1 494s Author: Loú User 494s Date: Thu Apr 7 22:13:20 2005 +0000 494s 494s b⇒3 and a⇒X on branch b 494s 494s Original second commit: 494s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 494s Author: Loú User 494s Date: Thu Apr 7 22:13:15 2005 +0000 494s 494s a⇒1 on branch a 494s 494s There was a conflict merging commit 3-1, shown above. 494s Please resolve the conflict, commit the result, then type 494s 494s git-imerge continue 494s + git-imerge diagram --commits --frontier 494s 0 4 494s | | 494s 0 - ***** - b 494s *?.#? 494s *?.?? 494s 3 - *..?? 494s | 494s a 494s 494s 0 4 494s | | 494s 0 - ***** - b 494s *?|#? 494s *?|?? 494s 3 - *-+?? 494s | 494s a 494s 494s Key: 494s |,-,+ = rectangles forming current merge frontier 494s * = merge done manually 494s . = merge done automatically 494s # = conflict that is currently blocking progress 494s @ = merge was blocked but has been resolved 494s ? = no merge recorded 494s 495s + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out 495s + echo 1 495s + git add a.txt 495s + git-imerge continue --no-edit 495s + tee imerge-a-into-b-3-2.out 495s [imerge/a 2e82316] imerge 'a': manual merge 3-1 495s Merge has been recorded for merge 3-1. 495s Attempting automerge of 3-3...success. 495s Autofilling 3-2...success. 495s Autofilling 3-3...success. 495s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. 495s Attempting automerge of 4-3...failure. 495s Attempting automerge of 4-1...failure. 495s Switched to branch 'imerge/a' 495s Auto-merging a.txt 495s CONFLICT (content): Merge conflict in a.txt 495s Automatic merge failed; fix conflicts and then commit the result. 495s 495s Original first commit: 495s commit eb736f2ae81944f79f443fd39a89adf74dbc907a 495s Author: Loú User 495s Date: Thu Apr 7 22:13:21 2005 +0000 495s 495s b⇒4 and a⇒0 on branch b 495s 495s Original second commit: 495s commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 495s Author: Loú User 495s Date: Thu Apr 7 22:13:15 2005 +0000 495s 495s a⇒1 on branch a 495s 495s There was a conflict merging commit 4-1, shown above. 495s Please resolve the conflict, commit the result, then type 495s 495s git-imerge continue 495s + git-imerge diagram --commits --frontier 495s 0 4 495s | | 495s 0 - ***** - b 495s *?.*# 495s *?..? 495s 3 - *...? 495s | 495s a 495s 495s 0 4 495s | | 495s 0 - ***** - b 495s *?.*# 495s *?.|? 495s 3 - *--+? 495s | 495s a 495s 495s Key: 495s |,-,+ = rectangles forming current merge frontier 495s * = merge done manually 495s . = merge done automatically 495s # = conflict that is currently blocking progress 495s @ = merge was blocked but has been resolved 495s ? = no merge recorded 495s 495s + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out 495s + echo 1 495s + git add a.txt 495s + + git-imerge continue --no-edit 495s tee imerge-a-into-b-3-3.out 495s [imerge/a ac72e3b] imerge 'a': manual merge 4-1 495s Merge has been recorded for merge 4-1. 495s Attempting automerge of 4-3...success. 495s Autofilling 4-2...success. 495s Autofilling 4-3...success. 495s Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. 495s Merge is complete! 495s + grep -q Merge is complete imerge-a-into-b-3-3.out 495s + git-imerge diagram --commits --frontier 495s 0 4 495s | | 495s 0 - ***** - b 495s *?.** 495s *?... 495s 3 - *.... 495s | 495s a 495s 495s 0 4 495s | | 495s 0 - ***** - b 495s *?.** 495s *?..| 495s 3 - *---+ 495s | 495s a 495s 495s Key: 495s |,-,+ = rectangles forming current merge frontier 495s * = merge done manually 495s . = merge done automatically 495s # = conflict that is currently blocking progress 495s @ = merge was blocked but has been resolved 495s ? = no merge recorded 495s 495s + GIT_EDITOR=cat git-imerge finish 495s Merge a into b (using imerge) 495s 495s # Please enter the commit message for your changes. Lines starting 495s # with '#' will be ignored, and an empty message aborts the commit. 495s # 495s # Date: Wed Mar 20 09:30:01 2024 +0000 495s # 495s # On branch a-into-b-3 495s # Changes to be committed: 495s # modified: a.txt 495s # 495s [a-into-b-3 f1d5141] Merge a into b (using imerge) 495s Date: Wed Mar 20 09:30:01 2024 +0000 495s py312: commands[5] /tmp/autopkgtest.Q8MZaX/build.vm7/src> /bin/sh t/test-drop 495s + dirname t/test-drop 495s Initialized empty Git repository in /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop/.git/ 495s [master (root-commit) a733afa] m⇒0 495s 1 file changed, 1 insertion(+) 495s create mode 100644 a.txt 495s [master 389a4ba] a1⇒1 495s 1 file changed, 1 insertion(+) 495s create mode 100644 a1.txt 495s [master 4785218] a2⇒2 495s 1 file changed, 1 insertion(+) 495s create mode 100644 a2.txt 495s [master 34bdde3] a3⇒3 495s 1 file changed, 1 insertion(+) 495s create mode 100644 a3.txt 495s [master c793a5a] a4⇒4 495s 1 file changed, 1 insertion(+) 495s create mode 100644 a4.txt 495s [master b42f60c] a5⇒5 495s 1 file changed, 1 insertion(+) 495s create mode 100644 a5.txt 495s [master 9d6aec5] a6⇒6 495s 1 file changed, 1 insertion(+) 495s create mode 100644 a6.txt 495s + cd t 495s + pwd 495s + dirname /tmp/autopkgtest.Q8MZaX/build.vm7/src/t 495s + BASE=/tmp/autopkgtest.Q8MZaX/build.vm7/src 495s + . /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/test-lib.sh 495s + GIT_IMERGE=git-imerge 495s + TMP=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s + DESCRIPTION=git-imerge drop test repository 495s + init_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop git-imerge drop test repository 495s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s + local description=git-imerge drop test repository 495s + delete_test_repo /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop git-imerge drop test repository 495s + local path=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s + local description=git-imerge drop test repository 495s + test -d /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s + mkdir -p /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s + git init /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s hint: Using 'master' as the name for the initial branch. This default branch name 495s hint: is subject to change. To configure the initial branch name to use in all 495s hint: of your new repositories, which will suppress this warning, call: 495s hint: 495s hint: git config --global init.defaultBranch 495s hint: 495s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 495s hint: 'development'. The just-created branch can be renamed via this command: 495s hint: 495s hint: git branch -m 495s + echo git-imerge drop test repository 495s + printf %s\n /*.out /*.css /*.html 495s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop/.git config user.name Loú User 495s + git --git-dir=/tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop/.git config user.email luser@example.com 495s + TIME=1112911993 495s + ln -s /tmp/autopkgtest.Q8MZaX/build.vm7/src/imerge.css /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s + cd /tmp/autopkgtest.Q8MZaX/build.vm7/src/t/tmp/drop 495s + modify a.txt 0 495s + filename=a.txt 495s + text=0 495s + echo 0 495s + git add a.txt 495s + commit -m m⇒0 495s + TIME=1112911994 495s + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 495s + seq 6 495s + modify a1.txt 1 495s + filename=a1.txt 495s + text=1 495s + echo 1 495s + git add a1.txt 495s + commit -m a1⇒1 495s + TIME=1112911995 495s + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 495s + modify a2.txt 2 495s + filename=a2.txt 495s + text=2 495s + echo 2 495s + git add a2.txt 495s + commit -m a2⇒2 495s + TIME=1112911996 495s + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 495s + modify a3.txt 3 495s + filename=a3.txt 495s + text=3 495s + echo 3 495s + git add a3.txt 495s + commit -m a3⇒3 495s + TIME=1112911997 495s + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 495s + modify a4.txt 4 495s + filename=a4.txt 495s + text=4 495s + echo 4 495s + git add a4.txt 495s + commit -m a4⇒4 495s + TIME=1112911998 495s + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 495s + modify a5.txt 5 495s + filename=a5.txt 495s + text=5 495s + echo 5 495s + git add a5.txt 495s + commit -m a5⇒5 495s + TIME=1112911999 495s + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 495s + modify a6.txt 6 495s + filename=a6.txt 495s + text=6 495s + echo 6 495s + git add a6.txt 495s + commit -m a6⇒6 495s + TIME=1112912000 495s + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 495s + git checkout -b dropped master 495s Switched to a new branch 'dropped' 495s + git-imerge drop HEAD~5..HEAD~3 495s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 495s 495s You are in 'detached HEAD' state. You can look around, make experimental 495s changes and commit them, and you can discard any commits you make in this 495s state without impacting any branches by switching back to a branch. 495s 495s If you want to create a new branch to retain commits you create, you may 495s do so (now or later) by using -c with the switch command. Example: 495s 495s git switch -c 495s 495s Or undo this operation with: 495s 495s git switch - 495s 495s Turn off this advice by setting config variable advice.detachedHead to false 495s 495s HEAD is now at 34bdde3 a3⇒3 495s [detached HEAD 59b4fda] Revert "a3⇒3" 495s Date: Wed Mar 20 09:30:01 2024 +0000 495s 1 file changed, 1 deletion(-) 495s delete mode 100644 a3.txt 495s [detached HEAD 463b7e5] Revert "a2⇒2" 495s Date: Wed Mar 20 09:30:01 2024 +0000 495s 1 file changed, 1 deletion(-) 495s delete mode 100644 a2.txt 495s Attempting automerge of 3-2...success. 495s Autofilling 1-2...success. 495s Autofilling 2-2...success. 495s Autofilling 3-1...success. 495s Autofilling 3-2 (first way)...success. 495s Autofilling 3-2 (second way)...success. 495s The two ways of autofilling 3-2 agree. 495s Recording autofilled block MergeState('dropped', tip1='dropped', tip2='463b7e5820a961b0a4ed6004a5080c358959d7d8', goal='drop')[0:4,0:3]. 496s Merge is complete! 496s + git-imerge diagram --commits --frontier --html=imerge-drop.html 496s 0 3 496s | | 496s 0 - **** - dropped 496s *??. 496s 2 - *... 496s | 496s 463b7e5820a961b0a4ed6004a5080c358959d7d8 496s 496s 0 3 496s | | 496s 0 - **** - dropped 496s *??| 496s 2 - *--+ 496s | 496s 463b7e5820a961b0a4ed6004a5080c358959d7d8 496s 496s Key: 496s |,-,+ = rectangles forming current merge frontier 496s * = merge done manually 496s . = merge done automatically 496s # = conflict that is currently blocking progress 496s @ = merge was blocked but has been resolved 496s ? = no merge recorded 496s 496s + git-imerge finish 496s + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b 496s + local refname=dropped 496s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 496s + git rev-parse dropped^{tree} 496s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 496s + git checkout -b reverted master 496s Switched to a new branch 'reverted' 496s + git-imerge revert HEAD~5..HEAD~3 496s Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. 496s 496s You are in 'detached HEAD' state. You can look around, make experimental 496s changes and commit them, and you can discard any commits you make in this 496s state without impacting any branches by switching back to a branch. 496s 496s If you want to create a new branch to retain commits you create, you may 496s do so (now or later) by using -c with the switch command. Example: 496s 496s git switch -c 496s 496s Or undo this operation with: 496s 496s git switch - 496s 496s Turn off this advice by setting config variable advice.detachedHead to false 496s 496s HEAD is now at 34bdde3 a3⇒3 496s [detached HEAD e0cdc80] Revert "a3⇒3" 496s Date: Wed Mar 20 09:30:02 2024 +0000 496s 1 file changed, 1 deletion(-) 496s delete mode 100644 a3.txt 496s [detached HEAD 3f9af6a] Revert "a2⇒2" 496s Date: Wed Mar 20 09:30:02 2024 +0000 496s 1 file changed, 1 deletion(-) 496s delete mode 100644 a2.txt 496s Attempting automerge of 3-2...success. 496s Autofilling 1-2...success. 496s Autofilling 2-2...success. 496s Autofilling 3-1...success. 496s Autofilling 3-2 (first way)...success. 496s Autofilling 3-2 (second way)...success. 496s The two ways of autofilling 3-2 agree. 496s Recording autofilled block MergeState('reverted', tip1='reverted', tip2='3f9af6aef54b285e0ca9d1a5d7f9090d91aa1924', goal='revert')[0:4,0:3]. 496s Merge is complete! 496s + git-imerge diagram --commits --frontier --html=imerge-revert.html 496s 0 3 496s | | 496s 0 - **** - reverted 496s *??. 496s 2 - *... 496s | 496s 3f9af6aef54b285e0ca9d1a5d7f9090d91aa1924 496s 496s 0 3 496s | | 496s 0 - **** - reverted 496s *??| 496s 2 - *--+ 496s | 496s 3f9af6aef54b285e0ca9d1a5d7f9090d91aa1924 496s 496s Key: 496s |,-,+ = rectangles forming current merge frontier 496s * = merge done manually 496s . = merge done automatically 496s # = conflict that is currently blocking progress 496s @ = merge was blocked but has been resolved 496s ? = no merge recorded 496s 496s + git-imerge finish 496s + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b 496s + local refname=reverted 496s + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b 496s + git rev-parse reverted^{tree} 496s + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b 496s py312: OK (54.24=setup[0.28]+cmd[2.71,35.30,5.85,2.07,7.06,0.98] seconds) 496s congratulations :) (54.35 seconds) 497s autopkgtest [09:30:03]: test pybuild-autopkgtest: -----------------------] 497s pybuild-autopkgtest PASS 497s autopkgtest [09:30:03]: test pybuild-autopkgtest: - - - - - - - - - - results - - - - - - - - - - 498s autopkgtest [09:30:04]: @@@@@@@@@@@@@@@@@@@@ summary 498s pybuild-autopkgtest PASS 518s Creating nova instance adt-noble-ppc64el-git-imerge-20240320-092146-juju-7f2275-prod-proposed-migration-environment-3 from image adt/ubuntu-noble-ppc64el-server-20240320.img (UUID 1c7ceb83-4842-4144-a3c9-88510cdc9534)...