Warning: Permanently added '2620:52:3:1:dead:beef:cafe:c248' (ED25519) to the list of known hosts. You can reproduce this build on your computer by running: sudo dnf install copr-rpmbuild /usr/bin/copr-rpmbuild --verbose --drop-resultdir --task-url https://copr.fedorainfracloud.org/backend/get-build-task/8187483-fedora-39-ppc64le --chroot fedora-39-ppc64le Version: 1.1 PID: 7234 Logging PID: 7235 Task: {'allow_user_ssh': False, 'appstream': False, 'background': False, 'build_id': 8187483, 'buildroot_pkgs': [], 'chroot': 'fedora-39-ppc64le', 'enable_net': False, 'fedora_review': False, 'git_hash': 'ccb761cbbea48b6e46ebfec4d67154462976004f', 'git_repo': 'https://copr-dist-git.fedorainfracloud.org/git/sicherha/git-imerge/git-imerge', 'isolation': 'default', 'memory_reqs': 2048, 'package_name': 'git-imerge', 'package_version': '1.2.0-1', 'project_dirname': 'git-imerge', 'project_name': 'git-imerge', 'project_owner': 'sicherha', 'repo_priority': None, 'repos': [{'baseurl': 'https://download.copr.fedorainfracloud.org/results/sicherha/git-imerge/fedora-39-ppc64le/', 'id': 'copr_base', 'name': 'Copr repository', 'priority': None}], 'sandbox': 'sicherha/git-imerge--sicherha', 'source_json': {}, 'source_type': None, 'ssh_public_keys': None, 'storage': None, 'submitter': 'sicherha', 'tags': [], 'task_id': '8187483-fedora-39-ppc64le', 'timeout': 18000, 'uses_devel_repo': False, 'with_opts': [], 'without_opts': []} Running: git clone https://copr-dist-git.fedorainfracloud.org/git/sicherha/git-imerge/git-imerge /var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge --depth 500 --no-single-branch --recursive cmd: ['git', 'clone', 'https://copr-dist-git.fedorainfracloud.org/git/sicherha/git-imerge/git-imerge', '/var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge', '--depth', '500', '--no-single-branch', '--recursive'] cwd: . rc: 0 stdout: stderr: Cloning into '/var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge'... Running: git checkout ccb761cbbea48b6e46ebfec4d67154462976004f -- cmd: ['git', 'checkout', 'ccb761cbbea48b6e46ebfec4d67154462976004f', '--'] cwd: /var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge rc: 0 stdout: stderr: Note: switching to 'ccb761cbbea48b6e46ebfec4d67154462976004f'. 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 ccb761c automatic import of git-imerge Running: dist-git-client sources cmd: ['dist-git-client', 'sources'] cwd: /var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge rc: 0 stdout: stderr: INFO: Reading stdout from command: git rev-parse --abbrev-ref HEAD INFO: Reading stdout from command: git rev-parse HEAD INFO: Reading sources specification file: sources INFO: Downloading git-imerge-1.2.0.tar.gz INFO: Reading stdout from command: curl --help all INFO: Calling: curl -H Pragma: -o git-imerge-1.2.0.tar.gz --location --connect-timeout 60 --retry 3 --retry-delay 10 --remote-time --show-error --fail --retry-all-errors https://copr-dist-git.fedorainfracloud.org/repo/pkgs/sicherha/git-imerge/git-imerge/git-imerge-1.2.0.tar.gz/md5/59747229598f2b412eb91b6f734dae4c/git-imerge-1.2.0.tar.gz % Total % Received % Xferd Average Speed Time Time Time Current /usr/bin/tail: /var/lib/copr-rpmbuild/main.log: file truncated Dload Upload Total Spent Left Speed 100 50266 100 50266 0 0 220k 0 --:--:-- --:--:-- --:--:-- 220k INFO: Reading stdout from command: md5sum git-imerge-1.2.0.tar.gz Running (timeout=18000): unbuffer mock --spec /var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge/git-imerge.spec --sources /var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge --resultdir /var/lib/copr-rpmbuild/results --uniqueext 1730231711.608671 -r /var/lib/copr-rpmbuild/results/configs/child.cfg INFO: mock.py version 5.9 starting (python version = 3.12.1, NVR = mock-5.9-1.fc39), args: /usr/libexec/mock/mock --spec /var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge/git-imerge.spec --sources /var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge --resultdir /var/lib/copr-rpmbuild/results --uniqueext 1730231711.608671 -r /var/lib/copr-rpmbuild/results/configs/child.cfg Start(bootstrap): init plugins INFO: tmpfs initialized INFO: selinux enabled INFO: chroot_scan: initialized INFO: compress_logs: initialized Finish(bootstrap): init plugins Start: init plugins INFO: tmpfs initialized INFO: selinux enabled INFO: chroot_scan: initialized INFO: compress_logs: initialized Finish: init plugins INFO: Signal handler active Start: run INFO: Start(/var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge/git-imerge.spec) Config(fedora-39-ppc64le) Start: clean chroot Finish: clean chroot Mock Version: 5.9 INFO: Mock Version: 5.9 Start(bootstrap): chroot init INFO: mounting tmpfs at /var/lib/mock/fedora-39-ppc64le-bootstrap-1730231711.608671/root. INFO: calling preinit hooks INFO: enabled root cache INFO: enabled package manager cache Start(bootstrap): cleaning package manager metadata Finish(bootstrap): cleaning package manager metadata INFO: Guessed host environment type: unknown INFO: Using bootstrap image: registry.fedoraproject.org/fedora:39 INFO: Pulling image: registry.fedoraproject.org/fedora:39 INFO: Copy content of container registry.fedoraproject.org/fedora:39 to /var/lib/mock/fedora-39-ppc64le-bootstrap-1730231711.608671/root INFO: Checking that registry.fedoraproject.org/fedora:39 image matches host's architecture INFO: mounting registry.fedoraproject.org/fedora:39 with podman image mount INFO: image registry.fedoraproject.org/fedora:39 as /var/lib/containers/storage/overlay/810bde8266f7d86ad6cb6d6735cc06562a469cf3d9dfb4b40bbc7be87faede79/merged INFO: umounting image registry.fedoraproject.org/fedora:39 (/var/lib/containers/storage/overlay/810bde8266f7d86ad6cb6d6735cc06562a469cf3d9dfb4b40bbc7be87faede79/merged) with podman image umount INFO: Package manager dnf4 detected and used (fallback) INFO: Bootstrap image not marked ready Start(bootstrap): installing dnf tooling No matches found for the following disable plugin patterns: local, spacewalk, versionlock Copr repository 4.7 kB/s | 1.6 kB 00:00 fedora 13 MB/s | 83 MB 00:06 updates 9.0 MB/s | 38 MB 00:04 Package python3-dnf-4.21.1-1.fc39.noarch is already installed. Dependencies resolved. ================================================================================ Package Arch Version Repository Size ================================================================================ Installing: python3-dnf-plugins-core noarch 4.9.0-1.fc39 updates 320 k Installing dependencies: dbus-libs ppc64le 1:1.14.10-1.fc39 fedora 177 k python3-dateutil noarch 1:2.8.2-10.fc39 fedora 355 k python3-dbus ppc64le 1.3.2-4.fc39 fedora 161 k python3-distro noarch 1.8.0-6.fc39 fedora 49 k python3-six noarch 1.16.0-12.fc39 fedora 41 k python3-systemd ppc64le 235-5.fc39 fedora 108 k Transaction Summary ================================================================================ Install 7 Packages Total download size: 1.2 M Installed size: 4.9 M Downloading Packages: (1/7): python3-dbus-1.3.2-4.fc39.ppc64le.rpm 476 kB/s | 161 kB 00:00 (2/7): dbus-libs-1.14.10-1.fc39.ppc64le.rpm 443 kB/s | 177 kB 00:00 (3/7): python3-distro-1.8.0-6.fc39.noarch.rpm 824 kB/s | 49 kB 00:00 (4/7): python3-dateutil-2.8.2-10.fc39.noarch.rp 879 kB/s | 355 kB 00:00 (5/7): python3-six-1.16.0-12.fc39.noarch.rpm 546 kB/s | 41 kB 00:00 (6/7): python3-systemd-235-5.fc39.ppc64le.rpm 1.4 MB/s | 108 kB 00:00 (7/7): python3-dnf-plugins-core-4.9.0-1.fc39.no 2.0 MB/s | 320 kB 00:00 -------------------------------------------------------------------------------- Total 1.4 MB/s | 1.2 MB 00:00 Running transaction check Transaction check succeeded. Running transaction test Transaction test succeeded. Running transaction Preparing : 1/1 Installing : python3-systemd-235-5.fc39.ppc64le 1/7 Installing : python3-six-1.16.0-12.fc39.noarch 2/7 Installing : python3-dateutil-1:2.8.2-10.fc39.noarch 3/7 Installing : python3-distro-1.8.0-6.fc39.noarch 4/7 Installing : dbus-libs-1:1.14.10-1.fc39.ppc64le 5/7 Installing : python3-dbus-1.3.2-4.fc39.ppc64le 6/7 Installing : python3-dnf-plugins-core-4.9.0-1.fc39.noarch 7/7 Running scriptlet: python3-dnf-plugins-core-4.9.0-1.fc39.noarch 7/7 Verifying : dbus-libs-1:1.14.10-1.fc39.ppc64le 1/7 Verifying : python3-dateutil-1:2.8.2-10.fc39.noarch 2/7 Verifying : python3-dbus-1.3.2-4.fc39.ppc64le 3/7 Verifying : python3-distro-1.8.0-6.fc39.noarch 4/7 Verifying : python3-six-1.16.0-12.fc39.noarch 5/7 Verifying : python3-systemd-235-5.fc39.ppc64le 6/7 Verifying : python3-dnf-plugins-core-4.9.0-1.fc39.noarch 7/7 Installed: dbus-libs-1:1.14.10-1.fc39.ppc64le python3-dateutil-1:2.8.2-10.fc39.noarch python3-dbus-1.3.2-4.fc39.ppc64le python3-distro-1.8.0-6.fc39.noarch python3-dnf-plugins-core-4.9.0-1.fc39.noarch python3-six-1.16.0-12.fc39.noarch python3-systemd-235-5.fc39.ppc64le Complete! Finish(bootstrap): installing dnf tooling Start(bootstrap): creating root cache Finish(bootstrap): creating root cache Finish(bootstrap): chroot init Start: chroot init INFO: mounting tmpfs at /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root. INFO: calling preinit hooks INFO: enabled root cache INFO: enabled package manager cache Start: cleaning package manager metadata Finish: cleaning package manager metadata INFO: enabled HW Info plugin INFO: Package manager dnf4 detected and used (direct choice) INFO: Buildroot is handled by package management downloaded with a bootstrap image: rpm-4.19.1.1-1.fc39.ppc64le rpm-sequoia-1.7.0-1.fc39.ppc64le python3-dnf-4.21.1-1.fc39.noarch python3-dnf-plugins-core-4.9.0-1.fc39.noarch yum-4.21.1-1.fc39.noarch Start: installing minimal buildroot with dnf No matches found for the following disable plugin patterns: local, spacewalk, versionlock Copr repository 2.4 kB/s | 1.6 kB 00:00 fedora 13 MB/s | 83 MB 00:06 updates 11 MB/s | 38 MB 00:03 Dependencies resolved. ====================================================================================== Package Arch Version Repo Size ====================================================================================== Installing group/module packages: bash ppc64le 5.2.26-1.fc39 updates 1.9 M bzip2 ppc64le 1.0.8-16.fc39 fedora 53 k coreutils ppc64le 9.3-7.fc39 updates 1.4 M cpio ppc64le 2.14-4.fc39 fedora 286 k diffutils ppc64le 3.10-3.fc39 fedora 408 k fedora-release-common noarch 39-36 updates 19 k findutils ppc64le 1:4.9.0-6.fc39 updates 539 k gawk ppc64le 5.2.2-2.fc39 fedora 1.1 M glibc-minimal-langpack ppc64le 2.38-19.fc39 updates 65 k grep ppc64le 3.11-3.fc39 fedora 308 k gzip ppc64le 1.12-6.fc39 fedora 170 k info ppc64le 7.0.3-3.fc39 fedora 200 k patch ppc64le 2.7.6-22.fc39 fedora 137 k redhat-rpm-config noarch 266-1.fc39 updates 78 k rpm-build ppc64le 4.19.1.1-1.fc39 updates 80 k sed ppc64le 4.8-14.fc39 fedora 312 k shadow-utils ppc64le 2:4.14.0-2.fc39 updates 1.3 M tar ppc64le 2:1.35-2.fc39 fedora 884 k unzip ppc64le 6.0-62.fc39 fedora 190 k util-linux ppc64le 2.39.4-1.fc39 updates 1.3 M which ppc64le 2.21-40.fc39 fedora 43 k xz ppc64le 5.4.4-1.fc39 fedora 559 k Installing dependencies: alternatives ppc64le 1.26-1.fc39 updates 41 k ansible-srpm-macros noarch 1-12.fc39 updates 21 k audit-libs ppc64le 3.1.5-1.fc39 updates 141 k authselect ppc64le 1.4.3-1.fc39 fedora 151 k authselect-libs ppc64le 1.4.3-1.fc39 fedora 253 k basesystem noarch 11-18.fc39 fedora 7.2 k binutils ppc64le 2.40-14.fc39 updates 6.4 M binutils-gold ppc64le 2.40-14.fc39 updates 1.1 M bzip2-libs ppc64le 1.0.8-16.fc39 fedora 47 k ca-certificates noarch 2024.2.69_v8.0.401-1.0.fc39 updates 871 k coreutils-common ppc64le 9.3-7.fc39 updates 2.1 M cracklib ppc64le 2.9.11-2.fc39 fedora 96 k crypto-policies noarch 20231204-1.git1e3a2e4.fc39 updates 100 k curl ppc64le 8.2.1-5.fc39 updates 347 k cyrus-sasl-lib ppc64le 2.1.28-11.fc39 fedora 877 k debugedit ppc64le 5.0-12.fc39 updates 81 k dwz ppc64le 0.15-3.fc39 fedora 147 k ed ppc64le 1.19-4.fc39 fedora 81 k efi-srpm-macros noarch 5-9.fc39 fedora 22 k elfutils ppc64le 0.191-2.fc39 updates 590 k elfutils-debuginfod-client ppc64le 0.191-2.fc39 updates 40 k elfutils-default-yama-scope noarch 0.191-2.fc39 updates 13 k elfutils-libelf ppc64le 0.191-2.fc39 updates 218 k elfutils-libs ppc64le 0.191-2.fc39 updates 300 k fedora-gpg-keys noarch 39-2 updates 130 k fedora-release noarch 39-36 updates 8.6 k fedora-release-identity-basic noarch 39-36 updates 9.4 k fedora-repos noarch 39-2 updates 9.3 k file ppc64le 5.44-5.fc39 fedora 50 k file-libs ppc64le 5.44-5.fc39 fedora 742 k filesystem ppc64le 3.18-6.fc39 fedora 1.1 M fonts-srpm-macros noarch 1:2.0.5-12.fc39 fedora 26 k forge-srpm-macros noarch 0.3.1-1.fc39 updates 19 k fpc-srpm-macros noarch 1.3-8.fc39 fedora 7.4 k gdb-minimal ppc64le 15.1-1.fc39 updates 4.3 M gdbm-libs ppc64le 1:1.23-4.fc39 fedora 62 k ghc-srpm-macros noarch 1.6.1-2.fc39 fedora 7.8 k glibc ppc64le 2.38-19.fc39 updates 2.2 M glibc-common ppc64le 2.38-19.fc39 updates 358 k glibc-gconv-extra ppc64le 2.38-19.fc39 updates 2.0 M gmp ppc64le 1:6.2.1-5.fc39 fedora 304 k gnat-srpm-macros noarch 6-3.fc39 fedora 8.8 k go-srpm-macros noarch 3.5.0-1.fc39 updates 28 k jansson ppc64le 2.13.1-7.fc39 fedora 49 k kernel-srpm-macros noarch 1.0-20.fc39 fedora 10 k keyutils-libs ppc64le 1.6.3-1.fc39 updates 33 k krb5-libs ppc64le 1.21.3-1.fc39 updates 849 k libacl ppc64le 2.3.1-9.fc39 updates 26 k libarchive ppc64le 3.7.1-2.fc39 updates 476 k libattr ppc64le 2.5.1-8.fc39 fedora 19 k libblkid ppc64le 2.39.4-1.fc39 updates 134 k libbrotli ppc64le 1.1.0-1.fc39 fedora 380 k libcap ppc64le 2.48-9.fc39 updates 73 k libcap-ng ppc64le 0.8.3-8.fc39 fedora 33 k libcom_err ppc64le 1.47.0-2.fc39 fedora 27 k libcurl ppc64le 8.2.1-5.fc39 updates 358 k libdb ppc64le 5.3.28-56.fc39 fedora 838 k libeconf ppc64le 0.5.2-2.fc39 updates 34 k libevent ppc64le 2.1.12-9.fc39 fedora 275 k libfdisk ppc64le 2.39.4-1.fc39 updates 178 k libffi ppc64le 3.4.4-4.fc39 fedora 38 k libgcc ppc64le 13.3.1-3.fc39 updates 115 k libgomp ppc64le 13.3.1-3.fc39 updates 343 k libidn2 ppc64le 2.3.7-1.fc39 updates 122 k libmount ppc64le 2.39.4-1.fc39 updates 176 k libnghttp2 ppc64le 1.55.1-5.fc39 updates 85 k libnsl2 ppc64le 2.0.0-6.fc39 fedora 32 k libpkgconf ppc64le 1.9.5-2.fc39 fedora 42 k libpsl ppc64le 0.21.2-4.fc39 fedora 65 k libpwquality ppc64le 1.4.5-6.fc39 fedora 123 k librtas ppc64le 2.0.4-3.fc39 fedora 70 k libselinux ppc64le 3.5-5.fc39 fedora 100 k libsemanage ppc64le 3.5-4.fc39 fedora 131 k libsepol ppc64le 3.5-2.fc39 fedora 356 k libsigsegv ppc64le 2.14-5.fc39 fedora 28 k libsmartcols ppc64le 2.39.4-1.fc39 updates 73 k libssh ppc64le 0.10.6-2.fc39 updates 240 k libssh-config noarch 0.10.6-2.fc39 updates 9.0 k libstdc++ ppc64le 13.3.1-3.fc39 updates 1.0 M libtasn1 ppc64le 4.19.0-3.fc39 fedora 80 k libtirpc ppc64le 1.3.5-0.fc39 updates 109 k libtool-ltdl ppc64le 2.4.7-7.fc39 fedora 40 k libunistring ppc64le 1.1-5.fc39 fedora 578 k libutempter ppc64le 1.2.1-10.fc39 fedora 27 k libuuid ppc64le 2.39.4-1.fc39 updates 29 k libverto ppc64le 0.3.2-6.fc39 fedora 22 k libxcrypt ppc64le 4.4.36-2.fc39 fedora 132 k libxml2 ppc64le 2.10.4-3.fc39 fedora 780 k libzstd ppc64le 1.5.6-1.fc39 updates 339 k lua-libs ppc64le 5.4.6-3.fc39 fedora 149 k lua-srpm-macros noarch 1-13.fc39 updates 8.7 k lz4-libs ppc64le 1.9.4-4.fc39 fedora 85 k mpfr ppc64le 4.2.0-3.fc39 fedora 353 k ncurses-base noarch 6.4-7.20230520.fc39.1 updates 88 k ncurses-libs ppc64le 6.4-7.20230520.fc39.1 updates 380 k ocaml-srpm-macros noarch 8-2.fc39 fedora 14 k openblas-srpm-macros noarch 2-14.fc39 fedora 7.5 k openldap ppc64le 2.6.7-1.fc39 updates 287 k openssl-libs ppc64le 1:3.1.4-4.fc39 updates 2.3 M p11-kit ppc64le 0.25.5-1.fc39 updates 519 k p11-kit-trust ppc64le 0.25.5-1.fc39 updates 153 k package-notes-srpm-macros noarch 0.5-9.fc39 fedora 11 k pam ppc64le 1.5.3-3.fc39 updates 586 k pam-libs ppc64le 1.5.3-3.fc39 updates 63 k pcre2 ppc64le 10.42-1.fc39.2 fedora 241 k pcre2-syntax noarch 10.42-1.fc39.2 fedora 143 k perl-srpm-macros noarch 1-51.fc39 fedora 8.0 k pkgconf ppc64le 1.9.5-2.fc39 fedora 43 k pkgconf-m4 noarch 1.9.5-2.fc39 fedora 14 k pkgconf-pkg-config ppc64le 1.9.5-2.fc39 fedora 9.6 k popt ppc64le 1.19-3.fc39 fedora 71 k publicsuffix-list-dafsa noarch 20240107-1.fc39 updates 58 k pyproject-srpm-macros noarch 1.15.1-1.fc39 updates 13 k python-srpm-macros noarch 3.12-8.fc39 updates 23 k qt5-srpm-macros noarch 5.15.14-2.fc39 updates 8.9 k qt6-srpm-macros noarch 6.6.2-1.fc39 updates 8.9 k readline ppc64le 8.2-6.fc39 updates 229 k rpm ppc64le 4.19.1.1-1.fc39 updates 539 k rpm-build-libs ppc64le 4.19.1.1-1.fc39 updates 102 k rpm-libs ppc64le 4.19.1.1-1.fc39 updates 356 k rpm-sequoia ppc64le 1.7.0-1.fc39 updates 1.6 M rpmautospec-rpm-macros noarch 0.7.2-1.fc39 updates 10 k rust-srpm-macros noarch 26.3-1.fc39 updates 13 k setup noarch 2.14.4-1.fc39 fedora 154 k sqlite-libs ppc64le 3.42.0-7.fc39 fedora 789 k systemd-libs ppc64le 254.19-1.fc39 updates 727 k util-linux-core ppc64le 2.39.4-1.fc39 updates 550 k xxhash-libs ppc64le 0.8.2-4.fc39 updates 37 k xz-libs ppc64le 5.4.4-1.fc39 fedora 121 k zip ppc64le 3.0-39.fc39 fedora 274 k zlib ppc64le 1.2.13-4.fc39 fedora 100 k zstd ppc64le 1.5.6-1.fc39 updates 506 k Installing Groups: Buildsystem building group Transaction Summary ====================================================================================== Install 154 Packages Total download size: 57 M Installed size: 326 M Downloading Packages: (1/154): basesystem-11-18.fc39.noarch.rpm 75 kB/s | 7.2 kB 00:00 (2/154): bzip2-1.0.8-16.fc39.ppc64le.rpm 546 kB/s | 53 kB 00:00 (3/154): authselect-1.4.3-1.fc39.ppc64le.rpm 713 kB/s | 151 kB 00:00 (4/154): bzip2-libs-1.0.8-16.fc39.ppc64le.rpm 600 kB/s | 47 kB 00:00 (5/154): cpio-2.14-4.fc39.ppc64le.rpm 2.2 MB/s | 286 kB 00:00 (6/154): cracklib-2.9.11-2.fc39.ppc64le.rpm 734 kB/s | 96 kB 00:00 (7/154): cyrus-sasl-lib-2.1.28-11.fc39.ppc64le. 8.5 MB/s | 877 kB 00:00 (8/154): dwz-0.15-3.fc39.ppc64le.rpm 3.3 MB/s | 147 kB 00:00 (9/154): diffutils-3.10-3.fc39.ppc64le.rpm 4.0 MB/s | 408 kB 00:00 (10/154): authselect-libs-1.4.3-1.fc39.ppc64le. 473 kB/s | 253 kB 00:00 (11/154): ed-1.19-4.fc39.ppc64le.rpm 1.6 MB/s | 81 kB 00:00 (12/154): efi-srpm-macros-5-9.fc39.noarch.rpm 707 kB/s | 22 kB 00:00 (13/154): file-5.44-5.fc39.ppc64le.rpm 758 kB/s | 50 kB 00:00 (14/154): file-libs-5.44-5.fc39.ppc64le.rpm 6.4 MB/s | 742 kB 00:00 (15/154): filesystem-3.18-6.fc39.ppc64le.rpm 9.1 MB/s | 1.1 MB 00:00 (16/154): fonts-srpm-macros-2.0.5-12.fc39.noarc 470 kB/s | 26 kB 00:00 (17/154): fpc-srpm-macros-1.3-8.fc39.noarch.rpm 118 kB/s | 7.4 kB 00:00 (18/154): gdbm-libs-1.23-4.fc39.ppc64le.rpm 1.0 MB/s | 62 kB 00:00 (19/154): gawk-5.2.2-2.fc39.ppc64le.rpm 12 MB/s | 1.1 MB 00:00 (20/154): ghc-srpm-macros-1.6.1-2.fc39.noarch.r 106 kB/s | 7.8 kB 00:00 (21/154): gmp-6.2.1-5.fc39.ppc64le.rpm 4.1 MB/s | 304 kB 00:00 (22/154): gnat-srpm-macros-6-3.fc39.noarch.rpm 157 kB/s | 8.8 kB 00:00 (23/154): gzip-1.12-6.fc39.ppc64le.rpm 3.0 MB/s | 170 kB 00:00 (24/154): grep-3.11-3.fc39.ppc64le.rpm 5.1 MB/s | 308 kB 00:00 (25/154): info-7.0.3-3.fc39.ppc64le.rpm 3.2 MB/s | 200 kB 00:00 (26/154): jansson-2.13.1-7.fc39.ppc64le.rpm 1.1 MB/s | 49 kB 00:00 (27/154): libattr-2.5.1-8.fc39.ppc64le.rpm 496 kB/s | 19 kB 00:00 (28/154): kernel-srpm-macros-1.0-20.fc39.noarch 159 kB/s | 10 kB 00:00 (29/154): libbrotli-1.1.0-1.fc39.ppc64le.rpm 7.6 MB/s | 380 kB 00:00 (30/154): libcap-ng-0.8.3-8.fc39.ppc64le.rpm 517 kB/s | 33 kB 00:00 (31/154): libcom_err-1.47.0-2.fc39.ppc64le.rpm 330 kB/s | 27 kB 00:00 (32/154): libevent-2.1.12-9.fc39.ppc64le.rpm 3.7 MB/s | 275 kB 00:00 (33/154): libdb-5.3.28-56.fc39.ppc64le.rpm 5.5 MB/s | 838 kB 00:00 (34/154): libffi-3.4.4-4.fc39.ppc64le.rpm 418 kB/s | 38 kB 00:00 (35/154): libnsl2-2.0.0-6.fc39.ppc64le.rpm 411 kB/s | 32 kB 00:00 (36/154): libpsl-0.21.2-4.fc39.ppc64le.rpm 982 kB/s | 65 kB 00:00 (37/154): libpwquality-1.4.5-6.fc39.ppc64le.rpm 1.3 MB/s | 123 kB 00:00 (38/154): librtas-2.0.4-3.fc39.ppc64le.rpm 997 kB/s | 70 kB 00:00 (39/154): libpkgconf-1.9.5-2.fc39.ppc64le.rpm 250 kB/s | 42 kB 00:00 (40/154): libselinux-3.5-5.fc39.ppc64le.rpm 1.9 MB/s | 100 kB 00:00 (41/154): libsigsegv-2.14-5.fc39.ppc64le.rpm 714 kB/s | 28 kB 00:00 (42/154): libsemanage-3.5-4.fc39.ppc64le.rpm 1.6 MB/s | 131 kB 00:00 (43/154): libsepol-3.5-2.fc39.ppc64le.rpm 6.4 MB/s | 356 kB 00:00 (44/154): libtasn1-4.19.0-3.fc39.ppc64le.rpm 1.6 MB/s | 80 kB 00:00 (45/154): libtool-ltdl-2.4.7-7.fc39.ppc64le.rpm 958 kB/s | 40 kB 00:00 (46/154): libunistring-1.1-5.fc39.ppc64le.rpm 8.7 MB/s | 578 kB 00:00 (47/154): libutempter-1.2.1-10.fc39.ppc64le.rpm 541 kB/s | 27 kB 00:00 (48/154): libxcrypt-4.4.36-2.fc39.ppc64le.rpm 3.9 MB/s | 132 kB 00:00 (49/154): libverto-0.3.2-6.fc39.ppc64le.rpm 252 kB/s | 22 kB 00:00 (50/154): libxml2-2.10.4-3.fc39.ppc64le.rpm 9.0 MB/s | 780 kB 00:00 (51/154): lua-libs-5.4.6-3.fc39.ppc64le.rpm 2.1 MB/s | 149 kB 00:00 (52/154): lz4-libs-1.9.4-4.fc39.ppc64le.rpm 1.6 MB/s | 85 kB 00:00 (53/154): ocaml-srpm-macros-8-2.fc39.noarch.rpm 238 kB/s | 14 kB 00:00 (54/154): openblas-srpm-macros-2-14.fc39.noarch 87 kB/s | 7.5 kB 00:00 (55/154): mpfr-4.2.0-3.fc39.ppc64le.rpm 3.0 MB/s | 353 kB 00:00 (56/154): package-notes-srpm-macros-0.5-9.fc39. 121 kB/s | 11 kB 00:00 (57/154): patch-2.7.6-22.fc39.ppc64le.rpm 1.3 MB/s | 137 kB 00:00 (58/154): pcre2-10.42-1.fc39.2.ppc64le.rpm 3.0 MB/s | 241 kB 00:00 (59/154): pkgconf-1.9.5-2.fc39.ppc64le.rpm 640 kB/s | 43 kB 00:00 (60/154): pcre2-syntax-10.42-1.fc39.2.noarch.rp 945 kB/s | 143 kB 00:00 (61/154): pkgconf-m4-1.9.5-2.fc39.noarch.rpm 201 kB/s | 14 kB 00:00 (62/154): pkgconf-pkg-config-1.9.5-2.fc39.ppc64 160 kB/s | 9.6 kB 00:00 (63/154): perl-srpm-macros-1-51.fc39.noarch.rpm 39 kB/s | 8.0 kB 00:00 (64/154): popt-1.19-3.fc39.ppc64le.rpm 1.0 MB/s | 71 kB 00:00 (65/154): sed-4.8-14.fc39.ppc64le.rpm 6.0 MB/s | 312 kB 00:00 (66/154): setup-2.14.4-1.fc39.noarch.rpm 2.2 MB/s | 154 kB 00:00 (67/154): sqlite-libs-3.42.0-7.fc39.ppc64le.rpm 6.2 MB/s | 789 kB 00:00 (68/154): tar-1.35-2.fc39.ppc64le.rpm 7.4 MB/s | 884 kB 00:00 (69/154): unzip-6.0-62.fc39.ppc64le.rpm 3.0 MB/s | 190 kB 00:00 (70/154): which-2.21-40.fc39.ppc64le.rpm 622 kB/s | 43 kB 00:00 (71/154): xz-5.4.4-1.fc39.ppc64le.rpm 7.5 MB/s | 559 kB 00:00 (72/154): xz-libs-5.4.4-1.fc39.ppc64le.rpm 1.7 MB/s | 121 kB 00:00 (73/154): alternatives-1.26-1.fc39.ppc64le.rpm 778 kB/s | 41 kB 00:00 (74/154): zip-3.0-39.fc39.ppc64le.rpm 4.6 MB/s | 274 kB 00:00 (75/154): zlib-1.2.13-4.fc39.ppc64le.rpm 1.7 MB/s | 100 kB 00:00 (76/154): ansible-srpm-macros-1-12.fc39.noarch. 705 kB/s | 21 kB 00:00 (77/154): audit-libs-3.1.5-1.fc39.ppc64le.rpm 2.9 MB/s | 141 kB 00:00 (78/154): bash-5.2.26-1.fc39.ppc64le.rpm 20 MB/s | 1.9 MB 00:00 (79/154): binutils-gold-2.40-14.fc39.ppc64le.rp 12 MB/s | 1.1 MB 00:00 (80/154): ca-certificates-2024.2.69_v8.0.401-1. 11 MB/s | 871 kB 00:00 (81/154): coreutils-9.3-7.fc39.ppc64le.rpm 16 MB/s | 1.4 MB 00:00 (82/154): binutils-2.40-14.fc39.ppc64le.rpm 20 MB/s | 6.4 MB 00:00 (83/154): coreutils-common-9.3-7.fc39.ppc64le.r 12 MB/s | 2.1 MB 00:00 (84/154): crypto-policies-20231204-1.git1e3a2e4 817 kB/s | 100 kB 00:00 (85/154): curl-8.2.1-5.fc39.ppc64le.rpm 6.2 MB/s | 347 kB 00:00 (86/154): debugedit-5.0-12.fc39.ppc64le.rpm 1.4 MB/s | 81 kB 00:00 (87/154): elfutils-0.191-2.fc39.ppc64le.rpm 10 MB/s | 590 kB 00:00 (88/154): elfutils-debuginfod-client-0.191-2.fc 833 kB/s | 40 kB 00:00 (89/154): elfutils-default-yama-scope-0.191-2.f 275 kB/s | 13 kB 00:00 (90/154): elfutils-libelf-0.191-2.fc39.ppc64le. 4.3 MB/s | 218 kB 00:00 (91/154): elfutils-libs-0.191-2.fc39.ppc64le.rp 6.3 MB/s | 300 kB 00:00 (92/154): fedora-gpg-keys-39-2.noarch.rpm 2.7 MB/s | 130 kB 00:00 (93/154): fedora-release-39-36.noarch.rpm 169 kB/s | 8.6 kB 00:00 (94/154): fedora-release-common-39-36.noarch.rp 352 kB/s | 19 kB 00:00 (95/154): fedora-release-identity-basic-39-36.n 173 kB/s | 9.4 kB 00:00 (96/154): fedora-repos-39-2.noarch.rpm 116 kB/s | 9.3 kB 00:00 (97/154): forge-srpm-macros-0.3.1-1.fc39.noarch 399 kB/s | 19 kB 00:00 (98/154): findutils-4.9.0-6.fc39.ppc64le.rpm 8.4 MB/s | 539 kB 00:00 (99/154): glibc-common-2.38-19.fc39.ppc64le.rpm 2.5 MB/s | 358 kB 00:00 (100/154): gdb-minimal-15.1-1.fc39.ppc64le.rpm 19 MB/s | 4.3 MB 00:00 (101/154): glibc-2.38-19.fc39.ppc64le.rpm 9.9 MB/s | 2.2 MB 00:00 (102/154): glibc-minimal-langpack-2.38-19.fc39. 1.5 MB/s | 65 kB 00:00 (103/154): go-srpm-macros-3.5.0-1.fc39.noarch.r 664 kB/s | 28 kB 00:00 (104/154): keyutils-libs-1.6.3-1.fc39.ppc64le.r 667 kB/s | 33 kB 00:00 (105/154): krb5-libs-1.21.3-1.fc39.ppc64le.rpm 11 MB/s | 849 kB 00:00 (106/154): libarchive-3.7.1-2.fc39.ppc64le.rpm 5.8 MB/s | 476 kB 00:00 (107/154): libacl-2.3.1-9.fc39.ppc64le.rpm 204 kB/s | 26 kB 00:00 (108/154): libblkid-2.39.4-1.fc39.ppc64le.rpm 3.5 MB/s | 134 kB 00:00 (109/154): libcap-2.48-9.fc39.ppc64le.rpm 1.8 MB/s | 73 kB 00:00 (110/154): libcurl-8.2.1-5.fc39.ppc64le.rpm 6.5 MB/s | 358 kB 00:00 (111/154): libeconf-0.5.2-2.fc39.ppc64le.rpm 446 kB/s | 34 kB 00:00 (112/154): libfdisk-2.39.4-1.fc39.ppc64le.rpm 4.1 MB/s | 178 kB 00:00 (113/154): glibc-gconv-extra-2.38-19.fc39.ppc64 4.4 MB/s | 2.0 MB 00:00 (114/154): libgcc-13.3.1-3.fc39.ppc64le.rpm 1.9 MB/s | 115 kB 00:00 (115/154): libgomp-13.3.1-3.fc39.ppc64le.rpm 5.4 MB/s | 343 kB 00:00 (116/154): libidn2-2.3.7-1.fc39.ppc64le.rpm 1.4 MB/s | 122 kB 00:00 (117/154): libmount-2.39.4-1.fc39.ppc64le.rpm 2.8 MB/s | 176 kB 00:00 (118/154): libnghttp2-1.55.1-5.fc39.ppc64le.rpm 861 kB/s | 85 kB 00:00 (119/154): libssh-0.10.6-2.fc39.ppc64le.rpm 4.1 MB/s | 240 kB 00:00 (120/154): libsmartcols-2.39.4-1.fc39.ppc64le.r 953 kB/s | 73 kB 00:00 (121/154): libssh-config-0.10.6-2.fc39.noarch.r 228 kB/s | 9.0 kB 00:00 (122/154): libstdc++-13.3.1-3.fc39.ppc64le.rpm 9.4 MB/s | 1.0 MB 00:00 (123/154): libuuid-2.39.4-1.fc39.ppc64le.rpm 348 kB/s | 29 kB 00:00 (124/154): libtirpc-1.3.5-0.fc39.ppc64le.rpm 1.1 MB/s | 109 kB 00:00 (125/154): lua-srpm-macros-1-13.fc39.noarch.rpm 204 kB/s | 8.7 kB 00:00 (126/154): libzstd-1.5.6-1.fc39.ppc64le.rpm 4.2 MB/s | 339 kB 00:00 (127/154): ncurses-base-6.4-7.20230520.fc39.1.n 996 kB/s | 88 kB 00:00 (128/154): ncurses-libs-6.4-7.20230520.fc39.1.p 4.9 MB/s | 380 kB 00:00 (129/154): openldap-2.6.7-1.fc39.ppc64le.rpm 2.4 MB/s | 287 kB 00:00 (130/154): p11-kit-0.25.5-1.fc39.ppc64le.rpm 4.4 MB/s | 519 kB 00:00 (131/154): p11-kit-trust-0.25.5-1.fc39.ppc64le. 1.8 MB/s | 153 kB 00:00 (132/154): pam-1.5.3-3.fc39.ppc64le.rpm 8.8 MB/s | 586 kB 00:00 (133/154): pam-libs-1.5.3-3.fc39.ppc64le.rpm 1.0 MB/s | 63 kB 00:00 (134/154): publicsuffix-list-dafsa-20240107-1.f 1.0 MB/s | 58 kB 00:00 (135/154): pyproject-srpm-macros-1.15.1-1.fc39. 265 kB/s | 13 kB 00:00 (136/154): python-srpm-macros-3.12-8.fc39.noarc 429 kB/s | 23 kB 00:00 (137/154): qt5-srpm-macros-5.15.14-2.fc39.noarc 178 kB/s | 8.9 kB 00:00 (138/154): qt6-srpm-macros-6.6.2-1.fc39.noarch. 182 kB/s | 8.9 kB 00:00 (139/154): redhat-rpm-config-266-1.fc39.noarch. 1.5 MB/s | 78 kB 00:00 (140/154): readline-8.2-6.fc39.ppc64le.rpm 2.7 MB/s | 229 kB 00:00 (141/154): openssl-libs-3.1.4-4.fc39.ppc64le.rp 5.0 MB/s | 2.3 MB 00:00 (142/154): rpm-build-4.19.1.1-1.fc39.ppc64le.rp 2.2 MB/s | 80 kB 00:00 (143/154): rpm-4.19.1.1-1.fc39.ppc64le.rpm 10 MB/s | 539 kB 00:00 (144/154): rpm-libs-4.19.1.1-1.fc39.ppc64le.rpm 11 MB/s | 356 kB 00:00 (145/154): rpm-build-libs-4.19.1.1-1.fc39.ppc64 2.1 MB/s | 102 kB 00:00 (146/154): rpmautospec-rpm-macros-0.7.2-1.fc39. 292 kB/s | 10 kB 00:00 (147/154): rust-srpm-macros-26.3-1.fc39.noarch. 335 kB/s | 13 kB 00:00 (148/154): rpm-sequoia-1.7.0-1.fc39.ppc64le.rpm 13 MB/s | 1.6 MB 00:00 (149/154): shadow-utils-4.14.0-2.fc39.ppc64le.r 11 MB/s | 1.3 MB 00:00 (150/154): systemd-libs-254.19-1.fc39.ppc64le.r 5.4 MB/s | 727 kB 00:00 (151/154): util-linux-2.39.4-1.fc39.ppc64le.rpm 11 MB/s | 1.3 MB 00:00 (152/154): util-linux-core-2.39.4-1.fc39.ppc64l 7.4 MB/s | 550 kB 00:00 (153/154): xxhash-libs-0.8.2-4.fc39.ppc64le.rpm 727 kB/s | 37 kB 00:00 (154/154): zstd-1.5.6-1.fc39.ppc64le.rpm 8.3 MB/s | 506 kB 00:00 -------------------------------------------------------------------------------- Total 12 MB/s | 57 MB 00:04 fedora 1.6 MB/s | 1.6 kB 00:00 Key imported successfully Importing GPG key 0x18B8E74C: Userid : "Fedora (39) " Fingerprint: E8F2 3996 F232 1864 0CB4 4CBE 75CF 5AC4 18B8 E74C From : /usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-39-primary Running transaction check Transaction check succeeded. Running transaction test Transaction test succeeded. Running transaction Running scriptlet: filesystem-3.18-6.fc39.ppc64le 1/1 Preparing : 1/1 Installing : libgcc-13.3.1-3.fc39.ppc64le 1/154 Running scriptlet: libgcc-13.3.1-3.fc39.ppc64le 1/154 Installing : crypto-policies-20231204-1.git1e3a2e4.fc39.noarc 2/154 Running scriptlet: crypto-policies-20231204-1.git1e3a2e4.fc39.noarc 2/154 Installing : fedora-release-identity-basic-39-36.noarch 3/154 Installing : fedora-gpg-keys-39-2.noarch 4/154 Installing : fedora-repos-39-2.noarch 5/154 Installing : fedora-release-common-39-36.noarch 6/154 Installing : fedora-release-39-36.noarch 7/154 Installing : setup-2.14.4-1.fc39.noarch 8/154 warning: /etc/hosts created as /etc/hosts.rpmnew Running scriptlet: setup-2.14.4-1.fc39.noarch 8/154 Installing : filesystem-3.18-6.fc39.ppc64le 9/154 Installing : basesystem-11-18.fc39.noarch 10/154 Installing : rust-srpm-macros-26.3-1.fc39.noarch 11/154 Installing : qt6-srpm-macros-6.6.2-1.fc39.noarch 12/154 Installing : qt5-srpm-macros-5.15.14-2.fc39.noarch 13/154 Installing : publicsuffix-list-dafsa-20240107-1.fc39.noarch 14/154 Installing : ncurses-base-6.4-7.20230520.fc39.1.noarch 15/154 Installing : glibc-gconv-extra-2.38-19.fc39.ppc64le 16/154 Running scriptlet: glibc-gconv-extra-2.38-19.fc39.ppc64le 16/154 Installing : glibc-minimal-langpack-2.38-19.fc39.ppc64le 17/154 Installing : glibc-common-2.38-19.fc39.ppc64le 18/154 Running scriptlet: glibc-2.38-19.fc39.ppc64le 19/154 Installing : glibc-2.38-19.fc39.ppc64le 19/154 Running scriptlet: glibc-2.38-19.fc39.ppc64le 19/154 Installing : ncurses-libs-6.4-7.20230520.fc39.1.ppc64le 20/154 Installing : bash-5.2.26-1.fc39.ppc64le 21/154 Running scriptlet: bash-5.2.26-1.fc39.ppc64le 21/154 Installing : zlib-1.2.13-4.fc39.ppc64le 22/154 Installing : xz-libs-5.4.4-1.fc39.ppc64le 23/154 Installing : bzip2-libs-1.0.8-16.fc39.ppc64le 24/154 Installing : popt-1.19-3.fc39.ppc64le 25/154 Installing : libstdc++-13.3.1-3.fc39.ppc64le 26/154 Installing : libuuid-2.39.4-1.fc39.ppc64le 27/154 Installing : libzstd-1.5.6-1.fc39.ppc64le 28/154 Installing : elfutils-libelf-0.191-2.fc39.ppc64le 29/154 Installing : libblkid-2.39.4-1.fc39.ppc64le 30/154 Installing : readline-8.2-6.fc39.ppc64le 31/154 Installing : gmp-1:6.2.1-5.fc39.ppc64le 32/154 Installing : libattr-2.5.1-8.fc39.ppc64le 33/154 Installing : libacl-2.3.1-9.fc39.ppc64le 34/154 Installing : libxcrypt-4.4.36-2.fc39.ppc64le 35/154 Installing : libcap-2.48-9.fc39.ppc64le 36/154 Installing : lz4-libs-1.9.4-4.fc39.ppc64le 37/154 Installing : libeconf-0.5.2-2.fc39.ppc64le 38/154 Installing : systemd-libs-254.19-1.fc39.ppc64le 39/154 Installing : mpfr-4.2.0-3.fc39.ppc64le 40/154 Installing : dwz-0.15-3.fc39.ppc64le 41/154 Installing : unzip-6.0-62.fc39.ppc64le 42/154 Installing : file-libs-5.44-5.fc39.ppc64le 43/154 Installing : file-5.44-5.fc39.ppc64le 44/154 Installing : jansson-2.13.1-7.fc39.ppc64le 45/154 Installing : libcap-ng-0.8.3-8.fc39.ppc64le 46/154 Installing : audit-libs-3.1.5-1.fc39.ppc64le 47/154 Installing : pam-libs-1.5.3-3.fc39.ppc64le 48/154 Installing : libcom_err-1.47.0-2.fc39.ppc64le 49/154 Installing : libsepol-3.5-2.fc39.ppc64le 50/154 Installing : libtasn1-4.19.0-3.fc39.ppc64le 51/154 Installing : libunistring-1.1-5.fc39.ppc64le 52/154 Installing : libidn2-2.3.7-1.fc39.ppc64le 53/154 Installing : lua-libs-5.4.6-3.fc39.ppc64le 54/154 Installing : alternatives-1.26-1.fc39.ppc64le 55/154 Installing : libsmartcols-2.39.4-1.fc39.ppc64le 56/154 Installing : libpsl-0.21.2-4.fc39.ppc64le 57/154 Installing : zip-3.0-39.fc39.ppc64le 58/154 Installing : zstd-1.5.6-1.fc39.ppc64le 59/154 Installing : libfdisk-2.39.4-1.fc39.ppc64le 60/154 Installing : bzip2-1.0.8-16.fc39.ppc64le 61/154 Installing : libxml2-2.10.4-3.fc39.ppc64le 62/154 Installing : sqlite-libs-3.42.0-7.fc39.ppc64le 63/154 Installing : ed-1.19-4.fc39.ppc64le 64/154 Installing : elfutils-default-yama-scope-0.191-2.fc39.noarch 65/154 Running scriptlet: elfutils-default-yama-scope-0.191-2.fc39.noarch 65/154 Installing : cpio-2.14-4.fc39.ppc64le 66/154 Installing : diffutils-3.10-3.fc39.ppc64le 67/154 Installing : gdbm-libs-1:1.23-4.fc39.ppc64le 68/154 Installing : cyrus-sasl-lib-2.1.28-11.fc39.ppc64le 69/154 Installing : libbrotli-1.1.0-1.fc39.ppc64le 70/154 Installing : libdb-5.3.28-56.fc39.ppc64le 71/154 Installing : libffi-3.4.4-4.fc39.ppc64le 72/154 Installing : p11-kit-0.25.5-1.fc39.ppc64le 73/154 Installing : p11-kit-trust-0.25.5-1.fc39.ppc64le 74/154 Running scriptlet: p11-kit-trust-0.25.5-1.fc39.ppc64le 74/154 Installing : libpkgconf-1.9.5-2.fc39.ppc64le 75/154 Installing : pkgconf-1.9.5-2.fc39.ppc64le 76/154 Installing : librtas-2.0.4-3.fc39.ppc64le 77/154 Running scriptlet: librtas-2.0.4-3.fc39.ppc64le 77/154 Installing : libsigsegv-2.14-5.fc39.ppc64le 78/154 Installing : gawk-5.2.2-2.fc39.ppc64le 79/154 Installing : libtool-ltdl-2.4.7-7.fc39.ppc64le 80/154 Installing : libverto-0.3.2-6.fc39.ppc64le 81/154 Installing : keyutils-libs-1.6.3-1.fc39.ppc64le 82/154 Installing : libgomp-13.3.1-3.fc39.ppc64le 83/154 Installing : libnghttp2-1.55.1-5.fc39.ppc64le 84/154 Installing : xxhash-libs-0.8.2-4.fc39.ppc64le 85/154 Installing : libssh-config-0.10.6-2.fc39.noarch 86/154 Installing : coreutils-common-9.3-7.fc39.ppc64le 87/154 Installing : ansible-srpm-macros-1-12.fc39.noarch 88/154 Installing : pkgconf-m4-1.9.5-2.fc39.noarch 89/154 Installing : pkgconf-pkg-config-1.9.5-2.fc39.ppc64le 90/154 Installing : perl-srpm-macros-1-51.fc39.noarch 91/154 Installing : pcre2-syntax-10.42-1.fc39.2.noarch 92/154 Installing : pcre2-10.42-1.fc39.2.ppc64le 93/154 Installing : libselinux-3.5-5.fc39.ppc64le 94/154 Installing : sed-4.8-14.fc39.ppc64le 95/154 Installing : grep-3.11-3.fc39.ppc64le 96/154 Installing : findutils-1:4.9.0-6.fc39.ppc64le 97/154 Installing : xz-5.4.4-1.fc39.ppc64le 98/154 Installing : libmount-2.39.4-1.fc39.ppc64le 99/154 Installing : util-linux-core-2.39.4-1.fc39.ppc64le 100/154 Installing : openssl-libs-1:3.1.4-4.fc39.ppc64le 101/154 Installing : coreutils-9.3-7.fc39.ppc64le 102/154 Running scriptlet: ca-certificates-2024.2.69_v8.0.401-1.0.fc39.noar 103/154 Installing : ca-certificates-2024.2.69_v8.0.401-1.0.fc39.noar 103/154 Running scriptlet: ca-certificates-2024.2.69_v8.0.401-1.0.fc39.noar 103/154 Installing : krb5-libs-1.21.3-1.fc39.ppc64le 104/154 Installing : libtirpc-1.3.5-0.fc39.ppc64le 105/154 Running scriptlet: authselect-libs-1.4.3-1.fc39.ppc64le 106/154 Installing : authselect-libs-1.4.3-1.fc39.ppc64le 106/154 Installing : gzip-1.12-6.fc39.ppc64le 107/154 Installing : libarchive-3.7.1-2.fc39.ppc64le 108/154 Installing : cracklib-2.9.11-2.fc39.ppc64le 109/154 Installing : libpwquality-1.4.5-6.fc39.ppc64le 110/154 Installing : authselect-1.4.3-1.fc39.ppc64le 111/154 Installing : libnsl2-2.0.0-6.fc39.ppc64le 112/154 Installing : pam-1.5.3-3.fc39.ppc64le 113/154 Installing : libssh-0.10.6-2.fc39.ppc64le 114/154 Installing : libevent-2.1.12-9.fc39.ppc64le 115/154 Installing : openldap-2.6.7-1.fc39.ppc64le 116/154 Installing : libcurl-8.2.1-5.fc39.ppc64le 117/154 Installing : elfutils-libs-0.191-2.fc39.ppc64le 118/154 Installing : elfutils-debuginfod-client-0.191-2.fc39.ppc64le 119/154 Installing : binutils-gold-2.40-14.fc39.ppc64le 120/154 Running scriptlet: binutils-gold-2.40-14.fc39.ppc64le 120/154 Installing : binutils-2.40-14.fc39.ppc64le 121/154 Running scriptlet: binutils-2.40-14.fc39.ppc64le 121/154 Installing : elfutils-0.191-2.fc39.ppc64le 122/154 Installing : gdb-minimal-15.1-1.fc39.ppc64le 123/154 Installing : debugedit-5.0-12.fc39.ppc64le 124/154 Installing : curl-8.2.1-5.fc39.ppc64le 125/154 Installing : rpm-sequoia-1.7.0-1.fc39.ppc64le 126/154 Installing : rpm-libs-4.19.1.1-1.fc39.ppc64le 127/154 Running scriptlet: rpm-4.19.1.1-1.fc39.ppc64le 128/154 Installing : rpm-4.19.1.1-1.fc39.ppc64le 128/154 Installing : efi-srpm-macros-5-9.fc39.noarch 129/154 Installing : lua-srpm-macros-1-13.fc39.noarch 130/154 Installing : rpmautospec-rpm-macros-0.7.2-1.fc39.noarch 131/154 Installing : rpm-build-libs-4.19.1.1-1.fc39.ppc64le 132/154 Installing : libsemanage-3.5-4.fc39.ppc64le 133/154 Installing : shadow-utils-2:4.14.0-2.fc39.ppc64le 134/154 Running scriptlet: libutempter-1.2.1-10.fc39.ppc64le 135/154 Installing : libutempter-1.2.1-10.fc39.ppc64le 135/154 Installing : patch-2.7.6-22.fc39.ppc64le 136/154 Installing : tar-2:1.35-2.fc39.ppc64le 137/154 Installing : package-notes-srpm-macros-0.5-9.fc39.noarch 138/154 Installing : openblas-srpm-macros-2-14.fc39.noarch 139/154 Installing : ocaml-srpm-macros-8-2.fc39.noarch 140/154 Installing : kernel-srpm-macros-1.0-20.fc39.noarch 141/154 Installing : gnat-srpm-macros-6-3.fc39.noarch 142/154 Installing : ghc-srpm-macros-1.6.1-2.fc39.noarch 143/154 Installing : fpc-srpm-macros-1.3-8.fc39.noarch 144/154 Installing : fonts-srpm-macros-1:2.0.5-12.fc39.noarch 145/154 Installing : forge-srpm-macros-0.3.1-1.fc39.noarch 146/154 Installing : go-srpm-macros-3.5.0-1.fc39.noarch 147/154 Installing : python-srpm-macros-3.12-8.fc39.noarch 148/154 Installing : redhat-rpm-config-266-1.fc39.noarch 149/154 Installing : rpm-build-4.19.1.1-1.fc39.ppc64le 150/154 Installing : pyproject-srpm-macros-1.15.1-1.fc39.noarch 151/154 Installing : util-linux-2.39.4-1.fc39.ppc64le 152/154 Running scriptlet: util-linux-2.39.4-1.fc39.ppc64le 152/154 Installing : which-2.21-40.fc39.ppc64le 153/154 Installing : info-7.0.3-3.fc39.ppc64le 154/154 Running scriptlet: filesystem-3.18-6.fc39.ppc64le 154/154 Running scriptlet: ca-certificates-2024.2.69_v8.0.401-1.0.fc39.noar 154/154 Running scriptlet: authselect-libs-1.4.3-1.fc39.ppc64le 154/154 Running scriptlet: rpm-4.19.1.1-1.fc39.ppc64le 154/154 Running scriptlet: info-7.0.3-3.fc39.ppc64le 154/154 Verifying : authselect-1.4.3-1.fc39.ppc64le 1/154 Verifying : authselect-libs-1.4.3-1.fc39.ppc64le 2/154 Verifying : basesystem-11-18.fc39.noarch 3/154 Verifying : bzip2-1.0.8-16.fc39.ppc64le 4/154 Verifying : bzip2-libs-1.0.8-16.fc39.ppc64le 5/154 Verifying : cpio-2.14-4.fc39.ppc64le 6/154 Verifying : cracklib-2.9.11-2.fc39.ppc64le 7/154 Verifying : cyrus-sasl-lib-2.1.28-11.fc39.ppc64le 8/154 Verifying : diffutils-3.10-3.fc39.ppc64le 9/154 Verifying : dwz-0.15-3.fc39.ppc64le 10/154 Verifying : ed-1.19-4.fc39.ppc64le 11/154 Verifying : efi-srpm-macros-5-9.fc39.noarch 12/154 Verifying : file-5.44-5.fc39.ppc64le 13/154 Verifying : file-libs-5.44-5.fc39.ppc64le 14/154 Verifying : filesystem-3.18-6.fc39.ppc64le 15/154 Verifying : fonts-srpm-macros-1:2.0.5-12.fc39.noarch 16/154 Verifying : fpc-srpm-macros-1.3-8.fc39.noarch 17/154 Verifying : gawk-5.2.2-2.fc39.ppc64le 18/154 Verifying : gdbm-libs-1:1.23-4.fc39.ppc64le 19/154 Verifying : ghc-srpm-macros-1.6.1-2.fc39.noarch 20/154 Verifying : gmp-1:6.2.1-5.fc39.ppc64le 21/154 Verifying : gnat-srpm-macros-6-3.fc39.noarch 22/154 Verifying : grep-3.11-3.fc39.ppc64le 23/154 Verifying : gzip-1.12-6.fc39.ppc64le 24/154 Verifying : info-7.0.3-3.fc39.ppc64le 25/154 Verifying : jansson-2.13.1-7.fc39.ppc64le 26/154 Verifying : kernel-srpm-macros-1.0-20.fc39.noarch 27/154 Verifying : libattr-2.5.1-8.fc39.ppc64le 28/154 Verifying : libbrotli-1.1.0-1.fc39.ppc64le 29/154 Verifying : libcap-ng-0.8.3-8.fc39.ppc64le 30/154 Verifying : libcom_err-1.47.0-2.fc39.ppc64le 31/154 Verifying : libdb-5.3.28-56.fc39.ppc64le 32/154 Verifying : libevent-2.1.12-9.fc39.ppc64le 33/154 Verifying : libffi-3.4.4-4.fc39.ppc64le 34/154 Verifying : libnsl2-2.0.0-6.fc39.ppc64le 35/154 Verifying : libpkgconf-1.9.5-2.fc39.ppc64le 36/154 Verifying : libpsl-0.21.2-4.fc39.ppc64le 37/154 Verifying : libpwquality-1.4.5-6.fc39.ppc64le 38/154 Verifying : librtas-2.0.4-3.fc39.ppc64le 39/154 Verifying : libselinux-3.5-5.fc39.ppc64le 40/154 Verifying : libsemanage-3.5-4.fc39.ppc64le 41/154 Verifying : libsepol-3.5-2.fc39.ppc64le 42/154 Verifying : libsigsegv-2.14-5.fc39.ppc64le 43/154 Verifying : libtasn1-4.19.0-3.fc39.ppc64le 44/154 Verifying : libtool-ltdl-2.4.7-7.fc39.ppc64le 45/154 Verifying : libunistring-1.1-5.fc39.ppc64le 46/154 Verifying : libutempter-1.2.1-10.fc39.ppc64le 47/154 Verifying : libverto-0.3.2-6.fc39.ppc64le 48/154 Verifying : libxcrypt-4.4.36-2.fc39.ppc64le 49/154 Verifying : libxml2-2.10.4-3.fc39.ppc64le 50/154 Verifying : lua-libs-5.4.6-3.fc39.ppc64le 51/154 Verifying : lz4-libs-1.9.4-4.fc39.ppc64le 52/154 Verifying : mpfr-4.2.0-3.fc39.ppc64le 53/154 Verifying : ocaml-srpm-macros-8-2.fc39.noarch 54/154 Verifying : openblas-srpm-macros-2-14.fc39.noarch 55/154 Verifying : package-notes-srpm-macros-0.5-9.fc39.noarch 56/154 Verifying : patch-2.7.6-22.fc39.ppc64le 57/154 Verifying : pcre2-10.42-1.fc39.2.ppc64le 58/154 Verifying : pcre2-syntax-10.42-1.fc39.2.noarch 59/154 Verifying : perl-srpm-macros-1-51.fc39.noarch 60/154 Verifying : pkgconf-1.9.5-2.fc39.ppc64le 61/154 Verifying : pkgconf-m4-1.9.5-2.fc39.noarch 62/154 Verifying : pkgconf-pkg-config-1.9.5-2.fc39.ppc64le 63/154 Verifying : popt-1.19-3.fc39.ppc64le 64/154 Verifying : sed-4.8-14.fc39.ppc64le 65/154 Verifying : setup-2.14.4-1.fc39.noarch 66/154 Verifying : sqlite-libs-3.42.0-7.fc39.ppc64le 67/154 Verifying : tar-2:1.35-2.fc39.ppc64le 68/154 Verifying : unzip-6.0-62.fc39.ppc64le 69/154 Verifying : which-2.21-40.fc39.ppc64le 70/154 Verifying : xz-5.4.4-1.fc39.ppc64le 71/154 Verifying : xz-libs-5.4.4-1.fc39.ppc64le 72/154 Verifying : zip-3.0-39.fc39.ppc64le 73/154 Verifying : zlib-1.2.13-4.fc39.ppc64le 74/154 Verifying : alternatives-1.26-1.fc39.ppc64le 75/154 Verifying : ansible-srpm-macros-1-12.fc39.noarch 76/154 Verifying : audit-libs-3.1.5-1.fc39.ppc64le 77/154 Verifying : bash-5.2.26-1.fc39.ppc64le 78/154 Verifying : binutils-2.40-14.fc39.ppc64le 79/154 Verifying : binutils-gold-2.40-14.fc39.ppc64le 80/154 Verifying : ca-certificates-2024.2.69_v8.0.401-1.0.fc39.noar 81/154 Verifying : coreutils-9.3-7.fc39.ppc64le 82/154 Verifying : coreutils-common-9.3-7.fc39.ppc64le 83/154 Verifying : crypto-policies-20231204-1.git1e3a2e4.fc39.noarc 84/154 Verifying : curl-8.2.1-5.fc39.ppc64le 85/154 Verifying : debugedit-5.0-12.fc39.ppc64le 86/154 Verifying : elfutils-0.191-2.fc39.ppc64le 87/154 Verifying : elfutils-debuginfod-client-0.191-2.fc39.ppc64le 88/154 Verifying : elfutils-default-yama-scope-0.191-2.fc39.noarch 89/154 Verifying : elfutils-libelf-0.191-2.fc39.ppc64le 90/154 Verifying : elfutils-libs-0.191-2.fc39.ppc64le 91/154 Verifying : fedora-gpg-keys-39-2.noarch 92/154 Verifying : fedora-release-39-36.noarch 93/154 Verifying : fedora-release-common-39-36.noarch 94/154 Verifying : fedora-release-identity-basic-39-36.noarch 95/154 Verifying : fedora-repos-39-2.noarch 96/154 Verifying : findutils-1:4.9.0-6.fc39.ppc64le 97/154 Verifying : forge-srpm-macros-0.3.1-1.fc39.noarch 98/154 Verifying : gdb-minimal-15.1-1.fc39.ppc64le 99/154 Verifying : glibc-2.38-19.fc39.ppc64le 100/154 Verifying : glibc-common-2.38-19.fc39.ppc64le 101/154 Verifying : glibc-gconv-extra-2.38-19.fc39.ppc64le 102/154 Verifying : glibc-minimal-langpack-2.38-19.fc39.ppc64le 103/154 Verifying : go-srpm-macros-3.5.0-1.fc39.noarch 104/154 Verifying : keyutils-libs-1.6.3-1.fc39.ppc64le 105/154 Verifying : krb5-libs-1.21.3-1.fc39.ppc64le 106/154 Verifying : libacl-2.3.1-9.fc39.ppc64le 107/154 Verifying : libarchive-3.7.1-2.fc39.ppc64le 108/154 Verifying : libblkid-2.39.4-1.fc39.ppc64le 109/154 Verifying : libcap-2.48-9.fc39.ppc64le 110/154 Verifying : libcurl-8.2.1-5.fc39.ppc64le 111/154 Verifying : libeconf-0.5.2-2.fc39.ppc64le 112/154 Verifying : libfdisk-2.39.4-1.fc39.ppc64le 113/154 Verifying : libgcc-13.3.1-3.fc39.ppc64le 114/154 Verifying : libgomp-13.3.1-3.fc39.ppc64le 115/154 Verifying : libidn2-2.3.7-1.fc39.ppc64le 116/154 Verifying : libmount-2.39.4-1.fc39.ppc64le 117/154 Verifying : libnghttp2-1.55.1-5.fc39.ppc64le 118/154 Verifying : libsmartcols-2.39.4-1.fc39.ppc64le 119/154 Verifying : libssh-0.10.6-2.fc39.ppc64le 120/154 Verifying : libssh-config-0.10.6-2.fc39.noarch 121/154 Verifying : libstdc++-13.3.1-3.fc39.ppc64le 122/154 Verifying : libtirpc-1.3.5-0.fc39.ppc64le 123/154 Verifying : libuuid-2.39.4-1.fc39.ppc64le 124/154 Verifying : libzstd-1.5.6-1.fc39.ppc64le 125/154 Verifying : lua-srpm-macros-1-13.fc39.noarch 126/154 Verifying : ncurses-base-6.4-7.20230520.fc39.1.noarch 127/154 Verifying : ncurses-libs-6.4-7.20230520.fc39.1.ppc64le 128/154 Verifying : openldap-2.6.7-1.fc39.ppc64le 129/154 Verifying : openssl-libs-1:3.1.4-4.fc39.ppc64le 130/154 Verifying : p11-kit-0.25.5-1.fc39.ppc64le 131/154 Verifying : p11-kit-trust-0.25.5-1.fc39.ppc64le 132/154 Verifying : pam-1.5.3-3.fc39.ppc64le 133/154 Verifying : pam-libs-1.5.3-3.fc39.ppc64le 134/154 Verifying : publicsuffix-list-dafsa-20240107-1.fc39.noarch 135/154 Verifying : pyproject-srpm-macros-1.15.1-1.fc39.noarch 136/154 Verifying : python-srpm-macros-3.12-8.fc39.noarch 137/154 Verifying : qt5-srpm-macros-5.15.14-2.fc39.noarch 138/154 Verifying : qt6-srpm-macros-6.6.2-1.fc39.noarch 139/154 Verifying : readline-8.2-6.fc39.ppc64le 140/154 Verifying : redhat-rpm-config-266-1.fc39.noarch 141/154 Verifying : rpm-4.19.1.1-1.fc39.ppc64le 142/154 Verifying : rpm-build-4.19.1.1-1.fc39.ppc64le 143/154 Verifying : rpm-build-libs-4.19.1.1-1.fc39.ppc64le 144/154 Verifying : rpm-libs-4.19.1.1-1.fc39.ppc64le 145/154 Verifying : rpm-sequoia-1.7.0-1.fc39.ppc64le 146/154 Verifying : rpmautospec-rpm-macros-0.7.2-1.fc39.noarch 147/154 Verifying : rust-srpm-macros-26.3-1.fc39.noarch 148/154 Verifying : shadow-utils-2:4.14.0-2.fc39.ppc64le 149/154 Verifying : systemd-libs-254.19-1.fc39.ppc64le 150/154 Verifying : util-linux-2.39.4-1.fc39.ppc64le 151/154 Verifying : util-linux-core-2.39.4-1.fc39.ppc64le 152/154 Verifying : xxhash-libs-0.8.2-4.fc39.ppc64le 153/154 Verifying : zstd-1.5.6-1.fc39.ppc64le 154/154 Installed: alternatives-1.26-1.fc39.ppc64le ansible-srpm-macros-1-12.fc39.noarch audit-libs-3.1.5-1.fc39.ppc64le authselect-1.4.3-1.fc39.ppc64le authselect-libs-1.4.3-1.fc39.ppc64le basesystem-11-18.fc39.noarch bash-5.2.26-1.fc39.ppc64le binutils-2.40-14.fc39.ppc64le binutils-gold-2.40-14.fc39.ppc64le bzip2-1.0.8-16.fc39.ppc64le bzip2-libs-1.0.8-16.fc39.ppc64le ca-certificates-2024.2.69_v8.0.401-1.0.fc39.noarch coreutils-9.3-7.fc39.ppc64le coreutils-common-9.3-7.fc39.ppc64le cpio-2.14-4.fc39.ppc64le cracklib-2.9.11-2.fc39.ppc64le crypto-policies-20231204-1.git1e3a2e4.fc39.noarch curl-8.2.1-5.fc39.ppc64le cyrus-sasl-lib-2.1.28-11.fc39.ppc64le debugedit-5.0-12.fc39.ppc64le diffutils-3.10-3.fc39.ppc64le dwz-0.15-3.fc39.ppc64le ed-1.19-4.fc39.ppc64le efi-srpm-macros-5-9.fc39.noarch elfutils-0.191-2.fc39.ppc64le elfutils-debuginfod-client-0.191-2.fc39.ppc64le elfutils-default-yama-scope-0.191-2.fc39.noarch elfutils-libelf-0.191-2.fc39.ppc64le elfutils-libs-0.191-2.fc39.ppc64le fedora-gpg-keys-39-2.noarch fedora-release-39-36.noarch fedora-release-common-39-36.noarch fedora-release-identity-basic-39-36.noarch fedora-repos-39-2.noarch file-5.44-5.fc39.ppc64le file-libs-5.44-5.fc39.ppc64le filesystem-3.18-6.fc39.ppc64le findutils-1:4.9.0-6.fc39.ppc64le fonts-srpm-macros-1:2.0.5-12.fc39.noarch forge-srpm-macros-0.3.1-1.fc39.noarch fpc-srpm-macros-1.3-8.fc39.noarch gawk-5.2.2-2.fc39.ppc64le gdb-minimal-15.1-1.fc39.ppc64le gdbm-libs-1:1.23-4.fc39.ppc64le ghc-srpm-macros-1.6.1-2.fc39.noarch glibc-2.38-19.fc39.ppc64le glibc-common-2.38-19.fc39.ppc64le glibc-gconv-extra-2.38-19.fc39.ppc64le glibc-minimal-langpack-2.38-19.fc39.ppc64le gmp-1:6.2.1-5.fc39.ppc64le gnat-srpm-macros-6-3.fc39.noarch go-srpm-macros-3.5.0-1.fc39.noarch grep-3.11-3.fc39.ppc64le gzip-1.12-6.fc39.ppc64le info-7.0.3-3.fc39.ppc64le jansson-2.13.1-7.fc39.ppc64le kernel-srpm-macros-1.0-20.fc39.noarch keyutils-libs-1.6.3-1.fc39.ppc64le krb5-libs-1.21.3-1.fc39.ppc64le libacl-2.3.1-9.fc39.ppc64le libarchive-3.7.1-2.fc39.ppc64le libattr-2.5.1-8.fc39.ppc64le libblkid-2.39.4-1.fc39.ppc64le libbrotli-1.1.0-1.fc39.ppc64le libcap-2.48-9.fc39.ppc64le libcap-ng-0.8.3-8.fc39.ppc64le libcom_err-1.47.0-2.fc39.ppc64le libcurl-8.2.1-5.fc39.ppc64le libdb-5.3.28-56.fc39.ppc64le libeconf-0.5.2-2.fc39.ppc64le libevent-2.1.12-9.fc39.ppc64le libfdisk-2.39.4-1.fc39.ppc64le libffi-3.4.4-4.fc39.ppc64le libgcc-13.3.1-3.fc39.ppc64le libgomp-13.3.1-3.fc39.ppc64le libidn2-2.3.7-1.fc39.ppc64le libmount-2.39.4-1.fc39.ppc64le libnghttp2-1.55.1-5.fc39.ppc64le libnsl2-2.0.0-6.fc39.ppc64le libpkgconf-1.9.5-2.fc39.ppc64le libpsl-0.21.2-4.fc39.ppc64le libpwquality-1.4.5-6.fc39.ppc64le librtas-2.0.4-3.fc39.ppc64le libselinux-3.5-5.fc39.ppc64le libsemanage-3.5-4.fc39.ppc64le libsepol-3.5-2.fc39.ppc64le libsigsegv-2.14-5.fc39.ppc64le libsmartcols-2.39.4-1.fc39.ppc64le libssh-0.10.6-2.fc39.ppc64le libssh-config-0.10.6-2.fc39.noarch libstdc++-13.3.1-3.fc39.ppc64le libtasn1-4.19.0-3.fc39.ppc64le libtirpc-1.3.5-0.fc39.ppc64le libtool-ltdl-2.4.7-7.fc39.ppc64le libunistring-1.1-5.fc39.ppc64le libutempter-1.2.1-10.fc39.ppc64le libuuid-2.39.4-1.fc39.ppc64le libverto-0.3.2-6.fc39.ppc64le libxcrypt-4.4.36-2.fc39.ppc64le libxml2-2.10.4-3.fc39.ppc64le libzstd-1.5.6-1.fc39.ppc64le lua-libs-5.4.6-3.fc39.ppc64le lua-srpm-macros-1-13.fc39.noarch lz4-libs-1.9.4-4.fc39.ppc64le mpfr-4.2.0-3.fc39.ppc64le ncurses-base-6.4-7.20230520.fc39.1.noarch ncurses-libs-6.4-7.20230520.fc39.1.ppc64le ocaml-srpm-macros-8-2.fc39.noarch openblas-srpm-macros-2-14.fc39.noarch openldap-2.6.7-1.fc39.ppc64le openssl-libs-1:3.1.4-4.fc39.ppc64le p11-kit-0.25.5-1.fc39.ppc64le p11-kit-trust-0.25.5-1.fc39.ppc64le package-notes-srpm-macros-0.5-9.fc39.noarch pam-1.5.3-3.fc39.ppc64le pam-libs-1.5.3-3.fc39.ppc64le patch-2.7.6-22.fc39.ppc64le pcre2-10.42-1.fc39.2.ppc64le pcre2-syntax-10.42-1.fc39.2.noarch perl-srpm-macros-1-51.fc39.noarch pkgconf-1.9.5-2.fc39.ppc64le pkgconf-m4-1.9.5-2.fc39.noarch pkgconf-pkg-config-1.9.5-2.fc39.ppc64le popt-1.19-3.fc39.ppc64le publicsuffix-list-dafsa-20240107-1.fc39.noarch pyproject-srpm-macros-1.15.1-1.fc39.noarch python-srpm-macros-3.12-8.fc39.noarch qt5-srpm-macros-5.15.14-2.fc39.noarch qt6-srpm-macros-6.6.2-1.fc39.noarch readline-8.2-6.fc39.ppc64le redhat-rpm-config-266-1.fc39.noarch rpm-4.19.1.1-1.fc39.ppc64le rpm-build-4.19.1.1-1.fc39.ppc64le rpm-build-libs-4.19.1.1-1.fc39.ppc64le rpm-libs-4.19.1.1-1.fc39.ppc64le rpm-sequoia-1.7.0-1.fc39.ppc64le rpmautospec-rpm-macros-0.7.2-1.fc39.noarch rust-srpm-macros-26.3-1.fc39.noarch sed-4.8-14.fc39.ppc64le setup-2.14.4-1.fc39.noarch shadow-utils-2:4.14.0-2.fc39.ppc64le sqlite-libs-3.42.0-7.fc39.ppc64le systemd-libs-254.19-1.fc39.ppc64le tar-2:1.35-2.fc39.ppc64le unzip-6.0-62.fc39.ppc64le util-linux-2.39.4-1.fc39.ppc64le util-linux-core-2.39.4-1.fc39.ppc64le which-2.21-40.fc39.ppc64le xxhash-libs-0.8.2-4.fc39.ppc64le xz-5.4.4-1.fc39.ppc64le xz-libs-5.4.4-1.fc39.ppc64le zip-3.0-39.fc39.ppc64le zlib-1.2.13-4.fc39.ppc64le zstd-1.5.6-1.fc39.ppc64le Complete! Finish: installing minimal buildroot with dnf Start: creating root cache Finish: creating root cache Finish: chroot init INFO: Installed packages: INFO: alternatives-1.26-1.fc39.ppc64le ansible-srpm-macros-1-12.fc39.noarch audit-libs-3.1.5-1.fc39.ppc64le authselect-1.4.3-1.fc39.ppc64le authselect-libs-1.4.3-1.fc39.ppc64le basesystem-11-18.fc39.noarch bash-5.2.26-1.fc39.ppc64le binutils-2.40-14.fc39.ppc64le binutils-gold-2.40-14.fc39.ppc64le bzip2-1.0.8-16.fc39.ppc64le bzip2-libs-1.0.8-16.fc39.ppc64le ca-certificates-2024.2.69_v8.0.401-1.0.fc39.noarch coreutils-9.3-7.fc39.ppc64le coreutils-common-9.3-7.fc39.ppc64le cpio-2.14-4.fc39.ppc64le cracklib-2.9.11-2.fc39.ppc64le crypto-policies-20231204-1.git1e3a2e4.fc39.noarch curl-8.2.1-5.fc39.ppc64le cyrus-sasl-lib-2.1.28-11.fc39.ppc64le debugedit-5.0-12.fc39.ppc64le diffutils-3.10-3.fc39.ppc64le dwz-0.15-3.fc39.ppc64le ed-1.19-4.fc39.ppc64le efi-srpm-macros-5-9.fc39.noarch elfutils-0.191-2.fc39.ppc64le elfutils-debuginfod-client-0.191-2.fc39.ppc64le elfutils-default-yama-scope-0.191-2.fc39.noarch elfutils-libelf-0.191-2.fc39.ppc64le elfutils-libs-0.191-2.fc39.ppc64le fedora-gpg-keys-39-2.noarch fedora-release-39-36.noarch fedora-release-common-39-36.noarch fedora-release-identity-basic-39-36.noarch fedora-repos-39-2.noarch file-5.44-5.fc39.ppc64le file-libs-5.44-5.fc39.ppc64le filesystem-3.18-6.fc39.ppc64le findutils-4.9.0-6.fc39.ppc64le fonts-srpm-macros-2.0.5-12.fc39.noarch forge-srpm-macros-0.3.1-1.fc39.noarch fpc-srpm-macros-1.3-8.fc39.noarch gawk-5.2.2-2.fc39.ppc64le gdb-minimal-15.1-1.fc39.ppc64le gdbm-libs-1.23-4.fc39.ppc64le ghc-srpm-macros-1.6.1-2.fc39.noarch glibc-2.38-19.fc39.ppc64le glibc-common-2.38-19.fc39.ppc64le glibc-gconv-extra-2.38-19.fc39.ppc64le glibc-minimal-langpack-2.38-19.fc39.ppc64le gmp-6.2.1-5.fc39.ppc64le gnat-srpm-macros-6-3.fc39.noarch go-srpm-macros-3.5.0-1.fc39.noarch gpg-pubkey-18b8e74c-62f2920f grep-3.11-3.fc39.ppc64le gzip-1.12-6.fc39.ppc64le info-7.0.3-3.fc39.ppc64le jansson-2.13.1-7.fc39.ppc64le kernel-srpm-macros-1.0-20.fc39.noarch keyutils-libs-1.6.3-1.fc39.ppc64le krb5-libs-1.21.3-1.fc39.ppc64le libacl-2.3.1-9.fc39.ppc64le libarchive-3.7.1-2.fc39.ppc64le libattr-2.5.1-8.fc39.ppc64le libblkid-2.39.4-1.fc39.ppc64le libbrotli-1.1.0-1.fc39.ppc64le libcap-2.48-9.fc39.ppc64le libcap-ng-0.8.3-8.fc39.ppc64le libcom_err-1.47.0-2.fc39.ppc64le libcurl-8.2.1-5.fc39.ppc64le libdb-5.3.28-56.fc39.ppc64le libeconf-0.5.2-2.fc39.ppc64le libevent-2.1.12-9.fc39.ppc64le libfdisk-2.39.4-1.fc39.ppc64le libffi-3.4.4-4.fc39.ppc64le libgcc-13.3.1-3.fc39.ppc64le libgomp-13.3.1-3.fc39.ppc64le libidn2-2.3.7-1.fc39.ppc64le libmount-2.39.4-1.fc39.ppc64le libnghttp2-1.55.1-5.fc39.ppc64le libnsl2-2.0.0-6.fc39.ppc64le libpkgconf-1.9.5-2.fc39.ppc64le libpsl-0.21.2-4.fc39.ppc64le libpwquality-1.4.5-6.fc39.ppc64le librtas-2.0.4-3.fc39.ppc64le libselinux-3.5-5.fc39.ppc64le libsemanage-3.5-4.fc39.ppc64le libsepol-3.5-2.fc39.ppc64le libsigsegv-2.14-5.fc39.ppc64le libsmartcols-2.39.4-1.fc39.ppc64le libssh-0.10.6-2.fc39.ppc64le libssh-config-0.10.6-2.fc39.noarch libstdc++-13.3.1-3.fc39.ppc64le libtasn1-4.19.0-3.fc39.ppc64le libtirpc-1.3.5-0.fc39.ppc64le libtool-ltdl-2.4.7-7.fc39.ppc64le libunistring-1.1-5.fc39.ppc64le libutempter-1.2.1-10.fc39.ppc64le libuuid-2.39.4-1.fc39.ppc64le libverto-0.3.2-6.fc39.ppc64le libxcrypt-4.4.36-2.fc39.ppc64le libxml2-2.10.4-3.fc39.ppc64le libzstd-1.5.6-1.fc39.ppc64le lua-libs-5.4.6-3.fc39.ppc64le lua-srpm-macros-1-13.fc39.noarch lz4-libs-1.9.4-4.fc39.ppc64le mpfr-4.2.0-3.fc39.ppc64le ncurses-base-6.4-7.20230520.fc39.1.noarch ncurses-libs-6.4-7.20230520.fc39.1.ppc64le ocaml-srpm-macros-8-2.fc39.noarch openblas-srpm-macros-2-14.fc39.noarch openldap-2.6.7-1.fc39.ppc64le openssl-libs-3.1.4-4.fc39.ppc64le p11-kit-0.25.5-1.fc39.ppc64le p11-kit-trust-0.25.5-1.fc39.ppc64le package-notes-srpm-macros-0.5-9.fc39.noarch pam-1.5.3-3.fc39.ppc64le pam-libs-1.5.3-3.fc39.ppc64le patch-2.7.6-22.fc39.ppc64le pcre2-10.42-1.fc39.2.ppc64le pcre2-syntax-10.42-1.fc39.2.noarch perl-srpm-macros-1-51.fc39.noarch pkgconf-1.9.5-2.fc39.ppc64le pkgconf-m4-1.9.5-2.fc39.noarch pkgconf-pkg-config-1.9.5-2.fc39.ppc64le popt-1.19-3.fc39.ppc64le publicsuffix-list-dafsa-20240107-1.fc39.noarch pyproject-srpm-macros-1.15.1-1.fc39.noarch python-srpm-macros-3.12-8.fc39.noarch qt5-srpm-macros-5.15.14-2.fc39.noarch qt6-srpm-macros-6.6.2-1.fc39.noarch readline-8.2-6.fc39.ppc64le redhat-rpm-config-266-1.fc39.noarch rpm-4.19.1.1-1.fc39.ppc64le rpm-build-4.19.1.1-1.fc39.ppc64le rpm-build-libs-4.19.1.1-1.fc39.ppc64le rpm-libs-4.19.1.1-1.fc39.ppc64le rpm-sequoia-1.7.0-1.fc39.ppc64le rpmautospec-rpm-macros-0.7.2-1.fc39.noarch rust-srpm-macros-26.3-1.fc39.noarch sed-4.8-14.fc39.ppc64le setup-2.14.4-1.fc39.noarch shadow-utils-4.14.0-2.fc39.ppc64le sqlite-libs-3.42.0-7.fc39.ppc64le systemd-libs-254.19-1.fc39.ppc64le tar-1.35-2.fc39.ppc64le unzip-6.0-62.fc39.ppc64le util-linux-2.39.4-1.fc39.ppc64le util-linux-core-2.39.4-1.fc39.ppc64le which-2.21-40.fc39.ppc64le xxhash-libs-0.8.2-4.fc39.ppc64le xz-5.4.4-1.fc39.ppc64le xz-libs-5.4.4-1.fc39.ppc64le zip-3.0-39.fc39.ppc64le zlib-1.2.13-4.fc39.ppc64le zstd-1.5.6-1.fc39.ppc64le Start: buildsrpm Start: rpmbuild -bs Building target platforms: ppc64le Building for target ppc64le setting SOURCE_DATE_EPOCH=1730160000 Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc39.src.rpm Finish: rpmbuild -bs INFO: chroot_scan: 3 files copied to /var/lib/copr-rpmbuild/results/chroot_scan INFO: /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root/var/log/dnf.log /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root/var/log/dnf.librepo.log /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root/var/log/dnf.rpm.log INFO: chroot_scan: creating tarball /var/lib/copr-rpmbuild/results/chroot_scan.tar.gz /bin/tar: Removing leading `/' from member names Finish: buildsrpm INFO: Done(/var/lib/copr-rpmbuild/workspace/workdir-qt4pam0j/git-imerge/git-imerge.spec) Config(child) 3 minutes 34 seconds INFO: Results and/or logs in: /var/lib/copr-rpmbuild/results INFO: Cleaning up build root ('cleanup_on_success=True') Start: clean chroot INFO: unmounting tmpfs. Finish: clean chroot INFO: Start(/var/lib/copr-rpmbuild/results/git-imerge-1.2.0-1.fc39.src.rpm) Config(fedora-39-ppc64le) Start(bootstrap): chroot init INFO: mounting tmpfs at /var/lib/mock/fedora-39-ppc64le-bootstrap-1730231711.608671/root. INFO: reusing tmpfs at /var/lib/mock/fedora-39-ppc64le-bootstrap-1730231711.608671/root. INFO: calling preinit hooks INFO: enabled root cache INFO: enabled package manager cache Start(bootstrap): cleaning package manager metadata Finish(bootstrap): cleaning package manager metadata Finish(bootstrap): chroot init Start: chroot init INFO: mounting tmpfs at /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root. INFO: calling preinit hooks INFO: enabled root cache Start: unpacking root cache Finish: unpacking root cache INFO: enabled package manager cache Start: cleaning package manager metadata Finish: cleaning package manager metadata INFO: enabled HW Info plugin INFO: Buildroot is handled by package management downloaded with a bootstrap image: rpm-4.19.1.1-1.fc39.ppc64le rpm-sequoia-1.7.0-1.fc39.ppc64le python3-dnf-4.21.1-1.fc39.noarch python3-dnf-plugins-core-4.9.0-1.fc39.noarch yum-4.21.1-1.fc39.noarch Finish: chroot init Start: build phase for git-imerge-1.2.0-1.fc39.src.rpm Start: build setup for git-imerge-1.2.0-1.fc39.src.rpm Building target platforms: ppc64le Building for target ppc64le setting SOURCE_DATE_EPOCH=1730160000 Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc39.src.rpm No matches found for the following disable plugin patterns: local, spacewalk, versionlock Copr repository 17 kB/s | 1.5 kB 00:00 fedora 39 kB/s | 5.0 kB 00:00 updates 71 kB/s | 5.0 kB 00:00 Dependencies resolved. ================================================================================ Package Arch Version Repo Size ================================================================================ Installing: bash-completion noarch 1:2.11-12.fc39 fedora 367 k git-core ppc64le 2.47.0-1.fc39 updates 5.3 M python3-devel ppc64le 3.12.7-1.fc39 updates 314 k Installing dependencies: expat ppc64le 2.6.3-1.fc39 updates 120 k less ppc64le 633-4.fc39 updates 189 k libb2 ppc64le 0.98.1-9.fc39 fedora 25 k libcbor ppc64le 0.10.2-2.fc39 fedora 59 k libedit ppc64le 3.1-53.20240808cvs.fc39 updates 122 k libfido2 ppc64le 1.13.0-3.fc39 fedora 109 k mpdecimal ppc64le 2.5.1-7.fc39 fedora 104 k openssh ppc64le 9.3p1-11.fc39 updates 461 k openssh-clients ppc64le 9.3p1-11.fc39 updates 796 k pyproject-rpm-macros noarch 1.15.1-1.fc39 updates 43 k python-pip-wheel noarch 23.2.1-2.fc39 updates 1.5 M python-rpm-macros noarch 3.12-8.fc39 updates 18 k python3 ppc64le 3.12.7-1.fc39 updates 28 k python3-libs ppc64le 3.12.7-1.fc39 updates 9.3 M python3-packaging noarch 23.1-4.fc39 fedora 114 k python3-rpm-generators noarch 14-7.fc39 fedora 30 k python3-rpm-macros noarch 3.12-8.fc39 updates 12 k tzdata noarch 2024a-2.fc39 updates 715 k Transaction Summary ================================================================================ Install 21 Packages Total download size: 20 M Installed size: 94 M Downloading Packages: (1/21): libb2-0.98.1-9.fc39.ppc64le.rpm 88 kB/s | 25 kB 00:00 (2/21): libcbor-0.10.2-2.fc39.ppc64le.rpm 150 kB/s | 59 kB 00:00 (3/21): mpdecimal-2.5.1-7.fc39.ppc64le.rpm 499 kB/s | 104 kB 00:00 (4/21): bash-completion-2.11-12.fc39.noarch.rpm 562 kB/s | 367 kB 00:00 (5/21): libfido2-1.13.0-3.fc39.ppc64le.rpm 291 kB/s | 109 kB 00:00 (6/21): python3-packaging-23.1-4.fc39.noarch.rp 903 kB/s | 114 kB 00:00 (7/21): python3-rpm-generators-14-7.fc39.noarch 372 kB/s | 30 kB 00:00 (8/21): expat-2.6.3-1.fc39.ppc64le.rpm 582 kB/s | 120 kB 00:00 (9/21): less-633-4.fc39.ppc64le.rpm 822 kB/s | 189 kB 00:00 (10/21): libedit-3.1-53.20240808cvs.fc39.ppc64l 1.0 MB/s | 122 kB 00:00 (11/21): openssh-9.3p1-11.fc39.ppc64le.rpm 3.0 MB/s | 461 kB 00:00 (12/21): pyproject-rpm-macros-1.15.1-1.fc39.noa 663 kB/s | 43 kB 00:00 (13/21): openssh-clients-9.3p1-11.fc39.ppc64le. 3.6 MB/s | 796 kB 00:00 (14/21): python-rpm-macros-3.12-8.fc39.noarch.r 420 kB/s | 18 kB 00:00 (15/21): python3-3.12.7-1.fc39.ppc64le.rpm 801 kB/s | 28 kB 00:00 (16/21): python-pip-wheel-23.2.1-2.fc39.noarch. 11 MB/s | 1.5 MB 00:00 (17/21): git-core-2.47.0-1.fc39.ppc64le.rpm 8.7 MB/s | 5.3 MB 00:00 (18/21): python3-devel-3.12.7-1.fc39.ppc64le.rp 6.1 MB/s | 314 kB 00:00 (19/21): python3-rpm-macros-3.12-8.fc39.noarch. 254 kB/s | 12 kB 00:00 (20/21): tzdata-2024a-2.fc39.noarch.rpm 8.7 MB/s | 715 kB 00:00 (21/21): python3-libs-3.12.7-1.fc39.ppc64le.rpm 29 MB/s | 9.3 MB 00:00 -------------------------------------------------------------------------------- Total 10 MB/s | 20 MB 00:01 Running transaction check Transaction check succeeded. Running transaction test Transaction test succeeded. Running transaction Preparing : 1/1 Installing : python-rpm-macros-3.12-8.fc39.noarch 1/21 Installing : python3-rpm-macros-3.12-8.fc39.noarch 2/21 Installing : expat-2.6.3-1.fc39.ppc64le 3/21 Installing : pyproject-rpm-macros-1.15.1-1.fc39.noarch 4/21 Installing : tzdata-2024a-2.fc39.noarch 5/21 Installing : python-pip-wheel-23.2.1-2.fc39.noarch 6/21 Installing : openssh-9.3p1-11.fc39.ppc64le 7/21 Installing : libedit-3.1-53.20240808cvs.fc39.ppc64le 8/21 Installing : less-633-4.fc39.ppc64le 9/21 Installing : mpdecimal-2.5.1-7.fc39.ppc64le 10/21 Installing : libcbor-0.10.2-2.fc39.ppc64le 11/21 Installing : libfido2-1.13.0-3.fc39.ppc64le 12/21 Installing : openssh-clients-9.3p1-11.fc39.ppc64le 13/21 Running scriptlet: openssh-clients-9.3p1-11.fc39.ppc64le 13/21 Installing : libb2-0.98.1-9.fc39.ppc64le 14/21 Installing : python3-3.12.7-1.fc39.ppc64le 15/21 Installing : python3-libs-3.12.7-1.fc39.ppc64le 16/21 Installing : python3-packaging-23.1-4.fc39.noarch 17/21 Installing : python3-rpm-generators-14-7.fc39.noarch 18/21 Installing : python3-devel-3.12.7-1.fc39.ppc64le 19/21 Installing : git-core-2.47.0-1.fc39.ppc64le 20/21 Installing : bash-completion-1:2.11-12.fc39.noarch 21/21 Running scriptlet: bash-completion-1:2.11-12.fc39.noarch 21/21 Verifying : bash-completion-1:2.11-12.fc39.noarch 1/21 Verifying : libb2-0.98.1-9.fc39.ppc64le 2/21 Verifying : libcbor-0.10.2-2.fc39.ppc64le 3/21 Verifying : libfido2-1.13.0-3.fc39.ppc64le 4/21 Verifying : mpdecimal-2.5.1-7.fc39.ppc64le 5/21 Verifying : python3-packaging-23.1-4.fc39.noarch 6/21 Verifying : python3-rpm-generators-14-7.fc39.noarch 7/21 Verifying : expat-2.6.3-1.fc39.ppc64le 8/21 Verifying : git-core-2.47.0-1.fc39.ppc64le 9/21 Verifying : less-633-4.fc39.ppc64le 10/21 Verifying : libedit-3.1-53.20240808cvs.fc39.ppc64le 11/21 Verifying : openssh-9.3p1-11.fc39.ppc64le 12/21 Verifying : openssh-clients-9.3p1-11.fc39.ppc64le 13/21 Verifying : pyproject-rpm-macros-1.15.1-1.fc39.noarch 14/21 Verifying : python-pip-wheel-23.2.1-2.fc39.noarch 15/21 Verifying : python-rpm-macros-3.12-8.fc39.noarch 16/21 Verifying : python3-3.12.7-1.fc39.ppc64le 17/21 Verifying : python3-devel-3.12.7-1.fc39.ppc64le 18/21 Verifying : python3-libs-3.12.7-1.fc39.ppc64le 19/21 Verifying : python3-rpm-macros-3.12-8.fc39.noarch 20/21 Verifying : tzdata-2024a-2.fc39.noarch 21/21 Installed: bash-completion-1:2.11-12.fc39.noarch expat-2.6.3-1.fc39.ppc64le git-core-2.47.0-1.fc39.ppc64le less-633-4.fc39.ppc64le libb2-0.98.1-9.fc39.ppc64le libcbor-0.10.2-2.fc39.ppc64le libedit-3.1-53.20240808cvs.fc39.ppc64le libfido2-1.13.0-3.fc39.ppc64le mpdecimal-2.5.1-7.fc39.ppc64le openssh-9.3p1-11.fc39.ppc64le openssh-clients-9.3p1-11.fc39.ppc64le pyproject-rpm-macros-1.15.1-1.fc39.noarch python-pip-wheel-23.2.1-2.fc39.noarch python-rpm-macros-3.12-8.fc39.noarch python3-3.12.7-1.fc39.ppc64le python3-devel-3.12.7-1.fc39.ppc64le python3-libs-3.12.7-1.fc39.ppc64le python3-packaging-23.1-4.fc39.noarch python3-rpm-generators-14-7.fc39.noarch python3-rpm-macros-3.12-8.fc39.noarch tzdata-2024a-2.fc39.noarch Complete! Finish: build setup for git-imerge-1.2.0-1.fc39.src.rpm Start: rpmbuild git-imerge-1.2.0-1.fc39.src.rpm Building target platforms: ppc64le Building for target ppc64le setting SOURCE_DATE_EPOCH=1730160000 Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.YEUOb8 + umask 022 + cd /builddir/build/BUILD + cd /builddir/build/BUILD + rm -rf git-imerge-1.2.0 + /usr/lib/rpm/rpmuncompress -x /builddir/build/SOURCES/git-imerge-1.2.0.tar.gz + STATUS=0 + '[' 0 -ne 0 ']' + cd git-imerge-1.2.0 + rm -rf /builddir/build/BUILD/git-imerge-1.2.0-SPECPARTS + /usr/bin/mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-SPECPARTS + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . + RPM_EC=0 ++ jobs -p + exit 0 Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.oGXpDH + umask 022 + cd /builddir/build/BUILD + cd git-imerge-1.2.0 + echo pyproject-rpm-macros + echo python3-devel + echo 'python3dist(packaging)' + echo 'python3dist(pip) >= 19' + '[' -f pyproject.toml ']' + '[' -f setup.py ']' + echo 'python3dist(setuptools) >= 40.8' + echo 'python3dist(wheel)' + rm -rfv '*.dist-info/' + '[' -f /usr/bin/python3 ']' + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + echo -n + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + VALAFLAGS=-g + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none --cap-lints=warn' + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 ' + LT_SYS_LIBRARY_PATH=/usr/lib64: + CC=gcc + CXX=g++ + TMPDIR=/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + RPM_TOXENV=py312 + HOSTNAME=rpmbuild + /usr/bin/python3 -Bs /usr/lib/rpm/redhat/pyproject_buildrequires.py --generate-extras --python3_pkgversion 3 --wheeldir /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires -t Handling setuptools >= 40.8 from default build backend Requirement not satisfied: setuptools >= 40.8 Handling wheel from default build backend Requirement not satisfied: wheel Exiting dependency generation pass: build backend + cat /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires + rm -rfv '*.dist-info/' + RPM_EC=0 ++ jobs -p + exit 0 Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc39.buildreqs.nosrc.rpm INFO: Going to install missing dynamic buildrequires No matches found for the following disable plugin patterns: local, spacewalk, versionlock Copr repository 20 kB/s | 1.5 kB 00:00 fedora 64 kB/s | 5.0 kB 00:00 updates 56 kB/s | 5.0 kB 00:00 Package git-core-2.47.0-1.fc39.ppc64le is already installed. Package bash-completion-1:2.11-12.fc39.noarch is already installed. Package pyproject-rpm-macros-1.15.1-1.fc39.noarch is already installed. Package python3-devel-3.12.7-1.fc39.ppc64le is already installed. Package python3-devel-3.12.7-1.fc39.ppc64le is already installed. Package python3-packaging-23.1-4.fc39.noarch is already installed. Dependencies resolved. ================================================================================ Package Arch Version Repository Size ================================================================================ Installing: python3-pip noarch 23.2.1-2.fc39 updates 3.1 M python3-setuptools noarch 67.7.2-8.fc39 updates 1.5 M python3-wheel noarch 1:0.40.0-4.fc39 fedora 161 k Transaction Summary ================================================================================ Install 3 Packages Total download size: 4.8 M Installed size: 21 M Downloading Packages: (1/3): python3-wheel-0.40.0-4.fc39.noarch.rpm 271 kB/s | 161 kB 00:00 (2/3): python3-setuptools-67.7.2-8.fc39.noarch. 2.5 MB/s | 1.5 MB 00:00 (3/3): python3-pip-23.2.1-2.fc39.noarch.rpm 4.3 MB/s | 3.1 MB 00:00 -------------------------------------------------------------------------------- Total 5.2 MB/s | 4.8 MB 00:00 Running transaction check Transaction check succeeded. Running transaction test Transaction test succeeded. Running transaction Preparing : 1/1 Installing : python3-setuptools-67.7.2-8.fc39.noarch 1/3 Installing : python3-pip-23.2.1-2.fc39.noarch 2/3 Installing : python3-wheel-1:0.40.0-4.fc39.noarch 3/3 Running scriptlet: python3-wheel-1:0.40.0-4.fc39.noarch 3/3 Verifying : python3-wheel-1:0.40.0-4.fc39.noarch 1/3 Verifying : python3-pip-23.2.1-2.fc39.noarch 2/3 Verifying : python3-setuptools-67.7.2-8.fc39.noarch 3/3 Installed: python3-pip-23.2.1-2.fc39.noarch python3-setuptools-67.7.2-8.fc39.noarch python3-wheel-1:0.40.0-4.fc39.noarch Complete! Building target platforms: ppc64le Building for target ppc64le setting SOURCE_DATE_EPOCH=1730160000 Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.qeB3EH + umask 022 + cd /builddir/build/BUILD + cd git-imerge-1.2.0 + echo pyproject-rpm-macros + echo python3-devel + echo 'python3dist(packaging)' + echo 'python3dist(pip) >= 19' + '[' -f pyproject.toml ']' + '[' -f setup.py ']' + echo 'python3dist(setuptools) >= 40.8' + echo 'python3dist(wheel)' + rm -rfv '*.dist-info/' + '[' -f /usr/bin/python3 ']' + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + echo -n + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + VALAFLAGS=-g + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none --cap-lints=warn' + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 ' + LT_SYS_LIBRARY_PATH=/usr/lib64: + CC=gcc + CXX=g++ + TMPDIR=/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + RPM_TOXENV=py312 + HOSTNAME=rpmbuild + /usr/bin/python3 -Bs /usr/lib/rpm/redhat/pyproject_buildrequires.py --generate-extras --python3_pkgversion 3 --wheeldir /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires -t Handling setuptools >= 40.8 from default build backend Requirement satisfied: setuptools >= 40.8 (installed: setuptools 67.7.2) Handling wheel from default build backend Requirement satisfied: wheel (installed: wheel 0.40.0) 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' Handling wheel from get_requires_for_build_wheel Requirement satisfied: wheel (installed: wheel 0.40.0) Handling tox-current-env >= 0.0.6 from tox itself Requirement not satisfied: tox-current-env >= 0.0.6 Exiting dependency generation pass: tox itself + cat /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires + rm -rfv '*.dist-info/' + RPM_EC=0 ++ jobs -p + exit 0 Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc39.buildreqs.nosrc.rpm INFO: Going to install missing dynamic buildrequires No matches found for the following disable plugin patterns: local, spacewalk, versionlock Copr repository 14 kB/s | 1.5 kB 00:00 fedora 58 kB/s | 5.0 kB 00:00 updates 76 kB/s | 5.0 kB 00:00 Package git-core-2.47.0-1.fc39.ppc64le is already installed. Package bash-completion-1:2.11-12.fc39.noarch is already installed. Package pyproject-rpm-macros-1.15.1-1.fc39.noarch is already installed. Package python3-devel-3.12.7-1.fc39.ppc64le is already installed. Package python3-devel-3.12.7-1.fc39.ppc64le is already installed. Package python3-packaging-23.1-4.fc39.noarch is already installed. Package python3-pip-23.2.1-2.fc39.noarch is already installed. Package python3-setuptools-67.7.2-8.fc39.noarch is already installed. Package python3-wheel-1:0.40.0-4.fc39.noarch is already installed. Dependencies resolved. ================================================================================ Package Arch Version Repository Size ================================================================================ Installing: python3-tox-current-env noarch 0.0.12-1.fc39 updates 30 k Installing dependencies: python-setuptools-wheel noarch 67.7.2-8.fc39 updates 660 k python-wheel-wheel noarch 1:0.40.0-4.fc39 fedora 69 k python3-cachetools noarch 5.3.1-4.fc39 fedora 37 k python3-chardet noarch 5.2.0-1.fc39 fedora 299 k python3-colorama noarch 0.4.6-4.fc39 fedora 71 k python3-distlib noarch 0.3.6-4.fc39 fedora 262 k python3-filelock noarch 3.12.2-1.fc39 fedora 35 k python3-platformdirs noarch 3.9.1-2.fc39 fedora 45 k python3-pluggy noarch 1.2.0-1.fc39 fedora 54 k python3-pyproject-api noarch 1.5.1-3.fc39 fedora 41 k python3-virtualenv noarch 20.21.1-25.fc39 updates 305 k tox noarch 4.21.2-1.fc39 updates 419 k Transaction Summary ================================================================================ Install 13 Packages Total download size: 2.3 M Installed size: 6.7 M Downloading Packages: (1/13): python3-cachetools-5.3.1-4.fc39.noarch. 324 kB/s | 37 kB 00:00 (2/13): python-wheel-wheel-0.40.0-4.fc39.noarch 402 kB/s | 69 kB 00:00 (3/13): python3-colorama-0.4.6-4.fc39.noarch.rp 898 kB/s | 71 kB 00:00 (4/13): python3-chardet-5.2.0-1.fc39.noarch.rpm 1.4 MB/s | 299 kB 00:00 (5/13): python3-platformdirs-3.9.1-2.fc39.noarc 1.2 MB/s | 45 kB 00:00 (6/13): python3-distlib-0.3.6-4.fc39.noarch.rpm 2.3 MB/s | 262 kB 00:00 (7/13): python3-pluggy-1.2.0-1.fc39.noarch.rpm 1.1 MB/s | 54 kB 00:00 (8/13): python3-filelock-3.12.2-1.fc39.noarch.r 339 kB/s | 35 kB 00:00 (9/13): python3-pyproject-api-1.5.1-3.fc39.noar 882 kB/s | 41 kB 00:00 (10/13): python3-tox-current-env-0.0.12-1.fc39. 381 kB/s | 30 kB 00:00 (11/13): python-setuptools-wheel-67.7.2-8.fc39. 6.3 MB/s | 660 kB 00:00 (12/13): python3-virtualenv-20.21.1-25.fc39.noa 3.1 MB/s | 305 kB 00:00 (13/13): tox-4.21.2-1.fc39.noarch.rpm 2.1 MB/s | 419 kB 00:00 -------------------------------------------------------------------------------- Total 2.5 MB/s | 2.3 MB 00:00 Running transaction check Transaction check succeeded. Running transaction test Transaction test succeeded. Running transaction Preparing : 1/1 Installing : python3-platformdirs-3.9.1-2.fc39.noarch 1/13 Installing : python3-filelock-3.12.2-1.fc39.noarch 2/13 Installing : python-setuptools-wheel-67.7.2-8.fc39.noarch 3/13 Installing : python3-pyproject-api-1.5.1-3.fc39.noarch 4/13 Installing : python3-pluggy-1.2.0-1.fc39.noarch 5/13 Installing : python3-distlib-0.3.6-4.fc39.noarch 6/13 Installing : python3-colorama-0.4.6-4.fc39.noarch 7/13 Installing : python3-chardet-5.2.0-1.fc39.noarch 8/13 Installing : python3-cachetools-5.3.1-4.fc39.noarch 9/13 Installing : python-wheel-wheel-1:0.40.0-4.fc39.noarch 10/13 Installing : python3-virtualenv-20.21.1-25.fc39.noarch 11/13 Installing : tox-4.21.2-1.fc39.noarch 12/13 Installing : python3-tox-current-env-0.0.12-1.fc39.noarch 13/13 Running scriptlet: python3-tox-current-env-0.0.12-1.fc39.noarch 13/13 Verifying : python-wheel-wheel-1:0.40.0-4.fc39.noarch 1/13 Verifying : python3-cachetools-5.3.1-4.fc39.noarch 2/13 Verifying : python3-chardet-5.2.0-1.fc39.noarch 3/13 Verifying : python3-colorama-0.4.6-4.fc39.noarch 4/13 Verifying : python3-distlib-0.3.6-4.fc39.noarch 5/13 Verifying : python3-filelock-3.12.2-1.fc39.noarch 6/13 Verifying : python3-platformdirs-3.9.1-2.fc39.noarch 7/13 Verifying : python3-pluggy-1.2.0-1.fc39.noarch 8/13 Verifying : python3-pyproject-api-1.5.1-3.fc39.noarch 9/13 Verifying : python-setuptools-wheel-67.7.2-8.fc39.noarch 10/13 Verifying : python3-tox-current-env-0.0.12-1.fc39.noarch 11/13 Verifying : python3-virtualenv-20.21.1-25.fc39.noarch 12/13 Verifying : tox-4.21.2-1.fc39.noarch 13/13 Installed: python-setuptools-wheel-67.7.2-8.fc39.noarch python-wheel-wheel-1:0.40.0-4.fc39.noarch python3-cachetools-5.3.1-4.fc39.noarch python3-chardet-5.2.0-1.fc39.noarch python3-colorama-0.4.6-4.fc39.noarch python3-distlib-0.3.6-4.fc39.noarch python3-filelock-3.12.2-1.fc39.noarch python3-platformdirs-3.9.1-2.fc39.noarch python3-pluggy-1.2.0-1.fc39.noarch python3-pyproject-api-1.5.1-3.fc39.noarch python3-tox-current-env-0.0.12-1.fc39.noarch python3-virtualenv-20.21.1-25.fc39.noarch tox-4.21.2-1.fc39.noarch Complete! Building target platforms: ppc64le Building for target ppc64le setting SOURCE_DATE_EPOCH=1730160000 Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.ZlZ0iA + umask 022 + cd /builddir/build/BUILD + cd git-imerge-1.2.0 + echo pyproject-rpm-macros + echo python3-devel + echo 'python3dist(packaging)' + echo 'python3dist(pip) >= 19' + '[' -f pyproject.toml ']' + '[' -f setup.py ']' + echo 'python3dist(setuptools) >= 40.8' + echo 'python3dist(wheel)' + rm -rfv '*.dist-info/' + '[' -f /usr/bin/python3 ']' + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + echo -n + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + VALAFLAGS=-g + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none --cap-lints=warn' + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 ' + LT_SYS_LIBRARY_PATH=/usr/lib64: + CC=gcc + CXX=g++ + TMPDIR=/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + RPM_TOXENV=py312 + HOSTNAME=rpmbuild + /usr/bin/python3 -Bs /usr/lib/rpm/redhat/pyproject_buildrequires.py --generate-extras --python3_pkgversion 3 --wheeldir /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires -t Handling setuptools >= 40.8 from default build backend Requirement satisfied: setuptools >= 40.8 (installed: setuptools 67.7.2) Handling wheel from default build backend Requirement satisfied: wheel (installed: wheel 0.40.0) 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' Handling wheel from get_requires_for_build_wheel Requirement satisfied: wheel (installed: wheel 0.40.0) Handling tox-current-env >= 0.0.6 from tox itself Requirement satisfied: tox-current-env >= 0.0.6 (installed: tox-current-env 0.0.12) py312: OK (0.01 seconds) congratulations :) (0.08 seconds) Handling tox from tox --print-deps-only: py312 Requirement satisfied: tox (installed: tox 4.21.2) running dist_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' creating '/builddir/build/BUILD/git-imerge-1.2.0/git_imerge-1.2.0.dist-info' + cat /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires + rm -rfv git_imerge-1.2.0.dist-info/ removed 'git_imerge-1.2.0.dist-info/entry_points.txt' removed 'git_imerge-1.2.0.dist-info/top_level.txt' removed 'git_imerge-1.2.0.dist-info/METADATA' removed 'git_imerge-1.2.0.dist-info/COPYING' removed directory 'git_imerge-1.2.0.dist-info/' + RPM_EC=0 ++ jobs -p + exit 0 Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc39.buildreqs.nosrc.rpm INFO: Going to install missing dynamic buildrequires No matches found for the following disable plugin patterns: local, spacewalk, versionlock Copr repository 8.8 kB/s | 1.5 kB 00:00 fedora 42 kB/s | 5.0 kB 00:00 updates 80 kB/s | 5.0 kB 00:00 Package git-core-2.47.0-1.fc39.ppc64le is already installed. Package bash-completion-1:2.11-12.fc39.noarch is already installed. Package pyproject-rpm-macros-1.15.1-1.fc39.noarch is already installed. Package python3-devel-3.12.7-1.fc39.ppc64le is already installed. Package python3-devel-3.12.7-1.fc39.ppc64le is already installed. Package python3-packaging-23.1-4.fc39.noarch is already installed. Package python3-pip-23.2.1-2.fc39.noarch is already installed. Package python3-setuptools-67.7.2-8.fc39.noarch is already installed. Package tox-4.21.2-1.fc39.noarch is already installed. Package python3-tox-current-env-0.0.12-1.fc39.noarch is already installed. Package python3-wheel-1:0.40.0-4.fc39.noarch is already installed. Dependencies resolved. Nothing to do. Complete! Building target platforms: ppc64le Building for target ppc64le setting SOURCE_DATE_EPOCH=1730160000 Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.L2UIzt + umask 022 + cd /builddir/build/BUILD + cd git-imerge-1.2.0 + echo pyproject-rpm-macros + echo python3-devel + echo 'python3dist(packaging)' + echo 'python3dist(pip) >= 19' + '[' -f pyproject.toml ']' + '[' -f setup.py ']' + echo 'python3dist(setuptools) >= 40.8' + echo 'python3dist(wheel)' + rm -rfv '*.dist-info/' + '[' -f /usr/bin/python3 ']' + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + echo -n + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + VALAFLAGS=-g + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none --cap-lints=warn' + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 ' + LT_SYS_LIBRARY_PATH=/usr/lib64: + CC=gcc + CXX=g++ + TMPDIR=/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + RPM_TOXENV=py312 + HOSTNAME=rpmbuild + /usr/bin/python3 -Bs /usr/lib/rpm/redhat/pyproject_buildrequires.py --generate-extras --python3_pkgversion 3 --wheeldir /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires -t Handling setuptools >= 40.8 from default build backend Requirement satisfied: setuptools >= 40.8 (installed: setuptools 67.7.2) Handling wheel from default build backend Requirement satisfied: wheel (installed: wheel 0.40.0) 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' Handling wheel from get_requires_for_build_wheel Requirement satisfied: wheel (installed: wheel 0.40.0) Handling tox-current-env >= 0.0.6 from tox itself Requirement satisfied: tox-current-env >= 0.0.6 (installed: tox-current-env 0.0.12) py312: OK (0.01 seconds) congratulations :) (0.08 seconds) Handling tox from tox --print-deps-only: py312 Requirement satisfied: tox (installed: tox 4.21.2) running dist_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' creating '/builddir/build/BUILD/git-imerge-1.2.0/git_imerge-1.2.0.dist-info' + cat /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-buildrequires + rm -rfv git_imerge-1.2.0.dist-info/ removed 'git_imerge-1.2.0.dist-info/entry_points.txt' removed 'git_imerge-1.2.0.dist-info/top_level.txt' removed 'git_imerge-1.2.0.dist-info/METADATA' removed 'git_imerge-1.2.0.dist-info/COPYING' removed directory 'git_imerge-1.2.0.dist-info/' + RPM_EC=0 ++ jobs -p + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.aVy85V + umask 022 + cd /builddir/build/BUILD + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + export CFLAGS + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + export CXXFLAGS + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + export FFLAGS + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + export FCFLAGS + VALAFLAGS=-g + export VALAFLAGS + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn' + export RUSTFLAGS + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes ' + export LDFLAGS + LT_SYS_LIBRARY_PATH=/usr/lib64: + export LT_SYS_LIBRARY_PATH + CC=gcc + export CC + CXX=g++ + export CXX + cd git-imerge-1.2.0 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + VALAFLAGS=-g + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn' + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes ' + LT_SYS_LIBRARY_PATH=/usr/lib64: + CC=gcc + CXX=g++ + TMPDIR=/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + /usr/bin/python3 -Bs /usr/lib/rpm/redhat/pyproject_wheel.py /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir Processing /builddir/build/BUILD/git-imerge-1.2.0 Preparing metadata (pyproject.toml): started Running command Preparing metadata (pyproject.toml) running dist_info creating /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info writing /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info/PKG-INFO writing dependency_links to /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info/dependency_links.txt writing entry points to /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info/entry_points.txt writing top-level names to /builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info/top_level.txt writing manifest file '/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info/SOURCES.txt' reading manifest file '/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'COPYING' writing manifest file '/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge.egg-info/SOURCES.txt' creating '/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-modern-metadata-ax7cc58m/git_imerge-1.2.0.dist-info' Preparing metadata (pyproject.toml): finished with status 'done' Building wheels for collected packages: git-imerge Building wheel for git-imerge (pyproject.toml): started Running command Building wheel for git-imerge (pyproject.toml) running bdist_wheel running build running build_py creating build creating build/lib copying gitimerge.py -> build/lib installing to build/bdist.linux-ppc64le/wheel running install running install_lib creating build/bdist.linux-ppc64le creating build/bdist.linux-ppc64le/wheel copying build/lib/gitimerge.py -> build/bdist.linux-ppc64le/wheel running install_data creating build/bdist.linux-ppc64le/wheel/git_imerge-1.2.0.data creating build/bdist.linux-ppc64le/wheel/git_imerge-1.2.0.data/data creating build/bdist.linux-ppc64le/wheel/usr creating build/bdist.linux-ppc64le/wheel/usr/share creating build/bdist.linux-ppc64le/wheel/usr/share/bash-completion creating build/bdist.linux-ppc64le/wheel/usr/share/bash-completion/completions copying completions/git-imerge -> build/bdist.linux-ppc64le/wheel/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 build/bdist.linux-ppc64le/wheel/git_imerge-1.2.0-py3.12.egg-info running install_scripts creating build/bdist.linux-ppc64le/wheel/git_imerge-1.2.0.dist-info/WHEEL creating '/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir/pip-wheel-iaeqgr5h/.tmp-xyz4l3xy/git_imerge-1.2.0-py3-none-any.whl' and adding 'build/bdist.linux-ppc64le/wheel' to it adding 'gitimerge.py' adding 'usr/share/bash-completion/completions/git-imerge' adding 'git_imerge-1.2.0.dist-info/COPYING' adding 'git_imerge-1.2.0.dist-info/METADATA' adding 'git_imerge-1.2.0.dist-info/WHEEL' adding 'git_imerge-1.2.0.dist-info/entry_points.txt' adding 'git_imerge-1.2.0.dist-info/top_level.txt' adding 'git_imerge-1.2.0.dist-info/RECORD' removing build/bdist.linux-ppc64le/wheel Building wheel for git-imerge (pyproject.toml): finished with status 'done' Created wheel for git-imerge: filename=git_imerge-1.2.0-py3-none-any.whl size=46056 sha256=2db6a652a5c2e19d1c36298146d2bb51fbbbe02cd620dedd03faadef73aaeabb Stored in directory: /builddir/.cache/pip/wheels/93/5f/82/bdaf53cd35e982425654512e59d358eb0bc1c8a3faebcec4eb Successfully built git-imerge + RPM_EC=0 ++ jobs -p + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.kaZX2X + umask 022 + cd /builddir/build/BUILD + '[' /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le '!=' / ']' + rm -rf /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le ++ dirname /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le + mkdir -p /builddir/build/BUILDROOT + mkdir /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + export CFLAGS + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + export CXXFLAGS + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + export FFLAGS + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + export FCFLAGS + VALAFLAGS=-g + export VALAFLAGS + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn' + export RUSTFLAGS + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes ' + export LDFLAGS + LT_SYS_LIBRARY_PATH=/usr/lib64: + export LT_SYS_LIBRARY_PATH + CC=gcc + export CC + CXX=g++ + export CXX + cd git-imerge-1.2.0 ++ ls /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir/git_imerge-1.2.0-py3-none-any.whl ++ xargs basename --multiple ++ sed -E 's/([^-]+)-([^-]+)-.+\.whl/\1==\2/' + specifier=git_imerge==1.2.0 + '[' -z git_imerge==1.2.0 ']' + TMPDIR=/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir + /usr/bin/python3 -m pip install --root /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le --prefix /usr --no-deps --disable-pip-version-check --progress-bar off --verbose --ignore-installed --no-warn-script-location --no-index --no-cache-dir --find-links /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir git_imerge==1.2.0 Using pip 23.2.1 from /usr/lib/python3.12/site-packages/pip (python 3.12) Looking in links: /builddir/build/BUILD/git-imerge-1.2.0/pyproject-wheeldir Processing ./pyproject-wheeldir/git_imerge-1.2.0-py3-none-any.whl Installing collected packages: git_imerge Creating /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/bin changing mode of /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/bin/git-imerge to 755 Successfully installed git_imerge-1.2.0 + '[' -d /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/bin ']' + '[' -z sP ']' + shebang_flags=-kasP + /usr/bin/python3 -B /usr/lib/rpm/redhat/pathfix.py -pni /usr/bin/python3 -kasP /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/bin/git-imerge /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/bin/git-imerge: updating + rm -rfv /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/bin/__pycache__ + rm -f /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-ghost-distinfo + site_dirs=() + '[' -d /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages ']' + site_dirs+=("/usr/lib/python3.12/site-packages") + '[' /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib64/python3.12/site-packages '!=' /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages ']' + '[' -d /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib64/python3.12/site-packages ']' + for site_dir in ${site_dirs[@]} + for distinfo in /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le$site_dir/*.dist-info + echo '%ghost /usr/lib/python3.12/site-packages/git_imerge-1.2.0.dist-info' + sed -i s/pip/rpm/ /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages/git_imerge-1.2.0.dist-info/INSTALLER + PYTHONPATH=/usr/lib/rpm/redhat + /usr/bin/python3 -B /usr/lib/rpm/redhat/pyproject_preprocess_record.py --buildroot /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le --record /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages/git_imerge-1.2.0.dist-info/RECORD --output /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-record + rm -fv /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages/git_imerge-1.2.0.dist-info/RECORD removed '/builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages/git_imerge-1.2.0.dist-info/RECORD' + rm -fv /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages/git_imerge-1.2.0.dist-info/REQUESTED removed '/builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages/git_imerge-1.2.0.dist-info/REQUESTED' ++ cut -f1 '-d ' ++ wc -l /builddir/build/BUILD/git-imerge-1.2.0-1.fc39.ppc64le-pyproject-ghost-distinfo + lines=1 + '[' 1 -ne 1 ']' + /usr/bin/find-debuginfo -j2 --strict-build-id -m -i --build-id-seed 1.2.0-1.fc39 --unique-debug-suffix -1.2.0-1.fc39.ppc64le --unique-debug-src-base git-imerge-1.2.0-1.fc39.ppc64le --run-dwz --dwz-low-mem-die-limit 10000000 --dwz-max-die-limit 50000000 -S debugsourcefiles.list /builddir/build/BUILD/git-imerge-1.2.0 find-debuginfo: starting Extracting debug info from 0 files Creating .debug symlinks for symlinks to ELF files find-debuginfo: done find: ‘debug’: No such file or directory + /usr/lib/rpm/check-buildroot + /usr/lib/rpm/redhat/brp-ldconfig + /usr/lib/rpm/brp-compress + /usr/lib/rpm/redhat/brp-strip-lto /usr/bin/strip + /usr/lib/rpm/brp-strip-static-archive /usr/bin/strip + /usr/lib/rpm/check-rpaths + /usr/lib/rpm/redhat/brp-mangle-shebangs + /usr/lib/rpm/brp-remove-la-files + env /usr/lib/rpm/redhat/brp-python-bytecompile '' 1 0 -j2 Bytecompiling .py files below /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12 using python3.12 + /usr/lib/rpm/redhat/brp-python-hardlink Executing(%check): /bin/sh -e /var/tmp/rpm-tmp.e0vuRB + umask 022 + cd /builddir/build/BUILD + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + export CFLAGS + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + export CXXFLAGS + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + export FFLAGS + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -I/usr/lib64/gfortran/modules ' + export FCFLAGS + VALAFLAGS=-g + export VALAFLAGS + RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn' + export RUSTFLAGS + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes ' + export LDFLAGS + LT_SYS_LIBRARY_PATH=/usr/lib64: + export LT_SYS_LIBRARY_PATH + CC=gcc + export CC + CXX=g++ + export CXX + cd git-imerge-1.2.0 + TOX_TESTENV_PASSENV='*' + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection ' + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes ' + PATH=/builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin + PYTHONPATH=/builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib64/python3.12/site-packages:/builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/lib/python3.12/site-packages + PYTHONDONTWRITEBYTECODE=1 + PYTEST_ADDOPTS=' --ignore=/builddir/build/BUILD/git-imerge-1.2.0/.pyproject-builddir' + PYTEST_XDIST_AUTO_NUM_WORKERS=2 + HOSTNAME=rpmbuild + /usr/bin/python3 -m tox --current-env -q --recreate -e py312 ++++ dirname t/test-unconflicted +++ cd t +++ pwd ++ dirname /builddir/build/BUILD/git-imerge-1.2.0/t + BASE=/builddir/build/BUILD/git-imerge-1.2.0 + . /builddir/build/BUILD/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted + DESCRIPTION='git-imerge test repository without conflicts' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted + local 'description=git-imerge test repository without conflicts' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted + local 'description=git-imerge test repository without conflicts' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted + git init /builddir/build/BUILD/git-imerge-1.2.0/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 + echo 'git-imerge test repository without conflicts' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.name 'Loú User' Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted/.git/ [master (root-commit) 780ddf5] m⇒0 2 files changed, 2 insertions(+) create mode 100644 a.txt create mode 100644 b.txt + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/unconflicted + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + git checkout -b a -- Switched to a new branch 'a' ++ seq 8 + for i in $(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 + for i in $(seq 8) + 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 + for i in $(seq 8) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt [a b862e30] a⇒1 1 file changed, 1 insertion(+), 1 deletion(-) [a dcbe282] a⇒2 1 file changed, 1 insertion(+), 1 deletion(-) [a ecd8647] a⇒3 1 file changed, 1 insertion(+), 1 deletion(-) [a 1634bab] a⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + commit -m a⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE='@1112911997 +0000' + GIT_COMMITTER_DATE='@1112911997 +0000' + git commit -m a⇒3 + for i in $(seq 8) + 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 + for i in $(seq 8) + 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(-) [a f6520bf] a⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 8) + 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 + for i in $(seq 8) + 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(-) [a 49643dd] a⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 8) + 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 + git checkout -b b master -- Switched to a new branch 'b' ++ seq 5 + for i in $(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(-) + for i in $(seq 5) + 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(-) + for i in $(seq 5) + 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(-) + for i in $(seq 5) + 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(-) + for i in $(seq 5) + 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 + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git checkout a Switched to branch 'a' + git-imerge start --first-parent --name=a-b --branch=a-b-merge b [b e22cd97] b⇒5 1 file changed, 1 insertion(+), 1 deletion(-) 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: Tue Oct 29 19:59:45 2024 +0000 # # On branch a-b-merge # Changes to be committed: # modified: b.txt # [a-b-merge 88aa664] Merge b into a (using imerge) Date: Tue Oct 29 19:59:45 2024 +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 ++++ dirname t/test-conflicted +++ cd t +++ pwd ++ dirname /builddir/build/BUILD/git-imerge-1.2.0/t + BASE=/builddir/build/BUILD/git-imerge-1.2.0 + . /builddir/build/BUILD/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + EXPECTED_TREE=ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 4-3 + local conflict=4-3 + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 + DESCRIPTION='git-imerge test repository with conflict at 4-3' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 + local 'description=git-imerge test repository with conflict at 4-3' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 + local 'description=git-imerge test repository with conflict at 4-3' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/ + git init /builddir/build/BUILD/git-imerge-1.2.0/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 + echo 'git-imerge test repository with conflict at 4-3' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-4-3 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt [c a0ac37a] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE='@1112911999 +0000' + GIT_COMMITTER_DATE='@1112911999 +0000' + git commit -m c⇒5 + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in + 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(-) [c 1da7bf5] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE='@1112912001 +0000' + GIT_COMMITTER_DATE='@1112912001 +0000' + git commit -m c⇒7 + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + 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 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + 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 376d1e3] 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: Tue Oct 29 19:59:53 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 2bf9e10] Merge d into c (using imerge) Date: Tue Oct 29 19:59:53 2024 +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 7044c2f 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 + git-imerge continue --edit 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 6d9f6bd] imerge 'c-d': manual merge 4-3 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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 + DESCRIPTION='git-imerge test repository with conflict at 1-1' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 + local 'description=git-imerge test repository with conflict at 1-1' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 + local 'description=git-imerge test repository with conflict at 1-1' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 + git init /builddir/build/BUILD/git-imerge-1.2.0/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 + echo 'git-imerge test repository with conflict at 1-1' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.email luser@example.com + TIME=1112911993 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git/ [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 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-1 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + git checkout -b c master -- Switched to a new branch 'c' ++ seq 9 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + modify conflict.txt 'c version' + filename=conflict.txt + text='c version' + echo 'c version' + git add conflict.txt [c 2120f40] c⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE='@1112911995 +0000' + GIT_COMMITTER_DATE='@1112911995 +0000' + git commit -m c⇒1 + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE='@1112912000 +0000' + GIT_COMMITTER_DATE='@1112912000 +0000' + git commit -m c⇒6 + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE='@1112912001 +0000' + GIT_COMMITTER_DATE='@1112912001 +0000' + git commit -m c⇒7 [c 30dd2ae] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt [c 0883eb9] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE='@1112912002 +0000' + GIT_COMMITTER_DATE='@1112912002 +0000' + git commit -m c⇒8 + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE='@1112912003 +0000' + GIT_COMMITTER_DATE='@1112912003 +0000' + git commit -m c⇒9 + git checkout -b d master -- Switched to a new branch 'd' ++ seq 6 [c f661c06] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + 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 + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE='@1112912005 +0000' + GIT_COMMITTER_DATE='@1112912005 +0000' + git commit -m d⇒2 [d ac0427a] d⇒1 2 files changed, 2 insertions(+), 2 deletions(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE='@1112912006 +0000' + GIT_COMMITTER_DATE='@1112912006 +0000' + git commit -m d⇒3 [d 43c38c0] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) [d 0260058] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE='@1112912009 +0000' + GIT_COMMITTER_DATE='@1112912009 +0000' + git commit -m d⇒6 + git checkout c [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) 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...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: Original second commit: There was a conflict merging commit 1-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 + echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 617ccb7] 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: Tue Oct 29 20:00:01 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 308eafb] Merge d into c (using imerge) Date: Tue Oct 29 20:00:01 2024 +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...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. + grep -q Traceback start.out 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 '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 cdcd4bd] 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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 + DESCRIPTION='git-imerge test repository with conflict at 9-1' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 + local 'description=git-imerge test repository with conflict at 9-1' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 + local 'description=git-imerge test repository with conflict at 9-1' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 + git init /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git/ 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 + echo 'git-imerge test repository with conflict at 9-1' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.email luser@example.com [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 + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-1 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + git checkout -b c master -- Switched to a new branch 'c' ++ seq 9 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE='@1112911996 +0000' + GIT_COMMITTER_DATE='@1112911996 +0000' + git commit -m c⇒2 + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE='@1112911997 +0000' + GIT_COMMITTER_DATE='@1112911997 +0000' + git commit -m c⇒3 + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE='@1112911998 +0000' + GIT_COMMITTER_DATE='@1112911998 +0000' + git commit -m c⇒4 + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE='@1112911999 +0000' + GIT_COMMITTER_DATE='@1112911999 +0000' + git commit -m c⇒5 + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE='@1112912000 +0000' + GIT_COMMITTER_DATE='@1112912000 +0000' + git commit -m c⇒6 + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE='@1112912001 +0000' + GIT_COMMITTER_DATE='@1112912001 +0000' + git commit -m c⇒7 + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE='@1112912002 +0000' + GIT_COMMITTER_DATE='@1112912002 +0000' + git commit -m c⇒8 + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + 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 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) Switched to a new branch 'd' ++ seq 6 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + 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 + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE='@1112912005 +0000' + GIT_COMMITTER_DATE='@1112912005 +0000' + git commit -m d⇒2 [d ac0427a] d⇒1 2 files changed, 2 insertions(+), 2 deletions(-) [d 43c38c0] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + 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 + 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...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' Original first commit: Original second commit: Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 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 649a1b2] 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: Tue Oct 29 20:00:10 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 4ac3295] Merge d into c (using imerge) Date: Tue Oct 29 20:00:10 2024 +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...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 23c20eb] 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 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/ ++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 1-6 + local conflict=1-6 + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 + DESCRIPTION='git-imerge test repository with conflict at 1-6' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 + local 'description=git-imerge test repository with conflict at 1-6' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 + local 'description=git-imerge test repository with conflict at 1-6' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 + git init /builddir/build/BUILD/git-imerge-1.2.0/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 + echo 'git-imerge test repository with conflict at 1-6' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-6 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + 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 + for i in $(seq 9) [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 + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + 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(-) [c ac16a05] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE='@1112911999 +0000' + GIT_COMMITTER_DATE='@1112911999 +0000' + git commit -m c⇒5 + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE='@1112912003 +0000' + GIT_COMMITTER_DATE='@1112912003 +0000' + git commit -m c⇒9 + git checkout -b d master -- Switched to a new branch 'd' ++ seq 6 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE='@1112912004 +0000' + GIT_COMMITTER_DATE='@1112912004 +0000' + git commit -m d⇒1 [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + 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(-) [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) [d 9522207] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + case $conflict in + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE='@1112912007 +0000' + GIT_COMMITTER_DATE='@1112912007 +0000' + git commit -m d⇒4 + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE='@1112912008 +0000' + GIT_COMMITTER_DATE='@1112912008 +0000' + git commit -m d⇒5 + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + 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 + 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. commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 Original first commit: Original second commit: 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 5473bde] 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: Tue Oct 29 20:00:19 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 143bc84] Merge d into c (using imerge) Date: Tue Oct 29 20:00:19 2024 +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...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 fab7d6d 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 # + git-imerge continue --edit [imerge/c-d 7693dd9] imerge 'c-d': manual merge 1-6 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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 + DESCRIPTION='git-imerge test repository with conflict at 9-6' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 + local 'description=git-imerge test repository with conflict at 9-6' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 + local 'description=git-imerge test repository with conflict at 9-6' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 + git init /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git/ 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 + echo 'git-imerge test repository with conflict at 9-6' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-6 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE='@1112911995 +0000' + GIT_COMMITTER_DATE='@1112911995 +0000' + git commit -m c⇒1 + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + case $conflict in + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE='@1112911996 +0000' + GIT_COMMITTER_DATE='@1112911996 +0000' + git commit -m c⇒2 + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + 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(-) [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE='@1112911998 +0000' + GIT_COMMITTER_DATE='@1112911998 +0000' + git commit -m c⇒4 + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + commit -m c⇒5 + TIME=1112911999 + GIT_AUTHOR_DATE='@1112911999 +0000' + GIT_COMMITTER_DATE='@1112911999 +0000' + git commit -m c⇒5 + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + 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(-) + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE='@1112912001 +0000' + GIT_COMMITTER_DATE='@1112912001 +0000' + git commit -m c⇒7 + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) [c 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + case $conflict in + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE='@1112912002 +0000' + GIT_COMMITTER_DATE='@1112912002 +0000' + git commit -m c⇒8 + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + 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 + git checkout -b d master -- Switched to a new branch 'd' ++ seq 6 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + case $conflict in + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE='@1112912007 +0000' + GIT_COMMITTER_DATE='@1112912007 +0000' + git commit -m d⇒4 + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + commit -m d⇒5 + TIME=1112912008 + GIT_AUTHOR_DATE='@1112912008 +0000' + GIT_COMMITTER_DATE='@1112912008 +0000' + git commit -m d⇒5 [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) [d 9522207] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + 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 + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + 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 commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 Original second commit: 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 78c716b] 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: Tue Oct 29 20:00:25 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge dae8af8] Merge d into c (using imerge) Date: Tue Oct 29 20:00:25 2024 +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 6e85c22] 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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 + DESCRIPTION='git-imerge test repository with conflict at 1-2' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 + local 'description=git-imerge test repository with conflict at 1-2' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 + local 'description=git-imerge test repository with conflict at 1-2' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 + git init /builddir/build/BUILD/git-imerge-1.2.0/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 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git/ 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 + echo 'git-imerge test repository with conflict at 1-2' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-1-2 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt [c 2046ed2] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE='@1112911997 +0000' + GIT_COMMITTER_DATE='@1112911997 +0000' + git commit -m c⇒3 + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + 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 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + 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(-) [d 86c8052] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + case $conflict in + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE='@1112912007 +0000' + GIT_COMMITTER_DATE='@1112912007 +0000' + git commit -m d⇒4 + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + 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(-) [d df2e493] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE='@1112912009 +0000' + GIT_COMMITTER_DATE='@1112912009 +0000' + git commit -m d⇒6 + 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. commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 Original first commit: Original second commit: There was a conflict merging commit 1-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue commit 69efde8f66d581a765a3909ffacb9f895f95c345 Author: Loú User Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 + echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d f0ee668] 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: Tue Oct 29 20:00:34 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 536e8a8] Merge d into c (using imerge) Date: Tue Oct 29 20:00:34 2024 +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...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 d8ef43f 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 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 # + GIT_EDITOR=cat + git commit + git-imerge continue --edit [imerge/c-d 57cbda6] imerge 'c-d': manual merge 1-2 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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 + DESCRIPTION='git-imerge test repository with conflict at 9-5' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 + local 'description=git-imerge test repository with conflict at 9-5' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 + local 'description=git-imerge test repository with conflict at 9-5' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 + git init /builddir/build/BUILD/git-imerge-1.2.0/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 /builddir/build/BUILD/git-imerge-1.2.0/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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-9-5 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE='@1112912000 +0000' + GIT_COMMITTER_DATE='@1112912000 +0000' + git commit -m c⇒6 + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + commit -m c⇒7 + TIME=1112912001 + GIT_AUTHOR_DATE='@1112912001 +0000' + GIT_COMMITTER_DATE='@1112912001 +0000' + git commit -m c⇒7 [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + case $conflict in + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE='@1112912002 +0000' + GIT_COMMITTER_DATE='@1112912002 +0000' + git commit -m c⇒8 + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + 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 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' ++ seq 6 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + commit -m d⇒1 + TIME=1112912004 + GIT_AUTHOR_DATE='@1112912004 +0000' + GIT_COMMITTER_DATE='@1112912004 +0000' + git commit -m d⇒1 + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m d⇒2 + TIME=1112912005 + GIT_AUTHOR_DATE='@1112912005 +0000' + GIT_COMMITTER_DATE='@1112912005 +0000' + git commit -m d⇒2 + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE='@1112912006 +0000' + GIT_COMMITTER_DATE='@1112912006 +0000' + git commit -m d⇒3 [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m d⇒4 + TIME=1112912007 + GIT_AUTHOR_DATE='@1112912007 +0000' + GIT_COMMITTER_DATE='@1112912007 +0000' + git commit -m d⇒4 + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + 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 + 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...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 044977a] 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: Tue Oct 29 20:00:46 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 4794452] Merge d into c (using imerge) Date: Tue Oct 29 20:00:46 2024 +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...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 65420a1] 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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 + DESCRIPTION='git-imerge test repository with conflict at 5-1' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 + local 'description=git-imerge test repository with conflict at 5-1' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 + local 'description=git-imerge test repository with conflict at 5-1' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 + git init /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git/ 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 + echo 'git-imerge test repository with conflict at 5-1' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-5-1 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + 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(-) [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + case $conflict in + commit -m c⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE='@1112911996 +0000' + GIT_COMMITTER_DATE='@1112911996 +0000' + git commit -m c⇒2 + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in + 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(-) [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + commit -m c⇒4 + TIME=1112911998 + GIT_AUTHOR_DATE='@1112911998 +0000' + GIT_COMMITTER_DATE='@1112911998 +0000' + git commit -m c⇒4 + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + 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(-) [c df3c57a] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in + commit -m c⇒6 + TIME=1112912000 + GIT_AUTHOR_DATE='@1112912000 +0000' + GIT_COMMITTER_DATE='@1112912000 +0000' + git commit -m c⇒6 + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + 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(-) [c 44473d6] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt + case $conflict in + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE='@1112912002 +0000' + GIT_COMMITTER_DATE='@1112912002 +0000' + git commit -m c⇒8 + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in + 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 -- [d ac0427a] d⇒1 2 files changed, 2 insertions(+), 2 deletions(-) Switched to a new branch 'd' ++ seq 6 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + 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 + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + 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(-) [d 0260058] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + commit -m d⇒3 + TIME=1112912006 + GIT_AUTHOR_DATE='@1112912006 +0000' + GIT_COMMITTER_DATE='@1112912006 +0000' + git commit -m d⇒3 + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + 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(-) [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + commit -m d⇒6 + TIME=1112912009 + GIT_AUTHOR_DATE='@1112912009 +0000' + GIT_COMMITTER_DATE='@1112912009 +0000' + git commit -m d⇒6 + 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 Original first commit: Original second commit: There was a conflict merging commit 5-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue Automatic merge failed; fix conflicts and then commit the result. commit 7e31f254c318decc434628f023dac0703f3d2b9e Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 c⇒5 commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 + echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 8d2a547] 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: Tue Oct 29 20:00:53 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 82dbde2] Merge d into c (using imerge) Date: Tue Oct 29 20:00:53 2024 +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 efdaa66] 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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 + DESCRIPTION='git-imerge test repository with conflict at 6-6' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 + local 'description=git-imerge test repository with conflict at 6-6' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 + local 'description=git-imerge test repository with conflict at 6-6' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 + git init /builddir/build/BUILD/git-imerge-1.2.0/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 /builddir/build/BUILD/git-imerge-1.2.0/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=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/conflicted-6-6 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + git checkout -b c master -- Switched to a new branch 'c' ++ seq 9 + for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt + case $conflict in + commit -m c⇒1 + TIME=1112911995 + GIT_AUTHOR_DATE='@1112911995 +0000' + GIT_COMMITTER_DATE='@1112911995 +0000' + git commit -m c⇒1 [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 [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt + case $conflict in + 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(-) [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt + case $conflict in + commit -m c⇒3 + TIME=1112911997 + GIT_AUTHOR_DATE='@1112911997 +0000' + GIT_COMMITTER_DATE='@1112911997 +0000' + git commit -m c⇒3 + for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt + case $conflict in + 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(-) + for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt [c 7459ac3] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + case $conflict in + commit -m c⇒8 + TIME=1112912002 + GIT_AUTHOR_DATE='@1112912002 +0000' + GIT_COMMITTER_DATE='@1112912002 +0000' + git commit -m c⇒8 + for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt + case $conflict in [c 70408c8] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + commit -m c⇒9 + TIME=1112912003 + GIT_AUTHOR_DATE='@1112912003 +0000' + GIT_COMMITTER_DATE='@1112912003 +0000' + git commit -m c⇒9 + git checkout -b d master -- Switched to a new branch 'd' ++ seq 6 + for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt + case $conflict in + 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(-) + for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt + case $conflict in + 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: Original second commit: commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854 Author: Loú User Date: Thu Apr 7 22:13:20 2005 +0000 c⇒6 There was a conflict merging commit 6-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 + echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit [imerge/c-d 0da86e7] 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: Tue Oct 29 20:01:01 2024 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # [c-d-merge 06c32bf] Merge d into c (using imerge) Date: Tue Oct 29 20:01:01 2024 +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...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 8621550 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 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 # + GIT_EDITOR=cat + git commit [imerge/c-d f77707d] 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 ++++ dirname t/test-really-conflicted +++ cd t +++ pwd ++ dirname /builddir/build/BUILD/git-imerge-1.2.0/t + BASE=/builddir/build/BUILD/git-imerge-1.2.0 + . /builddir/build/BUILD/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted + DESCRIPTION='git-imerge test repository with multiple conflicts' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted + local 'description=git-imerge test repository with multiple conflicts' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted + local 'description=git-imerge test repository with multiple conflicts' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted + git init /builddir/build/BUILD/git-imerge-1.2.0/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 + echo 'git-imerge test repository with multiple conflicts' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.email luser@example.com Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted/.git/ + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/really-conflicted + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + for i in $(seq 0 7) + modify conflict0.txt 'original version' + filename=conflict0.txt + text='original version' + echo 'original version' + git add conflict0.txt + for i in $(seq 0 7) + modify conflict1.txt 'original version' + filename=conflict1.txt + text='original version' + echo 'original version' + git add conflict1.txt + for i in $(seq 0 7) + modify conflict2.txt 'original version' + filename=conflict2.txt + text='original version' + echo 'original version' + git add conflict2.txt + for i in $(seq 0 7) + modify conflict3.txt 'original version' + filename=conflict3.txt + text='original version' + echo 'original version' + git add conflict3.txt + for i in $(seq 0 7) + modify conflict4.txt 'original version' + filename=conflict4.txt + text='original version' + echo 'original version' + git add conflict4.txt + for i in $(seq 0 7) + modify conflict5.txt 'original version' + filename=conflict5.txt + text='original version' + echo 'original version' + git add conflict5.txt + for i in $(seq 0 7) + modify conflict6.txt 'original version' + filename=conflict6.txt + text='original version' + echo 'original version' + git add conflict6.txt + for i in $(seq 0 7) + 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 + 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 [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 + 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 + modify c.txt 2 + filename=c.txt + text=2 [c 4e6007a] c⇒1 3 files changed, 3 insertions(+), 3 deletions(-) + 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 + 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 + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt [c 42ad55a] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) [c a891793] c⇒4 2 files changed, 2 insertions(+), 2 deletions(-) + 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 + 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 c21441d] c⇒5 3 files changed, 3 insertions(+), 3 deletions(-) [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 + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt [c 9f3e7c8] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + 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 + git checkout -b d master -- [c ccbfccb] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) 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 + 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 b2f5c5e] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) [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 [d 67099d0] d⇒8 2 files changed, 2 insertions(+), 2 deletions(-) + commit -m d⇒8 + TIME=1112912011 + GIT_AUTHOR_DATE='@1112912011 +0000' + GIT_COMMITTER_DATE='@1112912011 +0000' + git commit -m d⇒8 + 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 + for i in $(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 + for i in $(seq 0 7) + grep -q ==== conflict1.txt + for i in $(seq 0 7) + grep -q ==== conflict2.txt + for i in $(seq 0 7) + grep -q ==== conflict3.txt + for i in $(seq 0 7) + grep -q ==== conflict4.txt + for i in $(seq 0 7) + grep -q ==== conflict5.txt + for i in $(seq 0 7) + grep -q ==== conflict6.txt + for i in $(seq 0 7) + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d cd55f31] 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 + for i in $(seq 0 7) + grep -q ==== conflict0.txt + for i in $(seq 0 7) + grep -q ==== conflict1.txt + for i in $(seq 0 7) + grep -q ==== conflict2.txt + for i in $(seq 0 7) + grep -q ==== conflict3.txt + for i in $(seq 0 7) + 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 + for i in $(seq 0 7) + grep -q ==== conflict5.txt + for i in $(seq 0 7) + grep -q ==== conflict6.txt + for i in $(seq 0 7) + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d fea91df] 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: b5ae6be 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 b5ae6be 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 + for i in $(seq 0 7) + grep -q ==== conflict0.txt + for i in $(seq 0 7) + 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 + for i in $(seq 0 7) + grep -q ==== conflict2.txt + for i in $(seq 0 7) + grep -q ==== conflict3.txt + for i in $(seq 0 7) + grep -q ==== conflict4.txt + for i in $(seq 0 7) + grep -q ==== conflict5.txt + for i in $(seq 0 7) + grep -q ==== conflict6.txt + for i in $(seq 0 7) + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d d2b05b2] 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 7adda42 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 + grep -q 'There was a conflict merging' autofill.out 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 ++ seq 0 7 + for i in $(seq 0 7) + grep -q ==== conflict0.txt + for i in $(seq 0 7) + grep -q ==== conflict1.txt + for i in $(seq 0 7) + grep -q ==== conflict2.txt + for i in $(seq 0 7) + grep -q ==== conflict3.txt + for i in $(seq 0 7) + grep -q ==== conflict4.txt + for i in $(seq 0 7) + grep -q ==== conflict5.txt + for i in $(seq 0 7) + 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 + for i in $(seq 0 7) + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d 65eb3d5] 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 7ab2e2f 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 + for i in $(seq 0 7) + grep -q ==== conflict0.txt + for i in $(seq 0 7) + grep -q ==== conflict1.txt + for i in $(seq 0 7) + grep -q ==== conflict2.txt + for i in $(seq 0 7) + 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 + for i in $(seq 0 7) + grep -q ==== conflict4.txt + for i in $(seq 0 7) + grep -q ==== conflict5.txt + for i in $(seq 0 7) + grep -q ==== conflict6.txt + for i in $(seq 0 7) + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d f5adc1c] 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 + for i in $(seq 0 7) + grep -q ==== conflict0.txt + for i in $(seq 0 7) + grep -q ==== conflict1.txt + for i in $(seq 0 7) + grep -q ==== conflict2.txt + for i in $(seq 0 7) + grep -q ==== conflict3.txt + for i in $(seq 0 7) + grep -q ==== conflict4.txt + for i in $(seq 0 7) + 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 + for i in $(seq 0 7) + grep -q ==== conflict6.txt + for i in $(seq 0 7) + grep -q ==== conflict7.txt + true + tee autofill.out + git-imerge continue --no-edit [imerge/c-d b733e26] 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 9a1c222 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 + for i in $(seq 0 7) + grep -q ==== conflict0.txt + for i in $(seq 0 7) + grep -q ==== conflict1.txt + for i in $(seq 0 7) + 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 + for i in $(seq 0 7) + grep -q ==== conflict3.txt + for i in $(seq 0 7) + grep -q ==== conflict4.txt + for i in $(seq 0 7) + grep -q ==== conflict5.txt + for i in $(seq 0 7) + grep -q ==== conflict6.txt + for i in $(seq 0 7) + grep -q ==== conflict7.txt + true + git-imerge continue --no-edit + tee autofill.out [imerge/c-d bc20205] 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: + grep -q Traceback autofill.out 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 + 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 + for i in $(seq 0 7) + grep -q ==== conflict0.txt + for i in $(seq 0 7) + grep -q ==== conflict1.txt + for i in $(seq 0 7) + grep -q ==== conflict2.txt + for i in $(seq 0 7) + grep -q ==== conflict3.txt + for i in $(seq 0 7) + grep -q ==== conflict4.txt + for i in $(seq 0 7) + grep -q ==== conflict5.txt + for i in $(seq 0 7) + grep -q ==== conflict6.txt + for i in $(seq 0 7) + 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 + git-imerge continue --no-edit + tee autofill.out [imerge/c-d cc4394e] 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: Tue Oct 29 20:01:17 2024 +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 ad79c84] Merge d into c (using imerge) Date: Tue Oct 29 20:01:17 2024 +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 ++++ dirname t/test-duplicated +++ cd t +++ pwd ++ dirname /builddir/build/BUILD/git-imerge-1.2.0/t Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated/.git/ [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + BASE=/builddir/build/BUILD/git-imerge-1.2.0 + . /builddir/build/BUILD/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated + DESCRIPTION='git-imerge test repository with duplicate commits' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated + local 'description=git-imerge test repository with duplicate commits' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated + local 'description=git-imerge test repository with duplicate commits' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated + git init /builddir/build/BUILD/git-imerge-1.2.0/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 + echo 'git-imerge test repository with duplicate commits' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/duplicated + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + git checkout -b a -- Switched to a new branch 'a' ++ seq 3 + for i in $(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' + for i in $(seq 3) + 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 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + for i in $(seq 3) + 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 -- [b 62a5c56] a⇒1 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) Switched to a new branch 'b' ++ seq 4 + for i in $(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' + for i in $(seq 4) + 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(-) + for i in $(seq 4) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt [b a4b2c2b] a⇒3 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) [b 5b24553] a⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + 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' + for i in $(seq 4) + 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' + 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: Tue Oct 29 20:01:20 2024 +0000 # # On branch a-b-merge # Changes to be committed: # modified: a.txt # [a-b-merge 855022b] Merge b into a (using imerge) Date: Tue Oct 29 20:01:20 2024 +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 ++++ dirname t/test-flip-flop +++ cd t +++ pwd Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1/.git/ ++ dirname /builddir/build/BUILD/git-imerge-1.2.0/t + BASE=/builddir/build/BUILD/git-imerge-1.2.0 + . /builddir/build/BUILD/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + for n in 1 2 3 + flip_flop_test 1 + local n=1 + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 + DESCRIPTION='git-imerge test repository with a commit and its revert at n=1' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 'git-imerge test repository with a commit and its revert at n=1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 + local 'description=git-imerge test repository with a commit and its revert at n=1' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 'git-imerge test repository with a commit and its revert at n=1' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 + local 'description=git-imerge test repository with a commit and its revert at n=1' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 + git init /builddir/build/BUILD/git-imerge-1.2.0/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 + echo 'git-imerge test repository with a commit and its revert at n=1' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 + cd /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-1 [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + 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 + git checkout -b a -- Switched to a new branch 'a' + for i in 1 2 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(-) + for i in 1 2 3 + 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(-) + for i in 1 2 3 + 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' + for i in 1 2 3 4 + 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 + for i in 1 2 3 4 + 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(-) + for i in 1 2 3 4 + 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(-) [b 2dc5eb7] b⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + for i in 1 2 3 4 + 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' + 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' + git-imerge merge --branch=b-into-a-1 b + tee imerge-b-into-a-1-1.out 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 580be78] 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 8835015 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 6f9e37d] 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: Tue Oct 29 20:01:26 2024 +0000 # # On branch b-into-a-1 # Changes to be committed: # new file: b.txt # [b-into-a-1 89611c3] Merge b into a (using imerge) Date: Tue Oct 29 20:01:26 2024 +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 + grep -q 'There was a conflict merging commit 1-1' imerge-a-into-b-1-1.out 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 + echo 1 + git add a.txt + git-imerge continue --no-edit + tee imerge-a-into-b-1-2.out [imerge/a 2055a75] 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 + git-imerge continue --no-edit + tee imerge-a-into-b-1-3.out [imerge/a 4b115b3] 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: Tue Oct 29 20:01:28 2024 +0000 # # On branch a-into-b-1 # Changes to be committed: # modified: a.txt # [a-into-b-1 afd4c67] Merge a into b (using imerge) Date: Tue Oct 29 20:01:28 2024 +0000 + for n in 1 2 3 + flip_flop_test 2 + local n=2 + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 + DESCRIPTION='git-imerge test repository with a commit and its revert at n=2' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 'git-imerge test repository with a commit and its revert at n=2' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 + local 'description=git-imerge test repository with a commit and its revert at n=2' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 'git-imerge test repository with a commit and its revert at n=2' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 + local 'description=git-imerge test repository with a commit and its revert at n=2' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 + git init /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2/.git/ [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt 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 + echo 'git-imerge test repository with a commit and its revert at n=2' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-2 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + git checkout -b a -- Switched to a new branch 'a' + for i in 1 2 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(-) + for i in 1 2 3 + 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(-) + for i in 1 2 3 + 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' + git checkout -b b master -- Switched to a new branch 'b' + for i in 1 2 3 4 + 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' + for i in 1 2 3 4 + 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' [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) [b 1f7d097] b⇒1 on branch b 1 file changed, 1 insertion(+) create mode 100644 b.txt [b 48df77d] b⇒2 and a⇒X on branch b 2 files changed, 2 insertions(+), 2 deletions(-) + for i in 1 2 3 4 + 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' + for i in 1 2 3 4 + 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' + 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 [b f3ef019] b⇒3 and a⇒0 on branch b 2 files changed, 2 insertions(+), 2 deletions(-) [b 69d0c21] b⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) 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 + git-imerge continue --no-edit + tee imerge-b-into-a-2-2.out [imerge/b afcaf09] 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 bb5f579 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 + git-imerge continue --no-edit + tee imerge-b-into-a-2-3.out [imerge/b 5f896a4] 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: Tue Oct 29 20:01:30 2024 +0000 # # On branch b-into-a-2 # Changes to be committed: # new file: b.txt # [b-into-a-2 afa5d5b] Merge b into a (using imerge) Date: Tue Oct 29 20:01:30 2024 +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 + git-imerge continue --no-edit + tee imerge-a-into-b-2-2.out [imerge/a 47013ef] 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 + git-imerge continue --no-edit + tee imerge-a-into-b-2-3.out [imerge/a 882b1b2] 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: Tue Oct 29 20:01:32 2024 +0000 # # On branch a-into-b-2 # Changes to be committed: # modified: a.txt # [a-into-b-2 35917be] Merge a into b (using imerge) Date: Tue Oct 29 20:01:32 2024 +0000 + for n in 1 2 3 + flip_flop_test 3 + local n=3 + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 + DESCRIPTION='git-imerge test repository with a commit and its revert at n=3' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 'git-imerge test repository with a commit and its revert at n=3' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 + local 'description=git-imerge test repository with a commit and its revert at n=3' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 'git-imerge test repository with a commit and its revert at n=3' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 + local 'description=git-imerge test repository with a commit and its revert at n=3' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 + git init /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3/.git/ 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 + echo 'git-imerge test repository with a commit and its revert at n=3' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name 'Loú User' [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/flip-flop-3 + cd /builddir/build/BUILD/git-imerge-1.2.0/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 + git checkout -b a -- Switched to a new branch 'a' + for i in 1 2 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' + for i in 1 2 3 + 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 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + for i in 1 2 3 + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + 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' + git checkout -b b master -- [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) [b 1f7d097] b⇒1 on branch b 1 file changed, 1 insertion(+) create mode 100644 b.txt [b ce671e9] b⇒2 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) Switched to a new branch 'b' + for i in 1 2 3 4 + 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' + for i in 1 2 3 4 + 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' + for i in 1 2 3 4 + 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(-) [b eb736f2] b⇒4 and a⇒0 on branch b 2 files changed, 2 insertions(+), 2 deletions(-) + for i in 1 2 3 4 + 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' + 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' + tee imerge-b-into-a-3-1.out + git-imerge merge --branch=b-into-a-3 b 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 + tee imerge-b-into-a-3-2.out + git-imerge continue --no-edit [imerge/b fe4e4e8] 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 f9b7128 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 9695d9c] 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: Tue Oct 29 20:01:35 2024 +0000 # # On branch b-into-a-3 # Changes to be committed: # new file: b.txt # [b-into-a-3 d679ecc] Merge b into a (using imerge) Date: Tue Oct 29 20:01:35 2024 +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 fc715f6] 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 + git-imerge continue --no-edit + tee imerge-a-into-b-3-3.out [imerge/a 10fafdc] 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: Tue Oct 29 20:01:36 2024 +0000 # # On branch a-into-b-3 # Changes to be committed: # modified: a.txt # [a-into-b-3 8b16577] Merge a into b (using imerge) Date: Tue Oct 29 20:01:36 2024 +0000 ++++ dirname t/test-drop +++ cd t +++ pwd ++ dirname /builddir/build/BUILD/git-imerge-1.2.0/t + BASE=/builddir/build/BUILD/git-imerge-1.2.0 + . /builddir/build/BUILD/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop + DESCRIPTION='git-imerge drop test repository' + init_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop + local 'description=git-imerge drop test repository' + delete_test_repo /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository' + local path=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop + local 'description=git-imerge drop test repository' + test -d /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop + mkdir -p /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop + git init /builddir/build/BUILD/git-imerge-1.2.0/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 /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop/.git/ + echo 'git-imerge drop test repository' + printf '%s\n' '/*.out' '/*.css' '/*.html' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop/.git config user.name 'Loú User' + git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop/.git config user.email luser@example.com + TIME=1112911993 + ln -s /builddir/build/BUILD/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0/t/tmp/drop + cd /builddir/build/BUILD/git-imerge-1.2.0/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 ++ seq 6 + for i in $(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 + for i in $(seq 6) + modify a2.txt 2 + filename=a2.txt + text=2 + echo 2 + git add a2.txt [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt [master 389a4ba] a1⇒1 1 file changed, 1 insertion(+) create mode 100644 a1.txt [master 4785218] a2⇒2 1 file changed, 1 insertion(+) create mode 100644 a2.txt [master 34bdde3] a3⇒3 1 file changed, 1 insertion(+) create mode 100644 a3.txt + commit -m a2⇒2 + TIME=1112911996 + GIT_AUTHOR_DATE='@1112911996 +0000' + GIT_COMMITTER_DATE='@1112911996 +0000' + git commit -m a2⇒2 + for i in $(seq 6) + 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 + for i in $(seq 6) + 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 + for i in $(seq 6) + 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 + for i in $(seq 6) + 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 5ecc6fd] Revert "a3⇒3" Date: Tue Oct 29 20:01:37 2024 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt [detached HEAD 6795450] Revert "a2⇒2" Date: Tue Oct 29 20:01:37 2024 +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='6795450f54b92b47134c76af8a0d79083b8b7dfa', goal='drop')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-drop.html 0 3 | | 0 - **** - dropped *??. 2 - *... | 6795450f54b92b47134c76af8a0d79083b8b7dfa 0 3 | | 0 - **** - dropped *??| 2 - *--+ | 6795450f54b92b47134c76af8a0d79083b8b7dfa 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 d73ca23] Revert "a3⇒3" Date: Tue Oct 29 20:01:38 2024 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt [detached HEAD 655f866] Revert "a2⇒2" Date: Tue Oct 29 20:01:38 2024 +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='655f86684ae33ea8dce5582bc15a83e81903eaa8', goal='revert')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-revert.html 0 3 | | 0 - **** - reverted *??. 2 - *... | 655f86684ae33ea8dce5582bc15a83e81903eaa8 0 3 | | 0 - **** - reverted *??| 2 - *--+ | 655f86684ae33ea8dce5582bc15a83e81903eaa8 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 py312: OK (113.84 seconds) congratulations :) (113.92 seconds) + RPM_EC=0 ++ jobs -p + exit 0 Processing files: git-imerge-1.2.0-1.fc39.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.p96v82 + umask 022 + cd /builddir/build/BUILD + cd git-imerge-1.2.0 + DOCDIR=/builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/share/doc/git-imerge + export LC_ALL= + LC_ALL= + export DOCDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/share/doc/git-imerge + cp -pr /builddir/build/BUILD/git-imerge-1.2.0/README.md /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/share/doc/git-imerge + RPM_EC=0 ++ jobs -p + exit 0 Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.HBretz + umask 022 + cd /builddir/build/BUILD + cd git-imerge-1.2.0 + LICENSEDIR=/builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/share/licenses/git-imerge + export LC_ALL= + LC_ALL= + export LICENSEDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/share/licenses/git-imerge + cp -pr /builddir/build/BUILD/git-imerge-1.2.0/COPYING /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le/usr/share/licenses/git-imerge + RPM_EC=0 ++ jobs -p + exit 0 Provides: git-imerge = 1.2.0-1.fc39 python3.12dist(git-imerge) = 1.2 python3dist(git-imerge) = 1.2 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires: /usr/bin/python3 python(abi) = 3.12 Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc39.src.rpm Wrote: /builddir/build/RPMS/git-imerge-1.2.0-1.fc39.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.JGtmZg + umask 022 + cd /builddir/build/BUILD + cd git-imerge-1.2.0 + /usr/bin/rm -rf /builddir/build/BUILDROOT/git-imerge-1.2.0-1.fc39.ppc64le + RPM_EC=0 ++ jobs -p + exit 0 Executing(rmbuild): /bin/sh -e /var/tmp/rpm-tmp.SdZK13 + umask 022 + cd /builddir/build/BUILD + rm -rf /builddir/build/BUILD/git-imerge-1.2.0-SPECPARTS + rm -rf git-imerge-1.2.0 git-imerge-1.2.0.gemspec + RPM_EC=0 ++ jobs -p + exit 0 Finish: rpmbuild git-imerge-1.2.0-1.fc39.src.rpm Finish: build phase for git-imerge-1.2.0-1.fc39.src.rpm INFO: chroot_scan: 3 files copied to /var/lib/copr-rpmbuild/results/chroot_scan INFO: /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root/var/log/dnf.log /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root/var/log/dnf.librepo.log /var/lib/mock/fedora-39-ppc64le-1730231711.608671/root/var/log/dnf.rpm.log INFO: chroot_scan: creating tarball /var/lib/copr-rpmbuild/results/chroot_scan.tar.gz /bin/tar: Removing leading `/' from member names INFO: Done(/var/lib/copr-rpmbuild/results/git-imerge-1.2.0-1.fc39.src.rpm) Config(child) 2 minutes 50 seconds INFO: Results and/or logs in: /var/lib/copr-rpmbuild/results INFO: Cleaning up build root ('cleanup_on_success=True') Start: clean chroot INFO: unmounting tmpfs. Finish: clean chroot Finish: run Running RPMResults tool Package info: { "packages": [ { "name": "git-imerge", "epoch": null, "version": "1.2.0", "release": "1.fc39", "arch": "noarch" }, { "name": "git-imerge", "epoch": null, "version": "1.2.0", "release": "1.fc39", "arch": "src" } ] } RPMResults finished