https://launchpad.net/ubuntu/+archive/test-rebuild-20220617-kinetic/+build/23997183 RUN: /usr/share/launchpad-buildd/bin/builder-prep Kernel version: Linux lgw01-amd64-016 5.4.0-120-generic #136-Ubuntu SMP Fri Jun 10 13:40:48 UTC 2022 x86_64 Buildd toolchain package versions: launchpad-buildd_215~563~ubuntu20.04.1 python3-lpbuildd_215~563~ubuntu20.04.1 sbuild_0.79.0-1ubuntu1 git-build-recipe_0.3.6 git_1:2.25.1-1ubuntu3.4 dpkg-dev_1.19.7ubuntu3.2 python3-debian_0.1.36ubuntu1. Syncing the system clock with the buildd NTP service... 22 Jun 13:08:30 ntpdate[1813]: adjust time server 10.211.37.1 offset -0.000356 sec RUN: /usr/share/launchpad-buildd/bin/in-target unpack-chroot --backend=chroot --series=kinetic --arch=amd64 PACKAGEBUILD-23997183 --image-type chroot /home/buildd/filecache-default/4d18961cd05542d5def75b14497015b674c37821 Creating target for build PACKAGEBUILD-23997183 RUN: /usr/share/launchpad-buildd/bin/in-target mount-chroot --backend=chroot --series=kinetic --arch=amd64 PACKAGEBUILD-23997183 Starting target for build PACKAGEBUILD-23997183 RUN: /usr/share/launchpad-buildd/bin/in-target override-sources-list --backend=chroot --series=kinetic --arch=amd64 PACKAGEBUILD-23997183 'deb http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic main' 'deb http://ftpmaster.internal/ubuntu kinetic main universe' Overriding sources.list in build-PACKAGEBUILD-23997183 RUN: /usr/share/launchpad-buildd/bin/in-target add-trusted-keys --backend=chroot --series=kinetic --arch=amd64 PACKAGEBUILD-23997183 Adding trusted keys to build-PACKAGEBUILD-23997183 pub rsa1024/1E9377A2BA9EF27F 2009-10-22 [SC] Key fingerprint = 60C3 1780 3A41 BA51 845E 371A 1E93 77A2 BA9E F27F uid Launchpad Toolchain builds RUN: /usr/share/launchpad-buildd/bin/in-target update-debian-chroot --backend=chroot --series=kinetic --arch=amd64 PACKAGEBUILD-23997183 Updating target for build PACKAGEBUILD-23997183 Get:1 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic InRelease [23.8 kB] Get:2 http://ftpmaster.internal/ubuntu kinetic InRelease [267 kB] Get:3 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 Packages [9632 B] Get:4 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main Translation-en [4132 B] Get:5 http://ftpmaster.internal/ubuntu kinetic/main amd64 Packages [1398 kB] Get:6 http://ftpmaster.internal/ubuntu kinetic/main Translation-en [510 kB] Get:7 http://ftpmaster.internal/ubuntu kinetic/universe amd64 Packages [13.9 MB] Get:8 http://ftpmaster.internal/ubuntu kinetic/universe Translation-en [5728 kB] Fetched 21.9 MB in 6s (3379 kB/s) Reading package lists... Reading package lists... Building dependency tree... Reading state information... Calculating upgrade... The following NEW packages will be installed: libgprofng0 util-linux-extra The following packages will be upgraded: adduser apt base-files binutils binutils-common binutils-x86-64-linux-gnu bsdutils cpp-11 dpkg dpkg-dev e2fsprogs fakeroot g++-11 gcc-11 gcc-11-base gcc-12-base init init-system-helpers libapparmor1 libapt-pkg6.0 libasan6 libatomic1 libbinutils libblkid1 libcap-ng0 libcc1-0 libcom-err2 libctf-nobfd0 libctf0 libdb5.3 libdpkg-perl libext2fs2 libfakeroot libgcc-11-dev libgcc-s1 libgcrypt20 libgnutls30 libgomp1 libgpg-error0 libip4tc2 libitm1 libkeyutils1 liblsan0 liblzma5 libmount1 libncurses6 libncursesw6 libpng16-16 libquadmath0 libreadline8 libselinux1 libsemanage-common libsemanage2 libsepol2 libsmartcols1 libsqlite3-0 libss2 libssl3 libstdc++-11-dev libstdc++6 libsystemd0 libtinfo6 libtsan0 libubsan1 libudev1 libuuid1 libzstd1 login logsave lto-disabled-list mawk mount ncurses-base ncurses-bin openssl passwd pinentry-curses policyrcd-script-zg2 readline-common systemd systemd-sysv util-linux xz-utils 83 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. Need to get 79.7 MB of archives. After this operation, 5304 kB of additional disk space will be used. Get:1 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 libctf0 amd64 2.38.50.20220615-4ubuntu1 [103 kB] Get:2 http://ftpmaster.internal/ubuntu kinetic/main amd64 base-files amd64 12.2ubuntu1 [62.6 kB] Get:3 http://ftpmaster.internal/ubuntu kinetic/main amd64 bsdutils amd64 1:2.38-4ubuntu1 [80.7 kB] Get:4 http://ftpmaster.internal/ubuntu kinetic/main amd64 libzstd1 amd64 1.5.2+dfsg-1 [270 kB] Get:5 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 libctf-nobfd0 amd64 2.38.50.20220615-4ubuntu1 [107 kB] Get:6 http://ftpmaster.internal/ubuntu kinetic/main amd64 libatomic1 amd64 12.1.0-2ubuntu1 [10.4 kB] Get:7 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 binutils-x86-64-linux-gnu amd64 2.38.50.20220615-4ubuntu1 [2476 kB] Get:8 http://ftpmaster.internal/ubuntu kinetic/main amd64 libubsan1 amd64 12.1.0-2ubuntu1 [969 kB] Get:9 http://ftpmaster.internal/ubuntu kinetic/main amd64 libquadmath0 amd64 12.1.0-2ubuntu1 [152 kB] Get:10 http://ftpmaster.internal/ubuntu kinetic/main amd64 liblsan0 amd64 12.1.0-2ubuntu1 [1060 kB] Get:11 http://ftpmaster.internal/ubuntu kinetic/main amd64 libitm1 amd64 12.1.0-2ubuntu1 [29.5 kB] Get:12 http://ftpmaster.internal/ubuntu kinetic/main amd64 libgomp1 amd64 12.1.0-2ubuntu1 [125 kB] Get:13 http://ftpmaster.internal/ubuntu kinetic/main amd64 gcc-12-base amd64 12.1.0-2ubuntu1 [18.8 kB] Get:14 http://ftpmaster.internal/ubuntu kinetic/main amd64 libgcc-s1 amd64 12.1.0-2ubuntu1 [54.2 kB] Get:15 http://ftpmaster.internal/ubuntu kinetic/main amd64 libcc1-0 amd64 12.1.0-2ubuntu1 [46.6 kB] Get:16 http://ftpmaster.internal/ubuntu kinetic/main amd64 libstdc++6 amd64 12.1.0-2ubuntu1 [679 kB] Get:17 http://ftpmaster.internal/ubuntu kinetic/main amd64 libgpg-error0 amd64 1.45-2 [69.0 kB] Get:18 http://ftpmaster.internal/ubuntu kinetic/main amd64 libgcrypt20 amd64 1.10.1-2ubuntu1 [524 kB] Get:19 http://ftpmaster.internal/ubuntu kinetic/main amd64 liblzma5 amd64 5.2.5-2.1 [99.2 kB] Get:20 http://ftpmaster.internal/ubuntu kinetic/main amd64 systemd-sysv amd64 249.11-0ubuntu4 [10.2 kB] Get:21 http://ftpmaster.internal/ubuntu kinetic/main amd64 libapparmor1 amd64 3.0.4-2ubuntu3 [38.0 kB] Get:22 http://ftpmaster.internal/ubuntu kinetic/main amd64 libgnutls30 amd64 3.7.6-2ubuntu1 [968 kB] Get:23 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 libbinutils amd64 2.38.50.20220615-4ubuntu1 [655 kB] Get:24 http://ftpmaster.internal/ubuntu kinetic/main amd64 libip4tc2 amd64 1.8.7-1ubuntu6 [19.7 kB] Get:25 http://ftpmaster.internal/ubuntu kinetic/main amd64 libblkid1 amd64 2.38-4ubuntu1 [103 kB] Get:26 http://ftpmaster.internal/ubuntu kinetic/main amd64 libselinux1 amd64 3.4-1 [77.6 kB] Get:27 http://ftpmaster.internal/ubuntu kinetic/main amd64 libmount1 amd64 2.38-4ubuntu1 [121 kB] Get:28 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsmartcols1 amd64 2.38-4ubuntu1 [50.8 kB] Get:29 http://ftpmaster.internal/ubuntu kinetic/main amd64 login amd64 1:4.11.1+dfsg1-2ubuntu1 [183 kB] Get:30 http://ftpmaster.internal/ubuntu kinetic/main amd64 util-linux-extra amd64 2.38-4ubuntu1 [83.8 kB] Get:31 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 binutils amd64 2.38.50.20220615-4ubuntu1 [3292 B] Get:32 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 binutils-common amd64 2.38.50.20220615-4ubuntu1 [224 kB] Get:33 http://ftpmaster.internal/ubuntu kinetic/main amd64 util-linux amd64 2.38-4ubuntu1 [1069 kB] Get:34 http://ppa.launchpadcontent.net/ubuntu-toolchain-r/binutils/ubuntu kinetic/main amd64 libgprofng0 amd64 2.38.50.20220615-4ubuntu1 [963 kB] Get:35 http://ftpmaster.internal/ubuntu kinetic/main amd64 mount amd64 2.38-4ubuntu1 [114 kB] Get:36 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsemanage-common all 3.4-1 [9828 B] Get:37 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsepol2 amd64 3.4-2 [294 kB] Get:38 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsemanage2 amd64 3.4-1 [91.8 kB] Get:39 http://ftpmaster.internal/ubuntu kinetic/main amd64 passwd amd64 1:4.11.1+dfsg1-2ubuntu1 [765 kB] Get:40 http://ftpmaster.internal/ubuntu kinetic/main amd64 adduser all 3.121ubuntu1 [150 kB] Get:41 http://ftpmaster.internal/ubuntu kinetic/main amd64 systemd amd64 249.11-0ubuntu4 [4517 kB] Get:42 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsystemd0 amd64 249.11-0ubuntu4 [314 kB] Get:43 http://ftpmaster.internal/ubuntu kinetic/main amd64 libudev1 amd64 249.11-0ubuntu4 [76.1 kB] Get:44 http://ftpmaster.internal/ubuntu kinetic/main amd64 libapt-pkg6.0 amd64 2.5.0 [896 kB] Get:45 http://ftpmaster.internal/ubuntu kinetic/main amd64 dpkg amd64 1.21.8ubuntu1 [1333 kB] Get:46 http://ftpmaster.internal/ubuntu kinetic/main amd64 ncurses-bin amd64 6.3+20220423-2 [183 kB] Get:47 http://ftpmaster.internal/ubuntu kinetic/main amd64 init-system-helpers all 1.63 [38.7 kB] Get:48 http://ftpmaster.internal/ubuntu kinetic/main amd64 ncurses-base all 6.3+20220423-2 [21.2 kB] Get:49 http://ftpmaster.internal/ubuntu kinetic/main amd64 apt amd64 2.5.0 [1370 kB] Get:50 http://ftpmaster.internal/ubuntu kinetic/main amd64 logsave amd64 1.46.5-2ubuntu2 [9914 B] Get:51 http://ftpmaster.internal/ubuntu kinetic/main amd64 libext2fs2 amd64 1.46.5-2ubuntu2 [205 kB] Get:52 http://ftpmaster.internal/ubuntu kinetic/main amd64 e2fsprogs amd64 1.46.5-2ubuntu2 [585 kB] Get:53 http://ftpmaster.internal/ubuntu kinetic/main amd64 init amd64 1.63 [5674 B] Get:54 http://ftpmaster.internal/ubuntu kinetic/main amd64 libcap-ng0 amd64 0.7.9-4 [12.1 kB] Get:55 http://ftpmaster.internal/ubuntu kinetic/main amd64 libdb5.3 amd64 5.3.28+dfsg1-0.9 [717 kB] Get:56 http://ftpmaster.internal/ubuntu kinetic/main amd64 libncurses6 amd64 6.3+20220423-2 [110 kB] Get:57 http://ftpmaster.internal/ubuntu kinetic/main amd64 libncursesw6 amd64 6.3+20220423-2 [146 kB] Get:58 http://ftpmaster.internal/ubuntu kinetic/main amd64 libtinfo6 amd64 6.3+20220423-2 [99.6 kB] Get:59 http://ftpmaster.internal/ubuntu kinetic/main amd64 libuuid1 amd64 2.38-4ubuntu1 [23.2 kB] Get:60 http://ftpmaster.internal/ubuntu kinetic/main amd64 libcom-err2 amd64 1.46.5-2ubuntu2 [9074 B] Get:61 http://ftpmaster.internal/ubuntu kinetic/main amd64 libss2 amd64 1.46.5-2ubuntu2 [12.3 kB] Get:62 http://ftpmaster.internal/ubuntu kinetic/main amd64 mawk amd64 1.3.4.20200120-3.1 [109 kB] Get:63 http://ftpmaster.internal/ubuntu kinetic/main amd64 libkeyutils1 amd64 1.6.1-3ubuntu1 [10.1 kB] Get:64 http://ftpmaster.internal/ubuntu kinetic/main amd64 readline-common all 8.1.2-1.2 [53.6 kB] Get:65 http://ftpmaster.internal/ubuntu kinetic/main amd64 libreadline8 amd64 8.1.2-1.2 [153 kB] Get:66 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsqlite3-0 amd64 3.38.5-1 [646 kB] Get:67 http://ftpmaster.internal/ubuntu kinetic/main amd64 libssl3 amd64 3.0.3-5ubuntu3 [1897 kB] Get:68 http://ftpmaster.internal/ubuntu kinetic/main amd64 openssl amd64 3.0.3-5ubuntu3 [1175 kB] Get:69 http://ftpmaster.internal/ubuntu kinetic/main amd64 libpng16-16 amd64 1.6.37-5 [187 kB] Get:70 http://ftpmaster.internal/ubuntu kinetic/main amd64 xz-utils amd64 5.2.5-2.1 [83.8 kB] Get:71 http://ftpmaster.internal/ubuntu kinetic/main amd64 g++-11 amd64 11.3.0-3ubuntu1 [11.3 MB] Get:72 http://ftpmaster.internal/ubuntu kinetic/main amd64 libstdc++-11-dev amd64 11.3.0-3ubuntu1 [2074 kB] Get:73 http://ftpmaster.internal/ubuntu kinetic/main amd64 libasan6 amd64 11.3.0-3ubuntu1 [2265 kB] Get:74 http://ftpmaster.internal/ubuntu kinetic/main amd64 gcc-11 amd64 11.3.0-3ubuntu1 [20.0 MB] Get:75 http://ftpmaster.internal/ubuntu kinetic/main amd64 libgcc-11-dev amd64 11.3.0-3ubuntu1 [2484 kB] Get:76 http://ftpmaster.internal/ubuntu kinetic/main amd64 libtsan0 amd64 11.3.0-3ubuntu1 [2241 kB] Get:77 http://ftpmaster.internal/ubuntu kinetic/main amd64 cpp-11 amd64 11.3.0-3ubuntu1 [9910 kB] Get:78 http://ftpmaster.internal/ubuntu kinetic/main amd64 gcc-11-base amd64 11.3.0-3ubuntu1 [20.8 kB] Get:79 http://ftpmaster.internal/ubuntu kinetic/main amd64 dpkg-dev all 1.21.8ubuntu1 [1069 kB] Get:80 http://ftpmaster.internal/ubuntu kinetic/main amd64 libdpkg-perl all 1.21.8ubuntu1 [237 kB] Get:81 http://ftpmaster.internal/ubuntu kinetic/main amd64 lto-disabled-list all 27 [12.4 kB] Get:82 http://ftpmaster.internal/ubuntu kinetic/main amd64 libfakeroot amd64 1.29-1ubuntu1 [31.1 kB] Get:83 http://ftpmaster.internal/ubuntu kinetic/main amd64 fakeroot amd64 1.29-1ubuntu1 [60.0 kB] Get:84 http://ftpmaster.internal/ubuntu kinetic/main amd64 pinentry-curses amd64 1.2.0-1ubuntu1 [34.5 kB] Get:85 http://ftpmaster.internal/ubuntu kinetic/main amd64 policyrcd-script-zg2 all 0.1-3.1 [5730 B] debconf: delaying package configuration, since apt-utils is not installed Fetched 79.7 MB in 5s (15.7 MB/s) (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../base-files_12.2ubuntu1_amd64.deb ... Unpacking base-files (12.2ubuntu1) over (12ubuntu5) ... Setting up base-files (12.2ubuntu1) ... (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../bsdutils_1%3a2.38-4ubuntu1_amd64.deb ... Unpacking bsdutils (1:2.38-4ubuntu1) over (1:2.37.2-4ubuntu3) ... Setting up bsdutils (1:2.38-4ubuntu1) ... (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../libzstd1_1.5.2+dfsg-1_amd64.deb ... Unpacking libzstd1:amd64 (1.5.2+dfsg-1) over (1.4.8+dfsg-3build1) ... Setting up libzstd1:amd64 (1.5.2+dfsg-1) ... (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../0-libatomic1_12.1.0-2ubuntu1_amd64.deb ... Unpacking libatomic1:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Preparing to unpack .../1-libubsan1_12.1.0-2ubuntu1_amd64.deb ... Unpacking libubsan1:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Preparing to unpack .../2-libquadmath0_12.1.0-2ubuntu1_amd64.deb ... Unpacking libquadmath0:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Preparing to unpack .../3-liblsan0_12.1.0-2ubuntu1_amd64.deb ... Unpacking liblsan0:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Preparing to unpack .../4-libitm1_12.1.0-2ubuntu1_amd64.deb ... Unpacking libitm1:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Preparing to unpack .../5-libgomp1_12.1.0-2ubuntu1_amd64.deb ... Unpacking libgomp1:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Preparing to unpack .../6-gcc-12-base_12.1.0-2ubuntu1_amd64.deb ... Unpacking gcc-12-base:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Setting up gcc-12-base:amd64 (12.1.0-2ubuntu1) ... (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../libgcc-s1_12.1.0-2ubuntu1_amd64.deb ... Unpacking libgcc-s1:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Setting up libgcc-s1:amd64 (12.1.0-2ubuntu1) ... (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../libcc1-0_12.1.0-2ubuntu1_amd64.deb ... Unpacking libcc1-0:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Preparing to unpack .../libstdc++6_12.1.0-2ubuntu1_amd64.deb ... Unpacking libstdc++6:amd64 (12.1.0-2ubuntu1) over (12-20220428-1ubuntu1) ... Setting up libstdc++6:amd64 (12.1.0-2ubuntu1) ... (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../libgpg-error0_1.45-2_amd64.deb ... Unpacking libgpg-error0:amd64 (1.45-2) over (1.43-3) ... Setting up libgpg-error0:amd64 (1.45-2) ... (Reading database ... 13449 files and directories currently installed.) Preparing to unpack .../libgcrypt20_1.10.1-2ubuntu1_amd64.deb ... Unpacking libgcrypt20:amd64 (1.10.1-2ubuntu1) over (1.9.4-3ubuntu3) ... Setting up libgcrypt20:amd64 (1.10.1-2ubuntu1) ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../liblzma5_5.2.5-2.1_amd64.deb ... Unpacking liblzma5:amd64 (5.2.5-2.1) over (5.2.5-2ubuntu1) ... Setting up liblzma5:amd64 (5.2.5-2.1) ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../systemd-sysv_249.11-0ubuntu4_amd64.deb ... Unpacking systemd-sysv (249.11-0ubuntu4) over (249.11-0ubuntu3.1) ... Preparing to unpack .../libapparmor1_3.0.4-2ubuntu3_amd64.deb ... Unpacking libapparmor1:amd64 (3.0.4-2ubuntu3) over (3.0.4-2ubuntu2) ... Preparing to unpack .../libgnutls30_3.7.6-2ubuntu1_amd64.deb ... Unpacking libgnutls30:amd64 (3.7.6-2ubuntu1) over (3.7.4-2ubuntu1) ... Setting up libgnutls30:amd64 (3.7.6-2ubuntu1) ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../libip4tc2_1.8.7-1ubuntu6_amd64.deb ... Unpacking libip4tc2:amd64 (1.8.7-1ubuntu6) over (1.8.7-1ubuntu5) ... Preparing to unpack .../libblkid1_2.38-4ubuntu1_amd64.deb ... Unpacking libblkid1:amd64 (2.38-4ubuntu1) over (2.37.2-4ubuntu3) ... Setting up libblkid1:amd64 (2.38-4ubuntu1) ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../libselinux1_3.4-1_amd64.deb ... Unpacking libselinux1:amd64 (3.4-1) over (3.3-1build2) ... Setting up libselinux1:amd64 (3.4-1) ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../libmount1_2.38-4ubuntu1_amd64.deb ... Unpacking libmount1:amd64 (2.38-4ubuntu1) over (2.37.2-4ubuntu3) ... Setting up libmount1:amd64 (2.38-4ubuntu1) ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../libsmartcols1_2.38-4ubuntu1_amd64.deb ... Unpacking libsmartcols1:amd64 (2.38-4ubuntu1) over (2.37.2-4ubuntu3) ... Setting up libsmartcols1:amd64 (2.38-4ubuntu1) ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../login_1%3a4.11.1+dfsg1-2ubuntu1_amd64.deb ... Unpacking login (1:4.11.1+dfsg1-2ubuntu1) over (1:4.8.1-2ubuntu2) ... Setting up login (1:4.11.1+dfsg1-2ubuntu1) ... Installing new version of config file /etc/login.defs ... (Reading database ... 13451 files and directories currently installed.) Preparing to unpack .../util-linux_2.38-4ubuntu1_amd64.deb ... Unpacking util-linux (2.38-4ubuntu1) over (2.37.2-4ubuntu3) ... dpkg: warning: unable to delete old directory '/usr/lib/udev': Directory not empty Selecting previously unselected package util-linux-extra. Preparing to unpack .../util-linux-extra_2.38-4ubuntu1_amd64.deb ... Unpacking util-linux-extra (2.38-4ubuntu1) ... Setting up util-linux-extra (2.38-4ubuntu1) ... (Reading database ... 13463 files and directories currently installed.) Preparing to unpack .../mount_2.38-4ubuntu1_amd64.deb ... Unpacking mount (2.38-4ubuntu1) over (2.37.2-4ubuntu3) ... Preparing to unpack .../libsemanage-common_3.4-1_all.deb ... Unpacking libsemanage-common (3.4-1) over (3.3-1build2) ... Setting up libsemanage-common (3.4-1) ... Installing new version of config file /etc/selinux/semanage.conf ... (Reading database ... 13463 files and directories currently installed.) Preparing to unpack .../libsepol2_3.4-2_amd64.deb ... Unpacking libsepol2:amd64 (3.4-2) over (3.3-1build1) ... Setting up libsepol2:amd64 (3.4-2) ... (Reading database ... 13463 files and directories currently installed.) Preparing to unpack .../libsemanage2_3.4-1_amd64.deb ... Unpacking libsemanage2:amd64 (3.4-1) over (3.3-1build2) ... Setting up libsemanage2:amd64 (3.4-1) ... (Reading database ... 13463 files and directories currently installed.) Preparing to unpack .../passwd_1%3a4.11.1+dfsg1-2ubuntu1_amd64.deb ... Unpacking passwd (1:4.11.1+dfsg1-2ubuntu1) over (1:4.8.1-2ubuntu2) ... Setting up passwd (1:4.11.1+dfsg1-2ubuntu1) ... Installing new version of config file /etc/default/useradd ... (Reading database ... 13463 files and directories currently installed.) Preparing to unpack .../adduser_3.121ubuntu1_all.deb ... Unpacking adduser (3.121ubuntu1) over (3.118ubuntu5) ... Setting up adduser (3.121ubuntu1) ... Installing new version of config file /etc/deluser.conf ... (Reading database ... 13460 files and directories currently installed.) Preparing to unpack .../systemd_249.11-0ubuntu4_amd64.deb ... Unpacking systemd (249.11-0ubuntu4) over (249.11-0ubuntu3.1) ... Preparing to unpack .../libsystemd0_249.11-0ubuntu4_amd64.deb ... Unpacking libsystemd0:amd64 (249.11-0ubuntu4) over (249.11-0ubuntu3.1) ... Setting up libsystemd0:amd64 (249.11-0ubuntu4) ... (Reading database ... 13460 files and directories currently installed.) Preparing to unpack .../libudev1_249.11-0ubuntu4_amd64.deb ... Unpacking libudev1:amd64 (249.11-0ubuntu4) over (249.11-0ubuntu3.1) ... Setting up libudev1:amd64 (249.11-0ubuntu4) ... (Reading database ... 13460 files and directories currently installed.) Preparing to unpack .../libapt-pkg6.0_2.5.0_amd64.deb ... Unpacking libapt-pkg6.0:amd64 (2.5.0) over (2.4.5) ... Setting up libapt-pkg6.0:amd64 (2.5.0) ... (Reading database ... 13460 files and directories currently installed.) Preparing to unpack .../dpkg_1.21.8ubuntu1_amd64.deb ... Unpacking dpkg (1.21.8ubuntu1) over (1.21.1ubuntu2) ... Setting up dpkg (1.21.8ubuntu1) ... (Reading database ... 13464 files and directories currently installed.) Preparing to unpack .../ncurses-bin_6.3+20220423-2_amd64.deb ... Unpacking ncurses-bin (6.3+20220423-2) over (6.3-2) ... Setting up ncurses-bin (6.3+20220423-2) ... (Reading database ... 13464 files and directories currently installed.) Preparing to unpack .../init-system-helpers_1.63_all.deb ... Unpacking init-system-helpers (1.63) over (1.62) ... Setting up init-system-helpers (1.63) ... (Reading database ... 13464 files and directories currently installed.) Preparing to unpack .../ncurses-base_6.3+20220423-2_all.deb ... Unpacking ncurses-base (6.3+20220423-2) over (6.3-2) ... Setting up ncurses-base (6.3+20220423-2) ... (Reading database ... 13465 files and directories currently installed.) Preparing to unpack .../archives/apt_2.5.0_amd64.deb ... Unpacking apt (2.5.0) over (2.4.5) ... Setting up apt (2.5.0) ... (Reading database ... 13466 files and directories currently installed.) Preparing to unpack .../logsave_1.46.5-2ubuntu2_amd64.deb ... Unpacking logsave (1.46.5-2ubuntu2) over (1.46.5-2ubuntu1) ... Preparing to unpack .../libext2fs2_1.46.5-2ubuntu2_amd64.deb ... Unpacking libext2fs2:amd64 (1.46.5-2ubuntu2) over (1.46.5-2ubuntu1) ... Setting up libext2fs2:amd64 (1.46.5-2ubuntu2) ... (Reading database ... 13466 files and directories currently installed.) Preparing to unpack .../e2fsprogs_1.46.5-2ubuntu2_amd64.deb ... Unpacking e2fsprogs (1.46.5-2ubuntu2) over (1.46.5-2ubuntu1) ... Setting up libapparmor1:amd64 (3.0.4-2ubuntu3) ... Setting up libip4tc2:amd64 (1.8.7-1ubuntu6) ... Setting up util-linux (2.38-4ubuntu1) ... Setting up mount (2.38-4ubuntu1) ... Setting up systemd (249.11-0ubuntu4) ... Initializing machine ID from random generator. Setting up systemd-sysv (249.11-0ubuntu4) ... (Reading database ... 13466 files and directories currently installed.) Preparing to unpack .../archives/init_1.63_amd64.deb ... Unpacking init (1.63) over (1.62) ... Preparing to unpack .../libcap-ng0_0.7.9-4_amd64.deb ... Unpacking libcap-ng0:amd64 (0.7.9-4) over (0.7.9-2.2build3) ... Setting up libcap-ng0:amd64 (0.7.9-4) ... (Reading database ... 13466 files and directories currently installed.) Preparing to unpack .../libdb5.3_5.3.28+dfsg1-0.9_amd64.deb ... Unpacking libdb5.3:amd64 (5.3.28+dfsg1-0.9) over (5.3.28+dfsg1-0.8ubuntu3) ... Setting up libdb5.3:amd64 (5.3.28+dfsg1-0.9) ... (Reading database ... 13466 files and directories currently installed.) Preparing to unpack .../libncurses6_6.3+20220423-2_amd64.deb ... Unpacking libncurses6:amd64 (6.3+20220423-2) over (6.3-2) ... Preparing to unpack .../libncursesw6_6.3+20220423-2_amd64.deb ... Unpacking libncursesw6:amd64 (6.3+20220423-2) over (6.3-2) ... Preparing to unpack .../libtinfo6_6.3+20220423-2_amd64.deb ... Unpacking libtinfo6:amd64 (6.3+20220423-2) over (6.3-2) ... Setting up libtinfo6:amd64 (6.3+20220423-2) ... (Reading database ... 13465 files and directories currently installed.) Preparing to unpack .../libuuid1_2.38-4ubuntu1_amd64.deb ... Unpacking libuuid1:amd64 (2.38-4ubuntu1) over (2.37.2-4ubuntu3) ... Setting up libuuid1:amd64 (2.38-4ubuntu1) ... (Reading database ... 13466 files and directories currently installed.) Preparing to unpack .../00-libcom-err2_1.46.5-2ubuntu2_amd64.deb ... Unpacking libcom-err2:amd64 (1.46.5-2ubuntu2) over (1.46.5-2ubuntu1) ... Preparing to unpack .../01-libss2_1.46.5-2ubuntu2_amd64.deb ... Unpacking libss2:amd64 (1.46.5-2ubuntu2) over (1.46.5-2ubuntu1) ... Preparing to unpack .../02-mawk_1.3.4.20200120-3.1_amd64.deb ... Unpacking mawk (1.3.4.20200120-3.1) over (1.3.4.20200120-3) ... Preparing to unpack .../03-libkeyutils1_1.6.1-3ubuntu1_amd64.deb ... Unpacking libkeyutils1:amd64 (1.6.1-3ubuntu1) over (1.6.1-2ubuntu3) ... Preparing to unpack .../04-readline-common_8.1.2-1.2_all.deb ... Unpacking readline-common (8.1.2-1.2) over (8.1.2-1) ... Preparing to unpack .../05-libreadline8_8.1.2-1.2_amd64.deb ... Unpacking libreadline8:amd64 (8.1.2-1.2) over (8.1.2-1) ... Preparing to unpack .../06-libsqlite3-0_3.38.5-1_amd64.deb ... Unpacking libsqlite3-0:amd64 (3.38.5-1) over (3.37.2-2) ... Preparing to unpack .../07-libssl3_3.0.3-5ubuntu3_amd64.deb ... Unpacking libssl3:amd64 (3.0.3-5ubuntu3) over (3.0.2-0ubuntu1) ... Preparing to unpack .../08-openssl_3.0.3-5ubuntu3_amd64.deb ... Unpacking openssl (3.0.3-5ubuntu3) over (3.0.2-0ubuntu1) ... Preparing to unpack .../09-libpng16-16_1.6.37-5_amd64.deb ... Unpacking libpng16-16:amd64 (1.6.37-5) over (1.6.37-3build5) ... Preparing to unpack .../10-xz-utils_5.2.5-2.1_amd64.deb ... Unpacking xz-utils (5.2.5-2.1) over (5.2.5-2ubuntu1) ... Preparing to unpack .../11-libctf0_2.38.50.20220615-4ubuntu1_amd64.deb ... Unpacking libctf0:amd64 (2.38.50.20220615-4ubuntu1) over (2.38-3ubuntu1) ... Preparing to unpack .../12-libctf-nobfd0_2.38.50.20220615-4ubuntu1_amd64.deb ... Unpacking libctf-nobfd0:amd64 (2.38.50.20220615-4ubuntu1) over (2.38-3ubuntu1) ... Preparing to unpack .../13-binutils-x86-64-linux-gnu_2.38.50.20220615-4ubuntu1_amd64.deb ... Unpacking binutils-x86-64-linux-gnu (2.38.50.20220615-4ubuntu1) over (2.38-3ubuntu1) ... Preparing to unpack .../14-libbinutils_2.38.50.20220615-4ubuntu1_amd64.deb ... Unpacking libbinutils:amd64 (2.38.50.20220615-4ubuntu1) over (2.38-3ubuntu1) ... Preparing to unpack .../15-binutils_2.38.50.20220615-4ubuntu1_amd64.deb ... Unpacking binutils (2.38.50.20220615-4ubuntu1) over (2.38-3ubuntu1) ... Preparing to unpack .../16-binutils-common_2.38.50.20220615-4ubuntu1_amd64.deb ... Unpacking binutils-common:amd64 (2.38.50.20220615-4ubuntu1) over (2.38-3ubuntu1) ... Selecting previously unselected package libgprofng0:amd64. Preparing to unpack .../17-libgprofng0_2.38.50.20220615-4ubuntu1_amd64.deb ... Unpacking libgprofng0:amd64 (2.38.50.20220615-4ubuntu1) ... Preparing to unpack .../18-g++-11_11.3.0-3ubuntu1_amd64.deb ... Unpacking g++-11 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../19-libstdc++-11-dev_11.3.0-3ubuntu1_amd64.deb ... Unpacking libstdc++-11-dev:amd64 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../20-libasan6_11.3.0-3ubuntu1_amd64.deb ... Unpacking libasan6:amd64 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../21-gcc-11_11.3.0-3ubuntu1_amd64.deb ... Unpacking gcc-11 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../22-libgcc-11-dev_11.3.0-3ubuntu1_amd64.deb ... Unpacking libgcc-11-dev:amd64 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../23-libtsan0_11.3.0-3ubuntu1_amd64.deb ... Unpacking libtsan0:amd64 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../24-cpp-11_11.3.0-3ubuntu1_amd64.deb ... Unpacking cpp-11 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../25-gcc-11-base_11.3.0-3ubuntu1_amd64.deb ... Unpacking gcc-11-base:amd64 (11.3.0-3ubuntu1) over (11.3.0-1ubuntu1) ... Preparing to unpack .../26-dpkg-dev_1.21.8ubuntu1_all.deb ... Unpacking dpkg-dev (1.21.8ubuntu1) over (1.21.1ubuntu2) ... Preparing to unpack .../27-libdpkg-perl_1.21.8ubuntu1_all.deb ... Unpacking libdpkg-perl (1.21.8ubuntu1) over (1.21.1ubuntu2) ... Preparing to unpack .../28-lto-disabled-list_27_all.deb ... Unpacking lto-disabled-list (27) over (25) ... Preparing to unpack .../29-libfakeroot_1.29-1ubuntu1_amd64.deb ... Unpacking libfakeroot:amd64 (1.29-1ubuntu1) over (1.28-1ubuntu1) ... Preparing to unpack .../30-fakeroot_1.29-1ubuntu1_amd64.deb ... Unpacking fakeroot (1.29-1ubuntu1) over (1.28-1ubuntu1) ... Preparing to unpack .../31-pinentry-curses_1.2.0-1ubuntu1_amd64.deb ... Unpacking pinentry-curses (1.2.0-1ubuntu1) over (1.1.1-1build2) ... Preparing to unpack .../32-policyrcd-script-zg2_0.1-3.1_all.deb ... Unpacking policyrcd-script-zg2 (0.1-3.1) over (0.1-3) ... Setting up gcc-11-base:amd64 (11.3.0-3ubuntu1) ... Setting up libkeyutils1:amd64 (1.6.1-3ubuntu1) ... Setting up lto-disabled-list (27) ... Setting up init (1.63) ... Setting up libsqlite3-0:amd64 (3.38.5-1) ... Setting up binutils-common:amd64 (2.38.50.20220615-4ubuntu1) ... Setting up libssl3:amd64 (3.0.3-5ubuntu3) ... Setting up libctf-nobfd0:amd64 (2.38.50.20220615-4ubuntu1) ... Setting up libcom-err2:amd64 (1.46.5-2ubuntu2) ... Setting up libgomp1:amd64 (12.1.0-2ubuntu1) ... Setting up libfakeroot:amd64 (1.29-1ubuntu1) ... Setting up libasan6:amd64 (11.3.0-3ubuntu1) ... Setting up fakeroot (1.29-1ubuntu1) ... Setting up policyrcd-script-zg2 (0.1-3.1) ... Setting up libncurses6:amd64 (6.3+20220423-2) ... Setting up xz-utils (5.2.5-2.1) ... Setting up libquadmath0:amd64 (12.1.0-2ubuntu1) ... Setting up libpng16-16:amd64 (1.6.37-5) ... Setting up libatomic1:amd64 (12.1.0-2ubuntu1) ... Setting up libss2:amd64 (1.46.5-2ubuntu2) ... Setting up libncursesw6:amd64 (6.3+20220423-2) ... Setting up libdpkg-perl (1.21.8ubuntu1) ... Setting up logsave (1.46.5-2ubuntu2) ... Setting up libubsan1:amd64 (12.1.0-2ubuntu1) ... Setting up mawk (1.3.4.20200120-3.1) ... Setting up libbinutils:amd64 (2.38.50.20220615-4ubuntu1) ... Setting up openssl (3.0.3-5ubuntu3) ... Installing new version of config file /etc/ssl/openssl.cnf ... Setting up readline-common (8.1.2-1.2) ... Setting up libcc1-0:amd64 (12.1.0-2ubuntu1) ... Setting up liblsan0:amd64 (12.1.0-2ubuntu1) ... Setting up libitm1:amd64 (12.1.0-2ubuntu1) ... Setting up libtsan0:amd64 (11.3.0-3ubuntu1) ... Setting up libctf0:amd64 (2.38.50.20220615-4ubuntu1) ... Setting up pinentry-curses (1.2.0-1ubuntu1) ... Setting up cpp-11 (11.3.0-3ubuntu1) ... Setting up libreadline8:amd64 (8.1.2-1.2) ... Setting up e2fsprogs (1.46.5-2ubuntu2) ... Setting up libgprofng0:amd64 (2.38.50.20220615-4ubuntu1) ... Setting up libgcc-11-dev:amd64 (11.3.0-3ubuntu1) ... Setting up binutils-x86-64-linux-gnu (2.38.50.20220615-4ubuntu1) ... Setting up binutils (2.38.50.20220615-4ubuntu1) ... Setting up dpkg-dev (1.21.8ubuntu1) ... Setting up libstdc++-11-dev:amd64 (11.3.0-3ubuntu1) ... Setting up gcc-11 (11.3.0-3ubuntu1) ... Setting up g++-11 (11.3.0-3ubuntu1) ... Processing triggers for libc-bin (2.35-0ubuntu3) ... RUN: /usr/share/launchpad-buildd/bin/sbuild-package PACKAGEBUILD-23997183 amd64 kinetic -c chroot:build-PACKAGEBUILD-23997183 --arch=amd64 --dist=kinetic --nolog -A git-imerge_1.2.0-3.dsc Initiating build PACKAGEBUILD-23997183 with 4 jobs across 4 processor cores. Kernel reported to sbuild: 5.4.0-120-generic #136-Ubuntu SMP Fri Jun 10 13:40:48 UTC 2022 x86_64 sbuild (Debian sbuild) 0.79.0 (05 February 2020) on lgw01-amd64-016.buildd +==============================================================================+ | git-imerge 1.2.0-3 (amd64) Wed, 22 Jun 2022 13:09:37 +0000 | +==============================================================================+ Package: git-imerge Version: 1.2.0-3 Source Version: 1.2.0-3 Distribution: kinetic Machine Architecture: amd64 Host Architecture: amd64 Build Architecture: amd64 Build Type: binary I: NOTICE: Log filtering will replace 'home/buildd/build-PACKAGEBUILD-23997183/chroot-autobuild' with '<>' I: NOTICE: Log filtering will replace 'build/git-imerge-44NLM7/resolver-QsNlTt' with '<>' +------------------------------------------------------------------------------+ | Fetch source files | +------------------------------------------------------------------------------+ Local sources ------------- git-imerge_1.2.0-3.dsc exists in .; copying to chroot I: NOTICE: Log filtering will replace 'build/git-imerge-44NLM7/git-imerge-1.2.0' with '<>' I: NOTICE: Log filtering will replace 'build/git-imerge-44NLM7' with '<>' +------------------------------------------------------------------------------+ | Install package build dependencies | +------------------------------------------------------------------------------+ Setup apt archive ----------------- Merged Build-Depends: bash-completion, debhelper-compat (= 13), dh-python, git, pkg-config, python3, python3-setuptools, tox, build-essential, fakeroot Filtered Build-Depends: bash-completion, debhelper-compat (= 13), dh-python, git, pkg-config, python3, python3-setuptools, tox, build-essential, fakeroot dpkg-deb: building package 'sbuild-build-depends-main-dummy' in '/<>/apt_archive/sbuild-build-depends-main-dummy.deb'. Ign:1 copy:/<>/apt_archive ./ InRelease Get:2 copy:/<>/apt_archive ./ Release [957 B] Ign:3 copy:/<>/apt_archive ./ Release.gpg Get:4 copy:/<>/apt_archive ./ Sources [422 B] Get:5 copy:/<>/apt_archive ./ Packages [493 B] Fetched 1872 B in 0s (33.2 kB/s) Reading package lists... Reading package lists... Install main build dependencies (apt-based resolver) ---------------------------------------------------- Installing build dependencies Reading package lists... Building dependency tree... Reading state information... The following additional packages will be installed: autoconf automake autopoint autotools-dev bash-completion bsdextrautils debhelper debugedit dh-autoreconf dh-python dh-strip-nondeterminism dwz file gettext gettext-base git git-man groff-base intltool-debian libarchive-zip-perl libbrotli1 libcurl3-gnutls libdebhelper-perl libdw1 libelf1 liberror-perl libexpat1 libfile-stripnondeterminism-perl libglib2.0-0 libicu71 libjs-jquery libjs-sphinxdoc libjs-underscore libldap-2.5-0 libmagic-mgc libmagic1 libmpdec3 libnghttp2-14 libpipeline1 libpsl5 libpython3-stdlib libpython3.10-minimal libpython3.10-stdlib librtmp1 libsasl2-2 libsasl2-modules-db libsigsegv2 libssh-4 libsub-override-perl libtool libuchardet0 libxml2 m4 man-db media-types pkg-config po-debconf python3 python3-distlib python3-distutils python3-filelock python3-lib2to3 python3-minimal python3-packaging python3-pip python3-pip-whl python3-pkg-resources python3-platformdirs python3-pluggy python3-py python3-pyparsing python3-setuptools python3-setuptools-whl python3-six python3-toml python3-virtualenv python3-wheel python3-wheel-whl python3.10 python3.10-minimal tox Suggested packages: autoconf-archive gnu-standards autoconf-doc dh-make flit python3-build python3-tomli python3-installer gettext-doc libasprintf-dev libgettextpo-dev git-daemon-run | git-daemon-sysvinit git-doc git-email git-gui gitk gitweb git-cvs git-mediawiki git-svn groff libtool-doc gfortran | fortran95-compiler gcj-jdk m4-doc apparmor less www-browser libmail-box-perl python3-doc python3-tk python3-venv subversion python3-pytest python-pyparsing-doc python-setuptools-doc python2-pip-whl python2-setuptools-whl python3.10-venv python3.10-doc binfmt-support Recommended packages: curl | wget | lynx less ssh-client libarchive-cpio-perl libglib2.0-data shared-mime-info xdg-user-dirs javascript-common libldap-common publicsuffix libsasl2-modules libltdl-dev libmail-sendmail-perl python3-dev The following NEW packages will be installed: autoconf automake autopoint autotools-dev bash-completion bsdextrautils debhelper debugedit dh-autoreconf dh-python dh-strip-nondeterminism dwz file gettext gettext-base git git-man groff-base intltool-debian libarchive-zip-perl libbrotli1 libcurl3-gnutls libdebhelper-perl libdw1 libelf1 liberror-perl libexpat1 libfile-stripnondeterminism-perl libglib2.0-0 libicu71 libjs-jquery libjs-sphinxdoc libjs-underscore libldap-2.5-0 libmagic-mgc libmagic1 libmpdec3 libnghttp2-14 libpipeline1 libpsl5 libpython3-stdlib libpython3.10-minimal libpython3.10-stdlib librtmp1 libsasl2-2 libsasl2-modules-db libsigsegv2 libssh-4 libsub-override-perl libtool libuchardet0 libxml2 m4 man-db media-types pkg-config po-debconf python3 python3-distlib python3-distutils python3-filelock python3-lib2to3 python3-minimal python3-packaging python3-pip python3-pip-whl python3-pkg-resources python3-platformdirs python3-pluggy python3-py python3-pyparsing python3-setuptools python3-setuptools-whl python3-six python3-toml python3-virtualenv python3-wheel python3-wheel-whl python3.10 python3.10-minimal sbuild-build-depends-main-dummy tox 0 upgraded, 82 newly installed, 0 to remove and 0 not upgraded. Need to get 37.3 MB of archives. After this operation, 138 MB of additional disk space will be used. Get:1 copy:/<>/apt_archive ./ sbuild-build-depends-main-dummy 0.invalid.0 [712 B] Get:2 http://ftpmaster.internal/ubuntu kinetic/main amd64 libpython3.10-minimal amd64 3.10.5-1 [804 kB] Get:3 http://ftpmaster.internal/ubuntu kinetic/main amd64 libexpat1 amd64 2.4.8-1 [90.6 kB] Get:4 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3.10-minimal amd64 3.10.5-1 [2228 kB] Get:5 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-minimal amd64 3.10.4-0ubuntu2 [24.4 kB] Get:6 http://ftpmaster.internal/ubuntu kinetic/main amd64 media-types all 8.0.0 [24.9 kB] Get:7 http://ftpmaster.internal/ubuntu kinetic/main amd64 libmpdec3 amd64 2.5.1-2build2 [86.8 kB] Get:8 http://ftpmaster.internal/ubuntu kinetic/main amd64 libpython3.10-stdlib amd64 3.10.5-1 [1805 kB] Get:9 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3.10 amd64 3.10.5-1 [491 kB] Get:10 http://ftpmaster.internal/ubuntu kinetic/main amd64 libpython3-stdlib amd64 3.10.4-0ubuntu2 [6990 B] Get:11 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3 amd64 3.10.4-0ubuntu2 [22.8 kB] Get:12 http://ftpmaster.internal/ubuntu kinetic/main amd64 libelf1 amd64 0.187-1 [51.3 kB] Get:13 http://ftpmaster.internal/ubuntu kinetic/main amd64 libglib2.0-0 amd64 2.72.2-2 [1435 kB] Get:14 http://ftpmaster.internal/ubuntu kinetic/main amd64 libicu71 amd64 71.1-3 [10.6 MB] Get:15 http://ftpmaster.internal/ubuntu kinetic/main amd64 libxml2 amd64 2.9.14+dfsg-1 [756 kB] Get:16 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-pkg-resources all 59.6.0-1.2 [132 kB] Get:17 http://ftpmaster.internal/ubuntu kinetic/main amd64 bash-completion all 1:2.11-6ubuntu1 [179 kB] Get:18 http://ftpmaster.internal/ubuntu kinetic/main amd64 bsdextrautils amd64 2.38-4ubuntu1 [71.1 kB] Get:19 http://ftpmaster.internal/ubuntu kinetic/main amd64 libmagic-mgc amd64 1:5.41-4 [257 kB] Get:20 http://ftpmaster.internal/ubuntu kinetic/main amd64 libmagic1 amd64 1:5.41-4 [87.3 kB] Get:21 http://ftpmaster.internal/ubuntu kinetic/main amd64 file amd64 1:5.41-4 [21.5 kB] Get:22 http://ftpmaster.internal/ubuntu kinetic/main amd64 gettext-base amd64 0.21-6 [37.9 kB] Get:23 http://ftpmaster.internal/ubuntu kinetic/main amd64 libuchardet0 amd64 0.0.7-1build2 [76.9 kB] Get:24 http://ftpmaster.internal/ubuntu kinetic/main amd64 groff-base amd64 1.22.4-8build1 [955 kB] Get:25 http://ftpmaster.internal/ubuntu kinetic/main amd64 libnghttp2-14 amd64 1.47.0-1 [69.0 kB] Get:26 http://ftpmaster.internal/ubuntu kinetic/main amd64 libpipeline1 amd64 1.5.6-1 [23.1 kB] Get:27 http://ftpmaster.internal/ubuntu kinetic/main amd64 libpsl5 amd64 0.21.0-1.2build2 [58.4 kB] Get:28 http://ftpmaster.internal/ubuntu kinetic/main amd64 man-db amd64 2.10.2-1 [1187 kB] Get:29 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsigsegv2 amd64 2.13-1ubuntu3 [14.6 kB] Get:30 http://ftpmaster.internal/ubuntu kinetic/main amd64 m4 amd64 1.4.18-5ubuntu2 [199 kB] Get:31 http://ftpmaster.internal/ubuntu kinetic/main amd64 autoconf all 2.71-2 [338 kB] Get:32 http://ftpmaster.internal/ubuntu kinetic/main amd64 autotools-dev all 20220109.1 [44.9 kB] Get:33 http://ftpmaster.internal/ubuntu kinetic/main amd64 automake all 1:1.16.5-1.3 [558 kB] Get:34 http://ftpmaster.internal/ubuntu kinetic/main amd64 autopoint all 0.21-6 [421 kB] Get:35 http://ftpmaster.internal/ubuntu kinetic/main amd64 libdebhelper-perl all 13.7.1ubuntu1 [66.9 kB] Get:36 http://ftpmaster.internal/ubuntu kinetic/main amd64 libtool all 2.4.7-4 [166 kB] Get:37 http://ftpmaster.internal/ubuntu kinetic/main amd64 dh-autoreconf all 20 [16.1 kB] Get:38 http://ftpmaster.internal/ubuntu kinetic/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] Get:39 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsub-override-perl all 0.09-3 [9756 B] Get:40 http://ftpmaster.internal/ubuntu kinetic/main amd64 libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] Get:41 http://ftpmaster.internal/ubuntu kinetic/main amd64 dh-strip-nondeterminism all 1.13.0-1 [5344 B] Get:42 http://ftpmaster.internal/ubuntu kinetic/main amd64 libdw1 amd64 0.187-1 [247 kB] Get:43 http://ftpmaster.internal/ubuntu kinetic/main amd64 debugedit amd64 1:5.0-4build1 [47.2 kB] Get:44 http://ftpmaster.internal/ubuntu kinetic/main amd64 dwz amd64 0.14-1build2 [105 kB] Get:45 http://ftpmaster.internal/ubuntu kinetic/main amd64 gettext amd64 0.21-6 [862 kB] Get:46 http://ftpmaster.internal/ubuntu kinetic/main amd64 intltool-debian all 0.35.0+20060710.5 [24.9 kB] Get:47 http://ftpmaster.internal/ubuntu kinetic/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] Get:48 http://ftpmaster.internal/ubuntu kinetic/main amd64 debhelper all 13.7.1ubuntu1 [940 kB] Get:49 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-lib2to3 all 3.10.4-0ubuntu2 [76.0 kB] Get:50 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-distutils all 3.10.4-0ubuntu2 [138 kB] Get:51 http://ftpmaster.internal/ubuntu kinetic/universe amd64 dh-python all 5.20220403 [106 kB] Get:52 http://ftpmaster.internal/ubuntu kinetic/main amd64 libbrotli1 amd64 1.0.9-2build6 [315 kB] Get:53 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsasl2-modules-db amd64 2.1.28+dfsg-6ubuntu1 [20.5 kB] Get:54 http://ftpmaster.internal/ubuntu kinetic/main amd64 libsasl2-2 amd64 2.1.28+dfsg-6ubuntu1 [55.9 kB] Get:55 http://ftpmaster.internal/ubuntu kinetic/main amd64 libldap-2.5-0 amd64 2.5.12+dfsg-2ubuntu1 [180 kB] Get:56 http://ftpmaster.internal/ubuntu kinetic/main amd64 librtmp1 amd64 2.4+20151223.gitfa8646d.1-2build4 [58.2 kB] Get:57 http://ftpmaster.internal/ubuntu kinetic/main amd64 libssh-4 amd64 0.9.6-2build1 [184 kB] Get:58 http://ftpmaster.internal/ubuntu kinetic/main amd64 libcurl3-gnutls amd64 7.83.1-2 [280 kB] Get:59 http://ftpmaster.internal/ubuntu kinetic/main amd64 liberror-perl all 0.17029-1 [26.5 kB] Get:60 http://ftpmaster.internal/ubuntu kinetic/main amd64 git-man all 1:2.36.1-1ubuntu1 [965 kB] Get:61 http://ftpmaster.internal/ubuntu kinetic/main amd64 git amd64 1:2.36.1-1ubuntu1 [3198 kB] Get:62 http://ftpmaster.internal/ubuntu kinetic/main amd64 libjs-jquery all 3.6.0+dfsg+~3.5.13-1 [321 kB] Get:63 http://ftpmaster.internal/ubuntu kinetic/main amd64 libjs-underscore all 1.13.3~dfsg+~1.11.4-1 [118 kB] Get:64 http://ftpmaster.internal/ubuntu kinetic/main amd64 libjs-sphinxdoc all 4.5.0-4 [142 kB] Get:65 http://ftpmaster.internal/ubuntu kinetic/main amd64 pkg-config amd64 0.29.2-1ubuntu3 [48.2 kB] Get:66 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-distlib all 0.3.4-1 [269 kB] Get:67 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-filelock all 3.7.1-1 [8914 B] Get:68 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-pyparsing all 3.0.7-2 [82.6 kB] Get:69 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-packaging all 21.3-1 [30.7 kB] Get:70 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-setuptools all 59.6.0-1.2 [339 kB] Get:71 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-wheel all 0.37.1-2 [31.9 kB] Get:72 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-pip all 22.1.1+dfsg-1 [1339 kB] Get:73 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-pip-whl all 22.1.1+dfsg-1 [1736 kB] Get:74 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-platformdirs all 2.5.2-1 [13.9 kB] Get:75 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-pluggy all 1.0.0-1 [15.1 kB] Get:76 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-py all 1.10.0-1 [71.9 kB] Get:77 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-setuptools-whl all 59.6.0-1.2 [788 kB] Get:78 http://ftpmaster.internal/ubuntu kinetic/main amd64 python3-six all 1.16.0-3ubuntu1 [12.6 kB] Get:79 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-toml all 0.10.2-1 [16.5 kB] Get:80 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-wheel-whl all 0.37.1-2 [37.9 kB] Get:81 http://ftpmaster.internal/ubuntu kinetic/universe amd64 python3-virtualenv all 20.14.0+ds-1 [79.8 kB] Get:82 http://ftpmaster.internal/ubuntu kinetic/universe amd64 tox all 3.21.4-1ubuntu1 [260 kB] debconf: delaying package configuration, since apt-utils is not installed Fetched 37.3 MB in 2s (17.3 MB/s) Selecting previously unselected package libpython3.10-minimal:amd64. (Reading database ... 13495 files and directories currently installed.) Preparing to unpack .../libpython3.10-minimal_3.10.5-1_amd64.deb ... Unpacking libpython3.10-minimal:amd64 (3.10.5-1) ... Selecting previously unselected package libexpat1:amd64. Preparing to unpack .../libexpat1_2.4.8-1_amd64.deb ... Unpacking libexpat1:amd64 (2.4.8-1) ... Selecting previously unselected package python3.10-minimal. Preparing to unpack .../python3.10-minimal_3.10.5-1_amd64.deb ... Unpacking python3.10-minimal (3.10.5-1) ... Setting up libpython3.10-minimal:amd64 (3.10.5-1) ... Setting up libexpat1:amd64 (2.4.8-1) ... Setting up python3.10-minimal (3.10.5-1) ... Selecting previously unselected package python3-minimal. (Reading database ... 13797 files and directories currently installed.) Preparing to unpack .../0-python3-minimal_3.10.4-0ubuntu2_amd64.deb ... Unpacking python3-minimal (3.10.4-0ubuntu2) ... Selecting previously unselected package media-types. Preparing to unpack .../1-media-types_8.0.0_all.deb ... Unpacking media-types (8.0.0) ... Selecting previously unselected package libmpdec3:amd64. Preparing to unpack .../2-libmpdec3_2.5.1-2build2_amd64.deb ... Unpacking libmpdec3:amd64 (2.5.1-2build2) ... Selecting previously unselected package libpython3.10-stdlib:amd64. Preparing to unpack .../3-libpython3.10-stdlib_3.10.5-1_amd64.deb ... Unpacking libpython3.10-stdlib:amd64 (3.10.5-1) ... Selecting previously unselected package python3.10. Preparing to unpack .../4-python3.10_3.10.5-1_amd64.deb ... Unpacking python3.10 (3.10.5-1) ... Selecting previously unselected package libpython3-stdlib:amd64. Preparing to unpack .../5-libpython3-stdlib_3.10.4-0ubuntu2_amd64.deb ... Unpacking libpython3-stdlib:amd64 (3.10.4-0ubuntu2) ... Setting up python3-minimal (3.10.4-0ubuntu2) ... Selecting previously unselected package python3. (Reading database ... 14198 files and directories currently installed.) Preparing to unpack .../00-python3_3.10.4-0ubuntu2_amd64.deb ... Unpacking python3 (3.10.4-0ubuntu2) ... Selecting previously unselected package libelf1:amd64. Preparing to unpack .../01-libelf1_0.187-1_amd64.deb ... Unpacking libelf1:amd64 (0.187-1) ... Selecting previously unselected package libglib2.0-0:amd64. Preparing to unpack .../02-libglib2.0-0_2.72.2-2_amd64.deb ... Unpacking libglib2.0-0:amd64 (2.72.2-2) ... Selecting previously unselected package libicu71:amd64. Preparing to unpack .../03-libicu71_71.1-3_amd64.deb ... Unpacking libicu71:amd64 (71.1-3) ... Selecting previously unselected package libxml2:amd64. Preparing to unpack .../04-libxml2_2.9.14+dfsg-1_amd64.deb ... Unpacking libxml2:amd64 (2.9.14+dfsg-1) ... Selecting previously unselected package python3-pkg-resources. Preparing to unpack .../05-python3-pkg-resources_59.6.0-1.2_all.deb ... Unpacking python3-pkg-resources (59.6.0-1.2) ... Selecting previously unselected package bash-completion. Preparing to unpack .../06-bash-completion_1%3a2.11-6ubuntu1_all.deb ... Unpacking bash-completion (1:2.11-6ubuntu1) ... Selecting previously unselected package bsdextrautils. Preparing to unpack .../07-bsdextrautils_2.38-4ubuntu1_amd64.deb ... Unpacking bsdextrautils (2.38-4ubuntu1) ... Selecting previously unselected package libmagic-mgc. Preparing to unpack .../08-libmagic-mgc_1%3a5.41-4_amd64.deb ... Unpacking libmagic-mgc (1:5.41-4) ... Selecting previously unselected package libmagic1:amd64. Preparing to unpack .../09-libmagic1_1%3a5.41-4_amd64.deb ... Unpacking libmagic1:amd64 (1:5.41-4) ... Selecting previously unselected package file. Preparing to unpack .../10-file_1%3a5.41-4_amd64.deb ... Unpacking file (1:5.41-4) ... Selecting previously unselected package gettext-base. Preparing to unpack .../11-gettext-base_0.21-6_amd64.deb ... Unpacking gettext-base (0.21-6) ... Selecting previously unselected package libuchardet0:amd64. Preparing to unpack .../12-libuchardet0_0.0.7-1build2_amd64.deb ... Unpacking libuchardet0:amd64 (0.0.7-1build2) ... Selecting previously unselected package groff-base. Preparing to unpack .../13-groff-base_1.22.4-8build1_amd64.deb ... Unpacking groff-base (1.22.4-8build1) ... Selecting previously unselected package libnghttp2-14:amd64. Preparing to unpack .../14-libnghttp2-14_1.47.0-1_amd64.deb ... Unpacking libnghttp2-14:amd64 (1.47.0-1) ... Selecting previously unselected package libpipeline1:amd64. Preparing to unpack .../15-libpipeline1_1.5.6-1_amd64.deb ... Unpacking libpipeline1:amd64 (1.5.6-1) ... Selecting previously unselected package libpsl5:amd64. Preparing to unpack .../16-libpsl5_0.21.0-1.2build2_amd64.deb ... Unpacking libpsl5:amd64 (0.21.0-1.2build2) ... Selecting previously unselected package man-db. Preparing to unpack .../17-man-db_2.10.2-1_amd64.deb ... Unpacking man-db (2.10.2-1) ... Selecting previously unselected package libsigsegv2:amd64. Preparing to unpack .../18-libsigsegv2_2.13-1ubuntu3_amd64.deb ... Unpacking libsigsegv2:amd64 (2.13-1ubuntu3) ... Selecting previously unselected package m4. Preparing to unpack .../19-m4_1.4.18-5ubuntu2_amd64.deb ... Unpacking m4 (1.4.18-5ubuntu2) ... Selecting previously unselected package autoconf. Preparing to unpack .../20-autoconf_2.71-2_all.deb ... Unpacking autoconf (2.71-2) ... Selecting previously unselected package autotools-dev. Preparing to unpack .../21-autotools-dev_20220109.1_all.deb ... Unpacking autotools-dev (20220109.1) ... Selecting previously unselected package automake. Preparing to unpack .../22-automake_1%3a1.16.5-1.3_all.deb ... Unpacking automake (1:1.16.5-1.3) ... Selecting previously unselected package autopoint. Preparing to unpack .../23-autopoint_0.21-6_all.deb ... Unpacking autopoint (0.21-6) ... Selecting previously unselected package libdebhelper-perl. Preparing to unpack .../24-libdebhelper-perl_13.7.1ubuntu1_all.deb ... Unpacking libdebhelper-perl (13.7.1ubuntu1) ... Selecting previously unselected package libtool. Preparing to unpack .../25-libtool_2.4.7-4_all.deb ... Unpacking libtool (2.4.7-4) ... Selecting previously unselected package dh-autoreconf. Preparing to unpack .../26-dh-autoreconf_20_all.deb ... Unpacking dh-autoreconf (20) ... Selecting previously unselected package libarchive-zip-perl. Preparing to unpack .../27-libarchive-zip-perl_1.68-1_all.deb ... Unpacking libarchive-zip-perl (1.68-1) ... Selecting previously unselected package libsub-override-perl. Preparing to unpack .../28-libsub-override-perl_0.09-3_all.deb ... Unpacking libsub-override-perl (0.09-3) ... Selecting previously unselected package libfile-stripnondeterminism-perl. Preparing to unpack .../29-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... Selecting previously unselected package dh-strip-nondeterminism. Preparing to unpack .../30-dh-strip-nondeterminism_1.13.0-1_all.deb ... Unpacking dh-strip-nondeterminism (1.13.0-1) ... Selecting previously unselected package libdw1:amd64. Preparing to unpack .../31-libdw1_0.187-1_amd64.deb ... Unpacking libdw1:amd64 (0.187-1) ... Selecting previously unselected package debugedit. Preparing to unpack .../32-debugedit_1%3a5.0-4build1_amd64.deb ... Unpacking debugedit (1:5.0-4build1) ... Selecting previously unselected package dwz. Preparing to unpack .../33-dwz_0.14-1build2_amd64.deb ... Unpacking dwz (0.14-1build2) ... Selecting previously unselected package gettext. Preparing to unpack .../34-gettext_0.21-6_amd64.deb ... Unpacking gettext (0.21-6) ... Selecting previously unselected package intltool-debian. Preparing to unpack .../35-intltool-debian_0.35.0+20060710.5_all.deb ... Unpacking intltool-debian (0.35.0+20060710.5) ... Selecting previously unselected package po-debconf. Preparing to unpack .../36-po-debconf_1.0.21+nmu1_all.deb ... Unpacking po-debconf (1.0.21+nmu1) ... Selecting previously unselected package debhelper. Preparing to unpack .../37-debhelper_13.7.1ubuntu1_all.deb ... Unpacking debhelper (13.7.1ubuntu1) ... Selecting previously unselected package python3-lib2to3. Preparing to unpack .../38-python3-lib2to3_3.10.4-0ubuntu2_all.deb ... Unpacking python3-lib2to3 (3.10.4-0ubuntu2) ... Selecting previously unselected package python3-distutils. Preparing to unpack .../39-python3-distutils_3.10.4-0ubuntu2_all.deb ... Unpacking python3-distutils (3.10.4-0ubuntu2) ... Selecting previously unselected package dh-python. Preparing to unpack .../40-dh-python_5.20220403_all.deb ... Unpacking dh-python (5.20220403) ... Selecting previously unselected package libbrotli1:amd64. Preparing to unpack .../41-libbrotli1_1.0.9-2build6_amd64.deb ... Unpacking libbrotli1:amd64 (1.0.9-2build6) ... Selecting previously unselected package libsasl2-modules-db:amd64. Preparing to unpack .../42-libsasl2-modules-db_2.1.28+dfsg-6ubuntu1_amd64.deb ... Unpacking libsasl2-modules-db:amd64 (2.1.28+dfsg-6ubuntu1) ... Selecting previously unselected package libsasl2-2:amd64. Preparing to unpack .../43-libsasl2-2_2.1.28+dfsg-6ubuntu1_amd64.deb ... Unpacking libsasl2-2:amd64 (2.1.28+dfsg-6ubuntu1) ... Selecting previously unselected package libldap-2.5-0:amd64. Preparing to unpack .../44-libldap-2.5-0_2.5.12+dfsg-2ubuntu1_amd64.deb ... Unpacking libldap-2.5-0:amd64 (2.5.12+dfsg-2ubuntu1) ... Selecting previously unselected package librtmp1:amd64. Preparing to unpack .../45-librtmp1_2.4+20151223.gitfa8646d.1-2build4_amd64.deb ... Unpacking librtmp1:amd64 (2.4+20151223.gitfa8646d.1-2build4) ... Selecting previously unselected package libssh-4:amd64. Preparing to unpack .../46-libssh-4_0.9.6-2build1_amd64.deb ... Unpacking libssh-4:amd64 (0.9.6-2build1) ... Selecting previously unselected package libcurl3-gnutls:amd64. Preparing to unpack .../47-libcurl3-gnutls_7.83.1-2_amd64.deb ... Unpacking libcurl3-gnutls:amd64 (7.83.1-2) ... Selecting previously unselected package liberror-perl. Preparing to unpack .../48-liberror-perl_0.17029-1_all.deb ... Unpacking liberror-perl (0.17029-1) ... Selecting previously unselected package git-man. Preparing to unpack .../49-git-man_1%3a2.36.1-1ubuntu1_all.deb ... Unpacking git-man (1:2.36.1-1ubuntu1) ... Selecting previously unselected package git. Preparing to unpack .../50-git_1%3a2.36.1-1ubuntu1_amd64.deb ... Unpacking git (1:2.36.1-1ubuntu1) ... Selecting previously unselected package libjs-jquery. Preparing to unpack .../51-libjs-jquery_3.6.0+dfsg+~3.5.13-1_all.deb ... Unpacking libjs-jquery (3.6.0+dfsg+~3.5.13-1) ... Selecting previously unselected package libjs-underscore. Preparing to unpack .../52-libjs-underscore_1.13.3~dfsg+~1.11.4-1_all.deb ... Unpacking libjs-underscore (1.13.3~dfsg+~1.11.4-1) ... Selecting previously unselected package libjs-sphinxdoc. Preparing to unpack .../53-libjs-sphinxdoc_4.5.0-4_all.deb ... Unpacking libjs-sphinxdoc (4.5.0-4) ... Selecting previously unselected package pkg-config. Preparing to unpack .../54-pkg-config_0.29.2-1ubuntu3_amd64.deb ... Unpacking pkg-config (0.29.2-1ubuntu3) ... Selecting previously unselected package python3-distlib. Preparing to unpack .../55-python3-distlib_0.3.4-1_all.deb ... Unpacking python3-distlib (0.3.4-1) ... Selecting previously unselected package python3-filelock. Preparing to unpack .../56-python3-filelock_3.7.1-1_all.deb ... Unpacking python3-filelock (3.7.1-1) ... Selecting previously unselected package python3-pyparsing. Preparing to unpack .../57-python3-pyparsing_3.0.7-2_all.deb ... Unpacking python3-pyparsing (3.0.7-2) ... Selecting previously unselected package python3-packaging. Preparing to unpack .../58-python3-packaging_21.3-1_all.deb ... Unpacking python3-packaging (21.3-1) ... Selecting previously unselected package python3-setuptools. Preparing to unpack .../59-python3-setuptools_59.6.0-1.2_all.deb ... Unpacking python3-setuptools (59.6.0-1.2) ... Selecting previously unselected package python3-wheel. Preparing to unpack .../60-python3-wheel_0.37.1-2_all.deb ... Unpacking python3-wheel (0.37.1-2) ... Selecting previously unselected package python3-pip. Preparing to unpack .../61-python3-pip_22.1.1+dfsg-1_all.deb ... Unpacking python3-pip (22.1.1+dfsg-1) ... Selecting previously unselected package python3-pip-whl. Preparing to unpack .../62-python3-pip-whl_22.1.1+dfsg-1_all.deb ... Unpacking python3-pip-whl (22.1.1+dfsg-1) ... Selecting previously unselected package python3-platformdirs. Preparing to unpack .../63-python3-platformdirs_2.5.2-1_all.deb ... Unpacking python3-platformdirs (2.5.2-1) ... Selecting previously unselected package python3-pluggy. Preparing to unpack .../64-python3-pluggy_1.0.0-1_all.deb ... Unpacking python3-pluggy (1.0.0-1) ... Selecting previously unselected package python3-py. Preparing to unpack .../65-python3-py_1.10.0-1_all.deb ... Unpacking python3-py (1.10.0-1) ... Selecting previously unselected package python3-setuptools-whl. Preparing to unpack .../66-python3-setuptools-whl_59.6.0-1.2_all.deb ... Unpacking python3-setuptools-whl (59.6.0-1.2) ... Selecting previously unselected package python3-six. Preparing to unpack .../67-python3-six_1.16.0-3ubuntu1_all.deb ... Unpacking python3-six (1.16.0-3ubuntu1) ... Selecting previously unselected package python3-toml. Preparing to unpack .../68-python3-toml_0.10.2-1_all.deb ... Unpacking python3-toml (0.10.2-1) ... Selecting previously unselected package python3-wheel-whl. Preparing to unpack .../69-python3-wheel-whl_0.37.1-2_all.deb ... Unpacking python3-wheel-whl (0.37.1-2) ... Selecting previously unselected package python3-virtualenv. Preparing to unpack .../70-python3-virtualenv_20.14.0+ds-1_all.deb ... Unpacking python3-virtualenv (20.14.0+ds-1) ... Selecting previously unselected package tox. Preparing to unpack .../71-tox_3.21.4-1ubuntu1_all.deb ... Unpacking tox (3.21.4-1ubuntu1) ... Selecting previously unselected package sbuild-build-depends-main-dummy. Preparing to unpack .../72-sbuild-build-depends-main-dummy_0.invalid.0_amd64.deb ... Unpacking sbuild-build-depends-main-dummy (0.invalid.0) ... Setting up media-types (8.0.0) ... Setting up libpipeline1:amd64 (1.5.6-1) ... Setting up libicu71:amd64 (71.1-3) ... Setting up python3-setuptools-whl (59.6.0-1.2) ... Setting up libpsl5:amd64 (0.21.0-1.2build2) ... Setting up bsdextrautils (2.38-4ubuntu1) ... Setting up libmagic-mgc (1:5.41-4) ... Setting up python3-pip-whl (22.1.1+dfsg-1) ... Setting up libarchive-zip-perl (1.68-1) ... Setting up libglib2.0-0:amd64 (2.72.2-2) ... No schema files found: doing nothing. Setting up libdebhelper-perl (13.7.1ubuntu1) ... Setting up libbrotli1:amd64 (1.0.9-2build6) ... Setting up libnghttp2-14:amd64 (1.47.0-1) ... Setting up libmagic1:amd64 (1:5.41-4) ... Setting up gettext-base (0.21-6) ... Setting up file (1:5.41-4) ... Setting up libsasl2-modules-db:amd64 (2.1.28+dfsg-6ubuntu1) ... Setting up liberror-perl (0.17029-1) ... Setting up autotools-dev (20220109.1) ... Setting up librtmp1:amd64 (2.4+20151223.gitfa8646d.1-2build4) ... Setting up bash-completion (1:2.11-6ubuntu1) ... Setting up libsigsegv2:amd64 (2.13-1ubuntu3) ... Setting up autopoint (0.21-6) ... Setting up pkg-config (0.29.2-1ubuntu3) ... Setting up libsasl2-2:amd64 (2.1.28+dfsg-6ubuntu1) ... Setting up libssh-4:amd64 (0.9.6-2build1) ... Setting up libuchardet0:amd64 (0.0.7-1build2) ... Setting up libmpdec3:amd64 (2.5.1-2build2) ... Setting up libsub-override-perl (0.09-3) ... Setting up git-man (1:2.36.1-1ubuntu1) ... Setting up libjs-jquery (3.6.0+dfsg+~3.5.13-1) ... Setting up python3-wheel-whl (0.37.1-2) ... Setting up libelf1:amd64 (0.187-1) ... Setting up libxml2:amd64 (2.9.14+dfsg-1) ... Setting up libjs-underscore (1.13.3~dfsg+~1.11.4-1) ... Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... Setting up libdw1:amd64 (0.187-1) ... Setting up gettext (0.21-6) ... Setting up libtool (2.4.7-4) ... Setting up m4 (1.4.18-5ubuntu2) ... Setting up libldap-2.5-0:amd64 (2.5.12+dfsg-2ubuntu1) ... Setting up intltool-debian (0.35.0+20060710.5) ... Setting up libpython3.10-stdlib:amd64 (3.10.5-1) ... Setting up libjs-sphinxdoc (4.5.0-4) ... Setting up autoconf (2.71-2) ... Setting up dh-strip-nondeterminism (1.13.0-1) ... Setting up dwz (0.14-1build2) ... Setting up groff-base (1.22.4-8build1) ... Setting up debugedit (1:5.0-4build1) ... Setting up libpython3-stdlib:amd64 (3.10.4-0ubuntu2) ... Setting up automake (1:1.16.5-1.3) ... update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode Setting up python3.10 (3.10.5-1) ... Setting up po-debconf (1.0.21+nmu1) ... Setting up libcurl3-gnutls:amd64 (7.83.1-2) ... Setting up python3 (3.10.4-0ubuntu2) ... Setting up python3-distlib (0.3.4-1) ... Setting up man-db (2.10.2-1) ... Not building database; man-db/auto-update is not 'true'. Created symlink /etc/systemd/system/timers.target.wants/man-db.timer → /lib/systemd/system/man-db.timer. Setting up python3-platformdirs (2.5.2-1) ... Setting up python3-six (1.16.0-3ubuntu1) ... Setting up dh-autoreconf (20) ... Setting up python3-pyparsing (3.0.7-2) ... Setting up git (1:2.36.1-1ubuntu1) ... Setting up python3-toml (0.10.2-1) ... Setting up python3-pluggy (1.0.0-1) ... Setting up python3-lib2to3 (3.10.4-0ubuntu2) ... Setting up python3-pkg-resources (59.6.0-1.2) ... Setting up python3-distutils (3.10.4-0ubuntu2) ... Setting up dh-python (5.20220403) ... Setting up python3-filelock (3.7.1-1) ... Setting up python3-setuptools (59.6.0-1.2) ... Setting up python3-py (1.10.0-1) ... Setting up debhelper (13.7.1ubuntu1) ... Setting up python3-wheel (0.37.1-2) ... Setting up python3-packaging (21.3-1) ... Setting up python3-pip (22.1.1+dfsg-1) ... Setting up python3-virtualenv (20.14.0+ds-1) ... Setting up tox (3.21.4-1ubuntu1) ... Setting up sbuild-build-depends-main-dummy (0.invalid.0) ... Processing triggers for libc-bin (2.35-0ubuntu3) ... +------------------------------------------------------------------------------+ | Check architectures | +------------------------------------------------------------------------------+ Arch check ok (amd64 included in all) +------------------------------------------------------------------------------+ | Build environment | +------------------------------------------------------------------------------+ Kernel: Linux 5.4.0-120-generic #136-Ubuntu SMP Fri Jun 10 13:40:48 UTC 2022 amd64 (x86_64) Toolchain package versions: binutils_2.38.50.20220615-4ubuntu1 dpkg-dev_1.21.8ubuntu1 g++-11_11.3.0-3ubuntu1 gcc-11_11.3.0-3ubuntu1 libc6-dev_2.35-0ubuntu3 libstdc++-11-dev_11.3.0-3ubuntu1 libstdc++6_12.1.0-2ubuntu1 linux-libc-dev_5.15.0-27.28 Package versions: adduser_3.121ubuntu1 advancecomp_2.1-2.1ubuntu2 apt_2.5.0 autoconf_2.71-2 automake_1:1.16.5-1.3 autopoint_0.21-6 autotools-dev_20220109.1 base-files_12.2ubuntu1 base-passwd_3.5.52build1 bash_5.1-6ubuntu1 bash-completion_1:2.11-6ubuntu1 binutils_2.38.50.20220615-4ubuntu1 binutils-common_2.38.50.20220615-4ubuntu1 binutils-x86-64-linux-gnu_2.38.50.20220615-4ubuntu1 bsdextrautils_2.38-4ubuntu1 bsdutils_1:2.38-4ubuntu1 build-essential_12.9ubuntu3 bzip2_1.0.8-5build1 ca-certificates_20211016 coreutils_8.32-4.1ubuntu1 cpp_4:11.2.0-1ubuntu1 cpp-11_11.3.0-3ubuntu1 dash_0.5.11+git20210903+057cd650a4ed-3build1 debconf_1.5.79ubuntu1 debhelper_13.7.1ubuntu1 debianutils_5.7-0.2 debugedit_1:5.0-4build1 dh-autoreconf_20 dh-python_5.20220403 dh-strip-nondeterminism_1.13.0-1 diffutils_1:3.8-0ubuntu2 dpkg_1.21.8ubuntu1 dpkg-dev_1.21.8ubuntu1 dwz_0.14-1build2 e2fsprogs_1.46.5-2ubuntu2 fakeroot_1.29-1ubuntu1 file_1:5.41-4 findutils_4.8.0-1ubuntu3 g++_4:11.2.0-1ubuntu1 g++-11_11.3.0-3ubuntu1 gcc_4:11.2.0-1ubuntu1 gcc-11_11.3.0-3ubuntu1 gcc-11-base_11.3.0-3ubuntu1 gcc-12-base_12.1.0-2ubuntu1 gettext_0.21-6 gettext-base_0.21-6 git_1:2.36.1-1ubuntu1 git-man_1:2.36.1-1ubuntu1 gpg_2.2.27-3ubuntu2 gpg-agent_2.2.27-3ubuntu2 gpgconf_2.2.27-3ubuntu2 gpgv_2.2.27-3ubuntu2 grep_3.7-1build1 groff-base_1.22.4-8build1 gzip_1.10-4ubuntu4 hostname_3.23ubuntu2 init_1.63 init-system-helpers_1.63 intltool-debian_0.35.0+20060710.5 libacl1_2.3.1-1 libapparmor1_3.0.4-2ubuntu3 libapt-pkg6.0_2.5.0 libarchive-zip-perl_1.68-1 libargon2-1_0~20171227-0.3 libasan6_11.3.0-3ubuntu1 libassuan0_2.5.5-3 libatomic1_12.1.0-2ubuntu1 libattr1_1:2.5.1-1build1 libaudit-common_1:3.0.7-1build1 libaudit1_1:3.0.7-1build1 libbinutils_2.38.50.20220615-4ubuntu1 libblkid1_2.38-4ubuntu1 libbrotli1_1.0.9-2build6 libbz2-1.0_1.0.8-5build1 libc-bin_2.35-0ubuntu3 libc-dev-bin_2.35-0ubuntu3 libc6_2.35-0ubuntu3 libc6-dev_2.35-0ubuntu3 libcap-ng0_0.7.9-4 libcap2_1:2.44-1build3 libcc1-0_12.1.0-2ubuntu1 libcom-err2_1.46.5-2ubuntu2 libcrypt-dev_1:4.4.27-1 libcrypt1_1:4.4.27-1 libcryptsetup12_2:2.4.3-1ubuntu1 libctf-nobfd0_2.38.50.20220615-4ubuntu1 libctf0_2.38.50.20220615-4ubuntu1 libcurl3-gnutls_7.83.1-2 libdb5.3_5.3.28+dfsg1-0.9 libdebconfclient0_0.261ubuntu1 libdebhelper-perl_13.7.1ubuntu1 libdevmapper1.02.1_2:1.02.175-2.1ubuntu4 libdpkg-perl_1.21.8ubuntu1 libdw1_0.187-1 libelf1_0.187-1 liberror-perl_0.17029-1 libexpat1_2.4.8-1 libext2fs2_1.46.5-2ubuntu2 libfakeroot_1.29-1ubuntu1 libffi8_3.4.2-4 libfile-stripnondeterminism-perl_1.13.0-1 libgcc-11-dev_11.3.0-3ubuntu1 libgcc-s1_12.1.0-2ubuntu1 libgcrypt20_1.10.1-2ubuntu1 libgdbm-compat4_1.23-1 libgdbm6_1.23-1 libglib2.0-0_2.72.2-2 libgmp10_2:6.2.1+dfsg-3ubuntu1 libgnutls30_3.7.6-2ubuntu1 libgomp1_12.1.0-2ubuntu1 libgpg-error0_1.45-2 libgprofng0_2.38.50.20220615-4ubuntu1 libgssapi-krb5-2_1.19.2-2 libhogweed6_3.7.3-1build2 libicu71_71.1-3 libidn2-0_2.3.2-2build1 libip4tc2_1.8.7-1ubuntu6 libisl23_0.24-2build1 libitm1_12.1.0-2ubuntu1 libjs-jquery_3.6.0+dfsg+~3.5.13-1 libjs-sphinxdoc_4.5.0-4 libjs-underscore_1.13.3~dfsg+~1.11.4-1 libjson-c5_0.16-1 libk5crypto3_1.19.2-2 libkeyutils1_1.6.1-3ubuntu1 libkmod2_29-1ubuntu1 libkrb5-3_1.19.2-2 libkrb5support0_1.19.2-2 libldap-2.5-0_2.5.12+dfsg-2ubuntu1 liblockfile-bin_1.17-1build2 liblockfile1_1.17-1build2 liblsan0_12.1.0-2ubuntu1 liblz4-1_1.9.3-2build2 liblzma5_5.2.5-2.1 libmagic-mgc_1:5.41-4 libmagic1_1:5.41-4 libmount1_2.38-4ubuntu1 libmpc3_1.2.1-2build1 libmpdec3_2.5.1-2build2 libmpfr6_4.1.0-3build3 libncurses6_6.3+20220423-2 libncursesw6_6.3+20220423-2 libnettle8_3.7.3-1build2 libnghttp2-14_1.47.0-1 libnpth0_1.6-3build2 libnsl-dev_1.3.0-2build2 libnsl2_1.3.0-2build2 libp11-kit0_0.24.1-1 libpam-modules_1.4.0-13ubuntu1 libpam-modules-bin_1.4.0-13ubuntu1 libpam-runtime_1.4.0-13ubuntu1 libpam0g_1.4.0-13ubuntu1 libpcre2-8-0_10.40-1 libpcre3_2:8.39-14 libperl5.34_5.34.0-3ubuntu1 libpipeline1_1.5.6-1 libpng16-16_1.6.37-5 libprocps8_2:3.3.17-6ubuntu2 libpsl5_0.21.0-1.2build2 libpython3-stdlib_3.10.4-0ubuntu2 libpython3.10-minimal_3.10.5-1 libpython3.10-stdlib_3.10.5-1 libquadmath0_12.1.0-2ubuntu1 libreadline8_8.1.2-1.2 librtmp1_2.4+20151223.gitfa8646d.1-2build4 libsasl2-2_2.1.28+dfsg-6ubuntu1 libsasl2-modules-db_2.1.28+dfsg-6ubuntu1 libseccomp2_2.5.4-1ubuntu1 libselinux1_3.4-1 libsemanage-common_3.4-1 libsemanage2_3.4-1 libsepol2_3.4-2 libsigsegv2_2.13-1ubuntu3 libsmartcols1_2.38-4ubuntu1 libsqlite3-0_3.38.5-1 libss2_1.46.5-2ubuntu2 libssh-4_0.9.6-2build1 libssl3_3.0.3-5ubuntu3 libstdc++-11-dev_11.3.0-3ubuntu1 libstdc++6_12.1.0-2ubuntu1 libsub-override-perl_0.09-3 libsystemd0_249.11-0ubuntu4 libtasn1-6_4.18.0-4build1 libtinfo6_6.3+20220423-2 libtirpc-common_1.3.2-2build1 libtirpc-dev_1.3.2-2build1 libtirpc3_1.3.2-2build1 libtool_2.4.7-4 libtsan0_11.3.0-3ubuntu1 libubsan1_12.1.0-2ubuntu1 libuchardet0_0.0.7-1build2 libudev1_249.11-0ubuntu4 libunistring2_1.0-1 libuuid1_2.38-4ubuntu1 libxml2_2.9.14+dfsg-1 libxxhash0_0.8.1-1 libzstd1_1.5.2+dfsg-1 linux-libc-dev_5.15.0-27.28 lockfile-progs_0.1.19build1 login_1:4.11.1+dfsg1-2ubuntu1 logsave_1.46.5-2ubuntu2 lsb-base_11.1.0ubuntu4 lto-disabled-list_27 m4_1.4.18-5ubuntu2 make_4.3-4.1build1 man-db_2.10.2-1 mawk_1.3.4.20200120-3.1 media-types_8.0.0 mount_2.38-4ubuntu1 ncurses-base_6.3+20220423-2 ncurses-bin_6.3+20220423-2 openssl_3.0.3-5ubuntu3 optipng_0.7.7-2build1 passwd_1:4.11.1+dfsg1-2ubuntu1 patch_2.7.6-7build2 perl_5.34.0-3ubuntu1 perl-base_5.34.0-3ubuntu1 perl-modules-5.34_5.34.0-3ubuntu1 pinentry-curses_1.2.0-1ubuntu1 pkg-config_0.29.2-1ubuntu3 pkgbinarymangler_149 po-debconf_1.0.21+nmu1 policyrcd-script-zg2_0.1-3.1 procps_2:3.3.17-6ubuntu2 python3_3.10.4-0ubuntu2 python3-distlib_0.3.4-1 python3-distutils_3.10.4-0ubuntu2 python3-filelock_3.7.1-1 python3-lib2to3_3.10.4-0ubuntu2 python3-minimal_3.10.4-0ubuntu2 python3-packaging_21.3-1 python3-pip_22.1.1+dfsg-1 python3-pip-whl_22.1.1+dfsg-1 python3-pkg-resources_59.6.0-1.2 python3-platformdirs_2.5.2-1 python3-pluggy_1.0.0-1 python3-py_1.10.0-1 python3-pyparsing_3.0.7-2 python3-setuptools_59.6.0-1.2 python3-setuptools-whl_59.6.0-1.2 python3-six_1.16.0-3ubuntu1 python3-toml_0.10.2-1 python3-virtualenv_20.14.0+ds-1 python3-wheel_0.37.1-2 python3-wheel-whl_0.37.1-2 python3.10_3.10.5-1 python3.10-minimal_3.10.5-1 readline-common_8.1.2-1.2 rpcsvc-proto_1.4.2-0ubuntu6 sbuild-build-depends-main-dummy_0.invalid.0 sed_4.8-1ubuntu2 sensible-utils_0.0.17 systemd_249.11-0ubuntu4 systemd-sysv_249.11-0ubuntu4 sysvinit-utils_3.01-1ubuntu1 tar_1.34+dfsg-1build3 tox_3.21.4-1ubuntu1 tzdata_2022a-0ubuntu1 ubuntu-keyring_2021.03.26 usrmerge_25ubuntu2 util-linux_2.38-4ubuntu1 util-linux-extra_2.38-4ubuntu1 xz-utils_5.2.5-2.1 zlib1g_1:1.2.11.dfsg-2ubuntu9 +------------------------------------------------------------------------------+ | Build | +------------------------------------------------------------------------------+ Unpack source ------------- -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 3.0 (quilt) Source: git-imerge Binary: git-imerge Architecture: all Version: 1.2.0-3 Maintainer: Paul Wise Homepage: https://github.com/mhagger/git-imerge Standards-Version: 4.5.0 Testsuite: autopkgtest Build-Depends: bash-completion, debhelper-compat (= 13), dh-python, git , pkg-config, python3, python3-setuptools, tox Package-List: git-imerge deb vcs optional arch=all Checksums-Sha1: ebc6d10e0a91414cc3396314fd3a3d857926595e 64449 git-imerge_1.2.0.orig.tar.gz e9c70d845d4ccd08116549b29d5bb70e173e0844 2640 git-imerge_1.2.0-3.debian.tar.xz Checksums-Sha256: cd80a817bc8dd4b5642f83610237e855fc0a23f5c11978d6f7d021cfb0e87bb2 64449 git-imerge_1.2.0.orig.tar.gz 766020d5e4e1f237cb3ae40cb7fa3c3e62a3a7d3391abe1db79399fa9dd16591 2640 git-imerge_1.2.0-3.debian.tar.xz Files: 87a2b582c619f888a7b195487cbaa83f 64449 git-imerge_1.2.0.orig.tar.gz 205f88c6680e985ceb7b33d15a511c80 2640 git-imerge_1.2.0-3.debian.tar.xz -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEYQsotVz8/kXqG1Y7MRa6Xp/6aaMFAl+WD8QACgkQMRa6Xp/6 aaO8hQ//Z6YpDPQTy4eBDucHNe2tXa0KUrKtfqdcQ1j0ablQsLAdXPqA4IOm15IH ZMDoKbd/YmynCCXWYZ+bbKoX4ZNcw53Pm0zALf2J6fSx9RH5DbsTB2KfCowQk5mK z0DrR2D+nMw09KysaYFoLzb7KVWIaRoTtakJWCtlr9dI8NVE3kmcBuUNVpQOyA/T 2m4Ltjd/LzeYtt1Dhw1YeY1wL5hQ3eKFkhYfmPJ0wJWsUzgnskrcCP5eDIyPuoQn 5V0KhBGcvPsxYn1k3oMIDLSQKKGVRwGs0fNnZO6BIMAPJkQeI2YnIAVBpKSJh82S oURj2TZhtqRBFUQpRg4F6j25FrXJ16465jXk4ux7t11EYxuidWDzQOs01BHHFEp+ D2Vv8H9WJvSv3cBTKWPPQQBoWGqWndmDYocY86KEfFBJY/in1hnso8xKSId5h7AZ 3V2ufOO8MfV5gI6+QcwblcXgHkN35YEBs4b1TsHP0Zh43jtGPbpwyt7cuGmTKDrh sNa8q+nxwhOYmZCgPIxyKFq0bYNniPSLUIrfERzciDnRJslS84uN4WTputXLxnd4 Bl8BL9wwXbyLh31htlz5WYFSqAtFMqyg+ltCNyTl83ZrIV0bhnJFvd64YRDolxKJ HETOXDp/k4An5FZMum1+FqkBS9ywb4BsVSROpbbeDycnldRCwaE= =Xrqn -----END PGP SIGNATURE----- gpgv: Signature made Sun Oct 25 23:52:36 2020 UTC gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 gpgv: Can't check signature: No public key dpkg-source: warning: cannot verify signature ./git-imerge_1.2.0-3.dsc dpkg-source: info: extracting git-imerge in /<> dpkg-source: info: unpacking git-imerge_1.2.0.orig.tar.gz dpkg-source: info: unpacking git-imerge_1.2.0-3.debian.tar.xz Check disk space ---------------- Sufficient free space for build User Environment ---------------- APT_CONFIG=/var/lib/sbuild/apt.conf DEB_BUILD_OPTIONS=noautodbgsym parallel=4 HOME=/sbuild-nonexistent LANG=C.UTF-8 LC_ALL=C.UTF-8 LOGNAME=buildd PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games SCHROOT_ALIAS_NAME=build-PACKAGEBUILD-23997183 SCHROOT_CHROOT_NAME=build-PACKAGEBUILD-23997183 SCHROOT_COMMAND=env SCHROOT_GID=2501 SCHROOT_GROUP=buildd SCHROOT_SESSION_ID=build-PACKAGEBUILD-23997183 SCHROOT_UID=2001 SCHROOT_USER=buildd SHELL=/bin/sh TERM=unknown USER=buildd V=1 dpkg-buildpackage ----------------- Command: dpkg-buildpackage -us -uc -mLaunchpad Build Daemon -b -rfakeroot dpkg-buildpackage: info: source package git-imerge dpkg-buildpackage: info: source version 1.2.0-3 dpkg-buildpackage: info: source distribution unstable dpkg-source --before-build . dpkg-buildpackage: info: host architecture amd64 debian/rules clean dh clean --with python3 --buildsystem=pybuild dh_auto_clean -O--buildsystem=pybuild I: pybuild base:239: python3.10 setup.py clean running clean removing '/<>/.pybuild/cpython3_3.10/build' (and everything under it) 'build/bdist.linux-x86_64' does not exist -- can't clean it 'build/scripts-3.10' does not exist -- can't clean it dh_autoreconf_clean -O--buildsystem=pybuild dh_clean -O--buildsystem=pybuild debian/rules binary dh binary --with python3 --buildsystem=pybuild dh_update_autotools_config -O--buildsystem=pybuild dh_autoreconf -O--buildsystem=pybuild dh_auto_configure -O--buildsystem=pybuild I: pybuild base:239: python3.10 setup.py config running config dh_auto_build -O--buildsystem=pybuild I: pybuild base:239: /usr/bin/python3 setup.py build running build running build_py copying gitimerge.py -> /<>/.pybuild/cpython3_3.10/build dh_auto_test -O--buildsystem=pybuild I: pybuild base:239: cd /<>/.pybuild/cpython3_3.10/build; tox -c /<>/tox.ini --sitepackages -e py310 GLOB sdist-make: /<>/setup.py py310 create: /<>/.tox/py310 py310 inst: /<>/.tox/.tmp/package/1/git-imerge-1.2.0.zip WARNING: Discarding $PYTHONPATH from environment, to override specify PYTHONPATH in 'passenv' in your configuration. py310 installed: distlib==0.3.4,filelock==3.7.1,git-imerge @ file:///<>/.tox/.tmp/package/1/git-imerge-1.2.0.zip,packaging==21.3,platformdirs==2.5.2,pluggy==1.0.0,py==1.10.0,pyparsing==3.0.7,six==1.16.0,toml==0.10.2,tox==3.21.4,virtualenv==20.14.0+ds py310 run-test-pre: PYTHONHASHSEED='2215229530' py310 run-test: commands[0] | /bin/sh t/test-unconflicted + dirname t/test-unconflicted + cd t + pwd + dirname /<>/t + BASE=/<> + . /<>/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/<>/t/tmp/unconflicted + DESCRIPTION=git-imerge test repository without conflicts + init_test_repo /<>/t/tmp/unconflicted git-imerge test repository without conflicts + local path=/<>/t/tmp/unconflicted + local description=git-imerge test repository without conflicts + delete_test_repo /<>/t/tmp/unconflicted git-imerge test repository without conflicts + local path=/<>/t/tmp/unconflicted + local description=git-imerge test repository without conflicts + test -d /<>/t/tmp/unconflicted + mkdir -p /<>/t/tmp/unconflicted + git init /<>/t/tmp/unconflicted hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/unconflicted/.git/ + echo git-imerge test repository without conflicts + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/unconflicted/.git config user.name Loú User + git --git-dir=/<>/t/tmp/unconflicted/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/unconflicted + cd /<>/t/tmp/unconflicted + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + modify b.txt 0 + filename=b.txt + text=0 + echo 0 + git add b.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) 780ddf5] m⇒0 2 files changed, 2 insertions(+) create mode 100644 a.txt create mode 100644 b.txt + git checkout -b a -- Switched to a new branch 'a' + seq 8 + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt + commit -m a⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 [a b862e30] a⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt + commit -m a⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 [a dcbe282] a⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt + commit -m a⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 [a ecd8647] a⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 4 + filename=a.txt + text=4 + echo 4 + git add a.txt + commit -m a⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 [a 1634bab] a⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 5 + filename=a.txt + text=5 + echo 5 + git add a.txt + commit -m a⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 [a 909ce12] a⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 6 + filename=a.txt + text=6 + echo 6 + git add a.txt + commit -m a⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 [a f6520bf] a⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 7 + filename=a.txt + text=7 + echo 7 + git add a.txt + commit -m a⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 [a 6797186] a⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 8 + filename=a.txt + text=8 + echo 8 + git add a.txt + commit -m a⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 [a 49643dd] a⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' + seq 5 + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt + commit -m b⇒1 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 [b d43305b] b⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt + commit -m b⇒2 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 [b 853ee68] b⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt + commit -m b⇒3 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 [b 03a2455] b⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt + commit -m b⇒4 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 [b 484ea85] b⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify b.txt 5 + filename=b.txt + text=5 + echo 5 + git add b.txt + commit -m b⇒5 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 [b e22cd97] b⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git checkout a Switched to branch 'a' + git-imerge start --first-parent --name=a-b --branch=a-b-merge b Attempting automerge of 8-5...success. Autofilling 1-5...success. Autofilling 2-5...success. Autofilling 3-5...success. Autofilling 4-5...success. Autofilling 5-5...success. Autofilling 6-5...success. Autofilling 7-5...success. Autofilling 8-1...success. Autofilling 8-2...success. Autofilling 8-3...success. Autofilling 8-4...success. Autofilling 8-5 (first way)...success. Autofilling 8-5 (second way)...success. The two ways of autofilling 8-5 agree. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6]. Merge is complete! + git-imerge list * a-b + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 8 | | | 0 - ********* - a *???????. *???????. *???????. *???????. 5 - *........ | b 0 5 8 | | | 0 - ********* - a *???????| *???????| *???????| *???????| 5 - *-------+ | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge Merge b into a (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:10:32 2022 +0000 # # On branch a-b-merge # Changes to be committed: # modified: b.txt # [a-b-merge 6cf2ef4] Merge b into a (using imerge) Date: Wed Jun 22 13:10:32 2022 +0000 + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-merge + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git rev-parse a-b-merge^{tree} + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git-imerge simplify --goal=rebase --branch=a-b-rebase + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-rebase + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git rev-parse a-b-rebase^{tree} + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-rebase-with-history + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git rev-parse a-b-rebase-with-history^{tree} + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git-imerge simplify --goal=border --branch=a-b-border + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-border + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git rev-parse a-b-border^{tree} + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-border-with-history + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git rev-parse a-b-border-with-history^{tree} + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2 + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-border-with-history2 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git rev-parse a-b-border-with-history2^{tree} + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git-imerge remove + git checkout a Switched to branch 'a' + git-imerge start --goal=full --name=a-b b Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Merge is complete! + git-imerge list * a-b + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 8 | | | 0 - ********* - a *........ *........ *........ *........ 5 - *........ | b 0 5 8 | | | 0 - ********* - a *.......| *.......| *.......| *.......| 5 - *-------+ | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=a-b-full + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-full + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git rev-parse a-b-full^{tree} + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 py310 run-test: commands[1] | /bin/sh t/test-conflicted + dirname t/test-conflicted + cd t + pwd + dirname /<>/t + BASE=/<> + . /<>/t/test-lib.sh + GIT_IMERGE=git-imerge + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 4-3 + local conflict=4-3 + TMP=/<>/t/tmp/conflicted-4-3 + DESCRIPTION=git-imerge test repository with conflict at 4-3 + init_test_repo /<>/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 + local path=/<>/t/tmp/conflicted-4-3 + local description=git-imerge test repository with conflict at 4-3 + delete_test_repo /<>/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 + local path=/<>/t/tmp/conflicted-4-3 + local description=git-imerge test repository with conflict at 4-3 + test -d /<>/t/tmp/conflicted-4-3 + mkdir -p /<>/t/tmp/conflicted-4-3 + git init /<>/t/tmp/conflicted-4-3 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-4-3/.git/ + echo git-imerge test repository with conflict at 4-3 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-4-3/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-4-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-4-3 + cd /<>/t/tmp/conflicted-4-3 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c 3c091de] c⇒4 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c a0ac37a] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c ed9fdfa] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c 1da7bf5] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c d8de99f] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 9cde605] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 2bb1a7e] d⇒3 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 81f9c80] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d 3690dde] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d 8085853] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + tee autofill.out + git-imerge autofill Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. Attempting automerge of 1-6...success. Attempting automerge of 9-6...failure. Attempting automerge of 5-6...failure. Attempting automerge of 3-6...success. Attempting automerge of 4-6...failure. Attempting automerge of 4-1...success. Attempting automerge of 4-4...failure. Attempting automerge of 4-3...failure. Attempting automerge of 4-2...success. Attempting automerge of 9-2...success. Autofilling 1-6...success. Autofilling 2-6...success. Autofilling 3-1...success. Autofilling 3-2...success. Autofilling 3-3...success. Autofilling 3-4...success. Autofilling 3-5...success. Autofilling 3-6 (first way)...success. Autofilling 3-6 (second way)...success. The two ways of autofilling 3-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:4,0:7]. Autofilling 4-2...success. Autofilling 5-2...success. Autofilling 6-2...success. Autofilling 7-2...success. Autofilling 8-2...success. Autofilling 9-1...success. Autofilling 9-2 (first way)...success. Autofilling 9-2 (second way)...success. The two ways of autofilling 9-2 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:10,0:3]. Attempting automerge of 9-6...failure. Attempting automerge of 4-3...failure. HEAD is now at 9cde605 c⇒9 Conflict; suggest manual merge of 4-3 + grep -q Traceback autofill.out + grep -q suggest manual merge of 4-3 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *??.?????. *??....... *??.#????? *??.?????? 5 - *??.?????? 6 - *...?????? | d 0 5 9 | | | 0 - ********** - c *??.?????| *??.-----+ *??|#????? *??|?????? 5 - *??|?????? 6 - *--+?????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 3c091ded129a5edf9061360bab867edade996c93 Author: Loú User Date: Thu Apr 7 22:13:18 2005 +0000 c⇒4 Original second commit: commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b Author: Loú User Date: Thu Apr 7 22:13:26 2005 +0000 d⇒3 There was a conflict merging commit 4-3, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d d0dee39] imerge 'c-d': manual merge 4-3 Merge has been recorded for merge 4-3. Attempting automerge of 4-6...success. Autofilling 4-4...success. Autofilling 4-5...success. Autofilling 4-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,3:7]. Attempting automerge of 9-6...success. Autofilling 5-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-6...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5...success. Autofilling 9-6 (first way)...success. Autofilling 9-6 (second way)...success. The two ways of autofilling 9-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:10,2:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *??.?????. *??....... *??.*????. *??..????. 5 - *??..????. 6 - *......... | d 0 5 9 | | | 0 - ********** - c *??.?????| *??......| *??.*????| *??..????| 5 - *??..????| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:10:42 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge ecdfc5e] Merge d into c (using imerge) Date: Wed Jun 22 13:10:42 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + git-imerge start --goal=full --first-parent+ --name=c-d d tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...conflict. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. Previous HEAD position was b5165a9 imerge 'c-d': automatic merge 9-2 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 3c091ded129a5edf9061360bab867edade996c93 Author: Loú User Date: Thu Apr 7 22:13:18 2005 +0000 c⇒4 Original second commit: commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b Author: Loú User Date: Thu Apr 7 22:13:26 2005 +0000 d⇒3 There was a conflict merging commit 4-3, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 4-3 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *......... *......... *...#????? *...?????? 5 - *...?????? 6 - *...?????? | d 0 5 9 | | | 0 - ********** - c *........| *...-----+ *..|#????? *..|?????? 5 - *..|?????? 6 - *--+?????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 4-3 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d 716394f] imerge 'c-d': manual merge 4-3 + git-imerge continue --edit Merge has been recorded for merge 4-3. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 7-6...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 8-6...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *......... *......... *...*..... *......... 5 - *......... 6 - *......... | d 0 5 9 | | | 0 - ********** - c *........| *........| *...*....| *........| 5 - *........| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 1-1 + local conflict=1-1 + TMP=/<>/t/tmp/conflicted-1-1 + DESCRIPTION=git-imerge test repository with conflict at 1-1 + init_test_repo /<>/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 + local path=/<>/t/tmp/conflicted-1-1 + local description=git-imerge test repository with conflict at 1-1 + delete_test_repo /<>/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 + local path=/<>/t/tmp/conflicted-1-1 + local description=git-imerge test repository with conflict at 1-1 + test -d /<>/t/tmp/conflicted-1-1 + mkdir -p /<>/t/tmp/conflicted-1-1 + git init /<>/t/tmp/conflicted-1-1 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-1-1/.git/ + echo git-imerge test repository with conflict at 1-1 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-1-1/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-1-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-1-1 + cd /<>/t/tmp/conflicted-1-1 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 2120f40] c⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 90cc7de] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c 2046ed2] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c 8a2cee9] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c ac16a05] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c 30dd2ae] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c 0883eb9] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c f661c06] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d ac0427a] d⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 43c38c0] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 0260058] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 40fef44] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d b080a65] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge autofill + tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...failure. HEAD is now at 243e8ed c⇒9 No progress was possible; suggest manual merge of 1-1 + grep -q Traceback autofill.out + grep -q suggest manual merge of 1-1 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *#???????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *#???????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 1-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 6639252] imerge 'c-d': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-6...success. Autofilling 1-2...success. Autofilling 1-3...success. Autofilling 1-4...success. Autofilling 1-5...success. Autofilling 1-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:7]. Attempting automerge of 9-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-6...success. Autofilling 5-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-6...success. Autofilling 9-1...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5...success. Autofilling 9-6 (first way)...success. Autofilling 9-6 (second way)...success. The two ways of autofilling 9-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,0:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c **???????. *.???????. *.???????. *.???????. 5 - *.???????. 6 - *......... | d 0 5 9 | | | 0 - ********** - c **???????| *.???????| *.???????| *.???????| 5 - *.???????| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:10:53 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge ab6f5a1] Merge d into c (using imerge) Date: Wed Jun 22 13:10:53 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + + git-imergetee start --goal=full --first-parent --name=c-d d start.out Attempting to merge 1-1...conflict. Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 1-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 1-1 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *#???????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *#???????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 1-1 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d f6a40a3] imerge 'c-d': manual merge 1-1 + git-imerge continue --edit Merge has been recorded for merge 1-1. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 7-6...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 8-6...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c **........ *......... *......... *......... 5 - *......... 6 - *......... | d 0 5 9 | | | 0 - ********** - c **.......| *........| *........| *........| 5 - *........| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-1 + local conflict=9-1 + TMP=/<>/t/tmp/conflicted-9-1 + DESCRIPTION=git-imerge test repository with conflict at 9-1 + init_test_repo /<>/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 + local path=/<>/t/tmp/conflicted-9-1 + local description=git-imerge test repository with conflict at 9-1 + delete_test_repo /<>/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 + local path=/<>/t/tmp/conflicted-9-1 + local description=git-imerge test repository with conflict at 9-1 + test -d /<>/t/tmp/conflicted-9-1 + mkdir -p /<>/t/tmp/conflicted-9-1 + git init /<>/t/tmp/conflicted-9-1 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-9-1/.git/ + echo git-imerge test repository with conflict at 9-1 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-9-1/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-9-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-9-1 + cd /<>/t/tmp/conflicted-9-1 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d ac0427a] d⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 43c38c0] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 0260058] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 40fef44] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d b080a65] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge autofill + tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. Attempting automerge of 1-6...success. Attempting automerge of 9-6...failure. Attempting automerge of 5-6...success. Attempting automerge of 7-6...success. Attempting automerge of 8-6...success. Attempting automerge of 9-1...failure. Autofilling 1-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-6...success. Autofilling 5-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-1...success. Autofilling 8-2...success. Autofilling 8-3...success. Autofilling 8-4...success. Autofilling 8-5...success. Autofilling 8-6 (first way)...success. Autofilling 8-6 (second way)...success. The two ways of autofilling 8-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. Attempting automerge of 9-6...failure. Attempting automerge of 9-1...failure. HEAD is now at 73a5eed c⇒9 Conflict; suggest manual merge of 9-1 + grep -q Traceback autofill.out + grep -q suggest manual merge of 9-1 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *???????.# *???????.? *???????.? *???????.? 5 - *???????.? 6 - *........? | d 0 5 9 | | | 0 - ********** - c *???????|# *???????|? *???????|? *???????|? 5 - *???????|? 6 - *-------+? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 9-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 48e6318] imerge 'c-d': manual merge 9-1 Merge has been recorded for merge 9-1. Attempting automerge of 9-6...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5...success. Autofilling 9-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *???????.* *???????.. *???????.. *???????.. 5 - *???????.. 6 - *......... | d 0 5 9 | | | 0 - ********** - c *???????.* *???????.| *???????.| *???????.| 5 - *???????.| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:11:02 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge b98fa4c] Merge d into c (using imerge) Date: Wed Jun 22 13:11:02 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + tee start.out + git-imerge start --goal=full --first-parent --name=c-d d Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 7-6...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 8-6...success. Attempting to merge 9-1...conflict. Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 9-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 9-1 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *........# *........? *........? *........? 5 - *........? 6 - *........? | d 0 5 9 | | | 0 - ********** - c *.......|# *.......|? *.......|? *.......|? 5 - *.......|? 6 - *-------+? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 9-1 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d b252df9] imerge 'c-d': manual merge 9-1 + git-imerge continue --edit Merge has been recorded for merge 9-1. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *........* *......... *......... *......... 5 - *......... 6 - *......... | d 0 5 9 | | | 0 - ********** - c *........* *........| *........| *........| 5 - *........| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 1-6 + local conflict=1-6 + TMP=/<>/t/tmp/conflicted-1-6 + DESCRIPTION=git-imerge test repository with conflict at 1-6 + init_test_repo /<>/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 + local path=/<>/t/tmp/conflicted-1-6 + local description=git-imerge test repository with conflict at 1-6 + delete_test_repo /<>/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 + local path=/<>/t/tmp/conflicted-1-6 + local description=git-imerge test repository with conflict at 1-6 + test -d /<>/t/tmp/conflicted-1-6 + mkdir -p /<>/t/tmp/conflicted-1-6 + git init /<>/t/tmp/conflicted-1-6 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-1-6/.git/ + echo git-imerge test repository with conflict at 1-6 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-1-6/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-1-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-1-6 + cd /<>/t/tmp/conflicted-1-6 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 2120f40] c⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 90cc7de] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c 2046ed2] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c 8a2cee9] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c ac16a05] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c 30dd2ae] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c 0883eb9] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c f661c06] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d 9522207] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + tee autofill.out + git-imerge autofill Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. Attempting automerge of 1-6...failure. Attempting automerge of 1-5...success. Attempting automerge of 9-5...success. Autofilling 1-5...success. Autofilling 2-5...success. Autofilling 3-5...success. Autofilling 4-5...success. Autofilling 5-5...success. Autofilling 6-5...success. Autofilling 7-5...success. Autofilling 8-5...success. Autofilling 9-1...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5 (first way)...success. Autofilling 9-5 (second way)...success. The two ways of autofilling 9-5 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6]. Attempting automerge of 9-6...failure. Attempting automerge of 1-6...failure. HEAD is now at 243e8ed c⇒9 Conflict; suggest manual merge of 1-6 + grep -q Traceback autofill.out + grep -q suggest manual merge of 1-6 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *????????. *????????. *????????. *????????. 5 - *......... 6 - *#???????? | d 0 5 9 | | | 0 - ********** - c *????????| *????????| *????????| *????????| 5 - *--------+ 6 - *#???????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 There was a conflict merging commit 1-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d eea4d5b] imerge 'c-d': manual merge 1-6 Merge has been recorded for merge 1-6. Attempting automerge of 9-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-6...success. Autofilling 5-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-6...success. Autofilling 9-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,5:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *????????. *????????. *????????. *????????. 5 - *......... 6 - **........ | d 0 5 9 | | | 0 - ********** - c *????????| *????????| *????????| *????????| 5 - *........| 6 - **-------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:11:13 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 99b7d0a] Merge d into c (using imerge) Date: Wed Jun 22 13:11:13 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + tee start.out + git-imerge start --goal=full --first-parent --name=c-d d Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...conflict. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Previous HEAD position was 986f4a4 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 There was a conflict merging commit 1-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 1-6 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *......... 6 - *#???????? | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........| 5 - *--------+ 6 - *#???????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 1-6 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d d576951] imerge 'c-d': manual merge 1-6 + git-imerge continue --edit Merge has been recorded for merge 1-6. Attempting to merge 2-6...success. Attempting to merge 3-6...success. Attempting to merge 4-6...success. Attempting to merge 5-6...success. Attempting to merge 6-6...success. Attempting to merge 7-6...success. Attempting to merge 8-6...success. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *......... 6 - **........ | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........| 5 - *........| 6 - **-------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-6 + local conflict=9-6 + TMP=/<>/t/tmp/conflicted-9-6 + DESCRIPTION=git-imerge test repository with conflict at 9-6 + init_test_repo /<>/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 + local path=/<>/t/tmp/conflicted-9-6 + local description=git-imerge test repository with conflict at 9-6 + delete_test_repo /<>/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 + local path=/<>/t/tmp/conflicted-9-6 + local description=git-imerge test repository with conflict at 9-6 + test -d /<>/t/tmp/conflicted-9-6 + mkdir -p /<>/t/tmp/conflicted-9-6 + git init /<>/t/tmp/conflicted-9-6 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-9-6/.git/ + echo git-imerge test repository with conflict at 9-6 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-9-6/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-9-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-9-6 + cd /<>/t/tmp/conflicted-9-6 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d 9522207] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge autofill + tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. Attempting automerge of 1-6...success. Attempting automerge of 9-6...failure. Attempting automerge of 5-6...success. Attempting automerge of 7-6...success. Attempting automerge of 8-6...success. Attempting automerge of 9-1...success. Attempting automerge of 9-4...success. Attempting automerge of 9-5...success. Autofilling 1-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-6...success. Autofilling 5-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-1...success. Autofilling 8-2...success. Autofilling 8-3...success. Autofilling 8-4...success. Autofilling 8-5...success. Autofilling 8-6 (first way)...success. Autofilling 8-6 (second way)...success. The two ways of autofilling 8-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. Autofilling 9-1...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:6]. Attempting automerge of 9-6...failure. Attempting automerge of 9-6...failure. HEAD is now at 73a5eed c⇒9 Conflict; suggest manual merge of 9-6 + grep -q Traceback autofill.out + grep -q suggest manual merge of 9-6 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *???????.. *???????.. *???????.. *???????.. 5 - *???????.. 6 - *........# | d 0 5 9 | | | 0 - ********** - c *???????.| *???????.| *???????.| *???????.| 5 - *???????.+ 6 - *-------+# | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 Original second commit: commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 There was a conflict merging commit 9-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d cf95d50] imerge 'c-d': manual merge 9-6 Merge has been recorded for merge 9-6. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *???????.. *???????.. *???????.. *???????.. 5 - *???????.. 6 - *........* | d 0 5 9 | | | 0 - ********** - c *???????.| *???????.| *???????.| *???????.| 5 - *???????.| 6 - *--------* | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:11:24 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 35a63a3] Merge d into c (using imerge) Date: Wed Jun 22 13:11:24 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + git-imerge start --goal=full --first-parent --name=c-d d + tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 7-6...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 8-6...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Attempting to merge 9-6...conflict. Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 Original second commit: commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 There was a conflict merging commit 9-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 9-6 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *......... 6 - *........# | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........| 5 - *........+ 6 - *-------+# | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 9-6 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d 61fcbb8] imerge 'c-d': manual merge 9-6 + git-imerge continue --edit Merge has been recorded for merge 9-6. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *......... 6 - *........* | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........| 5 - *........| 6 - *--------* | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 1-2 + local conflict=1-2 + TMP=/<>/t/tmp/conflicted-1-2 + DESCRIPTION=git-imerge test repository with conflict at 1-2 + init_test_repo /<>/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 + local path=/<>/t/tmp/conflicted-1-2 + local description=git-imerge test repository with conflict at 1-2 + delete_test_repo /<>/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 + local path=/<>/t/tmp/conflicted-1-2 + local description=git-imerge test repository with conflict at 1-2 + test -d /<>/t/tmp/conflicted-1-2 + mkdir -p /<>/t/tmp/conflicted-1-2 + git init /<>/t/tmp/conflicted-1-2 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-1-2/.git/ + echo git-imerge test repository with conflict at 1-2 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-1-2/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-1-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-1-2 + cd /<>/t/tmp/conflicted-1-2 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 2120f40] c⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 90cc7de] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c 2046ed2] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c 8a2cee9] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c ac16a05] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c 30dd2ae] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c 0883eb9] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c f661c06] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 69efde8] d⇒2 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 3169557] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 86c8052] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d 1700773] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d df2e493] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge autofill + tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...failure. Attempting automerge of 1-3...failure. Attempting automerge of 1-2...failure. Attempting automerge of 9-1...success. Autofilling 1-1...success. Autofilling 2-1...success. Autofilling 3-1...success. Autofilling 4-1...success. Autofilling 5-1...success. Autofilling 6-1...success. Autofilling 7-1...success. Autofilling 8-1...success. Autofilling 9-1...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2]. Attempting automerge of 9-6...failure. Attempting automerge of 1-2...failure. HEAD is now at 243e8ed c⇒9 Conflict; suggest manual merge of 1-2 + grep -q Traceback autofill.out + grep -q suggest manual merge of 1-2 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *......... *#???????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *--------+ *#???????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit 69efde8f66d581a765a3909ffacb9f895f95c345 Author: Loú User Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 There was a conflict merging commit 1-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 663ed3b] imerge 'c-d': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting automerge of 1-6...success. Autofilling 1-3...success. Autofilling 1-4...success. Autofilling 1-5...success. Autofilling 1-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,2:7]. Attempting automerge of 9-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-6...success. Autofilling 5-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-6...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5...success. Autofilling 9-6 (first way)...success. Autofilling 9-6 (second way)...success. The two ways of autofilling 9-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:10,1:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *......... **???????. *.???????. *.???????. 5 - *.???????. 6 - *......... | d 0 5 9 | | | 0 - ********** - c *........| **???????| *.???????| *.???????| 5 - *.???????| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:11:33 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge de3b20d] Merge d into c (using imerge) Date: Wed Jun 22 13:11:33 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + git-imerge start --goal=full --first-parent --name=c-d d + tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...conflict. Attempting to merge 2-1...success. Attempting to merge 3-1...success. Attempting to merge 4-1...success. Attempting to merge 5-1...success. Attempting to merge 6-1...success. Attempting to merge 7-1...success. Attempting to merge 8-1...success. Attempting to merge 9-1...success. Previous HEAD position was 789fb99 imerge 'c-d': automatic merge 9-1 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit 69efde8f66d581a765a3909ffacb9f895f95c345 Author: Loú User Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 There was a conflict merging commit 1-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 1-2 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *......... *#???????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *--------+ *#???????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 1-2 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d 6e041d7] imerge 'c-d': manual merge 1-2 + git-imerge continue --edit Merge has been recorded for merge 1-2. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 7-6...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 8-6...success. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *......... **........ *......... *......... 5 - *......... 6 - *......... | d 0 5 9 | | | 0 - ********** - c *........| **.......| *........| *........| 5 - *........| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-5 + local conflict=9-5 + TMP=/<>/t/tmp/conflicted-9-5 + DESCRIPTION=git-imerge test repository with conflict at 9-5 + init_test_repo /<>/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 + local path=/<>/t/tmp/conflicted-9-5 + local description=git-imerge test repository with conflict at 9-5 + delete_test_repo /<>/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 + local path=/<>/t/tmp/conflicted-9-5 + local description=git-imerge test repository with conflict at 9-5 + test -d /<>/t/tmp/conflicted-9-5 + mkdir -p /<>/t/tmp/conflicted-9-5 + git init /<>/t/tmp/conflicted-9-5 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-9-5/.git/ + echo git-imerge test repository with conflict at 9-5 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-9-5/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-9-5/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-9-5 + cd /<>/t/tmp/conflicted-9-5 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d 0a6f956] d⇒5 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d bfb30f0] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge autofill + tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. Attempting automerge of 1-6...success. Attempting automerge of 9-6...failure. Attempting automerge of 5-6...success. Attempting automerge of 7-6...success. Attempting automerge of 8-6...success. Attempting automerge of 9-1...success. Attempting automerge of 9-4...success. Attempting automerge of 9-5...failure. Autofilling 1-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-6...success. Autofilling 5-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-1...success. Autofilling 8-2...success. Autofilling 8-3...success. Autofilling 8-4...success. Autofilling 8-5...success. Autofilling 8-6 (first way)...success. Autofilling 8-6 (second way)...success. The two ways of autofilling 8-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7]. Autofilling 9-1...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5]. Attempting automerge of 9-6...failure. Attempting automerge of 9-5...failure. HEAD is now at 73a5eed c⇒9 Conflict; suggest manual merge of 9-5 + grep -q Traceback autofill.out + grep -q suggest manual merge of 9-5 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *???????.. *???????.. *???????.. *???????.. 5 - *???????.# 6 - *........? | d 0 5 9 | | | 0 - ********** - c *???????.| *???????.| *???????.| *???????.+ 5 - *???????|# 6 - *-------+? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 Original second commit: commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f Author: Loú User Date: Thu Apr 7 22:13:28 2005 +0000 d⇒5 There was a conflict merging commit 9-5, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 63e75b1] imerge 'c-d': manual merge 9-5 Merge has been recorded for merge 9-5. Attempting automerge of 9-6...success. Autofilling 9-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,5:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *???????.. *???????.. *???????.. *???????.. 5 - *???????.* 6 - *......... | d 0 5 9 | | | 0 - ********** - c *???????.| *???????.| *???????.| *???????.| 5 - *???????.* 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:11:43 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge a9ef94b] Merge d into c (using imerge) Date: Wed Jun 22 13:11:43 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + tee start.out + git-imerge start --goal=full --first-parent --name=c-d d Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 7-6...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 8-6...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...conflict. Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 Original second commit: commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f Author: Loú User Date: Thu Apr 7 22:13:28 2005 +0000 d⇒5 There was a conflict merging commit 9-5, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 9-5 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *........# 6 - *........? | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........+ 5 - *.......|# 6 - *-------+? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 9-5 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d 5eb0ff7] imerge 'c-d': manual merge 9-5 + git-imerge continue --edit Merge has been recorded for merge 9-5. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *........* 6 - *......... | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........| 5 - *........* 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 5-1 + local conflict=5-1 + TMP=/<>/t/tmp/conflicted-5-1 + DESCRIPTION=git-imerge test repository with conflict at 5-1 + init_test_repo /<>/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 + local path=/<>/t/tmp/conflicted-5-1 + local description=git-imerge test repository with conflict at 5-1 + delete_test_repo /<>/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 + local path=/<>/t/tmp/conflicted-5-1 + local description=git-imerge test repository with conflict at 5-1 + test -d /<>/t/tmp/conflicted-5-1 + mkdir -p /<>/t/tmp/conflicted-5-1 + git init /<>/t/tmp/conflicted-5-1 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-5-1/.git/ + echo git-imerge test repository with conflict at 5-1 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-5-1/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-5-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-5-1 + cd /<>/t/tmp/conflicted-5-1 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c 7e31f25] c⇒5 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c df3c57a] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c ea32d81] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c 44473d6] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c d8d80cf] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d ac0427a] d⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 43c38c0] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 0260058] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 40fef44] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d b080a65] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge autofill + tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. Attempting automerge of 1-6...success. Attempting automerge of 9-6...failure. Attempting automerge of 5-6...failure. Attempting automerge of 3-6...success. Attempting automerge of 4-6...success. Attempting automerge of 5-1...failure. Autofilling 1-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-1...success. Autofilling 4-2...success. Autofilling 4-3...success. Autofilling 4-4...success. Autofilling 4-5...success. Autofilling 4-6 (first way)...success. Autofilling 4-6 (second way)...success. The two ways of autofilling 4-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7]. Attempting automerge of 9-6...failure. Attempting automerge of 5-1...failure. HEAD is now at d8d80cf c⇒9 Conflict; suggest manual merge of 5-1 + grep -q Traceback autofill.out + grep -q suggest manual merge of 5-1 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *???.#???? *???.????? *???.????? *???.????? 5 - *???.????? 6 - *....????? | d 0 5 9 | | | 0 - ********** - c *???|#???? *???|????? *???|????? *???|????? 5 - *???|????? 6 - *---+????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 7e31f254c318decc434628f023dac0703f3d2b9e Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 c⇒5 Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 5-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d bbb6a7d] imerge 'c-d': manual merge 5-1 Merge has been recorded for merge 5-1. Attempting automerge of 5-6...success. Autofilling 5-2...success. Autofilling 5-3...success. Autofilling 5-4...success. Autofilling 5-5...success. Autofilling 5-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:7]. Attempting automerge of 9-6...success. Autofilling 6-6...success. Autofilling 7-6...success. Autofilling 8-6...success. Autofilling 9-1...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5...success. Autofilling 9-6 (first way)...success. Autofilling 9-6 (second way)...success. The two ways of autofilling 9-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *???.*???. *???..???. *???..???. *???..???. 5 - *???..???. 6 - *......... | d 0 5 9 | | | 0 - ********** - c *???.*???| *???..???| *???..???| *???..???| 5 - *???..???| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:11:54 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 8990371] Merge d into c (using imerge) Date: Wed Jun 22 13:11:54 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + git-imerge start --goal=full --first-parent --name=c-d d + tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-1...conflict. Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 7e31f254c318decc434628f023dac0703f3d2b9e Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 c⇒5 Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 5-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 5-1 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *....#???? *....????? *....????? *....????? 5 - *....????? 6 - *....????? | d 0 5 9 | | | 0 - ********** - c *...|#???? *...|????? *...|????? *...|????? 5 - *...|????? 6 - *---+????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 5-1 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d fbf84b5] imerge 'c-d': manual merge 5-1 + git-imerge continue --edit Merge has been recorded for merge 5-1. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...success. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 7-6...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 8-6...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *....*.... *......... *......... *......... 5 - *......... 6 - *......... | d 0 5 9 | | | 0 - ********** - c *....*...| *........| *........| *........| 5 - *........| 6 - *--------+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 6-6 + local conflict=6-6 + TMP=/<>/t/tmp/conflicted-6-6 + DESCRIPTION=git-imerge test repository with conflict at 6-6 + init_test_repo /<>/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 + local path=/<>/t/tmp/conflicted-6-6 + local description=git-imerge test repository with conflict at 6-6 + delete_test_repo /<>/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 + local path=/<>/t/tmp/conflicted-6-6 + local description=git-imerge test repository with conflict at 6-6 + test -d /<>/t/tmp/conflicted-6-6 + mkdir -p /<>/t/tmp/conflicted-6-6 + git init /<>/t/tmp/conflicted-6-6 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/conflicted-6-6/.git/ + echo git-imerge test repository with conflict at 6-6 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/conflicted-6-6/.git config user.name Loú User + git --git-dir=/<>/t/tmp/conflicted-6-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/conflicted-6-6 + cd /<>/t/tmp/conflicted-6-6 + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + modify conflict.txt original version + filename=conflict.txt + text=original version + echo original version + git add conflict.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + seq 9 + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + modify conflict.txt c version + filename=conflict.txt + text=c version + echo c version + git add conflict.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c fe4fed8] c⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c ec255ea] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c 7459ac3] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c 70408c8] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' + seq 6 + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d 9522207] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + modify conflict.txt d version + filename=conflict.txt + text=d version + echo d version + git add conflict.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? 6 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge autofill + tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. Attempting automerge of 1-6...success. Attempting automerge of 9-6...failure. Attempting automerge of 5-6...success. Attempting automerge of 7-6...failure. Attempting automerge of 6-6...failure. Attempting automerge of 6-1...success. Attempting automerge of 6-4...success. Attempting automerge of 6-5...success. Attempting automerge of 9-5...success. Autofilling 1-6...success. Autofilling 2-6...success. Autofilling 3-6...success. Autofilling 4-6...success. Autofilling 5-1...success. Autofilling 5-2...success. Autofilling 5-3...success. Autofilling 5-4...success. Autofilling 5-5...success. Autofilling 5-6 (first way)...success. Autofilling 5-6 (second way)...success. The two ways of autofilling 5-6 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:6,0:7]. Autofilling 6-5...success. Autofilling 7-5...success. Autofilling 8-5...success. Autofilling 9-1...success. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5 (first way)...success. Autofilling 9-5 (second way)...success. The two ways of autofilling 9-5 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:10,0:6]. Attempting automerge of 9-6...failure. Attempting automerge of 6-6...failure. HEAD is now at 70408c8 c⇒9 Conflict; suggest manual merge of 6-6 + grep -q Traceback autofill.out + grep -q suggest manual merge of 6-6 autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | 0 - ********** - c *????.???. *????.???. *????.???. *????.???. 5 - *????..... 6 - *.....#??? | d 0 5 9 | | | 0 - ********** - c *????.???| *????.???| *????.???| *????.???| 5 - *????.---+ 6 - *----+#??? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge continue --edit Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 c⇒6 Original second commit: commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 There was a conflict merging commit 6-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + echo merged version + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 1f3c611] imerge 'c-d': manual merge 6-6 Merge has been recorded for merge 6-6. Attempting automerge of 9-6...success. Autofilling 7-6...success. Autofilling 8-6...success. Autofilling 9-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,5:7]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge2.html 0 5 9 | | | 0 - ********** - c *????.???. *????.???. *????.???. *????.???. 5 - *????..... 6 - *.....*... | d 0 5 9 | | | 0 - ********** - c *????.???| *????.???| *????.???| *????.???| 5 - *????....| 6 - *-----*--+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:06 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge a2678d2] Merge d into c (using imerge) Date: Wed Jun 22 13:12:06 2022 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-merge^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-rebase-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-border-with-history2^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' + tee start.out + git-imerge start --goal=full --first-parent --name=c-d d Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 1-5...success. Attempting to merge 1-6...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 2-5...success. Attempting to merge 2-6...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Attempting to merge 3-5...success. Attempting to merge 3-6...success. Attempting to merge 4-1...success. Attempting to merge 4-2...success. Attempting to merge 4-3...success. Attempting to merge 4-4...success. Attempting to merge 4-5...success. Attempting to merge 4-6...success. Attempting to merge 5-1...success. Attempting to merge 5-2...success. Attempting to merge 5-3...success. Attempting to merge 5-4...success. Attempting to merge 5-5...success. Attempting to merge 5-6...success. Attempting to merge 6-1...success. Attempting to merge 6-2...success. Attempting to merge 6-3...success. Attempting to merge 6-4...success. Attempting to merge 6-5...success. Attempting to merge 6-6...conflict. Attempting to merge 7-1...success. Attempting to merge 7-2...success. Attempting to merge 7-3...success. Attempting to merge 7-4...success. Attempting to merge 7-5...success. Attempting to merge 8-1...success. Attempting to merge 8-2...success. Attempting to merge 8-3...success. Attempting to merge 8-4...success. Attempting to merge 8-5...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. Previous HEAD position was 05f8a3e imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 c⇒6 Original second commit: commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 There was a conflict merging commit 6-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback start.out + grep -q suggest manual merge of 6-6 autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *......... 6 - *.....#??? | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........| 5 - *.....---+ 6 - *----+#??? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + echo merged version + git add conflict.txt + GIT_EDITOR=cat git commit imerge 'c-d': manual merge 6-6 # Conflicts: # conflict.txt # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch imerge/c-d # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: conflict.txt # modified: d.txt # [imerge/c-d f1923e0] imerge 'c-d': manual merge 6-6 + git-imerge continue --edit Merge has been recorded for merge 6-6. Attempting to merge 7-6...success. Attempting to merge 8-6...success. Attempting to merge 9-6...success. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge4.html 0 5 9 | | | 0 - ********** - c *......... *......... *......... *......... 5 - *......... 6 - *.....*... | d 0 5 9 | | | 0 - ********** - c *........| *........| *........| *........| 5 - *........| 6 - *-----*--+ | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=c-d-full + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 + git rev-parse c-d-full^{tree} + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 py310 run-test: commands[2] | /bin/sh t/test-really-conflicted + dirname t/test-really-conflicted + cd t + pwd + dirname /<>/t + BASE=/<> + . /<>/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/<>/t/tmp/really-conflicted + DESCRIPTION=git-imerge test repository with multiple conflicts + init_test_repo /<>/t/tmp/really-conflicted git-imerge test repository with multiple conflicts + local path=/<>/t/tmp/really-conflicted + local description=git-imerge test repository with multiple conflicts + delete_test_repo /<>/t/tmp/really-conflicted git-imerge test repository with multiple conflicts + local path=/<>/t/tmp/really-conflicted + local description=git-imerge test repository with multiple conflicts + test -d /<>/t/tmp/really-conflicted + mkdir -p /<>/t/tmp/really-conflicted + git init /<>/t/tmp/really-conflicted hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/really-conflicted/.git/ + echo git-imerge test repository with multiple conflicts + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/really-conflicted/.git config user.name Loú User + git --git-dir=/<>/t/tmp/really-conflicted/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/really-conflicted + cd /<>/t/tmp/really-conflicted + modify c.txt 0 + filename=c.txt + text=0 + echo 0 + git add c.txt + modify d.txt 0 + filename=d.txt + text=0 + echo 0 + git add d.txt + seq 0 7 + modify conflict0.txt original version + filename=conflict0.txt + text=original version + echo original version + git add conflict0.txt + modify conflict1.txt original version + filename=conflict1.txt + text=original version + echo original version + git add conflict1.txt + modify conflict2.txt original version + filename=conflict2.txt + text=original version + echo original version + git add conflict2.txt + modify conflict3.txt original version + filename=conflict3.txt + text=original version + echo original version + git add conflict3.txt + modify conflict4.txt original version + filename=conflict4.txt + text=original version + echo original version + git add conflict4.txt + modify conflict5.txt original version + filename=conflict5.txt + text=original version + echo original version + git add conflict5.txt + modify conflict6.txt original version + filename=conflict6.txt + text=original version + echo original version + git add conflict6.txt + modify conflict7.txt original version + filename=conflict7.txt + text=original version + echo original version + git add conflict7.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) 8e21fbd] m⇒0 10 files changed, 10 insertions(+) create mode 100644 c.txt create mode 100644 conflict0.txt create mode 100644 conflict1.txt create mode 100644 conflict2.txt create mode 100644 conflict3.txt create mode 100644 conflict4.txt create mode 100644 conflict5.txt create mode 100644 conflict6.txt create mode 100644 conflict7.txt create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + modify conflict0.txt c version + filename=conflict0.txt + text=c version + echo c version + git add conflict0.txt + modify conflict4.txt c version + filename=conflict4.txt + text=c version + echo c version + git add conflict4.txt + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 [c 4e6007a] c⇒1 3 files changed, 3 insertions(+), 3 deletions(-) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 [c c2b7c49] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 [c 42ad55a] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + modify conflict1.txt c version + filename=conflict1.txt + text=c version + echo c version + git add conflict1.txt + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 [c a891793] c⇒4 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + modify conflict3.txt c version + filename=conflict3.txt + text=c version + echo c version + git add conflict3.txt + modify conflict6.txt c version + filename=conflict6.txt + text=c version + echo c version + git add conflict6.txt + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 [c c21441d] c⇒5 3 files changed, 3 insertions(+), 3 deletions(-) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + modify conflict5.txt c version + filename=conflict5.txt + text=c version + echo c version + git add conflict5.txt + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 [c a797a66] c⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + modify conflict2.txt c version + filename=conflict2.txt + text=c version + echo c version + git add conflict2.txt + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 [c c0e1537] c⇒7 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 [c 9f3e7c8] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + modify conflict7.txt c version + filename=conflict7.txt + text=c version + echo c version + git add conflict7.txt + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 [c ccbfccb] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + modify conflict0.txt d version + filename=conflict0.txt + text=d version + echo d version + git add conflict0.txt + modify conflict6.txt d version + filename=conflict6.txt + text=d version + echo d version + git add conflict6.txt + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d 8c3c065] d⇒1 3 files changed, 3 insertions(+), 3 deletions(-) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + modify conflict1.txt d version + filename=conflict1.txt + text=d version + echo d version + git add conflict1.txt + modify conflict2.txt d version + filename=conflict2.txt + text=d version + echo d version + git add conflict2.txt + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 [d 820b787] d⇒2 3 files changed, 3 insertions(+), 3 deletions(-) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 [d 821c792] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 [d c2a1456] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + modify conflict3.txt d version + filename=conflict3.txt + text=d version + echo d version + git add conflict3.txt + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d c3e3890] d⇒5 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + modify conflict4.txt d version + filename=conflict4.txt + text=d version + echo d version + git add conflict4.txt + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 [d b2f5c5e] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 7 + filename=d.txt + text=7 + echo 7 + git add d.txt + modify conflict5.txt d version + filename=conflict5.txt + text=d version + echo d version + git add conflict5.txt + commit -m d⇒7 + TIME=1112912010 + GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 [d 892af56] d⇒7 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 8 + filename=d.txt + text=8 + echo 8 + git add d.txt + modify conflict7.txt d version + filename=conflict7.txt + text=d version + echo d version + git add conflict7.txt + commit -m d⇒8 + TIME=1112912011 + GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 [d 67099d0] d⇒8 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d + git-imerge diagram --commits --frontier 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? *????????? *????????? 8 - *????????? | d 0 5 9 | | | 0 - ********** - c *????????? *????????? *????????? *????????? 5 - *????????? *????????? *????????? 8 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + conflict_count=0 + true + git-imerge continue --no-edit + tee autofill.out Attempting automerge of 9-8...failure. Attempting automerge of 1-1...failure. Switched to branch 'imerge/c-d' Auto-merging conflict0.txt CONFLICT (content): Merge conflict in conflict0.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 1-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c *#???????? *????????? *????????? *????????? 5 - *????????? *????????? *????????? 8 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + modify conflict0.txt merged version + filename=conflict0.txt + text=merged version + echo merged version + git add conflict0.txt + conflict_count=1 + grep -q ==== conflict1.txt + grep -q ==== conflict2.txt + grep -q ==== conflict3.txt + grep -q ==== conflict4.txt + grep -q ==== conflict5.txt + grep -q ==== conflict6.txt + grep -q ==== conflict7.txt + true + tee autofill.out + git-imerge continue --no-edit [imerge/c-d 2ea5fe0] imerge 'c-d': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-8...failure. Attempting automerge of 1-2...success. Attempting automerge of 1-6...failure. Attempting automerge of 1-4...success. Attempting automerge of 1-5...success. Autofilling 1-2...success. Autofilling 1-3...success. Autofilling 1-4...success. Autofilling 1-5...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,1:6]. Attempting automerge of 1-8...failure. Attempting automerge of 1-6...failure. Attempting automerge of 9-5...failure. Attempting automerge of 2-1...success. Attempting automerge of 2-4...success. Attempting automerge of 2-5...success. Attempting automerge of 9-5...failure. Attempting automerge of 6-5...failure. Attempting automerge of 4-5...failure. Attempting automerge of 3-5...success. Attempting automerge of 4-1...success. Attempting automerge of 4-3...failure. Attempting automerge of 4-2...failure. Attempting automerge of 9-1...failure. Attempting automerge of 7-1...failure. Attempting automerge of 6-1...failure. Attempting automerge of 5-1...failure. Autofilling 2-5...success. Autofilling 3-1...success. Autofilling 3-2...success. Autofilling 3-3...success. Autofilling 3-4...success. Autofilling 3-5 (first way)...success. Autofilling 3-5 (second way)...success. The two ways of autofilling 3-5 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,0:6]. Autofilling 4-1...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,0:2]. Attempting automerge of 4-5...failure. Attempting automerge of 4-2...failure. Attempting automerge of 9-1...failure. Attempting automerge of 5-1...failure. Previous HEAD position was c21441d c⇒5 Switched to branch 'imerge/c-d' Auto-merging conflict4.txt CONFLICT (content): Merge conflict in conflict4.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original second commit: commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 There was a conflict merging commit 1-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?.+#???? *.?|#????? *.?|?????? *.?|?????? 5 - *--+?????? *#???????? *????????? 8 - *????????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + grep -q ==== conflict1.txt + grep -q ==== conflict2.txt + grep -q ==== conflict3.txt + grep -q ==== conflict4.txt + modify conflict4.txt merged version + filename=conflict4.txt + text=merged version + echo merged version + git add conflict4.txt + conflict_count=2 + grep -q ==== conflict5.txt + grep -q ==== conflict6.txt + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d 937e29c] imerge 'c-d': manual merge 1-6 Merge has been recorded for merge 1-6. Attempting automerge of 1-8...success. Autofilling 1-7...success. Autofilling 1-8...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:2,6:9]. Attempting automerge of 3-8...success. Autofilling 2-8...success. Autofilling 3-6...success. Autofilling 3-7...success. Autofilling 3-8 (first way)...success. Autofilling 3-8 (second way)...success. The two ways of autofilling 3-8 agree. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[1:4,5:9]. Warning: you are leaving 1 commit behind, not connected to any of your branches: eb99ba7 imerge 'c-d': automatic merge 3-8 If you want to keep it by creating a new branch, this may be a good time to do so with: git branch eb99ba7 Switched to branch 'imerge/c-d' Auto-merging conflict1.txt CONFLICT (content): Merge conflict in conflict1.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit a89179336bb40a4ca90903425239a9ef3ce659bd Author: Loú User Date: Thu Apr 7 22:13:18 2005 +0000 c⇒4 Original second commit: commit 820b787e86e22612af7a061db842dc95e9f1d49f Author: Loú User Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 There was a conflict merging commit 4-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?.+#???? *.?|#????? *.?|?????? *.?|?????? 5 - *..|?????? **?|?????? *.?|?????? 8 - *--+?????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + grep -q ==== conflict1.txt + modify conflict1.txt merged version + filename=conflict1.txt + text=merged version + echo merged version + git add conflict1.txt + conflict_count=3 + grep -q ==== conflict2.txt + grep -q ==== conflict3.txt + grep -q ==== conflict4.txt + grep -q ==== conflict5.txt + grep -q ==== conflict6.txt + grep -q ==== conflict7.txt + true + tee autofill.out + git-imerge continue --no-edit [imerge/c-d ede6336] imerge 'c-d': manual merge 4-2 Merge has been recorded for merge 4-2. Attempting automerge of 4-8...success. Autofilling 4-3...success. Autofilling 4-4...success. Autofilling 4-5...success. Autofilling 4-6...success. Autofilling 4-7...success. Autofilling 4-8...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9]. Previous HEAD position was 29dadc3 imerge 'c-d': automatic merge 4-8 Switched to branch 'imerge/c-d' Auto-merging conflict6.txt CONFLICT (content): Merge conflict in conflict6.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit c21441db0b1abc10e3caf5024d19976bd7f9b469 Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 c⇒5 Original second commit: commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 There was a conflict merging commit 5-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?.|#???? *.?.*????? *.?.|????? *.?.|????? 5 - *...|????? **?.|????? *.?.|????? 8 - *---+????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + grep -q ==== conflict1.txt + grep -q ==== conflict2.txt + grep -q ==== conflict3.txt + grep -q ==== conflict4.txt + grep -q ==== conflict5.txt + grep -q ==== conflict6.txt + modify conflict6.txt merged version + filename=conflict6.txt + text=merged version + echo merged version + git add conflict6.txt + conflict_count=4 + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d fc985c5] imerge 'c-d': manual merge 5-1 Merge has been recorded for merge 5-1. Attempting automerge of 5-8...failure. Attempting automerge of 5-2...success. Attempting automerge of 5-6...failure. Attempting automerge of 5-4...success. Attempting automerge of 5-5...failure. Autofilling 5-2...success. Autofilling 5-3...success. Autofilling 5-4...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,1:5]. Attempting automerge of 5-8...failure. Attempting automerge of 5-5...failure. Attempting automerge of 9-4...failure. Attempting automerge of 6-1...success. Attempting automerge of 6-3...success. Attempting automerge of 6-4...success. Attempting automerge of 9-4...failure. Attempting automerge of 8-4...failure. Attempting automerge of 7-4...failure. Attempting automerge of 7-1...success. Attempting automerge of 7-3...failure. Attempting automerge of 7-2...failure. Attempting automerge of 9-1...success. Autofilling 6-1...success. Autofilling 6-2...success. Autofilling 6-3...success. Autofilling 6-4...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,0:5]. Autofilling 7-1...success. Autofilling 8-1...success. Autofilling 9-1...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2]. Attempting automerge of 9-4...failure. Attempting automerge of 7-2...failure. Previous HEAD position was 268512f imerge 'c-d': automatic merge 7-1 Switched to branch 'imerge/c-d' Auto-merging conflict3.txt CONFLICT (content): Merge conflict in conflict3.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit c21441db0b1abc10e3caf5024d19976bd7f9b469 Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 c⇒5 Original second commit: commit c3e3890b9e3c756c1d8f7e345184d576739be079 Author: Loú User Date: Thu Apr 7 22:13:28 2005 +0000 d⇒5 There was a conflict merging commit 5-5, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?..*.--+ *.?.*.|#?? *.?...|??? *.?..-+??? 5 - *...|#???? **?.|????? *.?.|????? 8 - *---+????? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + grep -q ==== conflict1.txt + grep -q ==== conflict2.txt + grep -q ==== conflict3.txt + modify conflict3.txt merged version + filename=conflict3.txt + text=merged version + echo merged version + git add conflict3.txt + conflict_count=5 + grep -q ==== conflict4.txt + grep -q ==== conflict5.txt + grep -q ==== conflict6.txt + grep -q ==== conflict7.txt + true + tee autofill.out + git-imerge continue --no-edit [imerge/c-d 44bf8d7] imerge 'c-d': manual merge 5-5 Merge has been recorded for merge 5-5. Attempting automerge of 5-8...success. Autofilling 5-6...success. Autofilling 5-7...success. Autofilling 5-8...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[4:6,5:9]. Attempting automerge of 6-8...failure. Attempting automerge of 6-5...success. Attempting automerge of 6-7...failure. Attempting automerge of 6-6...success. Autofilling 6-5...success. Autofilling 6-6...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,4:7]. Attempting automerge of 6-8...failure. Attempting automerge of 6-7...failure. Switched to branch 'imerge/c-d' Auto-merging conflict5.txt CONFLICT (content): Merge conflict in conflict5.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit a797a66a0e4b89690099557280641efeac302bcf Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 c⇒6 Original second commit: commit 892af56ace54c97776e84dff9e6fba7312efe5d0 Author: Loú User Date: Thu Apr 7 22:13:30 2005 +0000 d⇒7 There was a conflict merging commit 6-7, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?..*.--+ *.?.*.|#?? *.?...|??? *.?...|??? 5 - *....*|??? **?...+??? *.?..|#??? 8 - *----+???? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + grep -q ==== conflict1.txt + grep -q ==== conflict2.txt + grep -q ==== conflict3.txt + grep -q ==== conflict4.txt + grep -q ==== conflict5.txt + modify conflict5.txt merged version + filename=conflict5.txt + text=merged version + echo merged version + git add conflict5.txt + conflict_count=6 + grep -q ==== conflict6.txt + grep -q ==== conflict7.txt + true + tee autofill.out + git-imerge continue --no-edit [imerge/c-d 8b92cea] imerge 'c-d': manual merge 6-7 Merge has been recorded for merge 6-7. Attempting automerge of 6-8...success. Autofilling 6-8...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9]. Previous HEAD position was cb9c8e7 imerge 'c-d': automatic merge 6-8 Switched to branch 'imerge/c-d' Auto-merging conflict2.txt CONFLICT (content): Merge conflict in conflict2.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit c0e1537f1ecf33aa719926933c7db8cb93eb5315 Author: Loú User Date: Thu Apr 7 22:13:21 2005 +0000 c⇒7 Original second commit: commit 820b787e86e22612af7a061db842dc95e9f1d49f Author: Loú User Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 There was a conflict merging commit 7-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?..*.--+ *.?.*.|#?? *.?...|??? *.?...|??? 5 - *....*|??? **?...|??? *.?...*??? 8 - *-----+??? | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + grep -q ==== conflict1.txt + grep -q ==== conflict2.txt + modify conflict2.txt merged version + filename=conflict2.txt + text=merged version + echo merged version + git add conflict2.txt + conflict_count=7 + grep -q ==== conflict3.txt + grep -q ==== conflict4.txt + grep -q ==== conflict5.txt + grep -q ==== conflict6.txt + grep -q ==== conflict7.txt + true + tee autofill.out + git-imerge continue --no-edit [imerge/c-d 552439b] imerge 'c-d': manual merge 7-2 Merge has been recorded for merge 7-2. Attempting automerge of 7-8...success. Autofilling 7-3...success. Autofilling 7-4...success. Autofilling 7-5...success. Autofilling 7-6...success. Autofilling 7-7...success. Autofilling 7-8...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9]. Attempting automerge of 9-8...failure. Attempting automerge of 8-2...success. Attempting automerge of 8-6...success. Attempting automerge of 8-8...success. Attempting automerge of 9-8...failure. Attempting automerge of 9-2...success. Attempting automerge of 9-5...success. Attempting automerge of 9-7...success. Autofilling 8-2...success. Autofilling 8-3...success. Autofilling 8-4...success. Autofilling 8-5...success. Autofilling 8-6...success. Autofilling 8-7...success. Autofilling 8-8...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9]. Autofilling 9-2...success. Autofilling 9-3...success. Autofilling 9-4...success. Autofilling 9-5...success. Autofilling 9-6...success. Autofilling 9-7...success. Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8]. Attempting automerge of 9-8...failure. Attempting automerge of 9-8...failure. Switched to branch 'imerge/c-d' Auto-merging conflict7.txt CONFLICT (content): Merge conflict in conflict7.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87 Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 Original second commit: commit 67099d078100141fbe4063d46a6408200f4ff311 Author: Loú User Date: Thu Apr 7 22:13:31 2005 +0000 d⇒8 There was a conflict merging commit 9-8, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?..*...| *.?.*..*.| *.?......| *.?......| 5 - *....*...| **?......| *.?...*..+ 8 - *-------+# | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + seq 0 7 + grep -q ==== conflict0.txt + grep -q ==== conflict1.txt + grep -q ==== conflict2.txt + grep -q ==== conflict3.txt + grep -q ==== conflict4.txt + grep -q ==== conflict5.txt + grep -q ==== conflict6.txt + grep -q ==== conflict7.txt + modify conflict7.txt merged version + filename=conflict7.txt + text=merged version + echo merged version + git add conflict7.txt + conflict_count=8 + true + tee autofill.out + git-imerge continue --no-edit [imerge/c-d a529cea] imerge 'c-d': manual merge 9-8 Merge has been recorded for merge 9-8. Merge is complete! + grep -q Traceback autofill.out + git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c **?..*...| *.?.*..*.| *.?......| *.?......| 5 - *....*...| **?......| *.?...*..| 8 - *--------* | d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging autofill.out + break + test 8 -ne 8 + git-imerge diagram --commits + diff -u - diagram.out + cat + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge Merge d into c (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:26 2022 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict0.txt # modified: conflict1.txt # modified: conflict2.txt # modified: conflict3.txt # modified: conflict4.txt # modified: conflict5.txt # modified: conflict6.txt # modified: conflict7.txt # modified: d.txt # [c-d-merge 57aff9d] Merge d into c (using imerge) Date: Wed Jun 22 13:12:26 2022 +0000 + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + local refname=c-d-merge + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git rev-parse c-d-merge^{tree} + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + local refname=c-d-rebase + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git rev-parse c-d-rebase^{tree} + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + local refname=c-d-rebase-with-history + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git rev-parse c-d-rebase-with-history^{tree} + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + local refname=c-d-border + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git rev-parse c-d-border^{tree} + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + local refname=c-d-border-with-history + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git rev-parse c-d-border-with-history^{tree} + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + local refname=c-d-border-with-history2 + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git rev-parse c-d-border-with-history2^{tree} + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git-imerge remove py310 run-test: commands[3] | /bin/sh t/test-duplicated + dirname t/test-duplicated + cd t + pwd + dirname /<>/t + BASE=/<> + . /<>/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/<>/t/tmp/duplicated + DESCRIPTION=git-imerge test repository with duplicate commits + init_test_repo /<>/t/tmp/duplicated git-imerge test repository with duplicate commits + local path=/<>/t/tmp/duplicated + local description=git-imerge test repository with duplicate commits + delete_test_repo /<>/t/tmp/duplicated git-imerge test repository with duplicate commits + local path=/<>/t/tmp/duplicated + local description=git-imerge test repository with duplicate commits + test -d /<>/t/tmp/duplicated + mkdir -p /<>/t/tmp/duplicated + git init /<>/t/tmp/duplicated hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/duplicated/.git/ + echo git-imerge test repository with duplicate commits + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/duplicated/.git config user.name Loú User + git --git-dir=/<>/t/tmp/duplicated/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/duplicated + cd /<>/t/tmp/duplicated + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' + seq 3 + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt + commit -m a⇒1 on branch a + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt + commit -m a⇒2 on branch a + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt + commit -m a⇒3 on branch a + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' + seq 4 + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt + commit -m a⇒1 on branch b + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b [b 62a5c56] a⇒1 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt + commit -m a⇒2 on branch b + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b [b f846281] a⇒2 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt + commit -m a⇒3 on branch b + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b [b a4b2c2b] a⇒3 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 4 + filename=a.txt + text=4 + echo 4 + git add a.txt + commit -m a⇒4 on branch b + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b [b 5b24553] a⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git checkout a Switched to branch 'a' + git-imerge start --first-parent --name=a-b --branch=a-b-merge b Attempting automerge of 3-4...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-3...failure. Attempting automerge of 1-2...failure. Attempting automerge of 3-1...failure. Attempting automerge of 2-1...failure. Autofilling 1-1...success. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2]. Attempting automerge of 1-4...success. Autofilling 1-2...success. Autofilling 1-3...success. Autofilling 1-4...success. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5]. Attempting automerge of 3-4...failure. Attempting automerge of 2-1...success. Attempting automerge of 2-3...failure. Attempting automerge of 2-2...success. Attempting automerge of 3-2...failure. Attempting automerge of 3-1...success. Autofilling 2-1...success. Autofilling 2-2...success. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3]. Autofilling 3-1...success. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2]. Attempting automerge of 2-4...success. Autofilling 2-3...success. Autofilling 2-4...success. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5]. Attempting automerge of 3-4...failure. Attempting automerge of 3-2...success. Attempting automerge of 3-4...failure. Attempting automerge of 3-3...success. Autofilling 3-2...success. Autofilling 3-3...success. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4]. Attempting automerge of 3-4...success. Autofilling 3-4...success. Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge5.html 0 3 | | 0 - **** - a *... *... *... 4 - *... | b 0 3 | | 0 - **** - a *..| *..| *..| 4 - *--+ | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge Merge b into a (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:31 2022 +0000 # # On branch a-b-merge # Changes to be committed: # modified: a.txt # [a-b-merge 1663ef0] Merge b into a (using imerge) Date: Wed Jun 22 13:12:31 2022 +0000 + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-merge + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git rev-parse a-b-merge^{tree} + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 + git-imerge simplify --goal=rebase --branch=a-b-rebase + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-rebase + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git rev-parse a-b-rebase^{tree} + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-rebase-with-history + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git rev-parse a-b-rebase-with-history^{tree} + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 + git-imerge simplify --goal=border --branch=a-b-border + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-border + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git rev-parse a-b-border^{tree} + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-border-with-history + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git rev-parse a-b-border-with-history^{tree} + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2 + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-border-with-history2 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git rev-parse a-b-border-with-history2^{tree} + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 + git checkout a Switched to branch 'a' + git-imerge start --goal=full --name=a-b b Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. Attempting to merge 1-4...success. Attempting to merge 2-1...success. Attempting to merge 2-2...success. Attempting to merge 2-3...success. Attempting to merge 2-4...success. Attempting to merge 3-1...success. Attempting to merge 3-2...success. Attempting to merge 3-3...success. Attempting to merge 3-4...success. Merge is complete! + git-imerge list * a-b + git-imerge diagram --commits --frontier --html=imerge6.html 0 3 | | 0 - **** - a *... *... *... 4 - *... | b 0 3 | | 0 - **** - a *..| *..| *..| 4 - *--+ | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish --branch=a-b-full + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-full + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git rev-parse a-b-full^{tree} + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 py310 run-test: commands[4] | /bin/sh t/test-flip-flop + dirname t/test-flip-flop + cd t + pwd + dirname /<>/t + BASE=/<> + . /<>/t/test-lib.sh + GIT_IMERGE=git-imerge + flip_flop_test 1 + local n=1 + TMP=/<>/t/tmp/flip-flop-1 + DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 + init_test_repo /<>/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 + local path=/<>/t/tmp/flip-flop-1 + local description=git-imerge test repository with a commit and its revert at n=1 + delete_test_repo /<>/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 + local path=/<>/t/tmp/flip-flop-1 + local description=git-imerge test repository with a commit and its revert at n=1 + test -d /<>/t/tmp/flip-flop-1 + mkdir -p /<>/t/tmp/flip-flop-1 + git init /<>/t/tmp/flip-flop-1 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/flip-flop-1/.git/ + echo git-imerge test repository with a commit and its revert at n=1 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/flip-flop-1/.git config user.name Loú User + git --git-dir=/<>/t/tmp/flip-flop-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/flip-flop-1 + cd /<>/t/tmp/flip-flop-1 + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt + commit -m a⇒1 on branch a + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt + commit -m a⇒2 on branch a + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt + commit -m a⇒3 on branch a + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt + msg=b⇒1 + test 1 = 1 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt + msg=b⇒1 and a⇒X + test 1 = 2 + commit -m b⇒1 and a⇒X on branch b + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b [b 044a3fa] b⇒1 and a⇒X on branch b 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 b.txt + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt + msg=b⇒2 + test 2 = 1 + test 2 = 2 + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + msg=b⇒2 and a⇒0 + commit -m b⇒2 and a⇒0 on branch b + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b [b 7851975] b⇒2 and a⇒0 on branch b 2 files changed, 2 insertions(+), 2 deletions(-) + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt + msg=b⇒3 + test 3 = 1 + test 3 = 2 + commit -m b⇒3 on branch b + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b [b 6fe24f0] b⇒3 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt + msg=b⇒4 + test 4 = 1 + test 4 = 2 + commit -m b⇒4 on branch b + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b [b 2dc5eb7] b⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + test_merge b-into-a-1 a b 1-1 1-2 + local name=b-into-a-1 + local dst=a + local src=b + local conflict1=1-1 + local conflict2=1-2 + git checkout a Switched to branch 'a' + tee imerge-b-into-a-1-1.out + git-imerge merge --branch=b-into-a-1 b Attempting automerge of 3-4...success. Autofilling 1-4...success. Autofilling 2-4...success. Autofilling 3-1...unexpected conflict. Backtracking... Autofilling 1-4...success. Autofilling 2-1...unexpected conflict. Backtracking... Autofilling 1-1...unexpected conflict. Backtracking... Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a Original second commit: commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 Author: Loú User Date: Thu Apr 7 22:13:18 2005 +0000 b⇒1 and a⇒X on branch b There was a conflict merging commit 1-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a *#?? *??? *??? 4 - *??? | b 0 3 | | 0 - **** - a *#?? *??? *??? 4 - *??? | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out + echo 1 + git add a.txt + git-imerge continue --no-edit + tee imerge-b-into-a-1-2.out [imerge/b 25a7486] imerge 'b': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-4...failure. Attempting automerge of 1-2...failure. Attempting automerge of 3-1...success. Autofilling 2-1...success. Autofilling 3-1...success. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2]. Previous HEAD position was b477e29 imerge 'b': automatic merge 3-1 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a Original second commit: commit 7851975ee7d12ef0a256db7ebd029aab51f895ab Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 b⇒2 and a⇒0 on branch b There was a conflict merging commit 1-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a **.. *#?? *??? 4 - *??? | b 0 3 | | 0 - **** - a **-+ *#?? *??? 4 - *??? | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out + echo 1 + git add a.txt + git-imerge continue --no-edit + tee imerge-b-into-a-1-3.out [imerge/b d8b3799] imerge 'b': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting automerge of 1-4...success. Autofilling 1-3...success. Autofilling 1-4...success. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,2:5]. Attempting automerge of 3-4...success. Autofilling 2-4...success. Autofilling 3-2...success. Autofilling 3-3...success. Autofilling 3-4 (first way)...success. Autofilling 3-4 (second way)...success. The two ways of autofilling 3-4 agree. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5]. Merge is complete! + grep -q Merge is complete imerge-b-into-a-1-3.out + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a **.. **?. *.?. 4 - *... | b 0 3 | | 0 - **** - a **.| **?| *.?| 4 - *--+ | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge finish Merge b into a (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:37 2022 +0000 # # On branch b-into-a-1 # Changes to be committed: # new file: b.txt # [b-into-a-1 d139fe2] Merge b into a (using imerge) Date: Wed Jun 22 13:12:37 2022 +0000 + test_merge a-into-b-1 b a 1-1 2-1 + local name=a-into-b-1 + local dst=b + local src=a + local conflict1=1-1 + local conflict2=2-1 + git checkout b Switched to branch 'b' + git-imerge merge --branch=a-into-b-1 a + tee imerge-a-into-b-1-1.out Attempting automerge of 4-3...success. Autofilling 1-3...unexpected conflict. Backtracking... Autofilling 1-2...unexpected conflict. Backtracking... Autofilling 1-1...unexpected conflict. Backtracking... Switched to branch 'imerge/a' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2 Author: Loú User Date: Thu Apr 7 22:13:18 2005 +0000 b⇒1 and a⇒X on branch b Original second commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a There was a conflict merging commit 1-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b *#??? *???? 3 - *???? | a 0 4 | | 0 - ***** - b *#??? *???? 3 - *???? | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out + echo 1 + git add a.txt + + git-imerge continue --no-edit tee imerge-a-into-b-1-2.out [imerge/a c501c5f] imerge 'a': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-3...success. Autofilling 1-2...success. Autofilling 1-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,1:4]. Attempting automerge of 4-3...failure. Attempting automerge of 2-1...failure. Switched to branch 'imerge/a' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 7851975ee7d12ef0a256db7ebd029aab51f895ab Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 b⇒2 and a⇒0 on branch b Original second commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a There was a conflict merging commit 2-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b **#?? *.??? 3 - *.??? | a 0 4 | | 0 - ***** - b **#?? *|??? 3 - *+??? | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out + echo 1 + git add a.txt + tee imerge-a-into-b-1-3.out + git-imerge continue --no-edit [imerge/a 3971a0d] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. Autofilling 2-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. Attempting automerge of 4-3...success. Autofilling 3-3...success. Autofilling 4-1...success. Autofilling 4-2...success. Autofilling 4-3 (first way)...success. Autofilling 4-3 (second way)...success. The two ways of autofilling 4-3 agree. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4]. Merge is complete! + grep -q Merge is complete imerge-a-into-b-1-3.out + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b ***?. *..?. 3 - *.... | a 0 4 | | 0 - ***** - b ***?| *..?| 3 - *---+ | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge finish Merge a into b (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:39 2022 +0000 # # On branch a-into-b-1 # Changes to be committed: # modified: a.txt # [a-into-b-1 5a3cbfb] Merge a into b (using imerge) Date: Wed Jun 22 13:12:39 2022 +0000 + flip_flop_test 2 + local n=2 + TMP=/<>/t/tmp/flip-flop-2 + DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 + init_test_repo /<>/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 + local path=/<>/t/tmp/flip-flop-2 + local description=git-imerge test repository with a commit and its revert at n=2 + delete_test_repo /<>/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 + local path=/<>/t/tmp/flip-flop-2 + local description=git-imerge test repository with a commit and its revert at n=2 + test -d /<>/t/tmp/flip-flop-2 + mkdir -p /<>/t/tmp/flip-flop-2 + git init /<>/t/tmp/flip-flop-2 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/flip-flop-2/.git/ + echo git-imerge test repository with a commit and its revert at n=2 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/flip-flop-2/.git config user.name Loú User + git --git-dir=/<>/t/tmp/flip-flop-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/flip-flop-2 + cd /<>/t/tmp/flip-flop-2 + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt + commit -m a⇒1 on branch a + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt + commit -m a⇒2 on branch a + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt + commit -m a⇒3 on branch a + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt + msg=b⇒1 + test 1 = 2 + test 1 = 3 + commit -m b⇒1 on branch b + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b [b 1f7d097] b⇒1 on branch b 1 file changed, 1 insertion(+) create mode 100644 b.txt + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt + msg=b⇒2 + test 2 = 2 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt + msg=b⇒2 and a⇒X + test 2 = 3 + commit -m b⇒2 and a⇒X on branch b + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b [b 48df77d] b⇒2 and a⇒X on branch b 2 files changed, 2 insertions(+), 2 deletions(-) + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt + msg=b⇒3 + test 3 = 2 + test 3 = 3 + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + msg=b⇒3 and a⇒0 + commit -m b⇒3 and a⇒0 on branch b + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b [b f3ef019] b⇒3 and a⇒0 on branch b 2 files changed, 2 insertions(+), 2 deletions(-) + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt + msg=b⇒4 + test 4 = 2 + test 4 = 3 + commit -m b⇒4 on branch b + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b [b 69d0c21] b⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + test_merge b-into-a-2 a b 1-2 1-3 + local name=b-into-a-2 + local dst=a + local src=b + local conflict1=1-2 + local conflict2=1-3 + git checkout a Switched to branch 'a' + git-imerge merge --branch=b-into-a-2 b + tee imerge-b-into-a-2-1.out Attempting automerge of 3-4...success. Autofilling 1-4...success. Autofilling 2-4...success. Autofilling 3-1...success. Autofilling 3-2...unexpected conflict. Backtracking... Autofilling 1-4...success. Autofilling 2-1...success. Autofilling 2-2...unexpected conflict. Backtracking... Autofilling 1-1...success. Autofilling 1-2...unexpected conflict. Backtracking... Autofilling 1-1...success. Autofilling 2-1...success. Autofilling 3-1...success. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2]. Attempting automerge of 3-4...success. Autofilling 1-4...success. Autofilling 2-4...success. Autofilling 3-2...unexpected conflict. Backtracking... Autofilling 1-4...success. Autofilling 2-2...unexpected conflict. Backtracking... Autofilling 1-2...unexpected conflict. Backtracking... Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a Original second commit: commit 48df77d20a6d16fe330e32ba17d5472d3868a622 Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 b⇒2 and a⇒X on branch b There was a conflict merging commit 1-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a *... *#?? *??? 4 - *??? | b 0 3 | | 0 - **** - a *--+ *#?? *??? 4 - *??? | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out + echo 1 + git add a.txt + tee imerge-b-into-a-2-2.out + git-imerge continue --no-edit [imerge/b 072dd43] imerge 'b': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting automerge of 1-4...failure. Attempting automerge of 1-3...failure. Attempting automerge of 3-2...success. Autofilling 2-2...success. Autofilling 3-2...success. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3]. Previous HEAD position was c94394f imerge 'b': automatic merge 3-2 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a Original second commit: commit f3ef01986be02ef5e40589b283c0385471ecca7d Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 b⇒3 and a⇒0 on branch b There was a conflict merging commit 1-3, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a *... **.. *#?? 4 - *??? | b 0 3 | | 0 - **** - a *..| **-+ *#?? 4 - *??? | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out + echo 1 + git add a.txt + tee imerge-b-into-a-2-3.out + git-imerge continue --no-edit [imerge/b 6cb7a69] imerge 'b': manual merge 1-3 Merge has been recorded for merge 1-3. Attempting automerge of 1-4...success. Autofilling 1-4...success. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:2,3:5]. Attempting automerge of 3-4...success. Autofilling 2-4...success. Autofilling 3-3...success. Autofilling 3-4 (first way)...success. Autofilling 3-4 (second way)...success. The two ways of autofilling 3-4 agree. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5]. Merge is complete! + grep -q Merge is complete imerge-b-into-a-2-3.out + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a *... **.. **?. 4 - *... | b 0 3 | | 0 - **** - a *..| **.| **?| 4 - *--+ | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge finish Merge b into a (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:42 2022 +0000 # # On branch b-into-a-2 # Changes to be committed: # new file: b.txt # [b-into-a-2 35adfb3] Merge b into a (using imerge) Date: Wed Jun 22 13:12:42 2022 +0000 + test_merge a-into-b-2 b a 2-1 3-1 + local name=a-into-b-2 + local dst=b + local src=a + local conflict1=2-1 + local conflict2=3-1 + git checkout b Switched to branch 'b' + git-imerge merge --branch=a-into-b-2 a + tee imerge-a-into-b-2-1.out Attempting automerge of 4-3...success. Autofilling 1-3...success. Autofilling 2-3...unexpected conflict. Backtracking... Autofilling 1-1...success. Autofilling 1-2...success. Autofilling 1-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:2,0:4]. Autofilling 2-2...unexpected conflict. Backtracking... Autofilling 2-1...unexpected conflict. Backtracking... Switched to branch 'imerge/a' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 48df77d20a6d16fe330e32ba17d5472d3868a622 Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 b⇒2 and a⇒X on branch b Original second commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a There was a conflict merging commit 2-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b *.#?? *.??? 3 - *.??? | a 0 4 | | 0 - ***** - b *|#?? *|??? 3 - *+??? | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out + echo 1 + git add a.txt + tee imerge-a-into-b-2-2.out + git-imerge continue --no-edit [imerge/a 530d585] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. Autofilling 2-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[1:3,1:4]. Attempting automerge of 4-3...failure. Attempting automerge of 3-1...failure. Switched to branch 'imerge/a' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit f3ef01986be02ef5e40589b283c0385471ecca7d Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 b⇒3 and a⇒0 on branch b Original second commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a There was a conflict merging commit 3-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b *.*#? *..?? 3 - *..?? | a 0 4 | | 0 - ***** - b *.*#? *.|?? 3 - *-+?? | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out + echo 1 + git add a.txt + tee imerge-a-into-b-2-3.out + git-imerge continue --no-edit [imerge/a 74abb2e] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. Autofilling 3-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. Attempting automerge of 4-3...success. Autofilling 4-1...success. Autofilling 4-2...success. Autofilling 4-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4]. Merge is complete! + grep -q Merge is complete imerge-a-into-b-2-3.out + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b *.**. *.... 3 - *.... | a 0 4 | | 0 - ***** - b *.**| *...| 3 - *---+ | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge finish Merge a into b (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:44 2022 +0000 # # On branch a-into-b-2 # Changes to be committed: # modified: a.txt # [a-into-b-2 fa832b2] Merge a into b (using imerge) Date: Wed Jun 22 13:12:44 2022 +0000 + flip_flop_test 3 + local n=3 + TMP=/<>/t/tmp/flip-flop-3 + DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 + init_test_repo /<>/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 + local path=/<>/t/tmp/flip-flop-3 + local description=git-imerge test repository with a commit and its revert at n=3 + delete_test_repo /<>/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 + local path=/<>/t/tmp/flip-flop-3 + local description=git-imerge test repository with a commit and its revert at n=3 + test -d /<>/t/tmp/flip-flop-3 + mkdir -p /<>/t/tmp/flip-flop-3 + git init /<>/t/tmp/flip-flop-3 hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/flip-flop-3/.git/ + echo git-imerge test repository with a commit and its revert at n=3 + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/flip-flop-3/.git config user.name Loú User + git --git-dir=/<>/t/tmp/flip-flop-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/flip-flop-3 + cd /<>/t/tmp/flip-flop-3 + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt + commit -m a⇒1 on branch a + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt + commit -m a⇒2 on branch a + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt + commit -m a⇒3 on branch a + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt + msg=b⇒1 + test 1 = 3 + test 1 = 4 + commit -m b⇒1 on branch b + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b [b 1f7d097] b⇒1 on branch b 1 file changed, 1 insertion(+) create mode 100644 b.txt + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt + msg=b⇒2 + test 2 = 3 + test 2 = 4 + commit -m b⇒2 on branch b + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b [b ce671e9] b⇒2 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt + msg=b⇒3 + test 3 = 3 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt + msg=b⇒3 and a⇒X + test 3 = 4 + commit -m b⇒3 and a⇒X on branch b + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b [b d40495e] b⇒3 and a⇒X on branch b 2 files changed, 2 insertions(+), 2 deletions(-) + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt + msg=b⇒4 + test 4 = 3 + test 4 = 4 + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + msg=b⇒4 and a⇒0 + commit -m b⇒4 and a⇒0 on branch b + TIME=1112912001 + GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b [b eb736f2] b⇒4 and a⇒0 on branch b 2 files changed, 2 insertions(+), 2 deletions(-) + test_merge b-into-a-3 a b 1-3 1-4 + local name=b-into-a-3 + local dst=a + local src=b + local conflict1=1-3 + local conflict2=1-4 + git checkout a Switched to branch 'a' + git-imerge merge --branch=b-into-a-3 b + tee imerge-b-into-a-3-1.out Attempting automerge of 3-4...success. Autofilling 1-4...success. Autofilling 2-4...success. Autofilling 3-1...success. Autofilling 3-2...success. Autofilling 3-3...unexpected conflict. Backtracking... Autofilling 1-4...success. Autofilling 2-1...success. Autofilling 2-2...success. Autofilling 2-3...unexpected conflict. Backtracking... Autofilling 1-1...success. Autofilling 1-2...success. Autofilling 1-3...unexpected conflict. Backtracking... Autofilling 1-2...success. Autofilling 2-2...success. Autofilling 3-1...success. Autofilling 3-2 (first way)...success. Autofilling 3-2 (second way)...success. The two ways of autofilling 3-2 agree. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3]. Attempting automerge of 3-4...success. Autofilling 1-4...success. Autofilling 2-4...success. Autofilling 3-3...unexpected conflict. Backtracking... Autofilling 1-4...success. Autofilling 2-3...unexpected conflict. Backtracking... Autofilling 1-3...unexpected conflict. Backtracking... Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a Original second commit: commit d40495ed379f376841e517047f90b663e8c7c7e1 Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 b⇒3 and a⇒X on branch b There was a conflict merging commit 1-3, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a *??. *... *#?? 4 - *??? | b 0 3 | | 0 - **** - a *??| *--+ *#?? 4 - *??? | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out + echo 1 + git add a.txt + + teegit-imerge continue --no-edit imerge-b-into-a-3-2.out [imerge/b e290556] imerge 'b': manual merge 1-3 Merge has been recorded for merge 1-3. Attempting automerge of 1-4...failure. Attempting automerge of 1-4...failure. Attempting automerge of 3-3...success. Autofilling 2-3...success. Autofilling 3-3...success. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4]. Previous HEAD position was 9c808e9 imerge 'b': automatic merge 3-3 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a Original second commit: commit eb736f2ae81944f79f443fd39a89adf74dbc907a Author: Loú User Date: Thu Apr 7 22:13:21 2005 +0000 b⇒4 and a⇒0 on branch b There was a conflict merging commit 1-4, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a *??. *... **.. 4 - *#?? | b 0 3 | | 0 - **** - a *??| *..| **-+ 4 - *#?? | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out + echo 1 + git add a.txt + git-imerge continue --no-edit + tee imerge-b-into-a-3-3.out [imerge/b 4b81111] imerge 'b': manual merge 1-4 Merge has been recorded for merge 1-4. Attempting automerge of 3-4...success. Autofilling 2-4...success. Autofilling 3-4...success. Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5]. Merge is complete! + grep -q Merge is complete imerge-b-into-a-3-3.out + git-imerge diagram --commits --frontier 0 3 | | 0 - **** - a *??. *... **.. 4 - **.. | b 0 3 | | 0 - **** - a *??| *..| **.| 4 - **-+ | b Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge finish Merge b into a (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:47 2022 +0000 # # On branch b-into-a-3 # Changes to be committed: # new file: b.txt # [b-into-a-3 4816990] Merge b into a (using imerge) Date: Wed Jun 22 13:12:47 2022 +0000 + test_merge a-into-b-3 b a 3-1 4-1 + local name=a-into-b-3 + local dst=b + local src=a + local conflict1=3-1 + local conflict2=4-1 + git checkout b Switched to branch 'b' + git-imerge merge --branch=a-into-b-3 a + tee imerge-a-into-b-3-1.out Attempting automerge of 4-3...success. Autofilling 1-3...success. Autofilling 2-3...success. Autofilling 3-3...unexpected conflict. Backtracking... Autofilling 1-3...success. Autofilling 2-1...success. Autofilling 2-2...success. Autofilling 2-3 (first way)...success. Autofilling 2-3 (second way)...success. The two ways of autofilling 2-3 agree. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[0:3,0:4]. Autofilling 3-2...unexpected conflict. Backtracking... Autofilling 3-1...unexpected conflict. Backtracking... Switched to branch 'imerge/a' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit d40495ed379f376841e517047f90b663e8c7c7e1 Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 b⇒3 and a⇒X on branch b Original second commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a There was a conflict merging commit 3-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b *?.#? *?.?? 3 - *..?? | a 0 4 | | 0 - ***** - b *?|#? *?|?? 3 - *-+?? | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out + echo 1 + git add a.txt + tee imerge-a-into-b-3-2.out + git-imerge continue --no-edit [imerge/a 8f16176] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. Autofilling 3-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:4,1:4]. Attempting automerge of 4-3...failure. Attempting automerge of 4-1...failure. Switched to branch 'imerge/a' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt Automatic merge failed; fix conflicts and then commit the result. Original first commit: commit eb736f2ae81944f79f443fd39a89adf74dbc907a Author: Loú User Date: Thu Apr 7 22:13:21 2005 +0000 b⇒4 and a⇒0 on branch b Original second commit: commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 a⇒1 on branch a There was a conflict merging commit 4-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b *?.*# *?..? 3 - *...? | a 0 4 | | 0 - ***** - b *?.*# *?.|? 3 - *--+? | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out + echo 1 + git add a.txt + tee imerge-a-into-b-3-3.out + git-imerge continue --no-edit [imerge/a 889396a] imerge 'a': manual merge 4-1 Merge has been recorded for merge 4-1. Attempting automerge of 4-3...success. Autofilling 4-2...success. Autofilling 4-3...success. Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4]. Merge is complete! + grep -q Merge is complete imerge-a-into-b-3-3.out + git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b *?.** *?... 3 - *.... | a 0 4 | | 0 - ***** - b *?.** *?..| 3 - *---+ | a Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + GIT_EDITOR=cat git-imerge finish Merge a into b (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Jun 22 13:12:49 2022 +0000 # # On branch a-into-b-3 # Changes to be committed: # modified: a.txt # [a-into-b-3 f6ffd38] Merge a into b (using imerge) Date: Wed Jun 22 13:12:49 2022 +0000 py310 run-test: commands[5] | /bin/sh t/test-drop + dirname t/test-drop + cd t + pwd + dirname /<>/t + BASE=/<> + . /<>/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/<>/t/tmp/drop + DESCRIPTION=git-imerge drop test repository + init_test_repo /<>/t/tmp/drop git-imerge drop test repository + local path=/<>/t/tmp/drop + local description=git-imerge drop test repository + delete_test_repo /<>/t/tmp/drop git-imerge drop test repository + local path=/<>/t/tmp/drop + local description=git-imerge drop test repository + test -d /<>/t/tmp/drop + mkdir -p /<>/t/tmp/drop + git init /<>/t/tmp/drop hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: hint: hint: git config --global init.defaultBranch hint: hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m Initialized empty Git repository in /<>/t/tmp/drop/.git/ + echo git-imerge drop test repository + printf %s\n /*.out /*.css /*.html + git --git-dir=/<>/t/tmp/drop/.git config user.name Loú User + git --git-dir=/<>/t/tmp/drop/.git config user.email luser@example.com + TIME=1112911993 + ln -s /<>/imerge.css /<>/t/tmp/drop + cd /<>/t/tmp/drop + modify a.txt 0 + filename=a.txt + text=0 + echo 0 + git add a.txt + commit -m m⇒0 + TIME=1112911994 + GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + seq 6 + modify a1.txt 1 + filename=a1.txt + text=1 + echo 1 + git add a1.txt + commit -m a1⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 [master 389a4ba] a1⇒1 1 file changed, 1 insertion(+) create mode 100644 a1.txt + modify a2.txt 2 + filename=a2.txt + text=2 + echo 2 + git add a2.txt + commit -m a2⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 [master 4785218] a2⇒2 1 file changed, 1 insertion(+) create mode 100644 a2.txt + modify a3.txt 3 + filename=a3.txt + text=3 + echo 3 + git add a3.txt + commit -m a3⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 [master 34bdde3] a3⇒3 1 file changed, 1 insertion(+) create mode 100644 a3.txt + modify a4.txt 4 + filename=a4.txt + text=4 + echo 4 + git add a4.txt + commit -m a4⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 [master c793a5a] a4⇒4 1 file changed, 1 insertion(+) create mode 100644 a4.txt + modify a5.txt 5 + filename=a5.txt + text=5 + echo 5 + git add a5.txt + commit -m a5⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 [master b42f60c] a5⇒5 1 file changed, 1 insertion(+) create mode 100644 a5.txt + modify a6.txt 6 + filename=a6.txt + text=6 + echo 6 + git add a6.txt + commit -m a6⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 [master 9d6aec5] a6⇒6 1 file changed, 1 insertion(+) create mode 100644 a6.txt + git checkout -b dropped master Switched to a new branch 'dropped' + git-imerge drop HEAD~5..HEAD~3 Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by switching back to a branch. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -c with the switch command. Example: git switch -c Or undo this operation with: git switch - Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 [detached HEAD 67d170a] Revert "a3⇒3" Date: Wed Jun 22 13:12:50 2022 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt [detached HEAD cf95e83] Revert "a2⇒2" Date: Wed Jun 22 13:12:50 2022 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. Autofilling 1-2...success. Autofilling 2-2...success. Autofilling 3-1...success. Autofilling 3-2 (first way)...success. Autofilling 3-2 (second way)...success. The two ways of autofilling 3-2 agree. Recording autofilled block MergeState('dropped', tip1='dropped', tip2='cf95e837f07c931b06bcf113cae5f5962bfc8f0d', goal='drop')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-drop.html 0 3 | | 0 - **** - dropped *??. 2 - *... | cf95e837f07c931b06bcf113cae5f5962bfc8f0d 0 3 | | 0 - **** - dropped *??| 2 - *--+ | cf95e837f07c931b06bcf113cae5f5962bfc8f0d Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b + local refname=dropped + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b + git rev-parse dropped^{tree} + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b + git checkout -b reverted master Switched to a new branch 'reverted' + git-imerge revert HEAD~5..HEAD~3 Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by switching back to a branch. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -c with the switch command. Example: git switch -c Or undo this operation with: git switch - Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 [detached HEAD 67d170a] Revert "a3⇒3" Date: Wed Jun 22 13:12:50 2022 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt [detached HEAD 2e2afc2] Revert "a2⇒2" Date: Wed Jun 22 13:12:51 2022 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. Autofilling 1-2...success. Autofilling 2-2...success. Autofilling 3-1...success. Autofilling 3-2 (first way)...success. Autofilling 3-2 (second way)...success. The two ways of autofilling 3-2 agree. Recording autofilled block MergeState('reverted', tip1='reverted', tip2='2e2afc23049574b403b8e4b1128f74378140df63', goal='revert')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-revert.html 0 3 | | 0 - **** - reverted *??. 2 - *... | 2e2afc23049574b403b8e4b1128f74378140df63 0 3 | | 0 - **** - reverted *??| 2 - *--+ | 2e2afc23049574b403b8e4b1128f74378140df63 Key: |,-,+ = rectangles forming current merge frontier * = merge done manually . = merge done automatically # = conflict that is currently blocking progress @ = merge was blocked but has been resolved ? = no merge recorded + git-imerge finish + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b + local refname=reverted + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b + git rev-parse reverted^{tree} + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b ___________________________________ summary ____________________________________ py310: commands succeeded congratulations :) create-stamp debian/debhelper-build-stamp dh_testroot -O--buildsystem=pybuild dh_prep -O--buildsystem=pybuild dh_auto_install --destdir=debian/git-imerge/ -O--buildsystem=pybuild I: pybuild base:239: /usr/bin/python3 setup.py install --root /<>/debian/git-imerge running install /usr/lib/python3/dist-packages/setuptools/command/install.py:34: SetuptoolsDeprecationWarning: setup.py install is deprecated. Use build and pip and other standards-based tools. warnings.warn( running build running build_py running install_lib creating /<>/debian/git-imerge/usr creating /<>/debian/git-imerge/usr/lib creating /<>/debian/git-imerge/usr/lib/python3.10 creating /<>/debian/git-imerge/usr/lib/python3.10/dist-packages copying /<>/.pybuild/cpython3_3.10/build/gitimerge.py -> /<>/debian/git-imerge/usr/lib/python3.10/dist-packages byte-compiling /<>/debian/git-imerge/usr/lib/python3.10/dist-packages/gitimerge.py to gitimerge.cpython-310.pyc running install_data creating /<>/debian/git-imerge/usr/share creating /<>/debian/git-imerge/usr/share/bash-completion creating /<>/debian/git-imerge/usr/share/bash-completion/completions copying completions/git-imerge -> /<>/debian/git-imerge/usr/share/bash-completion/completions running install_egg_info running egg_info writing git_imerge.egg-info/PKG-INFO writing dependency_links to git_imerge.egg-info/dependency_links.txt writing entry points to git_imerge.egg-info/entry_points.txt writing top-level names to git_imerge.egg-info/top_level.txt reading manifest file 'git_imerge.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'COPYING' writing manifest file 'git_imerge.egg-info/SOURCES.txt' Copying git_imerge.egg-info to /<>/debian/git-imerge/usr/lib/python3.10/dist-packages/git_imerge-1.2.0.egg-info Skipping SOURCES.txt running install_scripts Installing git-imerge script to /<>/debian/git-imerge/usr/bin dh_installdocs -O--buildsystem=pybuild dh_installchangelogs -O--buildsystem=pybuild dh_python3 -O--buildsystem=pybuild dh_installsystemduser -O--buildsystem=pybuild dh_perl -O--buildsystem=pybuild dh_link -O--buildsystem=pybuild dh_strip_nondeterminism -O--buildsystem=pybuild dh_compress -O--buildsystem=pybuild dh_fixperms -O--buildsystem=pybuild dh_missing -O--buildsystem=pybuild dh_installdeb -O--buildsystem=pybuild dh_gencontrol -O--buildsystem=pybuild dh_md5sums -O--buildsystem=pybuild dh_builddeb -O--buildsystem=pybuild INFO: pkgstriptranslations version 149 pkgstriptranslations: processing git-imerge (in debian/git-imerge); do_strip: , oemstrip: pkgmaintainermangler: Maintainer field overridden to "Ubuntu Developers " pkgstripfiles: processing control file: debian/git-imerge/DEBIAN/control, package git-imerge, directory debian/git-imerge pkgstripfiles: Running PNG optimization (using 4 cpus) for package git-imerge ... pkgstripfiles: No PNG files. dpkg-deb: building package 'git-imerge' in '../git-imerge_1.2.0-3_all.deb'. dpkg-genbuildinfo --build=binary -O../git-imerge_1.2.0-3_amd64.buildinfo dpkg-genchanges --build=binary -mLaunchpad Build Daemon -O../git-imerge_1.2.0-3_amd64.changes dpkg-genchanges: info: binary-only upload (no source code included) dpkg-source --after-build . dpkg-buildpackage: info: binary-only upload (no source included) -------------------------------------------------------------------------------- Build finished at 2022-06-22T13:12:59Z Finished -------- I: Built successfully +------------------------------------------------------------------------------+ | Changes | +------------------------------------------------------------------------------+ git-imerge_1.2.0-3_amd64.changes: --------------------------------- Format: 1.8 Date: Mon, 26 Oct 2020 07:51:53 +0800 Source: git-imerge Binary: git-imerge Built-For-Profiles: noudeb Architecture: all Version: 1.2.0-3 Distribution: kinetic Urgency: medium Maintainer: Launchpad Build Daemon Changed-By: Paul Wise Description: git-imerge - incremental merge and rebase for git Changes: git-imerge (1.2.0-3) unstable; urgency=medium . * Mark upstream autopkgtest as allow-stderr, it logs to stderr Checksums-Sha1: d25873a04d1b949416753b4f118f6f7a8008d597 49186 git-imerge_1.2.0-3_all.deb bc93b860f80bbb348f5dcec3b7cca4ab1ee0f73a 7583 git-imerge_1.2.0-3_amd64.buildinfo Checksums-Sha256: 65b24366984a3ac66d735209c18e2b82fc4057e279e2023a99db8df859dc5aca 49186 git-imerge_1.2.0-3_all.deb a58f5dd81dacd4a94396dc51635b27f6df2459ef460c44530bc8d0293e921ead 7583 git-imerge_1.2.0-3_amd64.buildinfo Files: bbfd6c0f3634726fbccc5e39f5e7f066 49186 vcs optional git-imerge_1.2.0-3_all.deb a8bf4c9ee376b69806aaa4a8f78b2a72 7583 vcs optional git-imerge_1.2.0-3_amd64.buildinfo /<>/git-imerge_1.2.0-3_amd64.changes.new could not be renamed to /<>/git-imerge_1.2.0-3_amd64.changes: Illegal seek Distribution field may be wrong!!! +------------------------------------------------------------------------------+ | Buildinfo | +------------------------------------------------------------------------------+ Format: 1.0 Source: git-imerge Binary: git-imerge Architecture: all Version: 1.2.0-3 Checksums-Md5: bbfd6c0f3634726fbccc5e39f5e7f066 49186 git-imerge_1.2.0-3_all.deb Checksums-Sha1: d25873a04d1b949416753b4f118f6f7a8008d597 49186 git-imerge_1.2.0-3_all.deb Checksums-Sha256: 65b24366984a3ac66d735209c18e2b82fc4057e279e2023a99db8df859dc5aca 49186 git-imerge_1.2.0-3_all.deb Build-Origin: Ubuntu Build-Architecture: amd64 Build-Date: Wed, 22 Jun 2022 13:12:58 +0000 Build-Path: /<> Build-Tainted-By: merged-usr-via-aliased-dirs usr-local-has-programs Installed-Build-Depends: autoconf (= 2.71-2), automake (= 1:1.16.5-1.3), autopoint (= 0.21-6), autotools-dev (= 20220109.1), base-files (= 12.2ubuntu1), base-passwd (= 3.5.52build1), bash (= 5.1-6ubuntu1), bash-completion (= 1:2.11-6ubuntu1), binutils (= 2.38.50.20220615-4ubuntu1), binutils-common (= 2.38.50.20220615-4ubuntu1), binutils-x86-64-linux-gnu (= 2.38.50.20220615-4ubuntu1), bsdextrautils (= 2.38-4ubuntu1), bsdutils (= 1:2.38-4ubuntu1), build-essential (= 12.9ubuntu3), bzip2 (= 1.0.8-5build1), ca-certificates (= 20211016), coreutils (= 8.32-4.1ubuntu1), cpp (= 4:11.2.0-1ubuntu1), cpp-11 (= 11.3.0-3ubuntu1), dash (= 0.5.11+git20210903+057cd650a4ed-3build1), debconf (= 1.5.79ubuntu1), debhelper (= 13.7.1ubuntu1), debianutils (= 5.7-0.2), debugedit (= 1:5.0-4build1), dh-autoreconf (= 20), dh-python (= 5.20220403), dh-strip-nondeterminism (= 1.13.0-1), diffutils (= 1:3.8-0ubuntu2), dpkg (= 1.21.8ubuntu1), dpkg-dev (= 1.21.8ubuntu1), dwz (= 0.14-1build2), file (= 1:5.41-4), findutils (= 4.8.0-1ubuntu3), g++ (= 4:11.2.0-1ubuntu1), g++-11 (= 11.3.0-3ubuntu1), gcc (= 4:11.2.0-1ubuntu1), gcc-11 (= 11.3.0-3ubuntu1), gcc-11-base (= 11.3.0-3ubuntu1), gcc-12-base (= 12.1.0-2ubuntu1), gettext (= 0.21-6), gettext-base (= 0.21-6), git (= 1:2.36.1-1ubuntu1), git-man (= 1:2.36.1-1ubuntu1), grep (= 3.7-1build1), groff-base (= 1.22.4-8build1), gzip (= 1.10-4ubuntu4), hostname (= 3.23ubuntu2), init-system-helpers (= 1.63), intltool-debian (= 0.35.0+20060710.5), libacl1 (= 2.3.1-1), libarchive-zip-perl (= 1.68-1), libasan6 (= 11.3.0-3ubuntu1), libatomic1 (= 12.1.0-2ubuntu1), libattr1 (= 1:2.5.1-1build1), libaudit-common (= 1:3.0.7-1build1), libaudit1 (= 1:3.0.7-1build1), libbinutils (= 2.38.50.20220615-4ubuntu1), libblkid1 (= 2.38-4ubuntu1), libbrotli1 (= 1.0.9-2build6), libbz2-1.0 (= 1.0.8-5build1), libc-bin (= 2.35-0ubuntu3), libc-dev-bin (= 2.35-0ubuntu3), libc6 (= 2.35-0ubuntu3), libc6-dev (= 2.35-0ubuntu3), libcap-ng0 (= 0.7.9-4), libcap2 (= 1:2.44-1build3), libcc1-0 (= 12.1.0-2ubuntu1), libcom-err2 (= 1.46.5-2ubuntu2), libcrypt-dev (= 1:4.4.27-1), libcrypt1 (= 1:4.4.27-1), libctf-nobfd0 (= 2.38.50.20220615-4ubuntu1), libctf0 (= 2.38.50.20220615-4ubuntu1), libcurl3-gnutls (= 7.83.1-2), libdb5.3 (= 5.3.28+dfsg1-0.9), libdebconfclient0 (= 0.261ubuntu1), libdebhelper-perl (= 13.7.1ubuntu1), libdpkg-perl (= 1.21.8ubuntu1), libdw1 (= 0.187-1), libelf1 (= 0.187-1), liberror-perl (= 0.17029-1), libexpat1 (= 2.4.8-1), libffi8 (= 3.4.2-4), libfile-stripnondeterminism-perl (= 1.13.0-1), libgcc-11-dev (= 11.3.0-3ubuntu1), libgcc-s1 (= 12.1.0-2ubuntu1), libgcrypt20 (= 1.10.1-2ubuntu1), libgdbm-compat4 (= 1.23-1), libgdbm6 (= 1.23-1), libglib2.0-0 (= 2.72.2-2), libgmp10 (= 2:6.2.1+dfsg-3ubuntu1), libgnutls30 (= 3.7.6-2ubuntu1), libgomp1 (= 12.1.0-2ubuntu1), libgpg-error0 (= 1.45-2), libgprofng0 (= 2.38.50.20220615-4ubuntu1), libgssapi-krb5-2 (= 1.19.2-2), libhogweed6 (= 3.7.3-1build2), libicu71 (= 71.1-3), libidn2-0 (= 2.3.2-2build1), libisl23 (= 0.24-2build1), libitm1 (= 12.1.0-2ubuntu1), libjs-jquery (= 3.6.0+dfsg+~3.5.13-1), libjs-sphinxdoc (= 4.5.0-4), libjs-underscore (= 1.13.3~dfsg+~1.11.4-1), libk5crypto3 (= 1.19.2-2), libkeyutils1 (= 1.6.1-3ubuntu1), libkrb5-3 (= 1.19.2-2), libkrb5support0 (= 1.19.2-2), libldap-2.5-0 (= 2.5.12+dfsg-2ubuntu1), liblsan0 (= 12.1.0-2ubuntu1), liblz4-1 (= 1.9.3-2build2), liblzma5 (= 5.2.5-2.1), libmagic-mgc (= 1:5.41-4), libmagic1 (= 1:5.41-4), libmount1 (= 2.38-4ubuntu1), libmpc3 (= 1.2.1-2build1), libmpdec3 (= 2.5.1-2build2), libmpfr6 (= 4.1.0-3build3), libncursesw6 (= 6.3+20220423-2), libnettle8 (= 3.7.3-1build2), libnghttp2-14 (= 1.47.0-1), libnsl-dev (= 1.3.0-2build2), libnsl2 (= 1.3.0-2build2), libp11-kit0 (= 0.24.1-1), libpam-modules (= 1.4.0-13ubuntu1), libpam-modules-bin (= 1.4.0-13ubuntu1), libpam-runtime (= 1.4.0-13ubuntu1), libpam0g (= 1.4.0-13ubuntu1), libpcre2-8-0 (= 10.40-1), libpcre3 (= 2:8.39-14), libperl5.34 (= 5.34.0-3ubuntu1), libpipeline1 (= 1.5.6-1), libpsl5 (= 0.21.0-1.2build2), libpython3-stdlib (= 3.10.4-0ubuntu2), libpython3.10-minimal (= 3.10.5-1), libpython3.10-stdlib (= 3.10.5-1), libquadmath0 (= 12.1.0-2ubuntu1), libreadline8 (= 8.1.2-1.2), librtmp1 (= 2.4+20151223.gitfa8646d.1-2build4), libsasl2-2 (= 2.1.28+dfsg-6ubuntu1), libsasl2-modules-db (= 2.1.28+dfsg-6ubuntu1), libseccomp2 (= 2.5.4-1ubuntu1), libselinux1 (= 3.4-1), libsigsegv2 (= 2.13-1ubuntu3), libsmartcols1 (= 2.38-4ubuntu1), libsqlite3-0 (= 3.38.5-1), libssh-4 (= 0.9.6-2build1), libssl3 (= 3.0.3-5ubuntu3), libstdc++-11-dev (= 11.3.0-3ubuntu1), libstdc++6 (= 12.1.0-2ubuntu1), libsub-override-perl (= 0.09-3), libsystemd0 (= 249.11-0ubuntu4), libtasn1-6 (= 4.18.0-4build1), libtinfo6 (= 6.3+20220423-2), libtirpc-common (= 1.3.2-2build1), libtirpc-dev (= 1.3.2-2build1), libtirpc3 (= 1.3.2-2build1), libtool (= 2.4.7-4), libtsan0 (= 11.3.0-3ubuntu1), libubsan1 (= 12.1.0-2ubuntu1), libuchardet0 (= 0.0.7-1build2), libudev1 (= 249.11-0ubuntu4), libunistring2 (= 1.0-1), libuuid1 (= 2.38-4ubuntu1), libxml2 (= 2.9.14+dfsg-1), libzstd1 (= 1.5.2+dfsg-1), linux-libc-dev (= 5.15.0-27.28), login (= 1:4.11.1+dfsg1-2ubuntu1), lsb-base (= 11.1.0ubuntu4), lto-disabled-list (= 27), m4 (= 1.4.18-5ubuntu2), make (= 4.3-4.1build1), man-db (= 2.10.2-1), mawk (= 1.3.4.20200120-3.1), media-types (= 8.0.0), ncurses-base (= 6.3+20220423-2), ncurses-bin (= 6.3+20220423-2), openssl (= 3.0.3-5ubuntu3), patch (= 2.7.6-7build2), perl (= 5.34.0-3ubuntu1), perl-base (= 5.34.0-3ubuntu1), perl-modules-5.34 (= 5.34.0-3ubuntu1), pkg-config (= 0.29.2-1ubuntu3), po-debconf (= 1.0.21+nmu1), python3 (= 3.10.4-0ubuntu2), python3-distlib (= 0.3.4-1), python3-distutils (= 3.10.4-0ubuntu2), python3-filelock (= 3.7.1-1), python3-lib2to3 (= 3.10.4-0ubuntu2), python3-minimal (= 3.10.4-0ubuntu2), python3-packaging (= 21.3-1), python3-pip (= 22.1.1+dfsg-1), python3-pip-whl (= 22.1.1+dfsg-1), python3-pkg-resources (= 59.6.0-1.2), python3-platformdirs (= 2.5.2-1), python3-pluggy (= 1.0.0-1), python3-py (= 1.10.0-1), python3-pyparsing (= 3.0.7-2), python3-setuptools (= 59.6.0-1.2), python3-setuptools-whl (= 59.6.0-1.2), python3-six (= 1.16.0-3ubuntu1), python3-toml (= 0.10.2-1), python3-virtualenv (= 20.14.0+ds-1), python3-wheel (= 0.37.1-2), python3-wheel-whl (= 0.37.1-2), python3.10 (= 3.10.5-1), python3.10-minimal (= 3.10.5-1), readline-common (= 8.1.2-1.2), rpcsvc-proto (= 1.4.2-0ubuntu6), sed (= 4.8-1ubuntu2), sensible-utils (= 0.0.17), sysvinit-utils (= 3.01-1ubuntu1), tar (= 1.34+dfsg-1build3), tox (= 3.21.4-1ubuntu1), util-linux (= 2.38-4ubuntu1), util-linux-extra (= 2.38-4ubuntu1), xz-utils (= 5.2.5-2.1), zlib1g (= 1:1.2.11.dfsg-2ubuntu9) Environment: DEB_BUILD_OPTIONS="noautodbgsym parallel=4" DEB_BUILD_PROFILES="noudeb" LANG="C.UTF-8" LC_ALL="C.UTF-8" SOURCE_DATE_EPOCH="1603669913" +------------------------------------------------------------------------------+ | Package contents | +------------------------------------------------------------------------------+ git-imerge_1.2.0-3_all.deb -------------------------- new Debian package, version 2.0. size 49186 bytes: control archive=1286 bytes. 611 bytes, 16 lines control 995 bytes, 12 lines md5sums 255 bytes, 12 lines * postinst #!/bin/sh 399 bytes, 12 lines * prerm #!/bin/sh Package: git-imerge Version: 1.2.0-3 Architecture: all Maintainer: Ubuntu Developers Original-Maintainer: Paul Wise Installed-Size: 197 Depends: git, python3, python3:any Suggests: mergify Section: vcs Priority: optional Multi-Arch: foreign Homepage: https://github.com/mhagger/git-imerge Description: incremental merge and rebase for git Performs a merge between two branches incrementally. If conflicts are encountered, figures out exactly which pairs of commits conflict, and presents the user with one pairwise conflict at a time for resolution. drwxr-xr-x root/root 0 2020-10-25 23:51 ./ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/bin/ -rwxr-xr-x root/root 973 2020-10-25 23:51 ./usr/bin/git-imerge drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/lib/ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/lib/python3/ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/lib/python3/dist-packages/ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/lib/python3/dist-packages/git_imerge-1.2.0.egg-info/ -rw-r--r-- root/root 15762 2020-10-25 23:51 ./usr/lib/python3/dist-packages/git_imerge-1.2.0.egg-info/PKG-INFO -rw-r--r-- root/root 1 2020-10-25 23:51 ./usr/lib/python3/dist-packages/git_imerge-1.2.0.egg-info/dependency_links.txt -rw-r--r-- root/root 50 2020-10-25 23:51 ./usr/lib/python3/dist-packages/git_imerge-1.2.0.egg-info/entry_points.txt -rw-r--r-- root/root 10 2020-10-25 23:51 ./usr/lib/python3/dist-packages/git_imerge-1.2.0.egg-info/top_level.txt -rw-r--r-- root/root 140758 2020-09-20 13:28 ./usr/lib/python3/dist-packages/gitimerge.py drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/share/ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/share/bash-completion/ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/share/bash-completion/completions/ -rw-r--r-- root/root 5421 2020-09-20 13:28 ./usr/share/bash-completion/completions/git-imerge drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/share/doc/ drwxr-xr-x root/root 0 2020-10-25 23:51 ./usr/share/doc/git-imerge/ -rw-r--r-- root/root 4821 2020-09-20 13:28 ./usr/share/doc/git-imerge/README.md.gz -rw-r--r-- root/root 2571 2020-09-20 13:28 ./usr/share/doc/git-imerge/TODO.md.gz -rw-r--r-- root/root 323 2020-10-25 23:51 ./usr/share/doc/git-imerge/changelog.Debian.gz -rw-r--r-- root/root 2494 2020-10-08 04:16 ./usr/share/doc/git-imerge/copyright -rw-r--r-- root/root 5296 2020-09-20 13:28 ./usr/share/doc/git-imerge/talk.rst.gz +------------------------------------------------------------------------------+ | Post Build | +------------------------------------------------------------------------------+ +------------------------------------------------------------------------------+ | Cleanup | +------------------------------------------------------------------------------+ Purging /<> Not removing build depends: as requested +------------------------------------------------------------------------------+ | Summary | +------------------------------------------------------------------------------+ Build Architecture: amd64 Build Type: binary Build-Space: 56980 Build-Time: 161 Distribution: kinetic Host Architecture: amd64 Install-Time: 39 Job: git-imerge_1.2.0-3.dsc Machine Architecture: amd64 Package: git-imerge Package-Time: 202 Source-Version: 1.2.0-3 Space: 56980 Status: successful Version: 1.2.0-3 -------------------------------------------------------------------------------- Finished at 2022-06-22T13:12:59Z Build needed 00:03:22, 56980k disk space Adding user buildd to group lxd RUN: /usr/share/launchpad-buildd/bin/in-target scan-for-processes --backend=chroot --series=kinetic --arch=amd64 PACKAGEBUILD-23997183 Scanning for processes to kill in build PACKAGEBUILD-23997183