Warning: Permanently added '2620:52:3:1:dead:beef:cafe:c11b' (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/9741050-fedora-rawhide-x86_64 --chroot fedora-rawhide-x86_64


Version: 1.6
PID: 2855
Logging PID: 2857
Task:
{'allow_user_ssh': False,
 'appstream': False,
 'background': False,
 'build_id': 9741050,
 'buildroot_pkgs': [],
 'chroot': 'fedora-rawhide-x86_64',
 'enable_net': False,
 'fedora_review': False,
 'git_hash': 'b6f0c13eb07d057a10cbfd455a5c0cef8cf6f7f8',
 '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-rawhide-x86_64/',
            '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': '9741050-fedora-rawhide-x86_64',
 '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-mknffo2h/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-mknffo2h/git-imerge', '--depth', '500', '--no-single-branch', '--recursive']
cwd: .
rc: 0
stdout: 
stderr: Cloning into '/var/lib/copr-rpmbuild/workspace/workdir-mknffo2h/git-imerge'...

Running: git checkout b6f0c13eb07d057a10cbfd455a5c0cef8cf6f7f8 --

cmd: ['git', 'checkout', 'b6f0c13eb07d057a10cbfd455a5c0cef8cf6f7f8', '--']
cwd: /var/lib/copr-rpmbuild/workspace/workdir-mknffo2h/git-imerge
rc: 0
stdout: 
stderr: Note: switching to 'b6f0c13eb07d057a10cbfd455a5c0cef8cf6f7f8'.

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 <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at b6f0c13 automatic import of git-imerge

Running: dist-git-client sources
tail: /var/lib/copr-rpmbuild/main.log: file truncated
Running (timeout=18000): unbuffer mock --spec /var/lib/copr-rpmbuild/workspace/workdir-mknffo2h/git-imerge/git-imerge.spec --sources /var/lib/copr-rpmbuild/workspace/workdir-mknffo2h/git-imerge --resultdir /var/lib/copr-rpmbuild/results --uniqueext 1761685037.017021 -r /var/lib/copr-rpmbuild/results/configs/child.cfg
INFO: mock.py version 6.5 starting (python version = 3.13.7, NVR = mock-6.5-1.fc42), args: /usr/libexec/mock/mock --spec /var/lib/copr-rpmbuild/workspace/workdir-mknffo2h/git-imerge/git-imerge.spec --sources /var/lib/copr-rpmbuild/workspace/workdir-mknffo2h/git-imerge --resultdir /var/lib/copr-rpmbuild/results --uniqueext 1761685037.017021 -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-mknffo2h/git-imerge/git-imerge.spec)  Config(fedora-rawhide-x86_64)
Start: clean chroot
Finish: clean chroot
Mock Version: 6.5
INFO: Mock Version: 6.5
Start(bootstrap): chroot init
INFO: mounting tmpfs at /var/lib/mock/fedora-rawhide-x86_64-bootstrap-1761685037.017021/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 container image: registry.fedoraproject.org/fedora:rawhide
INFO: Pulling image: registry.fedoraproject.org/fedora:rawhide
INFO: Tagging container image as mock-bootstrap-4fcfb622-9dff-4c2e-8ec1-4f16b0501726
INFO: Checking that 1bd871cc49d526a58c3328a04d2c0b8eee8b275d443b482730e82388439263e7 image matches host's architecture
INFO: Copy content of container 1bd871cc49d526a58c3328a04d2c0b8eee8b275d443b482730e82388439263e7 to /var/lib/mock/fedora-rawhide-x86_64-bootstrap-1761685037.017021/root
INFO: mounting 1bd871cc49d526a58c3328a04d2c0b8eee8b275d443b482730e82388439263e7 with podman image mount
INFO: image 1bd871cc49d526a58c3328a04d2c0b8eee8b275d443b482730e82388439263e7 as /var/lib/containers/storage/overlay/781e9baecde16741f0d316d11232103fac067eea3f906a1e4033c32a3efff9b8/merged
INFO: umounting image 1bd871cc49d526a58c3328a04d2c0b8eee8b275d443b482730e82388439263e7 (/var/lib/containers/storage/overlay/781e9baecde16741f0d316d11232103fac067eea3f906a1e4033c32a3efff9b8/merged) with podman image umount
INFO: Removing image mock-bootstrap-4fcfb622-9dff-4c2e-8ec1-4f16b0501726
INFO: Package manager dnf5 detected and used (fallback)
INFO: Not updating bootstrap chroot, bootstrap_image_ready=True
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-rawhide-x86_64-1761685037.017021/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 dnf5 detected and used (direct choice)
INFO: Buildroot is handled by package management downloaded with a bootstrap image:
  rpm-6.0.0-1.fc44.x86_64
  rpm-sequoia-1.9.0-2.fc43.x86_64
  dnf5-5.2.17.0-2.fc44.x86_64
  dnf5-plugins-5.2.17.0-2.fc44.x86_64
Start: installing minimal buildroot with dnf5
Updating and loading repositories:
 Copr repository                        100% |  17.8 KiB/s |   2.6 KiB |  00m00s
 fedora                                 100% |   2.0 MiB/s |  21.8 MiB |  00m11s
Repositories loaded.
Package                            Arch   Version                    Repository      Size
Installing group/module packages:
 bash                              x86_64 5.3.0-2.fc43               fedora       8.4 MiB
 bzip2                             x86_64 1.0.8-21.fc43              fedora      95.3 KiB
 coreutils                         x86_64 9.8-3.fc44                 fedora       5.4 MiB
 cpio                              x86_64 2.15-6.fc43                fedora       1.1 MiB
 diffutils                         x86_64 3.12-3.fc43                fedora       1.6 MiB
 fedora-release-common             noarch 44-0.5                     fedora      20.6 KiB
 findutils                         x86_64 1:4.10.0-6.fc43            fedora       1.8 MiB
 gawk                              x86_64 5.3.2-2.fc43               fedora       1.8 MiB
 glibc-minimal-langpack            x86_64 2.42.9000-7.fc44           fedora       0.0   B
 grep                              x86_64 3.12-2.fc43                fedora       1.0 MiB
 gzip                              x86_64 1.14-1.fc44                fedora     397.8 KiB
 info                              x86_64 7.2-6.fc43                 fedora     353.9 KiB
 patch                             x86_64 2.8-2.fc43                 fedora     222.8 KiB
 redhat-rpm-config                 noarch 343-14.fc44                fedora     183.3 KiB
 rpm-build                         x86_64 6.0.0-1.fc44               fedora     287.4 KiB
 sed                               x86_64 4.9-6.fc44                 fedora     857.3 KiB
 shadow-utils                      x86_64 2:4.18.0-3.fc43            fedora       3.9 MiB
 tar                               x86_64 2:1.35-6.fc43              fedora       2.9 MiB
 unzip                             x86_64 6.0-68.fc44                fedora     390.3 KiB
 util-linux                        x86_64 2.41.2-7.fc44              fedora       3.5 MiB
 which                             x86_64 2.23-3.fc43                fedora      83.5 KiB
 xz                                x86_64 1:5.8.1-2.fc43             fedora       1.3 MiB
Installing dependencies:
 add-determinism                   x86_64 0.7.2-2.fc44               fedora       2.3 MiB
 alternatives                      x86_64 1.33-3.fc44                fedora      62.2 KiB
 ansible-srpm-macros               noarch 1-18.1.fc43                fedora      35.7 KiB
 audit-libs                        x86_64 4.1.2-2.fc44               fedora     378.8 KiB
 binutils                          x86_64 2.45.50-5.fc44             fedora      27.1 MiB
 build-reproducibility-srpm-macros noarch 0.7.2-2.fc44               fedora       1.2 KiB
 bzip2-libs                        x86_64 1.0.8-21.fc43              fedora      80.6 KiB
 ca-certificates                   noarch 2025.2.80_v9.0.304-2.fc44  fedora       2.7 MiB
 coreutils-common                  x86_64 9.8-3.fc44                 fedora      11.1 MiB
 crypto-policies                   noarch 20250714-5.gitcd6043a.fc44 fedora     146.9 KiB
 curl                              x86_64 8.17.0~rc2-1.fc44          fedora     474.2 KiB
 cyrus-sasl-lib                    x86_64 2.1.28-33.fc44             fedora       2.3 MiB
 debugedit                         x86_64 5.2-3.fc44                 fedora     214.0 KiB
 dwz                               x86_64 0.16-2.fc43                fedora     287.1 KiB
 ed                                x86_64 1.22.2-1.fc44              fedora     148.1 KiB
 efi-srpm-macros                   noarch 6-5.fc44                   fedora      40.2 KiB
 elfutils                          x86_64 0.193-3.fc43               fedora       2.9 MiB
 elfutils-debuginfod-client        x86_64 0.193-3.fc43               fedora      83.9 KiB
 elfutils-default-yama-scope       noarch 0.193-3.fc43               fedora       1.8 KiB
 elfutils-libelf                   x86_64 0.193-3.fc43               fedora       1.2 MiB
 elfutils-libs                     x86_64 0.193-3.fc43               fedora     683.4 KiB
 fedora-gpg-keys                   noarch 44-0.1                     fedora     131.2 KiB
 fedora-release                    noarch 44-0.5                     fedora       0.0   B
 fedora-release-identity-basic     noarch 44-0.5                     fedora     664.0   B
 fedora-repos                      noarch 44-0.1                     fedora       4.9 KiB
 fedora-repos-rawhide              noarch 44-0.1                     fedora       2.2 KiB
 file                              x86_64 5.46-8.fc44                fedora     100.2 KiB
 file-libs                         x86_64 5.46-8.fc44                fedora      11.9 MiB
 filesystem                        x86_64 3.18-50.fc43               fedora     112.0   B
 filesystem-srpm-macros            noarch 3.18-50.fc43               fedora      38.2 KiB
 fonts-srpm-macros                 noarch 1:5.0.0-1.fc44             fedora      55.8 KiB
 forge-srpm-macros                 noarch 0.4.0-3.fc43               fedora      38.9 KiB
 fpc-srpm-macros                   noarch 1.3-15.fc43                fedora     144.0   B
 gap-srpm-macros                   noarch 2-1.fc44                   fedora       2.1 KiB
 gdb-minimal                       x86_64 16.3-6.fc44                fedora      13.3 MiB
 gdbm-libs                         x86_64 1:1.23-10.fc43             fedora     129.9 KiB
 ghc-srpm-macros                   noarch 1.9.2-3.fc43               fedora     779.0   B
 glibc                             x86_64 2.42.9000-7.fc44           fedora       6.7 MiB
 glibc-common                      x86_64 2.42.9000-7.fc44           fedora       1.0 MiB
 glibc-gconv-extra                 x86_64 2.42.9000-7.fc44           fedora       7.2 MiB
 gmp                               x86_64 1:6.3.0-4.fc44             fedora     815.3 KiB
 gnat-srpm-macros                  noarch 6-8.fc43                   fedora       1.0 KiB
 gnulib-l10n                       noarch 20241231-1.fc44            fedora     655.0 KiB
 gnupg2                            x86_64 2.4.8-4.fc43               fedora       6.5 MiB
 gnupg2-dirmngr                    x86_64 2.4.8-4.fc43               fedora     618.4 KiB
 gnupg2-gpg-agent                  x86_64 2.4.8-4.fc43               fedora     671.4 KiB
 gnupg2-gpgconf                    x86_64 2.4.8-4.fc43               fedora     250.0 KiB
 gnupg2-keyboxd                    x86_64 2.4.8-4.fc43               fedora     201.4 KiB
 gnupg2-verify                     x86_64 2.4.8-4.fc43               fedora     348.5 KiB
 gnutls                            x86_64 3.8.10-5.fc44              fedora       3.8 MiB
 go-srpm-macros                    noarch 3.8.0-1.fc44               fedora      61.9 KiB
 gpgverify                         noarch 2.2-3.fc43                 fedora       8.7 KiB
 ima-evm-utils-libs                x86_64 1.6.2-7.fc44               fedora      60.7 KiB
 jansson                           x86_64 2.14-3.fc43                fedora      89.1 KiB
 java-srpm-macros                  noarch 1-7.fc43                   fedora     870.0   B
 json-c                            x86_64 0.18-7.fc43                fedora      82.7 KiB
 kernel-srpm-macros                noarch 1.0-27.fc43                fedora       1.9 KiB
 keyutils-libs                     x86_64 1.6.3-6.fc43               fedora      54.3 KiB
 krb5-libs                         x86_64 1.21.3-10.fc44             fedora       2.3 MiB
 libacl                            x86_64 2.3.2-4.fc43               fedora      35.9 KiB
 libarchive                        x86_64 3.8.2-1.fc44               fedora     955.2 KiB
 libassuan                         x86_64 2.5.7-4.fc43               fedora     163.8 KiB
 libattr                           x86_64 2.5.2-6.fc43               fedora      24.4 KiB
 libblkid                          x86_64 2.41.2-7.fc44              fedora     262.4 KiB
 libbrotli                         x86_64 1.1.0-10.fc44              fedora     833.3 KiB
 libcap                            x86_64 2.76-4.fc44                fedora     209.1 KiB
 libcap-ng                         x86_64 0.8.5-8.fc44               fedora      68.9 KiB
 libcom_err                        x86_64 1.47.3-2.fc43              fedora      63.1 KiB
 libcurl                           x86_64 8.17.0~rc2-1.fc44          fedora     923.4 KiB
 libeconf                          x86_64 0.7.9-2.fc43               fedora      64.9 KiB
 libevent                          x86_64 2.1.12-16.fc43             fedora     883.1 KiB
 libfdisk                          x86_64 2.41.2-7.fc44              fedora     380.4 KiB
 libffi                            x86_64 3.5.2-1.fc44               fedora      83.8 KiB
 libfsverity                       x86_64 1.6-3.fc43                 fedora      28.5 KiB
 libgcc                            x86_64 15.2.1-3.fc44              fedora     266.6 KiB
 libgcrypt                         x86_64 1.11.1-2.fc43              fedora       1.6 MiB
 libgomp                           x86_64 15.2.1-3.fc44              fedora     541.5 KiB
 libgpg-error                      x86_64 1.56-1.fc44                fedora     916.6 KiB
 libidn2                           x86_64 2.3.8-2.fc43               fedora     552.5 KiB
 libksba                           x86_64 1.6.7-4.fc43               fedora     398.5 KiB
 liblastlog2                       x86_64 2.41.2-7.fc44              fedora      33.9 KiB
 libmount                          x86_64 2.41.2-7.fc44              fedora     372.7 KiB
 libnghttp2                        x86_64 1.67.1-1.fc44              fedora     162.2 KiB
 libpkgconf                        x86_64 2.3.0-3.fc43               fedora      78.1 KiB
 libpsl                            x86_64 0.21.5-6.fc43              fedora      76.4 KiB
 libselinux                        x86_64 3.9-5.fc44                 fedora     193.1 KiB
 libselinux-utils                  x86_64 3.9-5.fc44                 fedora     309.0 KiB
 libsemanage                       x86_64 3.9-4.fc44                 fedora     308.5 KiB
 libsepol                          x86_64 3.9-2.fc43                 fedora     822.0 KiB
 libsmartcols                      x86_64 2.41.2-7.fc44              fedora     180.5 KiB
 libssh                            x86_64 0.11.3-1.fc44              fedora     567.1 KiB
 libssh-config                     noarch 0.11.3-1.fc44              fedora     277.0   B
 libstdc++                         x86_64 15.2.1-3.fc44              fedora       2.8 MiB
 libtasn1                          x86_64 4.20.0-2.fc43              fedora     176.3 KiB
 libtool-ltdl                      x86_64 2.5.4-7.fc43               fedora      70.1 KiB
 libunistring                      x86_64 1.1-10.fc43                fedora       1.7 MiB
 libusb1                           x86_64 1.0.29-4.fc44              fedora     171.3 KiB
 libuuid                           x86_64 2.41.2-7.fc44              fedora      37.3 KiB
 libverto                          x86_64 0.3.2-11.fc43              fedora      25.4 KiB
 libxcrypt                         x86_64 4.4.38-9.fc44              fedora     284.4 KiB
 libxml2                           x86_64 2.12.10-5.fc44             fedora       1.7 MiB
 libzstd                           x86_64 1.5.7-3.fc44               fedora     940.3 KiB
 linkdupes                         x86_64 0.7.2-2.fc44               fedora     838.7 KiB
 lua-libs                          x86_64 5.4.8-2.fc43               fedora     280.8 KiB
 lua-srpm-macros                   noarch 1-16.fc43                  fedora       1.3 KiB
 lz4-libs                          x86_64 1.10.0-3.fc43              fedora     161.4 KiB
 mpfr                              x86_64 4.2.2-2.fc43               fedora     832.8 KiB
 ncurses-base                      noarch 6.5-7.20250614.fc43        fedora     328.1 KiB
 ncurses-libs                      x86_64 6.5-7.20250614.fc43        fedora     946.3 KiB
 nettle                            x86_64 3.10.1-2.fc43              fedora     790.6 KiB
 npth                              x86_64 1.8-3.fc43                 fedora      49.6 KiB
 ocaml-srpm-macros                 noarch 11-2.fc43                  fedora       1.9 KiB
 openblas-srpm-macros              noarch 2-20.fc43                  fedora     112.0   B
 openldap                          x86_64 2.6.10-4.fc44              fedora     659.8 KiB
 openssl-libs                      x86_64 1:3.5.4-1.fc44             fedora       8.9 MiB
 p11-kit                           x86_64 0.25.8-1.fc44              fedora       2.3 MiB
 p11-kit-trust                     x86_64 0.25.8-1.fc44              fedora     446.5 KiB
 package-notes-srpm-macros         noarch 0.5-14.fc43                fedora       1.6 KiB
 pam-libs                          x86_64 1.7.1-3.fc43               fedora     126.8 KiB
 pcre2                             x86_64 10.46-1.fc44               fedora     697.7 KiB
 pcre2-syntax                      noarch 10.46-1.fc44               fedora     275.3 KiB
 perl-srpm-macros                  noarch 1-60.fc43                  fedora     861.0   B
 pkgconf                           x86_64 2.3.0-3.fc43               fedora      88.5 KiB
 pkgconf-m4                        noarch 2.3.0-3.fc43               fedora      14.4 KiB
 pkgconf-pkg-config                x86_64 2.3.0-3.fc43               fedora     989.0   B
 policycoreutils                   x86_64 3.9-5.fc44                 fedora     683.5 KiB
 popt                              x86_64 1.19-9.fc43                fedora     132.8 KiB
 publicsuffix-list-dafsa           noarch 20250616-2.fc43            fedora      69.1 KiB
 pyproject-srpm-macros             noarch 1.18.5-1.fc44              fedora       1.9 KiB
 python-srpm-macros                noarch 3.14-9.fc44                fedora      51.6 KiB
 qt5-srpm-macros                   noarch 5.15.17-2.fc43             fedora     500.0   B
 qt6-srpm-macros                   noarch 6.10.0-1.fc44              fedora     464.0   B
 readline                          x86_64 8.3-2.fc43                 fedora     511.7 KiB
 rpm                               x86_64 6.0.0-1.fc44               fedora       3.1 MiB
 rpm-build-libs                    x86_64 6.0.0-1.fc44               fedora     268.4 KiB
 rpm-libs                          x86_64 6.0.0-1.fc44               fedora     933.8 KiB
 rpm-plugin-selinux                x86_64 6.0.0-1.fc44               fedora      12.0 KiB
 rpm-sequoia                       x86_64 1.9.0-2.fc43               fedora       2.5 MiB
 rpm-sign-libs                     x86_64 6.0.0-1.fc44               fedora      39.7 KiB
 rust-srpm-macros                  noarch 26.4-1.fc44                fedora       4.8 KiB
 selinux-policy                    noarch 42.14-1.fc44               fedora      31.9 KiB
 selinux-policy-targeted           noarch 42.14-1.fc44               fedora      18.7 MiB
 setup                             noarch 2.15.0-26.fc43             fedora     725.0 KiB
 sqlite-libs                       x86_64 3.50.4-1.fc44              fedora       1.5 MiB
 systemd-libs                      x86_64 258.1-2.fc44               fedora       2.3 MiB
 systemd-standalone-sysusers       x86_64 258.1-2.fc44               fedora     293.5 KiB
 tpm2-tss                          x86_64 4.1.3-8.fc43               fedora       1.6 MiB
 tree-sitter-srpm-macros           noarch 0.4.2-1.fc43               fedora       8.3 KiB
 util-linux-core                   x86_64 2.41.2-7.fc44              fedora       1.5 MiB
 xxhash-libs                       x86_64 0.8.3-3.fc43               fedora      90.2 KiB
 xz-libs                           x86_64 1:5.8.1-2.fc43             fedora     217.8 KiB
 zig-srpm-macros                   noarch 1-5.fc43                   fedora       1.1 KiB
 zip                               x86_64 3.0-44.fc43                fedora     694.5 KiB
 zlib-ng-compat                    x86_64 2.2.5-2.fc44               fedora     137.6 KiB
 zstd                              x86_64 1.5.7-3.fc44               fedora     506.2 KiB
Installing groups:
 Buildsystem building group                                                              

Transaction Summary:
 Installing:       177 packages

Total size of inbound packages is 67 MiB. Need to download 67 MiB.
After this operation, 219 MiB extra will be used (install 219 MiB, remove 0 B).
[  1/177] bzip2-0:1.0.8-21.fc43.x86_64  100% | 295.0 KiB/s |  51.6 KiB |  00m00s
[  2/177] cpio-0:2.15-6.fc43.x86_64     100% |   1.3 MiB/s | 293.1 KiB |  00m00s
[  3/177] diffutils-0:3.12-3.fc43.x86_6 100% |   2.1 MiB/s | 392.3 KiB |  00m00s
[  4/177] fedora-release-common-0:44-0. 100% | 537.0 KiB/s |  24.7 KiB |  00m00s
[  5/177] coreutils-0:9.8-3.fc44.x86_64 100% |   1.7 MiB/s |   1.1 MiB |  00m01s
[  6/177] glibc-minimal-langpack-0:2.42 100% | 570.8 KiB/s |  50.2 KiB |  00m00s
[  7/177] grep-0:3.12-2.fc43.x86_64     100% | 522.0 KiB/s | 299.1 KiB |  00m01s
[  8/177] bash-0:5.3.0-2.fc43.x86_64    100% |   1.3 MiB/s |   1.9 MiB |  00m01s
[  9/177] findutils-1:4.10.0-6.fc43.x86 100% | 536.6 KiB/s | 550.0 KiB |  00m01s
[ 10/177] patch-0:2.8-2.fc43.x86_64     100% | 156.5 KiB/s | 113.8 KiB |  00m01s
[ 11/177] gzip-0:1.14-1.fc44.x86_64     100% | 152.0 KiB/s | 177.7 KiB |  00m01s
[ 12/177] info-0:7.2-6.fc43.x86_64      100% | 163.3 KiB/s | 182.9 KiB |  00m01s
[ 13/177] redhat-rpm-config-0:343-14.fc 100% | 308.3 KiB/s |  79.2 KiB |  00m00s
[ 14/177] rpm-build-0:6.0.0-1.fc44.x86_ 100% | 359.4 KiB/s | 138.0 KiB |  00m00s
[ 15/177] sed-0:4.9-6.fc44.x86_64       100% | 471.2 KiB/s | 317.1 KiB |  00m01s
[ 16/177] unzip-0:6.0-68.fc44.x86_64    100% | 613.2 KiB/s | 184.6 KiB |  00m00s
[ 17/177] which-0:2.23-3.fc43.x86_64    100% | 474.2 KiB/s |  41.7 KiB |  00m00s
[ 18/177] tar-2:1.35-6.fc43.x86_64      100% | 705.4 KiB/s | 856.4 KiB |  00m01s
[ 19/177] xz-1:5.8.1-2.fc43.x86_64      100% | 889.0 KiB/s | 572.5 KiB |  00m01s
[ 20/177] shadow-utils-2:4.18.0-3.fc43. 100% | 708.0 KiB/s |   1.3 MiB |  00m02s
[ 21/177] gawk-0:5.3.2-2.fc43.x86_64    100% |   1.1 MiB/s |   1.1 MiB |  00m01s
[ 22/177] util-linux-0:2.41.2-7.fc44.x8 100% |   1.2 MiB/s |   1.2 MiB |  00m01s
[ 23/177] filesystem-0:3.18-50.fc43.x86 100% |   1.2 MiB/s |   1.3 MiB |  00m01s
[ 24/177] ncurses-libs-0:6.5-7.20250614 100% |   1.2 MiB/s | 332.7 KiB |  00m00s
[ 25/177] bzip2-libs-0:1.0.8-21.fc43.x8 100% | 897.2 KiB/s |  43.1 KiB |  00m00s
[ 26/177] gmp-1:6.3.0-4.fc44.x86_64     100% |   1.4 MiB/s | 319.3 KiB |  00m00s
[ 27/177] libacl-0:2.3.2-4.fc43.x86_64  100% | 516.6 KiB/s |  24.3 KiB |  00m00s
[ 28/177] libattr-0:2.5.2-6.fc43.x86_64 100% | 396.7 KiB/s |  17.9 KiB |  00m00s
[ 29/177] libcap-0:2.76-4.fc44.x86_64   100% | 988.5 KiB/s |  87.0 KiB |  00m00s
[ 30/177] libselinux-0:3.9-5.fc44.x86_6 100% |   1.1 MiB/s |  97.8 KiB |  00m00s
[ 31/177] glibc-0:2.42.9000-7.fc44.x86_ 100% |   1.6 MiB/s |   2.2 MiB |  00m01s
[ 32/177] coreutils-common-0:9.8-3.fc44 100% |   1.7 MiB/s |   2.1 MiB |  00m01s
[ 33/177] fedora-repos-0:44-0.1.noarch  100% | 201.6 KiB/s |   9.1 KiB |  00m00s
[ 34/177] systemd-libs-0:258.1-2.fc44.x 100% |   1.8 MiB/s | 820.8 KiB |  00m00s
[ 35/177] glibc-common-0:2.42.9000-7.fc 100% |   1.8 MiB/s | 336.9 KiB |  00m00s
[ 36/177] ed-0:1.22.2-1.fc44.x86_64     100% |   1.6 MiB/s |  83.7 KiB |  00m00s
[ 37/177] pcre2-0:10.46-1.fc44.x86_64   100% |   1.8 MiB/s | 262.2 KiB |  00m00s
[ 38/177] ansible-srpm-macros-0:1-18.1. 100% | 432.8 KiB/s |  19.9 KiB |  00m00s
[ 39/177] build-reproducibility-srpm-ma 100% | 279.5 KiB/s |  12.9 KiB |  00m00s
[ 40/177] efi-srpm-macros-0:6-5.fc44.no 100% | 489.7 KiB/s |  22.5 KiB |  00m00s
[ 41/177] dwz-0:0.16-2.fc43.x86_64      100% |   1.5 MiB/s | 135.5 KiB |  00m00s
[ 42/177] file-0:5.46-8.fc44.x86_64     100% | 996.0 KiB/s |  48.8 KiB |  00m00s
[ 43/177] filesystem-srpm-macros-0:3.18 100% | 574.2 KiB/s |  26.4 KiB |  00m00s
[ 44/177] fonts-srpm-macros-1:5.0.0-1.f 100% | 580.6 KiB/s |  27.3 KiB |  00m00s
[ 45/177] forge-srpm-macros-0:0.4.0-3.f 100% | 436.7 KiB/s |  20.1 KiB |  00m00s
[ 46/177] fpc-srpm-macros-0:1.3-15.fc43 100% | 175.4 KiB/s |   7.9 KiB |  00m00s
[ 47/177] gap-srpm-macros-0:2-1.fc44.no 100% | 201.2 KiB/s |   9.1 KiB |  00m00s
[ 48/177] ghc-srpm-macros-0:1.9.2-3.fc4 100% | 194.4 KiB/s |   8.7 KiB |  00m00s
[ 49/177] gnat-srpm-macros-0:6-8.fc43.n 100% | 192.9 KiB/s |   8.5 KiB |  00m00s
[ 50/177] go-srpm-macros-0:3.8.0-1.fc44 100% | 602.3 KiB/s |  28.3 KiB |  00m00s
[ 51/177] java-srpm-macros-0:1-7.fc43.n 100% | 180.5 KiB/s |   7.9 KiB |  00m00s
[ 52/177] openssl-libs-1:3.5.4-1.fc44.x 100% |   1.9 MiB/s |   2.6 MiB |  00m01s
[ 53/177] kernel-srpm-macros-0:1.0-27.f 100% | 198.2 KiB/s |   8.9 KiB |  00m00s
[ 54/177] lua-srpm-macros-0:1-16.fc43.n 100% | 199.0 KiB/s |   8.8 KiB |  00m00s
[ 55/177] ocaml-srpm-macros-0:11-2.fc43 100% | 205.8 KiB/s |   9.3 KiB |  00m00s
[ 56/177] openblas-srpm-macros-0:2-20.f 100% | 168.8 KiB/s |   7.6 KiB |  00m00s
[ 57/177] package-notes-srpm-macros-0:0 100% | 199.7 KiB/s |   9.0 KiB |  00m00s
[ 58/177] perl-srpm-macros-0:1-60.fc43. 100% | 184.2 KiB/s |   8.3 KiB |  00m00s
[ 59/177] pyproject-srpm-macros-0:1.18. 100% | 293.9 KiB/s |  13.2 KiB |  00m00s
[ 60/177] python-srpm-macros-0:3.14-9.f 100% | 485.9 KiB/s |  23.8 KiB |  00m00s
[ 61/177] qt5-srpm-macros-0:5.15.17-2.f 100% | 192.5 KiB/s |   8.7 KiB |  00m00s
[ 62/177] qt6-srpm-macros-0:6.10.0-1.fc 100% | 208.0 KiB/s |   9.4 KiB |  00m00s
[ 63/177] rust-srpm-macros-0:26.4-1.fc4 100% | 248.0 KiB/s |  11.2 KiB |  00m00s
[ 64/177] tree-sitter-srpm-macros-0:0.4 100% | 296.7 KiB/s |  13.4 KiB |  00m00s
[ 65/177] zig-srpm-macros-0:1-5.fc43.no 100% | 187.4 KiB/s |   8.4 KiB |  00m00s
[ 66/177] debugedit-0:5.2-3.fc44.x86_64 100% |   1.6 MiB/s |  85.6 KiB |  00m00s
[ 67/177] zip-0:3.0-44.fc43.x86_64      100% |   1.9 MiB/s | 261.6 KiB |  00m00s
[ 68/177] rpm-0:6.0.0-1.fc44.x86_64     100% |   2.6 MiB/s | 576.6 KiB |  00m00s
[ 69/177] elfutils-libelf-0:0.193-3.fc4 100% |   1.6 MiB/s | 207.8 KiB |  00m00s
[ 70/177] libarchive-0:3.8.2-1.fc44.x86 100% |   2.3 MiB/s | 422.2 KiB |  00m00s
[ 71/177] elfutils-0:0.193-3.fc43.x86_6 100% |   2.1 MiB/s | 571.3 KiB |  00m00s
[ 72/177] libgcc-0:15.2.1-3.fc44.x86_64 100% |   1.5 MiB/s | 133.7 KiB |  00m00s
[ 73/177] popt-0:1.19-9.fc43.x86_64     100% |   1.3 MiB/s |  65.7 KiB |  00m00s
[ 74/177] readline-0:8.3-2.fc43.x86_64  100% |   1.7 MiB/s | 224.6 KiB |  00m00s
[ 75/177] rpm-build-libs-0:6.0.0-1.fc44 100% |   1.4 MiB/s | 127.9 KiB |  00m00s
[ 76/177] zstd-0:1.5.7-3.fc44.x86_64    100% |   1.9 MiB/s | 189.5 KiB |  00m00s
[ 77/177] libstdc++-0:15.2.1-3.fc44.x86 100% |   2.9 MiB/s | 920.8 KiB |  00m00s
[ 78/177] libeconf-0:0.7.9-2.fc43.x86_6 100% | 733.6 KiB/s |  35.2 KiB |  00m00s
[ 79/177] rpm-libs-0:6.0.0-1.fc44.x86_6 100% |   2.1 MiB/s | 400.5 KiB |  00m00s
[ 80/177] audit-libs-0:4.1.2-2.fc44.x86 100% |   1.5 MiB/s | 138.4 KiB |  00m00s
[ 81/177] libsemanage-0:3.9-4.fc44.x86_ 100% |   2.1 MiB/s | 123.5 KiB |  00m00s
[ 82/177] libxcrypt-0:4.4.38-9.fc44.x86 100% |   1.4 MiB/s | 127.1 KiB |  00m00s
[ 83/177] pam-libs-0:1.7.1-3.fc43.x86_6 100% | 653.7 KiB/s |  57.5 KiB |  00m00s
[ 84/177] setup-0:2.15.0-26.fc43.noarch 100% |   1.8 MiB/s | 157.3 KiB |  00m00s
[ 85/177] xz-libs-1:5.8.1-2.fc43.x86_64 100% |   1.3 MiB/s | 112.9 KiB |  00m00s
[ 86/177] libblkid-0:2.41.2-7.fc44.x86_ 100% |   1.9 MiB/s | 123.2 KiB |  00m00s
[ 87/177] libcap-ng-0:0.8.5-8.fc44.x86_ 100% | 670.8 KiB/s |  32.2 KiB |  00m00s
[ 88/177] mpfr-0:4.2.2-2.fc43.x86_64    100% |   1.9 MiB/s | 347.0 KiB |  00m00s
[ 89/177] liblastlog2-0:2.41.2-7.fc44.x 100% | 484.8 KiB/s |  23.3 KiB |  00m00s
[ 90/177] libfdisk-0:2.41.2-7.fc44.x86_ 100% |   1.8 MiB/s | 162.0 KiB |  00m00s
[ 91/177] libsmartcols-0:2.41.2-7.fc44. 100% |   1.5 MiB/s |  84.1 KiB |  00m00s
[ 92/177] libuuid-0:2.41.2-7.fc44.x86_6 100% | 560.6 KiB/s |  26.3 KiB |  00m00s
[ 93/177] libmount-0:2.41.2-7.fc44.x86_ 100% |   1.7 MiB/s | 162.7 KiB |  00m00s
[ 94/177] zlib-ng-compat-0:2.2.5-2.fc44 100% |   1.5 MiB/s |  79.2 KiB |  00m00s
[ 95/177] ncurses-base-0:6.5-7.20250614 100% |   1.6 MiB/s |  88.2 KiB |  00m00s
[ 96/177] gnulib-l10n-0:20241231-1.fc44 100% |   1.7 MiB/s | 150.2 KiB |  00m00s
[ 97/177] util-linux-core-0:2.41.2-7.fc 100% |   2.4 MiB/s | 550.8 KiB |  00m00s
[ 98/177] libsepol-0:3.9-2.fc43.x86_64  100% |   3.0 MiB/s | 345.4 KiB |  00m00s
[ 99/177] crypto-policies-0:20250714-5. 100% |   1.7 MiB/s |  98.5 KiB |  00m00s
[100/177] fedora-gpg-keys-0:44-0.1.noar 100% |   2.3 MiB/s | 138.8 KiB |  00m00s
[101/177] fedora-repos-rawhide-0:44-0.1 100% | 166.3 KiB/s |   8.6 KiB |  00m00s
[102/177] pcre2-syntax-0:10.46-1.fc44.n 100% |   1.8 MiB/s | 162.2 KiB |  00m00s
[103/177] ca-certificates-0:2025.2.80_v 100% |   2.7 MiB/s | 973.8 KiB |  00m00s
[104/177] glibc-gconv-extra-0:2.42.9000 100% |   2.9 MiB/s |   1.6 MiB |  00m01s
[105/177] linkdupes-0:0.7.2-2.fc44.x86_ 100% |   2.5 MiB/s | 356.3 KiB |  00m00s
[106/177] add-determinism-0:0.7.2-2.fc4 100% |   4.2 MiB/s | 887.6 KiB |  00m00s
[107/177] curl-0:8.17.0~rc2-1.fc44.x86_ 100% |   2.3 MiB/s | 237.1 KiB |  00m00s
[108/177] file-libs-0:5.46-8.fc44.x86_6 100% |   3.2 MiB/s | 849.9 KiB |  00m00s
[109/177] elfutils-debuginfod-client-0: 100% | 918.2 KiB/s |  46.8 KiB |  00m00s
[110/177] elfutils-libs-0:0.193-3.fc43. 100% |   3.0 MiB/s | 269.7 KiB |  00m00s
[111/177] lz4-libs-0:1.10.0-3.fc43.x86_ 100% |   1.5 MiB/s |  78.0 KiB |  00m00s
[112/177] libzstd-0:1.5.7-3.fc44.x86_64 100% |   2.7 MiB/s | 359.1 KiB |  00m00s
[113/177] lua-libs-0:5.4.8-2.fc43.x86_6 100% |   2.9 MiB/s | 131.7 KiB |  00m00s
[114/177] libgomp-0:15.2.1-3.fc44.x86_6 100% |   3.5 MiB/s | 373.8 KiB |  00m00s
[115/177] rpm-sign-libs-0:6.0.0-1.fc44. 100% | 671.9 KiB/s |  28.2 KiB |  00m00s
[116/177] libxml2-0:2.12.10-5.fc44.x86_ 100% |   3.1 MiB/s | 692.7 KiB |  00m00s
[117/177] elfutils-default-yama-scope-0 100% | 276.1 KiB/s |  12.4 KiB |  00m00s
[118/177] json-c-0:0.18-7.fc43.x86_64   100% | 937.0 KiB/s |  45.0 KiB |  00m00s
[119/177] rpm-sequoia-0:1.9.0-2.fc43.x8 100% |   5.0 MiB/s | 933.3 KiB |  00m00s
[120/177] sqlite-libs-0:3.50.4-1.fc44.x 100% |   4.2 MiB/s | 761.5 KiB |  00m00s
[121/177] ima-evm-utils-libs-0:1.6.2-7. 100% | 626.2 KiB/s |  29.4 KiB |  00m00s
[122/177] libfsverity-0:1.6-3.fc43.x86_ 100% | 443.5 KiB/s |  18.6 KiB |  00m00s
[123/177] gpgverify-0:2.2-3.fc43.noarch 100% | 246.7 KiB/s |  11.1 KiB |  00m00s
[124/177] gnupg2-gpg-agent-0:2.4.8-4.fc 100% |   4.7 MiB/s | 272.9 KiB |  00m00s
[125/177] gnupg2-dirmngr-0:2.4.8-4.fc43 100% |   3.1 MiB/s | 274.6 KiB |  00m00s
[126/177] gnupg2-keyboxd-0:2.4.8-4.fc43 100% |   2.1 MiB/s |  94.7 KiB |  00m00s
[127/177] gnupg2-gpgconf-0:2.4.8-4.fc43 100% |   2.0 MiB/s | 115.0 KiB |  00m00s
[128/177] gnupg2-verify-0:2.4.8-4.fc43. 100% |   3.8 MiB/s | 171.2 KiB |  00m00s
[129/177] libassuan-0:2.5.7-4.fc43.x86_ 100% |   1.4 MiB/s |  67.4 KiB |  00m00s
[130/177] libgpg-error-0:1.56-1.fc44.x8 100% |   3.9 MiB/s | 245.7 KiB |  00m00s
[131/177] npth-0:1.8-3.fc43.x86_64      100% | 545.9 KiB/s |  25.7 KiB |  00m00s
[132/177] gnupg2-0:2.4.8-4.fc43.x86_64  100% |   4.2 MiB/s |   1.6 MiB |  00m00s
[133/177] libgcrypt-0:1.11.1-2.fc43.x86 100% |   4.5 MiB/s | 595.8 KiB |  00m00s
[134/177] tpm2-tss-0:4.1.3-8.fc43.x86_6 100% |   4.3 MiB/s | 425.9 KiB |  00m00s
[135/177] libksba-0:1.6.7-4.fc43.x86_64 100% |   1.8 MiB/s | 160.4 KiB |  00m00s
[136/177] libusb1-0:1.0.29-4.fc44.x86_6 100% |   1.8 MiB/s |  79.9 KiB |  00m00s
[137/177] openldap-0:2.6.10-4.fc44.x86_ 100% |   2.9 MiB/s | 259.5 KiB |  00m00s
[138/177] libidn2-0:2.3.8-2.fc43.x86_64 100% |   3.9 MiB/s | 174.9 KiB |  00m00s
[139/177] libtasn1-0:4.20.0-2.fc43.x86_ 100% |   1.4 MiB/s |  74.5 KiB |  00m00s
[140/177] gnutls-0:3.8.10-5.fc44.x86_64 100% |   4.5 MiB/s |   1.4 MiB |  00m00s
[141/177] libunistring-0:1.1-10.fc43.x8 100% |   4.1 MiB/s | 542.9 KiB |  00m00s
[142/177] nettle-0:3.10.1-2.fc43.x86_64 100% |   3.9 MiB/s | 424.2 KiB |  00m00s
[143/177] p11-kit-0:0.25.8-1.fc44.x86_6 100% |   5.6 MiB/s | 510.0 KiB |  00m00s
[144/177] libevent-0:2.1.12-16.fc43.x86 100% |   2.9 MiB/s | 257.8 KiB |  00m00s
[145/177] libtool-ltdl-0:2.5.4-7.fc43.x 100% | 842.6 KiB/s |  36.2 KiB |  00m00s
[146/177] libffi-0:3.5.2-1.fc44.x86_64  100% | 855.4 KiB/s |  41.1 KiB |  00m00s
[147/177] cyrus-sasl-lib-0:2.1.28-33.fc 100% |   4.3 MiB/s | 796.5 KiB |  00m00s
[148/177] gdbm-libs-1:1.23-10.fc43.x86_ 100% | 667.8 KiB/s |  56.8 KiB |  00m00s
[149/177] alternatives-0:1.33-3.fc44.x8 100% | 849.2 KiB/s |  40.8 KiB |  00m00s
[150/177] jansson-0:2.14-3.fc43.x86_64  100% |   1.0 MiB/s |  45.3 KiB |  00m00s
[151/177] pkgconf-pkg-config-0:2.3.0-3. 100% | 213.5 KiB/s |   9.6 KiB |  00m00s
[152/177] pkgconf-0:2.3.0-3.fc43.x86_64 100% |   1.0 MiB/s |  44.6 KiB |  00m00s
[153/177] pkgconf-m4-0:2.3.0-3.fc43.noa 100% | 302.4 KiB/s |  13.9 KiB |  00m00s
[154/177] libpkgconf-0:2.3.0-3.fc43.x86 100% | 881.3 KiB/s |  37.9 KiB |  00m00s
[155/177] p11-kit-trust-0:0.25.8-1.fc44 100% |   2.6 MiB/s | 139.7 KiB |  00m00s
[156/177] fedora-release-0:44-0.5.noarc 100% | 322.8 KiB/s |  13.6 KiB |  00m00s
[157/177] systemd-standalone-sysusers-0 100% |   2.2 MiB/s | 144.6 KiB |  00m00s
[158/177] xxhash-libs-0:0.8.3-3.fc43.x8 100% | 785.4 KiB/s |  38.5 KiB |  00m00s
[159/177] fedora-release-identity-basic 100% | 318.3 KiB/s |  14.3 KiB |  00m00s
[160/177] libcurl-0:8.17.0~rc2-1.fc44.x 100% |   3.9 MiB/s | 411.8 KiB |  00m00s
[161/177] krb5-libs-0:1.21.3-10.fc44.x8 100% |   5.0 MiB/s | 761.1 KiB |  00m00s
[162/177] libbrotli-0:1.1.0-10.fc44.x86 100% |   3.6 MiB/s | 339.1 KiB |  00m00s
[163/177] libnghttp2-0:1.67.1-1.fc44.x8 100% |   1.6 MiB/s |  73.1 KiB |  00m00s
[164/177] gdb-minimal-0:16.3-6.fc44.x86 100% |   7.2 MiB/s |   4.4 MiB |  00m01s
[165/177] libpsl-0:0.21.5-6.fc43.x86_64 100% | 764.3 KiB/s |  65.0 KiB |  00m00s
[166/177] libssh-0:0.11.3-1.fc44.x86_64 100% |   4.9 MiB/s | 232.8 KiB |  00m00s
[167/177] keyutils-libs-0:1.6.3-6.fc43. 100% | 729.1 KiB/s |  31.4 KiB |  00m00s
[168/177] libcom_err-0:1.47.3-2.fc43.x8 100% | 595.4 KiB/s |  26.8 KiB |  00m00s
[169/177] libverto-0:0.3.2-11.fc43.x86_ 100% | 480.8 KiB/s |  20.7 KiB |  00m00s
[170/177] binutils-0:2.45.50-5.fc44.x86 100% |   6.0 MiB/s |   5.9 MiB |  00m01s
[171/177] libssh-config-0:0.11.3-1.fc44 100% | 193.9 KiB/s |   9.1 KiB |  00m00s
[172/177] publicsuffix-list-dafsa-0:202 100% | 650.0 KiB/s |  59.2 KiB |  00m00s
[173/177] policycoreutils-0:3.9-5.fc44. 100% |   4.8 MiB/s | 214.6 KiB |  00m00s
[174/177] libselinux-utils-0:3.9-5.fc44 100% |   2.7 MiB/s | 119.3 KiB |  00m00s
[175/177] selinux-policy-0:42.14-1.fc44 100% | 729.6 KiB/s |  62.7 KiB |  00m00s
[176/177] rpm-plugin-selinux-0:6.0.0-1. 100% | 453.3 KiB/s |  19.5 KiB |  00m00s
[177/177] selinux-policy-targeted-0:42. 100% |  12.0 MiB/s |   6.8 MiB |  00m01s
--------------------------------------------------------------------------------
[177/177] Total                         100% |   5.4 MiB/s |  66.5 MiB |  00m12s
Running transaction
Importing OpenPGP key 0x6D9F90A6:
 UserID     : "Fedora (44) <fedora-44-primary@fedoraproject.org>"
 Fingerprint: 36F612DCF27F7D1A48A835E4DBFCF71C6D9F90A6
 From       : file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-44-primary
The key was successfully imported.
Importing OpenPGP key 0x6D9F90A6:
 UserID     : "Fedora (44) <fedora-44-primary@fedoraproject.org>"
 Fingerprint: 36F612DCF27F7D1A48A835E4DBFCF71C6D9F90A6
 From       : file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-44-primary
The key was successfully imported.
Importing OpenPGP key 0x31645531:
 UserID     : "Fedora (43) <fedora-43-primary@fedoraproject.org>"
 Fingerprint: C6E7F081CF80E13146676E88829B606631645531
 From       : file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-43-primary
The key was successfully imported.
Importing OpenPGP key 0xF577861E:
 UserID     : "Fedora (45) <fedora-45-primary@fedoraproject.org>"
 Fingerprint: 4F50A6114CD5C6976A7F1179655A4B02F577861E
 From       : file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-45-primary
The key was successfully imported.
[  1/179] Verify package files          100% | 634.0   B/s | 177.0   B |  00m00s
[  2/179] Prepare transaction           100% |   1.6 KiB/s | 177.0   B |  00m00s
[  3/179] Installing libgcc-0:15.2.1-3. 100% | 131.0 MiB/s | 268.3 KiB |  00m00s
[  4/179] Installing libssh-config-0:0. 100% |   0.0   B/s | 816.0   B |  00m00s
[  5/179] Installing publicsuffix-list- 100% |  68.2 MiB/s |  69.8 KiB |  00m00s
[  6/179] Installing fedora-release-ide 100% | 898.4 KiB/s | 920.0   B |  00m00s
[  7/179] Installing fedora-gpg-keys-0: 100% |  19.4 MiB/s | 179.0 KiB |  00m00s
[  8/179] Installing fedora-repos-rawhi 100% |   0.0   B/s |   2.4 KiB |  00m00s
[  9/179] Installing fedora-repos-0:44- 100% |   0.0   B/s |   5.7 KiB |  00m00s
[ 10/179] Installing fedora-release-com 100% |  12.1 MiB/s |  24.9 KiB |  00m00s
[ 11/179] Installing fedora-release-0:4 100% |   9.3 KiB/s | 124.0   B |  00m00s
>>> Running sysusers scriptlet: setup-0:2.15.0-26.fc43.noarch                   
>>> Finished sysusers scriptlet: setup-0:2.15.0-26.fc43.noarch                  
>>> Scriptlet output:                                                           
>>> Creating group 'adm' with GID 4.                                            
>>> Creating group 'audio' with GID 63.                                         
>>> Creating group 'cdrom' with GID 11.                                         
>>> Creating group 'clock' with GID 103.                                        
>>> Creating group 'dialout' with GID 18.                                       
>>> Creating group 'disk' with GID 6.                                           
>>> Creating group 'floppy' with GID 19.                                        
>>> Creating group 'ftp' with GID 50.                                           
>>> Creating group 'games' with GID 20.                                         
>>> Creating group 'input' with GID 104.                                        
>>> Creating group 'kmem' with GID 9.                                           
>>> Creating group 'kvm' with GID 36.                                           
>>> Creating group 'lock' with GID 54.                                          
>>> Creating group 'lp' with GID 7.                                             
>>> Creating group 'mail' with GID 12.                                          
>>> Creating group 'man' with GID 15.                                           
>>> Creating group 'mem' with GID 8.                                            
>>> Creating group 'nobody' with GID 65534.                                     
>>> Creating group 'render' with GID 105.                                       
>>> Creating group 'root' with GID 0.                                           
>>> Creating group 'sgx' with GID 106.                                          
>>> Creating group 'sys' with GID 3.                                            
>>> Creating group 'tape' with GID 33.                                          
>>> Creating group 'tty' with GID 5.                                            
>>> Creating group 'users' with GID 100.                                        
>>> Creating group 'utmp' with GID 22.                                          
>>> Creating group 'video' with GID 39.                                         
>>> Creating group 'wheel' with GID 10.                                         
>>> Creating user 'adm' (adm) with UID 3 and GID 4.                             
>>> Creating group 'bin' with GID 1.                                            
>>> Creating user 'bin' (bin) with UID 1 and GID 1.                             
>>> Creating group 'daemon' with GID 2.                                         
>>> Creating user 'daemon' (daemon) with UID 2 and GID 2.                       
>>> Creating user 'ftp' (FTP User) with UID 14 and GID 50.                      
>>> Creating user 'games' (games) with UID 12 and GID 100.                      
>>> Creating user 'halt' (halt) with UID 7 and GID 0.                           
>>> Creating user 'lp' (lp) with UID 4 and GID 7.                               
>>> Creating user 'mail' (mail) with UID 8 and GID 12.                          
>>> Creating user 'nobody' (Kernel Overflow User) with UID 65534 and GID 65534. 
>>> Creating user 'operator' (operator) with UID 11 and GID 0.                  
>>> Creating user 'root' (Super User) with UID 0 and GID 0.                     
>>> Creating user 'shutdown' (shutdown) with UID 6 and GID 0.                   
>>> Creating user 'sync' (sync) with UID 5 and GID 0.                           
>>>                                                                             
[ 12/179] Installing setup-0:2.15.0-26. 100% |  39.6 MiB/s | 730.6 KiB |  00m00s
>>> [RPM] /etc/hosts created as /etc/hosts.rpmnew                               
[ 13/179] Installing filesystem-0:3.18- 100% |   1.4 MiB/s | 212.8 KiB |  00m00s
[ 14/179] Installing pkgconf-m4-0:2.3.0 100% |  14.5 MiB/s |  14.8 KiB |  00m00s
[ 15/179] Installing pcre2-syntax-0:10. 100% | 135.6 MiB/s | 277.8 KiB |  00m00s
[ 16/179] Installing gnulib-l10n-0:2024 100% |  92.3 MiB/s | 661.9 KiB |  00m00s
[ 17/179] Installing coreutils-common-0 100% | 237.7 MiB/s |  11.2 MiB |  00m00s
[ 18/179] Installing ncurses-base-0:6.5 100% |  38.4 MiB/s | 353.5 KiB |  00m00s
[ 19/179] Installing bash-0:5.3.0-2.fc4 100% | 205.6 MiB/s |   8.4 MiB |  00m00s
[ 20/179] Installing glibc-common-0:2.4 100% |  53.8 MiB/s |   1.0 MiB |  00m00s
[ 21/179] Installing glibc-gconv-extra- 100% | 149.3 MiB/s |   7.3 MiB |  00m00s
[ 22/179] Installing glibc-0:2.42.9000- 100% | 142.5 MiB/s |   6.7 MiB |  00m00s
[ 23/179] Installing ncurses-libs-0:6.5 100% | 186.1 MiB/s | 952.8 KiB |  00m00s
[ 24/179] Installing glibc-minimal-lang 100% |   0.0   B/s | 124.0   B |  00m00s
[ 25/179] Installing zlib-ng-compat-0:2 100% | 135.2 MiB/s | 138.4 KiB |  00m00s
[ 26/179] Installing bzip2-libs-0:1.0.8 100% |  79.8 MiB/s |  81.7 KiB |  00m00s
[ 27/179] Installing libgpg-error-0:1.5 100% |  50.0 MiB/s | 922.5 KiB |  00m00s
[ 28/179] Installing libstdc++-0:15.2.1 100% | 258.5 MiB/s |   2.8 MiB |  00m00s
[ 29/179] Installing libassuan-0:2.5.7- 100% | 161.7 MiB/s | 165.6 KiB |  00m00s
[ 30/179] Installing libgcrypt-0:1.11.1 100% | 262.5 MiB/s |   1.6 MiB |  00m00s
[ 31/179] Installing readline-0:8.3-2.f 100% | 167.3 MiB/s | 513.9 KiB |  00m00s
[ 32/179] Installing gmp-1:6.3.0-4.fc44 100% | 199.6 MiB/s | 817.5 KiB |  00m00s
[ 33/179] Installing xz-libs-1:5.8.1-2. 100% | 106.9 MiB/s | 218.9 KiB |  00m00s
[ 34/179] Installing libuuid-0:2.41.2-7 100% |  37.6 MiB/s |  38.5 KiB |  00m00s
[ 35/179] Installing popt-0:1.19-9.fc43 100% |  34.0 MiB/s | 139.4 KiB |  00m00s
[ 36/179] Installing libzstd-0:1.5.7-3. 100% | 229.9 MiB/s | 941.6 KiB |  00m00s
[ 37/179] Installing elfutils-libelf-0: 100% | 291.6 MiB/s |   1.2 MiB |  00m00s
[ 38/179] Installing npth-0:1.8-3.fc43. 100% |  49.5 MiB/s |  50.7 KiB |  00m00s
[ 39/179] Installing libblkid-0:2.41.2- 100% | 128.7 MiB/s | 263.5 KiB |  00m00s
[ 40/179] Installing libxcrypt-0:4.4.38 100% | 140.2 MiB/s | 287.1 KiB |  00m00s
[ 41/179] Installing libsepol-0:3.9-2.f 100% | 200.9 MiB/s | 822.9 KiB |  00m00s
[ 42/179] Installing sqlite-libs-0:3.50 100% | 252.7 MiB/s |   1.5 MiB |  00m00s
[ 43/179] Installing gnupg2-gpgconf-0:2 100% |  17.6 MiB/s | 252.0 KiB |  00m00s
[ 44/179] Installing libattr-0:2.5.2-6. 100% |  24.8 MiB/s |  25.4 KiB |  00m00s
[ 45/179] Installing libacl-0:2.3.2-4.f 100% |  35.9 MiB/s |  36.8 KiB |  00m00s
[ 46/179] Installing pcre2-0:10.46-1.fc 100% | 227.6 MiB/s | 699.1 KiB |  00m00s
[ 47/179] Installing libselinux-0:3.9-5 100% |  94.9 MiB/s | 194.4 KiB |  00m00s
[ 48/179] Installing grep-0:3.12-2.fc43 100% |  50.1 MiB/s |   1.0 MiB |  00m00s
[ 49/179] Installing sed-0:4.9-6.fc44.x 100% |  44.5 MiB/s | 865.5 KiB |  00m00s
[ 50/179] Installing findutils-1:4.10.0 100% |  84.5 MiB/s |   1.9 MiB |  00m00s
[ 51/179] Installing libtasn1-0:4.20.0- 100% |  87.0 MiB/s | 178.1 KiB |  00m00s
[ 52/179] Installing libunistring-0:1.1 100% | 287.8 MiB/s |   1.7 MiB |  00m00s
[ 53/179] Installing libidn2-0:2.3.8-2. 100% |  32.1 MiB/s | 558.7 KiB |  00m00s
[ 54/179] Installing crypto-policies-0: 100% |  15.3 MiB/s | 172.0 KiB |  00m00s
[ 55/179] Installing xz-1:5.8.1-2.fc43. 100% |  55.5 MiB/s |   1.3 MiB |  00m00s
[ 56/179] Installing libmount-0:2.41.2- 100% | 182.5 MiB/s | 373.8 KiB |  00m00s
[ 57/179] Installing gnupg2-verify-0:2. 100% |  24.4 MiB/s | 349.9 KiB |  00m00s
[ 58/179] Installing dwz-0:0.16-2.fc43. 100% |  21.7 MiB/s | 288.5 KiB |  00m00s
[ 59/179] Installing mpfr-0:4.2.2-2.fc4 100% | 203.7 MiB/s | 834.4 KiB |  00m00s
[ 60/179] Installing gawk-0:5.3.2-2.fc4 100% |  82.5 MiB/s |   1.8 MiB |  00m00s
[ 61/179] Installing libksba-0:1.6.7-4. 100% | 130.6 MiB/s | 401.1 KiB |  00m00s
[ 62/179] Installing unzip-0:6.0-68.fc4 100% |  27.5 MiB/s | 393.8 KiB |  00m00s
[ 63/179] Installing file-libs-0:5.46-8 100% | 474.3 MiB/s |  11.9 MiB |  00m00s
[ 64/179] Installing file-0:5.46-8.fc44 100% |   7.6 MiB/s | 101.7 KiB |  00m00s
[ 65/179] Installing diffutils-0:3.12-3 100% |  74.3 MiB/s |   1.6 MiB |  00m00s
[ 66/179] Installing libeconf-0:0.7.9-2 100% |  65.0 MiB/s |  66.5 KiB |  00m00s
[ 67/179] Installing libcap-ng-0:0.8.5- 100% |  69.2 MiB/s |  70.8 KiB |  00m00s
[ 68/179] Installing audit-libs-0:4.1.2 100% | 124.2 MiB/s | 381.5 KiB |  00m00s
[ 69/179] Installing pam-libs-0:1.7.1-3 100% |  63.0 MiB/s | 129.0 KiB |  00m00s
[ 70/179] Installing libcap-0:2.76-4.fc 100% |  13.9 MiB/s | 214.3 KiB |  00m00s
[ 71/179] Installing systemd-libs-0:258 100% | 257.9 MiB/s |   2.3 MiB |  00m00s
[ 72/179] Installing libsemanage-0:3.9- 100% | 151.5 MiB/s | 310.2 KiB |  00m00s
[ 73/179] Installing libsmartcols-0:2.4 100% | 177.3 MiB/s | 181.6 KiB |  00m00s
[ 74/179] Installing lua-libs-0:5.4.8-2 100% | 137.6 MiB/s | 281.9 KiB |  00m00s
[ 75/179] Installing json-c-0:0.18-7.fc 100% |  82.0 MiB/s |  84.0 KiB |  00m00s
[ 76/179] Installing libffi-0:3.5.2-1.f 100% |  41.6 MiB/s |  85.2 KiB |  00m00s
[ 77/179] Installing p11-kit-0:0.25.8-1 100% |  84.8 MiB/s |   2.3 MiB |  00m00s
[ 78/179] Installing alternatives-0:1.3 100% |   5.2 MiB/s |  63.8 KiB |  00m00s
[ 79/179] Installing p11-kit-trust-0:0. 100% |  16.2 MiB/s | 448.3 KiB |  00m00s
[ 80/179] Installing openssl-libs-1:3.5 100% | 297.0 MiB/s |   8.9 MiB |  00m00s
[ 81/179] Installing coreutils-0:9.8-3. 100% | 107.4 MiB/s |   5.5 MiB |  00m00s
[ 82/179] Installing ca-certificates-0: 100% |   1.3 MiB/s |   2.5 MiB |  00m02s
[ 83/179] Installing gzip-0:1.14-1.fc44 100% |  24.6 MiB/s | 403.3 KiB |  00m00s
[ 84/179] Installing rpm-sequoia-0:1.9. 100% | 275.4 MiB/s |   2.5 MiB |  00m00s
[ 85/179] Installing libfsverity-0:1.6- 100% |  28.8 MiB/s |  29.5 KiB |  00m00s
[ 86/179] Installing libevent-0:2.1.12- 100% | 173.2 MiB/s | 886.8 KiB |  00m00s
[ 87/179] Installing util-linux-core-0: 100% |  64.3 MiB/s |   1.5 MiB |  00m00s
[ 88/179] Installing libusb1-0:1.0.29-4 100% |  11.3 MiB/s | 172.9 KiB |  00m00s
>>> Running sysusers scriptlet: tpm2-tss-0:4.1.3-8.fc43.x86_64                  
>>> Finished sysusers scriptlet: tpm2-tss-0:4.1.3-8.fc43.x86_64                 
>>> Scriptlet output:                                                           
>>> Creating group 'tss' with GID 59.                                           
>>> Creating user 'tss' (Account used for TPM access) with UID 59 and GID 59.   
>>>                                                                             
[ 89/179] Installing tpm2-tss-0:4.1.3-8 100% | 157.2 MiB/s |   1.6 MiB |  00m00s
[ 90/179] Installing ima-evm-utils-libs 100% |  60.5 MiB/s |  62.0 KiB |  00m00s
[ 91/179] Installing gnupg2-gpg-agent-0 100% |  22.7 MiB/s | 675.4 KiB |  00m00s
[ 92/179] Installing systemd-standalone 100% |  20.5 MiB/s | 294.1 KiB |  00m00s
[ 93/179] Installing rpm-libs-0:6.0.0-1 100% | 228.3 MiB/s | 935.3 KiB |  00m00s
[ 94/179] Installing zip-0:3.0-44.fc43. 100% |  42.6 MiB/s | 698.4 KiB |  00m00s
[ 95/179] Installing gnupg2-keyboxd-0:2 100% |  15.2 MiB/s | 202.7 KiB |  00m00s
[ 96/179] Installing libpsl-0:0.21.5-6. 100% |  75.7 MiB/s |  77.5 KiB |  00m00s
[ 97/179] Installing tar-2:1.35-6.fc43. 100% | 109.6 MiB/s |   3.0 MiB |  00m00s
[ 98/179] Installing linkdupes-0:0.7.2- 100% |  54.7 MiB/s | 840.1 KiB |  00m00s
[ 99/179] Installing libselinux-utils-0 100% |  18.6 MiB/s | 323.4 KiB |  00m00s
[100/179] Installing liblastlog2-0:2.41 100% |   2.9 MiB/s |  35.9 KiB |  00m00s
[101/179] Installing libfdisk-0:2.41.2- 100% |  93.2 MiB/s | 381.6 KiB |  00m00s
[102/179] Installing util-linux-0:2.41. 100% |  62.7 MiB/s |   3.6 MiB |  00m00s
[103/179] Installing policycoreutils-0: 100% |  17.0 MiB/s | 711.8 KiB |  00m00s
[104/179] Installing selinux-policy-0:4 100% | 837.5 KiB/s |  33.5 KiB |  00m00s
[105/179] Installing selinux-policy-tar 100% |  87.1 MiB/s |  14.9 MiB |  00m00s
[106/179] Installing zstd-0:1.5.7-3.fc4 100% |  27.7 MiB/s | 509.8 KiB |  00m00s
[107/179] Installing libxml2-0:2.12.10- 100% |  89.7 MiB/s |   1.7 MiB |  00m00s
[108/179] Installing nettle-0:3.10.1-2. 100% | 193.8 MiB/s | 793.7 KiB |  00m00s
[109/179] Installing gnutls-0:3.8.10-5. 100% | 256.2 MiB/s |   3.8 MiB |  00m00s
[110/179] Installing bzip2-0:1.0.8-21.f 100% |   7.0 MiB/s |  99.8 KiB |  00m00s
[111/179] Installing add-determinism-0: 100% | 109.8 MiB/s |   2.3 MiB |  00m00s
[112/179] Installing build-reproducibil 100% |   0.0   B/s |   1.5 KiB |  00m00s
[113/179] Installing cpio-0:2.15-6.fc43 100% |  57.9 MiB/s |   1.1 MiB |  00m00s
[114/179] Installing ed-0:1.22.2-1.fc44 100% |  11.3 MiB/s | 150.4 KiB |  00m00s
[115/179] Installing patch-0:2.8-2.fc43 100% |  16.9 MiB/s | 224.3 KiB |  00m00s
[116/179] Installing lz4-libs-0:1.10.0- 100% | 158.6 MiB/s | 162.5 KiB |  00m00s
[117/179] Installing libarchive-0:3.8.2 100% | 187.0 MiB/s | 957.2 KiB |  00m00s
[118/179] Installing libgomp-0:15.2.1-3 100% | 176.7 MiB/s | 542.8 KiB |  00m00s
[119/179] Installing libtool-ltdl-0:2.5 100% |  69.6 MiB/s |  71.2 KiB |  00m00s
[120/179] Installing gdbm-libs-1:1.23-1 100% | 128.5 MiB/s | 131.6 KiB |  00m00s
[121/179] Installing cyrus-sasl-lib-0:2 100% | 104.5 MiB/s |   2.3 MiB |  00m00s
[122/179] Installing openldap-0:2.6.10- 100% | 162.0 MiB/s | 663.6 KiB |  00m00s
[123/179] Installing gnupg2-dirmngr-0:2 100% |  21.7 MiB/s | 621.1 KiB |  00m00s
[124/179] Installing gnupg2-0:2.4.8-4.f 100% | 168.0 MiB/s |   6.6 MiB |  00m00s
[125/179] Installing rpm-sign-libs-0:6. 100% |  39.6 MiB/s |  40.6 KiB |  00m00s
[126/179] Installing gpgverify-0:2.2-3. 100% |   9.2 MiB/s |   9.4 KiB |  00m00s
[127/179] Installing jansson-0:2.14-3.f 100% |  88.3 MiB/s |  90.5 KiB |  00m00s
[128/179] Installing libpkgconf-0:2.3.0 100% |  77.4 MiB/s |  79.2 KiB |  00m00s
[129/179] Installing pkgconf-0:2.3.0-3. 100% |   6.3 MiB/s |  91.0 KiB |  00m00s
[130/179] Installing pkgconf-pkg-config 100% | 147.8 KiB/s |   1.8 KiB |  00m00s
[131/179] Installing xxhash-libs-0:0.8. 100% |  89.4 MiB/s |  91.6 KiB |  00m00s
[132/179] Installing libbrotli-0:1.1.0- 100% | 204.0 MiB/s | 835.6 KiB |  00m00s
[133/179] Installing libnghttp2-0:1.67. 100% | 159.5 MiB/s | 163.4 KiB |  00m00s
[134/179] Installing keyutils-libs-0:1. 100% |  54.4 MiB/s |  55.7 KiB |  00m00s
[135/179] Installing libcom_err-0:1.47. 100% |  62.7 MiB/s |  64.2 KiB |  00m00s
[136/179] Installing libverto-0:0.3.2-1 100% |  26.6 MiB/s |  27.2 KiB |  00m00s
[137/179] Installing krb5-libs-0:1.21.3 100% | 191.6 MiB/s |   2.3 MiB |  00m00s
[138/179] Installing libssh-0:0.11.3-1. 100% | 185.3 MiB/s | 569.2 KiB |  00m00s
[139/179] Installing libcurl-0:8.17.0~r 100% | 225.7 MiB/s | 924.5 KiB |  00m00s
[140/179] Installing curl-0:8.17.0~rc2- 100% |  14.6 MiB/s | 476.9 KiB |  00m00s
[141/179] Installing rpm-0:6.0.0-1.fc44 100% |  46.8 MiB/s |   2.6 MiB |  00m00s
[142/179] Installing efi-srpm-macros-0: 100% |  40.2 MiB/s |  41.2 KiB |  00m00s
[143/179] Installing java-srpm-macros-0 100% |   1.1 MiB/s |   1.1 KiB |  00m00s
[144/179] Installing lua-srpm-macros-0: 100% |   1.9 MiB/s |   1.9 KiB |  00m00s
[145/179] Installing tree-sitter-srpm-m 100% |   9.1 MiB/s |   9.3 KiB |  00m00s
[146/179] Installing zig-srpm-macros-0: 100% |   1.6 MiB/s |   1.7 KiB |  00m00s
[147/179] Installing filesystem-srpm-ma 100% |  38.0 MiB/s |  38.9 KiB |  00m00s
[148/179] Installing elfutils-default-y 100% | 185.7 KiB/s |   2.0 KiB |  00m00s
[149/179] Installing elfutils-libs-0:0. 100% | 133.8 MiB/s | 685.2 KiB |  00m00s
[150/179] Installing elfutils-debuginfo 100% |   5.6 MiB/s |  86.2 KiB |  00m00s
[151/179] Installing elfutils-0:0.193-3 100% | 121.6 MiB/s |   2.9 MiB |  00m00s
[152/179] Installing binutils-0:2.45.50 100% | 237.9 MiB/s |  27.1 MiB |  00m00s
[153/179] Installing gdb-minimal-0:16.3 100% | 236.7 MiB/s |  13.3 MiB |  00m00s
[154/179] Installing debugedit-0:5.2-3. 100% |  15.2 MiB/s | 217.3 KiB |  00m00s
[155/179] Installing rpm-build-libs-0:6 100% | 131.5 MiB/s | 269.2 KiB |  00m00s
[156/179] Installing rust-srpm-macros-0 100% |   5.4 MiB/s |   5.6 KiB |  00m00s
[157/179] Installing qt6-srpm-macros-0: 100% |   0.0   B/s | 740.0   B |  00m00s
[158/179] Installing qt5-srpm-macros-0: 100% |   0.0   B/s | 776.0   B |  00m00s
[159/179] Installing perl-srpm-macros-0 100% |   0.0   B/s |   1.1 KiB |  00m00s
[160/179] Installing package-notes-srpm 100% |   2.0 MiB/s |   2.0 KiB |  00m00s
[161/179] Installing openblas-srpm-macr 100% |   0.0   B/s | 392.0   B |  00m00s
[162/179] Installing ocaml-srpm-macros- 100% |   0.0   B/s |   2.1 KiB |  00m00s
[163/179] Installing kernel-srpm-macros 100% |   2.3 MiB/s |   2.3 KiB |  00m00s
[164/179] Installing gnat-srpm-macros-0 100% |   0.0   B/s |   1.3 KiB |  00m00s
[165/179] Installing ghc-srpm-macros-0: 100% |   0.0   B/s |   1.0 KiB |  00m00s
[166/179] Installing gap-srpm-macros-0: 100% |   2.6 MiB/s |   2.7 KiB |  00m00s
[167/179] Installing fpc-srpm-macros-0: 100% |   0.0   B/s | 420.0   B |  00m00s
[168/179] Installing ansible-srpm-macro 100% |  35.4 MiB/s |  36.2 KiB |  00m00s
[169/179] Installing redhat-rpm-config- 100% |  46.3 MiB/s | 189.5 KiB |  00m00s
[170/179] Installing forge-srpm-macros- 100% |  39.3 MiB/s |  40.3 KiB |  00m00s
[171/179] Installing fonts-srpm-macros- 100% |  55.7 MiB/s |  57.0 KiB |  00m00s
[172/179] Installing go-srpm-macros-0:3 100% |  61.6 MiB/s |  63.0 KiB |  00m00s
[173/179] Installing rpm-build-0:6.0.0- 100% |  17.0 MiB/s | 296.5 KiB |  00m00s
[174/179] Installing pyproject-srpm-mac 100% |   2.4 MiB/s |   2.5 KiB |  00m00s
[175/179] Installing python-srpm-macros 100% |   5.2 MiB/s |  52.9 KiB |  00m00s
[176/179] Installing rpm-plugin-selinux 100% |  12.7 MiB/s |  13.0 KiB |  00m00s
[177/179] Installing which-0:2.23-3.fc4 100% |   5.2 MiB/s |  85.7 KiB |  00m00s
[178/179] Installing shadow-utils-2:4.1 100% |  84.5 MiB/s |   4.0 MiB |  00m00s
[179/179] Installing info-0:7.2-6.fc43. 100% |  37.8 KiB/s | 354.3 KiB |  00m09s
Complete!
Finish: installing minimal buildroot with dnf5
Start: creating root cache
Finish: creating root cache
Finish: chroot init
INFO: Installed packages:
INFO: add-determinism-0.7.2-2.fc44.x86_64
alternatives-1.33-3.fc44.x86_64
ansible-srpm-macros-1-18.1.fc43.noarch
audit-libs-4.1.2-2.fc44.x86_64
bash-5.3.0-2.fc43.x86_64
binutils-2.45.50-5.fc44.x86_64
build-reproducibility-srpm-macros-0.7.2-2.fc44.noarch
bzip2-1.0.8-21.fc43.x86_64
bzip2-libs-1.0.8-21.fc43.x86_64
ca-certificates-2025.2.80_v9.0.304-2.fc44.noarch
coreutils-9.8-3.fc44.x86_64
coreutils-common-9.8-3.fc44.x86_64
cpio-2.15-6.fc43.x86_64
crypto-policies-20250714-5.gitcd6043a.fc44.noarch
curl-8.17.0~rc2-1.fc44.x86_64
cyrus-sasl-lib-2.1.28-33.fc44.x86_64
debugedit-5.2-3.fc44.x86_64
diffutils-3.12-3.fc43.x86_64
dwz-0.16-2.fc43.x86_64
ed-1.22.2-1.fc44.x86_64
efi-srpm-macros-6-5.fc44.noarch
elfutils-0.193-3.fc43.x86_64
elfutils-debuginfod-client-0.193-3.fc43.x86_64
elfutils-default-yama-scope-0.193-3.fc43.noarch
elfutils-libelf-0.193-3.fc43.x86_64
elfutils-libs-0.193-3.fc43.x86_64
fedora-gpg-keys-44-0.1.noarch
fedora-release-44-0.5.noarch
fedora-release-common-44-0.5.noarch
fedora-release-identity-basic-44-0.5.noarch
fedora-repos-44-0.1.noarch
fedora-repos-rawhide-44-0.1.noarch
file-5.46-8.fc44.x86_64
file-libs-5.46-8.fc44.x86_64
filesystem-3.18-50.fc43.x86_64
filesystem-srpm-macros-3.18-50.fc43.noarch
findutils-4.10.0-6.fc43.x86_64
fonts-srpm-macros-5.0.0-1.fc44.noarch
forge-srpm-macros-0.4.0-3.fc43.noarch
fpc-srpm-macros-1.3-15.fc43.noarch
gap-srpm-macros-2-1.fc44.noarch
gawk-5.3.2-2.fc43.x86_64
gdb-minimal-16.3-6.fc44.x86_64
gdbm-libs-1.23-10.fc43.x86_64
ghc-srpm-macros-1.9.2-3.fc43.noarch
glibc-2.42.9000-7.fc44.x86_64
glibc-common-2.42.9000-7.fc44.x86_64
glibc-gconv-extra-2.42.9000-7.fc44.x86_64
glibc-minimal-langpack-2.42.9000-7.fc44.x86_64
gmp-6.3.0-4.fc44.x86_64
gnat-srpm-macros-6-8.fc43.noarch
gnulib-l10n-20241231-1.fc44.noarch
gnupg2-2.4.8-4.fc43.x86_64
gnupg2-dirmngr-2.4.8-4.fc43.x86_64
gnupg2-gpg-agent-2.4.8-4.fc43.x86_64
gnupg2-gpgconf-2.4.8-4.fc43.x86_64
gnupg2-keyboxd-2.4.8-4.fc43.x86_64
gnupg2-verify-2.4.8-4.fc43.x86_64
gnutls-3.8.10-5.fc44.x86_64
go-srpm-macros-3.8.0-1.fc44.noarch
gpg-pubkey-36f612dcf27f7d1a48a835e4dbfcf71c6d9f90a6-6786af3b
gpg-pubkey-4f50a6114cd5c6976a7f1179655a4b02f577861e-6888bc98
gpg-pubkey-c6e7f081cf80e13146676e88829b606631645531-66b6dccf
gpgverify-2.2-3.fc43.noarch
grep-3.12-2.fc43.x86_64
gzip-1.14-1.fc44.x86_64
ima-evm-utils-libs-1.6.2-7.fc44.x86_64
info-7.2-6.fc43.x86_64
jansson-2.14-3.fc43.x86_64
java-srpm-macros-1-7.fc43.noarch
json-c-0.18-7.fc43.x86_64
kernel-srpm-macros-1.0-27.fc43.noarch
keyutils-libs-1.6.3-6.fc43.x86_64
krb5-libs-1.21.3-10.fc44.x86_64
libacl-2.3.2-4.fc43.x86_64
libarchive-3.8.2-1.fc44.x86_64
libassuan-2.5.7-4.fc43.x86_64
libattr-2.5.2-6.fc43.x86_64
libblkid-2.41.2-7.fc44.x86_64
libbrotli-1.1.0-10.fc44.x86_64
libcap-2.76-4.fc44.x86_64
libcap-ng-0.8.5-8.fc44.x86_64
libcom_err-1.47.3-2.fc43.x86_64
libcurl-8.17.0~rc2-1.fc44.x86_64
libeconf-0.7.9-2.fc43.x86_64
libevent-2.1.12-16.fc43.x86_64
libfdisk-2.41.2-7.fc44.x86_64
libffi-3.5.2-1.fc44.x86_64
libfsverity-1.6-3.fc43.x86_64
libgcc-15.2.1-3.fc44.x86_64
libgcrypt-1.11.1-2.fc43.x86_64
libgomp-15.2.1-3.fc44.x86_64
libgpg-error-1.56-1.fc44.x86_64
libidn2-2.3.8-2.fc43.x86_64
libksba-1.6.7-4.fc43.x86_64
liblastlog2-2.41.2-7.fc44.x86_64
libmount-2.41.2-7.fc44.x86_64
libnghttp2-1.67.1-1.fc44.x86_64
libpkgconf-2.3.0-3.fc43.x86_64
libpsl-0.21.5-6.fc43.x86_64
libselinux-3.9-5.fc44.x86_64
libselinux-utils-3.9-5.fc44.x86_64
libsemanage-3.9-4.fc44.x86_64
libsepol-3.9-2.fc43.x86_64
libsmartcols-2.41.2-7.fc44.x86_64
libssh-0.11.3-1.fc44.x86_64
libssh-config-0.11.3-1.fc44.noarch
libstdc++-15.2.1-3.fc44.x86_64
libtasn1-4.20.0-2.fc43.x86_64
libtool-ltdl-2.5.4-7.fc43.x86_64
libunistring-1.1-10.fc43.x86_64
libusb1-1.0.29-4.fc44.x86_64
libuuid-2.41.2-7.fc44.x86_64
libverto-0.3.2-11.fc43.x86_64
libxcrypt-4.4.38-9.fc44.x86_64
libxml2-2.12.10-5.fc44.x86_64
libzstd-1.5.7-3.fc44.x86_64
linkdupes-0.7.2-2.fc44.x86_64
lua-libs-5.4.8-2.fc43.x86_64
lua-srpm-macros-1-16.fc43.noarch
lz4-libs-1.10.0-3.fc43.x86_64
mpfr-4.2.2-2.fc43.x86_64
ncurses-base-6.5-7.20250614.fc43.noarch
ncurses-libs-6.5-7.20250614.fc43.x86_64
nettle-3.10.1-2.fc43.x86_64
npth-1.8-3.fc43.x86_64
ocaml-srpm-macros-11-2.fc43.noarch
openblas-srpm-macros-2-20.fc43.noarch
openldap-2.6.10-4.fc44.x86_64
openssl-libs-3.5.4-1.fc44.x86_64
p11-kit-0.25.8-1.fc44.x86_64
p11-kit-trust-0.25.8-1.fc44.x86_64
package-notes-srpm-macros-0.5-14.fc43.noarch
pam-libs-1.7.1-3.fc43.x86_64
patch-2.8-2.fc43.x86_64
pcre2-10.46-1.fc44.x86_64
pcre2-syntax-10.46-1.fc44.noarch
perl-srpm-macros-1-60.fc43.noarch
pkgconf-2.3.0-3.fc43.x86_64
pkgconf-m4-2.3.0-3.fc43.noarch
pkgconf-pkg-config-2.3.0-3.fc43.x86_64
policycoreutils-3.9-5.fc44.x86_64
popt-1.19-9.fc43.x86_64
publicsuffix-list-dafsa-20250616-2.fc43.noarch
pyproject-srpm-macros-1.18.5-1.fc44.noarch
python-srpm-macros-3.14-9.fc44.noarch
qt5-srpm-macros-5.15.17-2.fc43.noarch
qt6-srpm-macros-6.10.0-1.fc44.noarch
readline-8.3-2.fc43.x86_64
redhat-rpm-config-343-14.fc44.noarch
rpm-6.0.0-1.fc44.x86_64
rpm-build-6.0.0-1.fc44.x86_64
rpm-build-libs-6.0.0-1.fc44.x86_64
rpm-libs-6.0.0-1.fc44.x86_64
rpm-plugin-selinux-6.0.0-1.fc44.x86_64
rpm-sequoia-1.9.0-2.fc43.x86_64
rpm-sign-libs-6.0.0-1.fc44.x86_64
rust-srpm-macros-26.4-1.fc44.noarch
sed-4.9-6.fc44.x86_64
selinux-policy-42.14-1.fc44.noarch
selinux-policy-targeted-42.14-1.fc44.noarch
setup-2.15.0-26.fc43.noarch
shadow-utils-4.18.0-3.fc43.x86_64
sqlite-libs-3.50.4-1.fc44.x86_64
systemd-libs-258.1-2.fc44.x86_64
systemd-standalone-sysusers-258.1-2.fc44.x86_64
tar-1.35-6.fc43.x86_64
tpm2-tss-4.1.3-8.fc43.x86_64
tree-sitter-srpm-macros-0.4.2-1.fc43.noarch
unzip-6.0-68.fc44.x86_64
util-linux-2.41.2-7.fc44.x86_64
util-linux-core-2.41.2-7.fc44.x86_64
which-2.23-3.fc43.x86_64
xxhash-libs-0.8.3-3.fc43.x86_64
xz-5.8.1-2.fc43.x86_64
xz-libs-5.8.1-2.fc43.x86_64
zig-srpm-macros-1-5.fc43.noarch
zip-3.0-44.fc43.x86_64
zlib-ng-compat-2.2.5-2.fc44.x86_64
zstd-1.5.7-3.fc44.x86_64
Start: buildsrpm
Start: rpmbuild -bs
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1761609600
Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc44.src.rpm
Finish: rpmbuild -bs
INFO: chroot_scan: 1 files copied to /var/lib/copr-rpmbuild/results/chroot_scan
INFO: /var/lib/mock/fedora-rawhide-x86_64-1761685037.017021/root/var/log/dnf5.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-mknffo2h/git-imerge/git-imerge.spec) Config(child) 0 minutes 58 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.fc44.src.rpm)  Config(fedora-rawhide-x86_64)
Start(bootstrap): chroot init
INFO: mounting tmpfs at /var/lib/mock/fedora-rawhide-x86_64-bootstrap-1761685037.017021/root.
INFO: reusing tmpfs at /var/lib/mock/fedora-rawhide-x86_64-bootstrap-1761685037.017021/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-rawhide-x86_64-1761685037.017021/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-6.0.0-1.fc44.x86_64
  rpm-sequoia-1.9.0-2.fc43.x86_64
  dnf5-5.2.17.0-2.fc44.x86_64
  dnf5-plugins-5.2.17.0-2.fc44.x86_64
Finish: chroot init
Start: build phase for git-imerge-1.2.0-1.fc44.src.rpm
Start: build setup for git-imerge-1.2.0-1.fc44.src.rpm
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1761609600
Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc44.src.rpm
Updating and loading repositories:
 Copr repository                        100% |  48.8 KiB/s |   1.5 KiB |  00m00s
 fedora                                 100% | 123.7 KiB/s |   7.9 KiB |  00m00s
Repositories loaded.
Package                 Arch   Version                 Repository      Size
Installing:
 bash-completion-devel  noarch 1:2.16-3.fc44           fedora     979.0   B
 git-core               x86_64 2.51.1-1.fc44           fedora      23.6 MiB
 python3-devel          x86_64 3.14.0-2.fc44           fedora       1.9 MiB
Installing dependencies:
 bash-completion        noarch 1:2.16-3.fc44           fedora       1.4 MiB
 expat                  x86_64 2.7.2-1.fc44            fedora     298.6 KiB
 less                   x86_64 685-1.fc44              fedora     413.4 KiB
 libcbor                x86_64 0.12.0-6.fc43           fedora      77.8 KiB
 libedit                x86_64 3.1-57.20251016cvs.fc44 fedora     240.2 KiB
 libfido2               x86_64 1.16.0-3.fc43           fedora     238.5 KiB
 mpdecimal              x86_64 4.0.1-2.fc43            fedora     217.2 KiB
 openssh                x86_64 10.0p1-7.fc44           fedora       1.4 MiB
 openssh-clients        x86_64 10.0p1-7.fc44           fedora       2.6 MiB
 pyproject-rpm-macros   noarch 1.18.5-1.fc44           fedora     115.0 KiB
 python-pip-wheel       noarch 25.2-4.fc44             fedora       1.2 MiB
 python-rpm-macros      noarch 3.14-9.fc44             fedora      27.6 KiB
 python3                x86_64 3.14.0-2.fc44           fedora      28.9 KiB
 python3-libs           x86_64 3.14.0-2.fc44           fedora      43.0 MiB
 python3-packaging      noarch 25.0-7.fc44             fedora     607.4 KiB
 python3-rpm-generators noarch 14-13.fc43              fedora      81.7 KiB
 python3-rpm-macros     noarch 3.14-9.fc44             fedora       6.5 KiB
 tzdata                 noarch 2025b-3.fc43            fedora       1.6 MiB

Transaction Summary:
 Installing:        21 packages

Total size of inbound packages is 20 MiB. Need to download 20 MiB.
After this operation, 79 MiB extra will be used (install 79 MiB, remove 0 B).
[ 1/21] python3-devel-0:3.14.0-2.fc44.x 100% |   2.3 MiB/s | 434.9 KiB |  00m00s
[ 2/21] bash-completion-devel-1:2.16-3. 100% |  48.4 KiB/s |   9.2 KiB |  00m00s
[ 3/21] less-0:685-1.fc44.x86_64        100% |   4.6 MiB/s | 199.3 KiB |  00m00s
[ 4/21] expat-0:2.7.2-1.fc44.x86_64     100% |   1.9 MiB/s | 119.0 KiB |  00m00s
[ 5/21] bash-completion-1:2.16-3.fc44.n 100% |   7.8 MiB/s | 470.9 KiB |  00m00s
[ 6/21] openssh-clients-0:10.0p1-7.fc44 100% |   7.7 MiB/s | 746.8 KiB |  00m00s
[ 7/21] libedit-0:3.1-57.20251016cvs.fc 100% |   3.1 MiB/s | 105.0 KiB |  00m00s
[ 8/21] libfido2-0:1.16.0-3.fc43.x86_64 100% |   2.1 MiB/s |  98.5 KiB |  00m00s
[ 9/21] openssh-0:10.0p1-7.fc44.x86_64  100% |   5.8 MiB/s | 338.9 KiB |  00m00s
[10/21] python3-libs-0:3.14.0-2.fc44.x8 100% |  51.7 MiB/s |   9.8 MiB |  00m00s
[11/21] mpdecimal-0:4.0.1-2.fc43.x86_64 100% |   2.7 MiB/s |  97.1 KiB |  00m00s
[12/21] tzdata-0:2025b-3.fc43.noarch    100% |  15.8 MiB/s | 713.9 KiB |  00m00s
[13/21] python-pip-wheel-0:25.2-4.fc44. 100% |  18.0 MiB/s |   1.1 MiB |  00m00s
[14/21] python3-0:3.14.0-2.fc44.x86_64  100% | 893.2 KiB/s |  27.7 KiB |  00m00s
[15/21] libcbor-0:0.12.0-6.fc43.x86_64  100% | 515.5 KiB/s |  33.5 KiB |  00m00s
[16/21] pyproject-rpm-macros-0:1.18.5-1 100% |   1.4 MiB/s |  44.4 KiB |  00m00s
[17/21] python-rpm-macros-0:3.14-9.fc44 100% | 632.8 KiB/s |  19.6 KiB |  00m00s
[18/21] python3-rpm-generators-0:14-13. 100% | 891.8 KiB/s |  28.5 KiB |  00m00s
[19/21] python3-rpm-macros-0:3.14-9.fc4 100% | 392.5 KiB/s |  12.2 KiB |  00m00s
[20/21] python3-packaging-0:25.0-7.fc44 100% |   4.9 MiB/s | 161.4 KiB |  00m00s
[21/21] git-core-0:2.51.1-1.fc44.x86_64 100% |   2.1 MiB/s |   5.0 MiB |  00m02s
--------------------------------------------------------------------------------
[21/21] Total                           100% |   8.1 MiB/s |  19.6 MiB |  00m02s
Running transaction
[ 1/23] Verify package files            100% | 283.0   B/s |  21.0   B |  00m00s
[ 2/23] Prepare transaction             100% | 328.0   B/s |  21.0   B |  00m00s
[ 3/23] Installing python-rpm-macros-0: 100% |  27.8 MiB/s |  28.5 KiB |  00m00s
[ 4/23] Installing python3-rpm-macros-0 100% |   0.0   B/s |   6.8 KiB |  00m00s
[ 5/23] Installing expat-0:2.7.2-1.fc44 100% |  18.4 MiB/s | 300.7 KiB |  00m00s
[ 6/23] Installing pyproject-rpm-macros 100% |  57.1 MiB/s | 117.0 KiB |  00m00s
[ 7/23] Installing libcbor-0:0.12.0-6.f 100% |  77.3 MiB/s |  79.2 KiB |  00m00s
[ 8/23] Installing libfido2-0:1.16.0-3. 100% |  39.1 MiB/s | 240.0 KiB |  00m00s
[ 9/23] Installing tzdata-0:2025b-3.fc4 100% |  25.6 MiB/s |   1.9 MiB |  00m00s
[10/23] Installing python-pip-wheel-0:2 100% | 295.0 MiB/s |   1.2 MiB |  00m00s
[11/23] Installing mpdecimal-0:4.0.1-2. 100% |  30.5 MiB/s | 218.8 KiB |  00m00s
[12/23] Installing python3-libs-0:3.14. 100% | 176.2 MiB/s |  43.3 MiB |  00m00s
[13/23] Installing python3-0:3.14.0-2.f 100% |   1.7 MiB/s |  30.6 KiB |  00m00s
[14/23] Installing python3-packaging-0: 100% | 100.9 MiB/s | 619.9 KiB |  00m00s
[15/23] Installing python3-rpm-generato 100% |  81.0 MiB/s |  82.9 KiB |  00m00s
[16/23] Installing openssh-0:10.0p1-7.f 100% |  66.3 MiB/s |   1.4 MiB |  00m00s
[17/23] Installing libedit-0:3.1-57.202 100% | 118.1 MiB/s | 241.8 KiB |  00m00s
[18/23] Installing openssh-clients-0:10 100% |  74.6 MiB/s |   2.6 MiB |  00m00s
[19/23] Installing bash-completion-1:2. 100% |  38.1 MiB/s |   1.5 MiB |  00m00s
[20/23] Installing less-0:685-1.fc44.x8 100% |  20.4 MiB/s | 416.8 KiB |  00m00s
[21/23] Installing git-core-0:2.51.1-1. 100% | 272.2 MiB/s |  23.7 MiB |  00m00s
[22/23] Installing bash-completion-deve 100% |   1.8 MiB/s |   1.8 KiB |  00m00s
[23/23] Installing python3-devel-0:3.14 100% |  26.5 MiB/s |   2.0 MiB |  00m00s
Complete!
Finish: build setup for git-imerge-1.2.0-1.fc44.src.rpm
Start: rpmbuild git-imerge-1.2.0-1.fc44.src.rpm
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1761609600
Executing(%mkbuilddir): /bin/sh -e /var/tmp/rpm-tmp.66kizV
Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.8Tfqfh
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-build
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
+ /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.7lXlz8
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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'
+ rm -rfv '*.dist-info/'
+ '[' -f /usr/bin/python3 ']'
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/.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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ VALAFLAGS=-g
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes --cap-lints=warn'
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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-build/.pyproject-builddir
+ RPM_TOXENV=py314
+ FEDORA=44
+ 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-build/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires -t
Handling setuptools >= 40.8 from default build backend
Requirement not satisfied: setuptools >= 40.8
Exiting dependency generation pass: build backend
+ cat /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires
+ rm -rfv '*.dist-info/'
+ RPM_EC=0
++ jobs -p
+ exit 0
Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc44.buildreqs.nosrc.rpm
INFO: Going to install missing dynamic buildrequires
Updating and loading repositories:
 Copr repository                        100% |  47.2 KiB/s |   1.5 KiB |  00m00s
 fedora                                 100% | 127.7 KiB/s |   7.9 KiB |  00m00s
Repositories loaded.
Package "git-core-2.51.1-1.fc44.x86_64" is already installed.
Package "bash-completion-devel-1:2.16-3.fc44.noarch" is already installed.Package             Arch   Version        Repository      Size
Installing:
 python3-pip        noarch 25.2-4.fc44    fedora      11.3 MiB
 python3-setuptools noarch 78.1.1-15.fc44 fedora       9.0 MiB

Transaction Summary:
 Installing:         2 packages


Package "pyproject-rpm-macros-1.18.5-1.fc44.noarch" is already installed.
Package "python3-devel-3.14.0-2.fc44.x86_64" is already installed.
Package "python3-packaging-25.0-7.fc44.noarch" is already installed.

Total size of inbound packages is 5 MiB. Need to download 5 MiB.
After this operation, 20 MiB extra will be used (install 20 MiB, remove 0 B).
[1/2] python3-setuptools-0:78.1.1-15.fc 100% |   7.5 MiB/s |   2.1 MiB |  00m00s
[2/2] python3-pip-0:25.2-4.fc44.noarch  100% |   7.7 MiB/s |   2.6 MiB |  00m00s
--------------------------------------------------------------------------------
[2/2] Total                             100% |  13.7 MiB/s |   4.7 MiB |  00m00s
Running transaction
[1/4] Verify package files              100% | 117.0   B/s |   2.0   B |  00m00s
[2/4] Prepare transaction               100% |  55.0   B/s |   2.0   B |  00m00s
[3/4] Installing python3-setuptools-0:7 100% | 119.7 MiB/s |   9.2 MiB |  00m00s
[4/4] Installing python3-pip-0:25.2-4.f 100% |  86.0 MiB/s |  11.5 MiB |  00m00s
Complete!
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1761609600
Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.IGRiGO
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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'
+ rm -rfv '*.dist-info/'
+ '[' -f /usr/bin/python3 ']'
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/.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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ VALAFLAGS=-g
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes --cap-lints=warn'
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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-build/.pyproject-builddir
+ RPM_TOXENV=py314
+ FEDORA=44
+ 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-build/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires -t
Handling setuptools >= 40.8 from default build backend
Requirement satisfied: setuptools >= 40.8
   (installed: setuptools 78.1.1)
/usr/lib/python3.14/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
!!

        ********************************************************************************
        Please consider removing the following classifiers in favor of a SPDX license expression:

        License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)

        See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
        ********************************************************************************

!!
  self._finalize_license_expression()
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 tox-current-env >= 0.0.16 from tox itself
Requirement not satisfied: tox-current-env >= 0.0.16
Exiting dependency generation pass: tox itself
+ cat /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires
+ rm -rfv '*.dist-info/'
+ RPM_EC=0
++ jobs -p
+ exit 0
Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc44.buildreqs.nosrc.rpm
INFO: Going to install missing dynamic buildrequires
Updating and loading repositories:
 Copr repository                        100% |  32.9 KiB/s |   1.5 KiB |  00m00s
 fedora                                 100% | 108.5 KiB/s |   7.9 KiB |  00m00s
Repositories loaded.
Package "git-core-2.51.1-1.fc44.x86_64" is already installed.
Package "bash-completion-devel-1:2.16-3.fc44.noarch" is already installed.
Package "pyproject-rpm-macros-1.18.5-1.fc44.noarch" is already installed.
Package "python3-devel-3.14.0-2.fc44.x86_64" is already installed.
Package "python3-packaging-25.0-7.fc44.noarch" is already installed.
Package "python3-pip-25.2-4.fc44.noarch" is already installed.
Package "python3-setuptools-78.1.1-15.fc44.noarch" is already installed.

Package                  Arch   Version        Repository      Size
Installing:
 python3-tox-current-env noarch 0.0.16-7.fc44  fedora      78.4 KiB
Installing dependencies:
 python-setuptools-wheel noarch 78.1.1-15.fc44 fedora       1.1 MiB
 python3-cachetools      noarch 6.2.1-1.fc44   fedora     152.3 KiB
 python3-chardet         noarch 5.2.0-22.fc44  fedora       2.1 MiB
 python3-colorama        noarch 0.4.6-14.fc44  fedora     190.4 KiB
 python3-distlib         noarch 0.4.0-2.fc44   fedora       1.2 MiB
 python3-filelock        noarch 3.15.4-10.fc44 fedora      97.0 KiB
 python3-platformdirs    noarch 4.4.0-2.fc44   fedora     182.4 KiB
 python3-pluggy          noarch 1.6.0-4.fc44   fedora     211.0 KiB
 python3-pyproject-api   noarch 1.10.0-1.fc44  fedora      85.0 KiB
 python3-virtualenv      noarch 20.35.3-1.fc44 fedora     707.7 KiB
 tox                     noarch 4.30.3-1.fc44  fedora       1.4 MiB

Transaction Summary:
 Installing:        12 packages

Total size of inbound packages is 3 MiB. Need to download 3 MiB.
After this operation, 8 MiB extra will be used (install 8 MiB, remove 0 B).
[ 1/12] python3-tox-current-env-0:0.0.1 100% | 414.5 KiB/s |  31.9 KiB |  00m00s
[ 2/12] python3-cachetools-0:6.2.1-1.fc 100% | 503.8 KiB/s |  48.4 KiB |  00m00s
[ 3/12] python3-colorama-0:0.4.6-14.fc4 100% |   1.7 MiB/s |  71.8 KiB |  00m00s
[ 4/12] tox-0:4.30.3-1.fc44.noarch      100% |   2.9 MiB/s | 463.6 KiB |  00m00s
[ 5/12] python3-filelock-0:3.15.4-10.fc 100% |   2.0 MiB/s |  44.9 KiB |  00m00s
[ 6/12] python3-chardet-0:5.2.0-22.fc44 100% |   2.9 MiB/s | 296.4 KiB |  00m00s
[ 7/12] python3-platformdirs-0:4.4.0-2. 100% |   2.0 MiB/s |  49.5 KiB |  00m00s
[ 8/12] python3-pluggy-0:1.6.0-4.fc44.n 100% |   2.4 MiB/s |  61.6 KiB |  00m00s
[ 9/12] python3-pyproject-api-0:1.10.0- 100% |   1.9 MiB/s |  43.6 KiB |  00m00s
[10/12] python3-virtualenv-0:20.35.3-1. 100% |   7.3 MiB/s | 306.3 KiB |  00m00s
[11/12] python3-distlib-0:0.4.0-2.fc44. 100% |   6.2 MiB/s | 270.9 KiB |  00m00s
[12/12] python-setuptools-wheel-0:78.1. 100% |  10.2 MiB/s |   1.1 MiB |  00m00s
--------------------------------------------------------------------------------
[12/12] Total                           100% |   9.3 MiB/s |   2.7 MiB |  00m00s
Running transaction
[ 1/14] Verify package files            100% |   1.1 KiB/s |  12.0   B |  00m00s
[ 2/14] Prepare transaction             100% | 571.0   B/s |  12.0   B |  00m00s
[ 3/14] Installing python3-platformdirs 100% |  61.5 MiB/s | 188.8 KiB |  00m00s
[ 4/14] Installing python3-filelock-0:3 100% |  33.8 MiB/s | 103.9 KiB |  00m00s
[ 5/14] Installing python3-distlib-0:0. 100% | 199.6 MiB/s |   1.2 MiB |  00m00s
[ 6/14] Installing python-setuptools-wh 100% | 382.8 MiB/s |   1.1 MiB |  00m00s
[ 7/14] Installing python3-virtualenv-0 100% |  21.1 MiB/s | 777.4 KiB |  00m00s
[ 8/14] Installing python3-pyproject-ap 100% |  44.5 MiB/s |  91.1 KiB |  00m00s
[ 9/14] Installing python3-pluggy-0:1.6 100% |  70.8 MiB/s | 217.5 KiB |  00m00s
[10/14] Installing python3-colorama-0:0 100% |  48.9 MiB/s | 200.3 KiB |  00m00s
[11/14] Installing python3-chardet-0:5. 100% |  79.0 MiB/s |   2.1 MiB |  00m00s
[12/14] Installing python3-cachetools-0 100% |  38.4 MiB/s | 157.2 KiB |  00m00s
[13/14] Installing tox-0:4.30.3-1.fc44. 100% |  41.5 MiB/s |   1.5 MiB |  00m00s
[14/14] Installing python3-tox-current- 100% |   4.0 MiB/s |  82.9 KiB |  00m00s
Complete!
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1761609600
Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.SnqvUR
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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'
+ rm -rfv '*.dist-info/'
+ '[' -f /usr/bin/python3 ']'
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/.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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ VALAFLAGS=-g
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes --cap-lints=warn'
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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-build/.pyproject-builddir
+ RPM_TOXENV=py314
+ FEDORA=44
+ 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-build/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires -t
Handling setuptools >= 40.8 from default build backend
Requirement satisfied: setuptools >= 40.8
   (installed: setuptools 78.1.1)
/usr/lib/python3.14/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
!!

        ********************************************************************************
        Please consider removing the following classifiers in favor of a SPDX license expression:

        License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)

        See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
        ********************************************************************************

!!
  self._finalize_license_expression()
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 tox-current-env >= 0.0.16 from tox itself
Requirement satisfied: tox-current-env >= 0.0.16
   (installed: tox-current-env 0.0.16)
  py314: OK (0.00 seconds)
  congratulations :) (0.04 seconds)
Handling tox from tox --print-deps-only: py314
Requirement satisfied: tox
   (installed: tox 4.30.3)
  py314: OK (0.00 seconds)
  congratulations :) (0.04 seconds)
/usr/lib/python3.14/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
!!

        ********************************************************************************
        Please consider removing the following classifiers in favor of a SPDX license expression:

        License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)

        See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
        ********************************************************************************

!!
  self._finalize_license_expression()
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-build/git-imerge-1.2.0/git_imerge-1.2.0.dist-info'
+ cat /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires
+ rm -rfv git_imerge-1.2.0.dist-info/
removed 'git_imerge-1.2.0.dist-info/licenses/COPYING'
removed directory 'git_imerge-1.2.0.dist-info/licenses'
removed 'git_imerge-1.2.0.dist-info/METADATA'
removed 'git_imerge-1.2.0.dist-info/entry_points.txt'
removed 'git_imerge-1.2.0.dist-info/top_level.txt'
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.fc44.buildreqs.nosrc.rpm
INFO: Going to install missing dynamic buildrequires
Updating and loading repositories:
 Copr repository                        100% |  32.9 KiB/s |   1.5 KiB |  00m00s
 fedora                                 100% | 110.0 KiB/s |   7.9 KiB |  00m00s
Repositories loaded.
Package "git-core-2.51.1-1.fc44.x86_64" is already installed.
Package "bash-completion-devel-1:2.16-3.fc44.noarch" is already installed.
Package "pyproject-rpm-macros-1.18.5-1.fc44.noarch" is already installed.
Package "python3-devel-3.14.0-2.fc44.x86_64" is already installed.
Package "python3-packaging-25.0-7.fc44.noarch" is already installed.
Package "python3-pip-25.2-4.fc44.noarch" is already installed.
Package "python3-setuptools-78.1.1-15.fc44.noarch" is already installed.
Package "tox-4.30.3-1.fc44.noarch" is already installed.
Package "python3-tox-current-env-0.0.16-7.fc44.noarch" is already installed.

Nothing to do.
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1761609600
Executing(%generate_buildrequires): /bin/sh -e /var/tmp/rpm-tmp.fQ0ccY
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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'
+ rm -rfv '*.dist-info/'
+ '[' -f /usr/bin/python3 ']'
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/.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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ VALAFLAGS=-g
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes --cap-lints=warn'
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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-build/.pyproject-builddir
+ RPM_TOXENV=py314
+ FEDORA=44
+ 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-build/pyproject-wheeldir --output /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires -t
Handling setuptools >= 40.8 from default build backend
Requirement satisfied: setuptools >= 40.8
   (installed: setuptools 78.1.1)
/usr/lib/python3.14/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
!!

        ********************************************************************************
        Please consider removing the following classifiers in favor of a SPDX license expression:

        License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)

        See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
        ********************************************************************************

!!
  self._finalize_license_expression()
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 tox-current-env >= 0.0.16 from tox itself
Requirement satisfied: tox-current-env >= 0.0.16
   (installed: tox-current-env 0.0.16)
  py314: OK (0.00 seconds)
  congratulations :) (0.05 seconds)
Handling tox from tox --print-deps-only: py314
Requirement satisfied: tox
   (installed: tox 4.30.3)
  py314: OK (0.00 seconds)
  congratulations :) (0.05 seconds)
/usr/lib/python3.14/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
!!

        ********************************************************************************
        Please consider removing the following classifiers in favor of a SPDX license expression:

        License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)

        See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
        ********************************************************************************

!!
  self._finalize_license_expression()
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-build/git-imerge-1.2.0/git_imerge-1.2.0.dist-info'
+ cat /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-buildrequires
+ rm -rfv git_imerge-1.2.0.dist-info/
removed 'git_imerge-1.2.0.dist-info/licenses/COPYING'
removed directory 'git_imerge-1.2.0.dist-info/licenses'
removed 'git_imerge-1.2.0.dist-info/METADATA'
removed 'git_imerge-1.2.0.dist-info/top_level.txt'
removed 'git_imerge-1.2.0.dist-info/entry_points.txt'
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.ZhCjGT
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ export FCFLAGS
+ VALAFLAGS=-g
+ export VALAFLAGS
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn'
+ export RUSTFLAGS
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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-build/.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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ VALAFLAGS=-g
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn'
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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-build/.pyproject-builddir
+ /usr/bin/python3 -Bs /usr/lib/rpm/redhat/pyproject_wheel.py /builddir/build/BUILD/git-imerge-1.2.0-build/pyproject-wheeldir
Processing /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0
  Preparing metadata (pyproject.toml): started
  Running command Preparing metadata (pyproject.toml)
  /usr/lib/python3.14/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
  !!

          ********************************************************************************
          Please consider removing the following classifiers in favor of a SPDX license expression:

          License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)

          See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
          ********************************************************************************

  !!
    self._finalize_license_expression()
  running dist_info
  creating /builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/git_imerge.egg-info
  writing /builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/git_imerge.egg-info/PKG-INFO
  writing dependency_links to /builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/git_imerge.egg-info/dependency_links.txt
  writing entry points to /builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/git_imerge.egg-info/entry_points.txt
  writing top-level names to /builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/git_imerge.egg-info/top_level.txt
  writing manifest file '/builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/git_imerge.egg-info/SOURCES.txt'
  reading manifest file '/builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/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-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/git_imerge.egg-info/SOURCES.txt'
  creating '/builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-modern-metadata-5h1sw23s/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)
  /usr/lib/python3.14/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
  !!

          ********************************************************************************
          Please consider removing the following classifiers in favor of a SPDX license expression:

          License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)

          See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
          ********************************************************************************

  !!
    self._finalize_license_expression()
  running bdist_wheel
  running build
  running build_py
  creating build/lib
  copying gitimerge.py -> build/lib
  installing to build/bdist.linux-x86_64/wheel
  running install
  running install_lib
  creating build/bdist.linux-x86_64/wheel
  copying build/lib/gitimerge.py -> build/bdist.linux-x86_64/wheel/.
  running install_data
  creating build/bdist.linux-x86_64/wheel/git_imerge-1.2.0.data/data
  creating build/bdist.linux-x86_64/wheel/usr/share/bash-completion/completions
  copying completions/git-imerge -> build/bdist.linux-x86_64/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-x86_64/wheel/./git_imerge-1.2.0-py3.14.egg-info
  running install_scripts
  creating build/bdist.linux-x86_64/wheel/git_imerge-1.2.0.dist-info/WHEEL
  creating '/builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir/pip-wheel-wa7jegbp/.tmp-04epvhyt/git_imerge-1.2.0-py3-none-any.whl' and adding 'build/bdist.linux-x86_64/wheel' to it
  adding 'gitimerge.py'
  adding 'git_imerge-1.2.0.dist-info/licenses/COPYING'
  adding 'usr/share/bash-completion/completions/git-imerge'
  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-x86_64/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=46033 sha256=84b37b528869a1a6c5310662c097cd56049cf87dece08dc5c609c041cfc0d1ec
  Stored in directory: /builddir/.cache/pip/wheels/ea/97/42/de32c6492ff57cf343389ac369ca832f083489be271e7be7ed
Successfully built git-imerge
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.eoXdPG
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-build
+ '[' /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT '!=' / ']'
+ rm -rf /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT
++ dirname /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build
+ mkdir /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ export FCFLAGS
+ VALAFLAGS=-g
+ export VALAFLAGS
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn'
+ export RUSTFLAGS
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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-build/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-build/.pyproject-builddir
+ /usr/bin/python3 -m pip install --root /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT --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-build/pyproject-wheeldir git_imerge==1.2.0
Using pip 25.2 from /usr/lib/python3.14/site-packages/pip (python 3.14)
Looking in links: /builddir/build/BUILD/git-imerge-1.2.0-build/pyproject-wheeldir
Processing /builddir/build/BUILD/git-imerge-1.2.0-build/pyproject-wheeldir/git_imerge-1.2.0-py3-none-any.whl
Installing collected packages: git_imerge
  Creating /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/bin
  changing mode of /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/bin/git-imerge to 755
Successfully installed git_imerge-1.2.0
+ '[' -d /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/bin ']'
+ '[' -z sP ']'
+ shebang_flags=-kasP
+ /usr/bin/python3 -B /usr/lib/rpm/redhat/pathfix.py -pni /usr/bin/python3 -kasP /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/bin/git-imerge
/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/bin/git-imerge: updating
+ rm -rfv /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/bin/__pycache__
+ rm -f /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-ghost-distinfo
+ site_dirs=()
+ '[' -d /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages ']'
+ site_dirs+=("/usr/lib/python3.14/site-packages")
+ '[' /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib64/python3.14/site-packages '!=' /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages ']'
+ '[' -d /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib64/python3.14/site-packages ']'
+ for site_dir in ${site_dirs[@]}
+ for distinfo in /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT$site_dir/*.dist-info
+ echo '%ghost %dir /usr/lib/python3.14/site-packages/git_imerge-1.2.0.dist-info'
+ sed -i s/pip/rpm/ /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/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/BUILD/git-imerge-1.2.0-build/BUILDROOT --record /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages/git_imerge-1.2.0.dist-info/RECORD --output /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-record
+ rm -fv /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages/git_imerge-1.2.0.dist-info/RECORD
removed '/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages/git_imerge-1.2.0.dist-info/RECORD'
+ rm -fv /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages/git_imerge-1.2.0.dist-info/REQUESTED
removed '/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages/git_imerge-1.2.0.dist-info/REQUESTED'
++ wc -l /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0-1.fc44.x86_64-pyproject-ghost-distinfo
++ cut -f1 '-d '
+ lines=1
+ '[' 1 -ne 1 ']'
+ /usr/lib/rpm/check-buildroot
+ /usr/lib/rpm/redhat/brp-ldconfig
+ /usr/lib/rpm/brp-compress
+ /usr/lib/rpm/brp-strip /usr/bin/strip
+ /usr/lib/rpm/brp-strip-comment-note /usr/bin/strip /usr/bin/objdump
+ /usr/lib/rpm/redhat/brp-strip-lto /usr/bin/strip
+ /usr/lib/rpm/check-rpaths
+ /usr/lib/rpm/redhat/brp-mangle-shebangs
+ /usr/lib/rpm/brp-remove-la-files
+ /usr/lib/rpm/redhat/brp-python-rpm-in-distinfo
+ env /usr/lib/rpm/redhat/brp-python-bytecompile '' 1 0 -j2
Bytecompiling .py files below /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14 using python3.14
+ /usr/lib/rpm/redhat/brp-python-hardlink
+ /usr/bin/add-det --brp -j2 /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT
/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages/__pycache__/gitimerge.cpython-314.pyc: replacing with normalized version
/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages/__pycache__/gitimerge.cpython-314.opt-1.pyc: replacing with normalized version
Scanned 13 directories and 11 files,
    processed 2 inodes,
    2 modified (2 replaced + 0 rewritten),
    0 unsupported format, 0 errors
+ /usr/bin/linkdupes --brp /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr
Scanned 12 directories and 11 files,
    considered 11 files, read 0 files, linked 0 files, 0 errors
    sum of sizes of linked files: 0 bytes
Executing(%check): /bin/sh -e /var/tmp/rpm-tmp.4BR3xK
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ 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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules  '
+ export FCFLAGS
+ VALAFLAGS=-g
+ export VALAFLAGS
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn'
+ export RUSTFLAGS
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -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 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer  '
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes  '
+ PATH=/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin
+ PYTHONPATH=/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib64/python3.14/site-packages:/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/lib/python3.14/site-packages
+ PYTHONDONTWRITEBYTECODE=1
+ PYTEST_ADDOPTS=' --ignore=/builddir/build/BUILD/git-imerge-1.2.0-build/.pyproject-builddir'
+ PYTEST_XDIST_AUTO_NUM_WORKERS=2
+ HOSTNAME=rpmbuild
+ /usr/bin/python3 -m tox --current-env --assert-config -q --recreate -e py314
++++ dirname t/test-unconflicted
+++ cd t
+++ pwd
++ dirname /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t
+ BASE=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0
+ . /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/test-lib.sh
+ GIT_IMERGE=git-imerge
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/unconflicted
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/unconflicted
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/unconflicted/.git/
+ echo 'git-imerge test repository without conflicts'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.name 'Loú User'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/unconflicted
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[master (root-commit) 780ddf5] m⇒0
 2 files changed, 2 insertions(+)
 create mode 100644 a.txt
 create mode 100644 b.txt
+ git checkout -b a --
Switched to a new branch 'a'
++ seq 8
+ 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
[a b862e30] a⇒1
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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
[a dcbe282] a⇒2
 1 file changed, 1 insertion(+), 1 deletion(-)
+ for i in $(seq 8)
+ modify a.txt 3
+ filename=a.txt
+ text=3
+ echo 3
+ git add a.txt
+ commit -m a⇒3
+ TIME=1112911997
+ GIT_AUTHOR_DATE='@1112911997 +0000'
+ GIT_COMMITTER_DATE='@1112911997 +0000'
+ git commit -m a⇒3
[a ecd8647] a⇒3
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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
[a 1634bab] a⇒4
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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(-)
+ 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
[a f6520bf] a⇒6
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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(-)
+ 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
[a 49643dd] a⇒8
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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
[b e22cd97] b⇒5
 1 file changed, 1 insertion(+), 1 deletion(-)
+ EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42
+ git checkout a
Switched to branch 'a'
+ git-imerge start --first-parent --name=a-b --branch=a-b-merge b
Attempting automerge of 8-5...success.
Autofilling 1-5...success.
Autofilling 2-5...success.
Autofilling 3-5...success.
Autofilling 4-5...success.
Autofilling 5-5...success.
Autofilling 6-5...success.
Autofilling 7-5...success.
Autofilling 8-1...success.
Autofilling 8-2...success.
Autofilling 8-3...success.
Autofilling 8-4...success.
Autofilling 8-5 (first way)...success.
Autofilling 8-5 (second way)...success.
The two ways of autofilling 8-5 agree.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:9,0:6].
Merge is complete!
+ git-imerge list
* a-b
+ git-imerge diagram --commits --frontier --html=imerge3.html
       0    5  8
       |    |  |
   0 - ********* - a
       *???????.
       *???????.
       *???????.
       *???????.
   5 - *........
       |
     b

       0    5  8
       |    |  |
   0 - ********* - a
       *???????|
       *???????|
       *???????|
       *???????|
   5 - *-------+
       |
     b

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ GIT_EDITOR=cat
+ git-imerge simplify --goal=merge --branch=a-b-merge
Merge b into a (using imerge)

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Tue Oct 28 20:58:37 2025 +0000
#
# On branch a-b-merge
# Changes to be committed:
#	modified:   b.txt
#
[a-b-merge 34f91e4] Merge b into a (using imerge)
 Date: Tue Oct 28 20:58:37 2025 +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-build/git-imerge-1.2.0/t
+ BASE=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0
+ . /builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-4-3
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-4-3
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/
+ echo 'git-imerge test repository with conflict at 4-3'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-4-3
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
+ 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 a0ac37a] 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 ed9fdfa] 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 1da7bf5] 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 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

+ 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...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 <luser@example.com>
Date:   Thu Apr 7 22:13:18 2005 +0000

    c⇒4

Original second commit:
commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b
Author: Loú User <luser@example.com>
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 dac4c1c] 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 28 20:58:40 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge f1a561a] Merge d into c (using imerge)
 Date: Tue Oct 28 20:58:40 2025 +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 4eb7224 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 <luser@example.com>
Date:   Thu Apr 7 22:13:18 2005 +0000

    c⇒4

Original second commit:
commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:26 2005 +0000

    d⇒3

There was a conflict merging commit 4-3, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ grep -q Traceback start.out
+ grep -q 'suggest manual merge of 4-3' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge3.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       *.........
       *...#?????
       *...??????
   5 - *...??????
   6 - *...??????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *........|
       *...-----+
       *..|#?????
       *..|??????
   5 - *..|??????
   6 - *--+??????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ echo 'merged version'
+ git add conflict.txt
+ GIT_EDITOR=cat
+ git commit
imerge 'c-d': manual merge 4-3

# Conflicts:
#	conflict.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#	git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch imerge/c-d
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[imerge/c-d 618f167] imerge 'c-d': manual merge 4-3
+ git-imerge continue --edit
Merge has been recorded for merge 4-3.
Attempting to merge 4-4...success.
Attempting to merge 4-5...success.
Attempting to merge 4-6...success.
Attempting to merge 5-3...success.
Attempting to merge 5-4...success.
Attempting to merge 5-5...success.
Attempting to merge 5-6...success.
Attempting to merge 6-3...success.
Attempting to merge 6-4...success.
Attempting to merge 6-5...success.
Attempting to merge 6-6...success.
Attempting to merge 7-3...success.
Attempting to merge 7-4...success.
Attempting to merge 7-5...success.
Attempting to merge 7-6...success.
Attempting to merge 8-3...success.
Attempting to merge 8-4...success.
Attempting to merge 8-5...success.
Attempting to merge 8-6...success.
Attempting to merge 9-3...success.
Attempting to merge 9-4...success.
Attempting to merge 9-5...success.
Attempting to merge 9-6...success.
Merge is complete!
+ git-imerge diagram --commits --frontier --html=imerge4.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       *.........
       *...*.....
       *.........
   5 - *.........
   6 - *.........
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *........|
       *........|
       *...*....|
       *........|
   5 - *........|
   6 - *--------+
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge finish --branch=c-d-full
+ check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-full
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-full^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ test_conflict 1-1
+ local conflict=1-1
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-1-1
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-1
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git/
+ echo 'git-imerge test repository with conflict at 1-1'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-build/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.email luser@example.com
+ TIME=1112911993
+ ln -s /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-1
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[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
+ 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
[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
+ modify conflict.txt 'd version'
+ filename=conflict.txt
+ text='d version'
+ echo 'd version'
+ git add conflict.txt
+ commit -m d⇒1
+ TIME=1112912004
+ GIT_AUTHOR_DATE='@1112912004 +0000'
+ GIT_COMMITTER_DATE='@1112912004 +0000'
+ git commit -m d⇒1
[d ac0427a] d⇒1
 2 files changed, 2 insertions(+), 2 deletions(-)
+ 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(-)
+ 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

+ git-imerge autofill
+ tee autofill.out
Attempting automerge of 9-6...failure.
Attempting automerge of 1-1...failure.
HEAD is now at 243e8ed c⇒9
No progress was possible; suggest manual merge of 1-1
+ grep -q Traceback autofill.out
+ grep -q 'suggest manual merge of 1-1' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge1.html
       0    5   9
       |    |   |
   0 - ********** - c
       *#????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *#????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge continue --edit
Switched to branch 'imerge/c-d'
Auto-merging conflict.txt
CONFLICT (content): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 2120f40dc39d28052a5279b645124e8ed7e5de73
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit ac0427a285b64f2815ebd6eb83880f309600d0c7
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:24 2005 +0000

    d⇒1

There was a conflict merging commit 1-1, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ echo 'merged version'
+ git add conflict.txt
+ git-imerge continue --no-edit
[imerge/c-d feb6d55] 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 28 20:58:44 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge a332373] Merge d into c (using imerge)
 Date: Tue Oct 28 20:58:44 2025 +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.

Original first commit:
commit 2120f40dc39d28052a5279b645124e8ed7e5de73
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit ac0427a285b64f2815ebd6eb83880f309600d0c7
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:24 2005 +0000

    d⇒1

There was a conflict merging commit 1-1, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ grep -q Traceback start.out
+ grep -q 'suggest manual merge of 1-1' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge3.html
       0    5   9
       |    |   |
   0 - ********** - c
       *#????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *#????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ echo 'merged version'
+ git add conflict.txt
+ GIT_EDITOR=cat
+ git commit
imerge 'c-d': manual merge 1-1

# Conflicts:
#	conflict.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#	git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch imerge/c-d
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[imerge/c-d ad5554e] 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-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-9-1
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-1
+ git init /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-1
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: 	git config --global init.defaultBranch <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git/
+ echo 'git-imerge test repository with conflict at 9-1'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-build/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.email luser@example.com
+ TIME=1112911993
+ ln -s /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-1
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[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
[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
[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
[c 9732e77] 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
+ modify conflict.txt 'c version'
+ filename=conflict.txt
+ text='c version'
+ echo 'c version'
+ git add conflict.txt
+ commit -m c⇒9
+ TIME=1112912003
+ GIT_AUTHOR_DATE='@1112912003 +0000'
+ GIT_COMMITTER_DATE='@1112912003 +0000'
+ git commit -m c⇒9
[c 73a5eed] c⇒9
 2 files changed, 2 insertions(+), 2 deletions(-)
+ git checkout -b d master --
Switched to a new branch 'd'
++ seq 6
+ 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
[d ac0427a] d⇒1
 2 files changed, 2 insertions(+), 2 deletions(-)
+ 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(-)
+ 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

+ git-imerge autofill
+ tee autofill.out
Attempting automerge of 9-6...failure.
Attempting automerge of 1-1...success.
Attempting automerge of 1-4...success.
Attempting automerge of 1-6...success.
Attempting automerge of 9-6...failure.
Attempting automerge of 5-6...success.
Attempting automerge of 7-6...success.
Attempting automerge of 8-6...success.
Attempting automerge of 9-1...failure.
Autofilling 1-6...success.
Autofilling 2-6...success.
Autofilling 3-6...success.
Autofilling 4-6...success.
Autofilling 5-6...success.
Autofilling 6-6...success.
Autofilling 7-6...success.
Autofilling 8-1...success.
Autofilling 8-2...success.
Autofilling 8-3...success.
Autofilling 8-4...success.
Autofilling 8-5...success.
Autofilling 8-6 (first way)...success.
Autofilling 8-6 (second way)...success.
The two ways of autofilling 8-6 agree.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7].
Attempting automerge of 9-6...failure.
Attempting automerge of 9-1...failure.
HEAD is now at 73a5eed c⇒9
Conflict; suggest manual merge of 9-1
+ grep -q Traceback autofill.out
+ grep -q 'suggest manual merge of 9-1' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge1.html
       0    5   9
       |    |   |
   0 - ********** - c
       *???????.#
       *???????.?
       *???????.?
       *???????.?
   5 - *???????.?
   6 - *........?
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *???????|#
       *???????|?
       *???????|?
       *???????|?
   5 - *???????|?
   6 - *-------+?
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge continue --edit
Switched to branch 'imerge/c-d'
Auto-merging conflict.txt
CONFLICT (content): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 73a5eedb087a0f656d730831b8def7943b40f3cf
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:23 2005 +0000

    c⇒9

Original second commit:
commit ac0427a285b64f2815ebd6eb83880f309600d0c7
Author: Loú User <luser@example.com>
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 3e99ad4] 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 28 20:58:48 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge 3b38a88] Merge d into c (using imerge)
 Date: Tue Oct 28 20:58:48 2025 +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 <luser@example.com>
Date:   Thu Apr 7 22:13:23 2005 +0000

    c⇒9

Original second commit:
commit ac0427a285b64f2815ebd6eb83880f309600d0c7
Author: Loú User <luser@example.com>
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 8768d5b] imerge 'c-d': manual merge 9-1
+ git-imerge continue --edit
Merge has been recorded for merge 9-1.
Attempting to merge 9-2...success.
Attempting to merge 9-3...success.
Attempting to merge 9-4...success.
Attempting to merge 9-5...success.
Attempting to merge 9-6...success.
Merge is complete!
+ git-imerge diagram --commits --frontier --html=imerge4.html
       0    5   9
       |    |   |
   0 - ********** - c
       *........*
       *.........
       *.........
       *.........
   5 - *.........
   6 - *.........
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *........*
       *........|
       *........|
       *........|
   5 - *........|
   6 - *--------+
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge finish --branch=c-d-full
+ check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-full
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-full^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ test_conflict 1-6
+ local conflict=1-6
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-1-6
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-6
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/
+ echo 'git-imerge test repository with conflict at 1-6'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-6
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[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
+ 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
[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
+ 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...failure.
Attempting automerge of 1-5...success.
Attempting automerge of 9-5...success.
Autofilling 1-5...success.
Autofilling 2-5...success.
Autofilling 3-5...success.
Autofilling 4-5...success.
Autofilling 5-5...success.
Autofilling 6-5...success.
Autofilling 7-5...success.
Autofilling 8-5...success.
Autofilling 9-1...success.
Autofilling 9-2...success.
Autofilling 9-3...success.
Autofilling 9-4...success.
Autofilling 9-5 (first way)...success.
Autofilling 9-5 (second way)...success.
The two ways of autofilling 9-5 agree.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:6].
Attempting automerge of 9-6...failure.
Attempting automerge of 1-6...failure.
HEAD is now at 243e8ed c⇒9
Conflict; suggest manual merge of 1-6
+ grep -q Traceback autofill.out
+ grep -q 'suggest manual merge of 1-6' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge1.html
       0    5   9
       |    |   |
   0 - ********** - c
       *????????.
       *????????.
       *????????.
       *????????.
   5 - *.........
   6 - *#????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *????????|
       *????????|
       *????????|
       *????????|
   5 - *--------+
   6 - *#????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge continue --edit
Switched to branch 'imerge/c-d'
Auto-merging conflict.txt
CONFLICT (content): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 2120f40dc39d28052a5279b645124e8ed7e5de73
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit f7e451a6c9656dda15641a9fbc591a602f158692
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:29 2005 +0000

    d⇒6

There was a conflict merging commit 1-6, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ echo 'merged version'
+ git add conflict.txt
+ git-imerge continue --no-edit
[imerge/c-d c7e116e] 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 28 20:58:52 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge 287ee52] Merge d into c (using imerge)
 Date: Tue Oct 28 20:58:52 2025 +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 1fed237 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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit f7e451a6c9656dda15641a9fbc591a602f158692
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:29 2005 +0000

    d⇒6

There was a conflict merging commit 1-6, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ grep -q Traceback start.out
+ grep -q 'suggest manual merge of 1-6' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge3.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       *.........
       *.........
       *.........
   5 - *.........
   6 - *#????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *........|
       *........|
       *........|
       *........|
   5 - *--------+
   6 - *#????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ echo 'merged version'
+ git add conflict.txt
+ GIT_EDITOR=cat
+ git commit
imerge 'c-d': manual merge 1-6

# Conflicts:
#	conflict.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#	git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch imerge/c-d
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[imerge/c-d 96a9291] imerge 'c-d': manual merge 1-6
+ git-imerge continue --edit
Merge has been recorded for merge 1-6.
Attempting to merge 2-6...success.
Attempting to merge 3-6...success.
Attempting to merge 4-6...success.
Attempting to merge 5-6...success.
Attempting to merge 6-6...success.
Attempting to merge 7-6...success.
Attempting to merge 8-6...success.
Attempting to merge 9-6...success.
Merge is complete!
+ git-imerge diagram --commits --frontier --html=imerge4.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       *.........
       *.........
       *.........
   5 - *.........
   6 - **........
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *........|
       *........|
       *........|
       *........|
   5 - *........|
   6 - **-------+
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge finish --branch=c-d-full
+ check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-full
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-full^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ test_conflict 9-6
+ local conflict=9-6
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-9-6
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-6
+ git init /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-6
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: 	git config --global init.defaultBranch <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git/
+ echo 'git-imerge test repository with conflict at 9-6'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-6
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
+ 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
[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
[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
[c 9732e77] 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
+ modify conflict.txt 'c version'
+ filename=conflict.txt
+ text='c version'
+ echo 'c version'
+ git add conflict.txt
+ commit -m c⇒9
+ TIME=1112912003
+ GIT_AUTHOR_DATE='@1112912003 +0000'
+ GIT_COMMITTER_DATE='@1112912003 +0000'
+ git commit -m c⇒9
[c 73a5eed] c⇒9
 2 files changed, 2 insertions(+), 2 deletions(-)
+ git checkout -b d master --
Switched to a new branch 'd'
++ seq 6
+ 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...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

Original first commit:
Automatic merge failed; fix conflicts and then commit the result.
commit 73a5eedb087a0f656d730831b8def7943b40f3cf
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:23 2005 +0000

    c⇒9

Original second commit:
commit f7e451a6c9656dda15641a9fbc591a602f158692
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:29 2005 +0000

    d⇒6

There was a conflict merging commit 9-6, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ echo 'merged version'
+ git add conflict.txt
+ git-imerge continue --no-edit
[imerge/c-d 03836f3] 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 28 20:58:56 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge d0e8477] Merge d into c (using imerge)
 Date: Tue Oct 28 20:58:56 2025 +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 <luser@example.com>
Date:   Thu Apr 7 22:13:23 2005 +0000

    c⇒9

Original second commit:
commit f7e451a6c9656dda15641a9fbc591a602f158692
Author: Loú User <luser@example.com>
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 470379a] 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-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-1-2
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-2
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git/
+ echo 'git-imerge test repository with conflict at 1-2'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-1-2
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
+ 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
[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(-)
+ 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 86c8052] 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 1700773] 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 df2e493] d⇒6
 1 file changed, 1 insertion(+), 1 deletion(-)
+ git checkout c
Switched to branch 'c'
+ git-imerge init --name=c-d d
+ git-imerge list
* c-d
+ git-imerge diagram --commits --frontier --html=imerge0.html
       0    5   9
       |    |   |
   0 - ********** - c
       *?????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *?????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge autofill
+ tee autofill.out
Attempting automerge of 9-6...failure.
Attempting automerge of 1-1...success.
Attempting automerge of 1-4...failure.
Attempting automerge of 1-3...failure.
Attempting automerge of 1-2...failure.
Attempting automerge of 9-1...success.
Autofilling 1-1...success.
Autofilling 2-1...success.
Autofilling 3-1...success.
Autofilling 4-1...success.
Autofilling 5-1...success.
Autofilling 6-1...success.
Autofilling 7-1...success.
Autofilling 8-1...success.
Autofilling 9-1...success.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:10,0:2].
Attempting automerge of 9-6...failure.
Attempting automerge of 1-2...failure.
HEAD is now at 243e8ed c⇒9
Conflict; suggest manual merge of 1-2
+ grep -q Traceback autofill.out
+ grep -q 'suggest manual merge of 1-2' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge1.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       *#????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *--------+
       *#????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge continue --edit
Switched to branch 'imerge/c-d'
Auto-merging conflict.txt
CONFLICT (content): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 2120f40dc39d28052a5279b645124e8ed7e5de73
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit 69efde8f66d581a765a3909ffacb9f895f95c345
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:25 2005 +0000

    d⇒2

There was a conflict merging commit 1-2, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ echo 'merged version'
+ git add conflict.txt
+ git-imerge continue --no-edit
[imerge/c-d 88fdd1a] 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 28 20:59:00 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge dc7dab9] Merge d into c (using imerge)
 Date: Tue Oct 28 20:59:00 2025 +0000
+ check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-merge
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-merge^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ git-imerge simplify --goal=rebase --branch=c-d-rebase
+ check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-rebase
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-rebase^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
+ check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-rebase-with-history
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-rebase-with-history^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ git-imerge simplify --goal=border --branch=c-d-border
+ check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-border
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-border^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
+ check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-border-with-history
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-border-with-history^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
+ check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-border-with-history2
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-border-with-history2^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ git-imerge remove
+ git checkout c
Switched to branch 'c'
+ git-imerge start --goal=full --first-parent --name=c-d d
+ tee start.out
Attempting to merge 1-1...success.
Attempting to merge 1-2...conflict.
Attempting to merge 2-1...success.
Attempting to merge 3-1...success.
Attempting to merge 4-1...success.
Attempting to merge 5-1...success.
Attempting to merge 6-1...success.
Attempting to merge 7-1...success.
Attempting to merge 8-1...success.
Attempting to merge 9-1...success.
Previous HEAD position was 2adeaa7 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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit 69efde8f66d581a765a3909ffacb9f895f95c345
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:25 2005 +0000

    d⇒2

There was a conflict merging commit 1-2, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ grep -q Traceback start.out
+ grep -q 'suggest manual merge of 1-2' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge3.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       *#????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *--------+
       *#????????
       *?????????
       *?????????
   5 - *?????????
   6 - *?????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ echo 'merged version'
+ git add conflict.txt
+ GIT_EDITOR=cat
+ git commit
imerge 'c-d': manual merge 1-2

# Conflicts:
#	conflict.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#	git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch imerge/c-d
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[imerge/c-d 48b4437] imerge 'c-d': manual merge 1-2
+ git-imerge continue --edit
Merge has been recorded for merge 1-2.
Attempting to merge 1-3...success.
Attempting to merge 1-4...success.
Attempting to merge 1-5...success.
Attempting to merge 1-6...success.
Attempting to merge 2-2...success.
Attempting to merge 2-3...success.
Attempting to merge 2-4...success.
Attempting to merge 2-5...success.
Attempting to merge 2-6...success.
Attempting to merge 3-2...success.
Attempting to merge 3-3...success.
Attempting to merge 3-4...success.
Attempting to merge 3-5...success.
Attempting to merge 3-6...success.
Attempting to merge 4-2...success.
Attempting to merge 4-3...success.
Attempting to merge 4-4...success.
Attempting to merge 4-5...success.
Attempting to merge 4-6...success.
Attempting to merge 5-2...success.
Attempting to merge 5-3...success.
Attempting to merge 5-4...success.
Attempting to merge 5-5...success.
Attempting to merge 5-6...success.
Attempting to merge 6-2...success.
Attempting to merge 6-3...success.
Attempting to merge 6-4...success.
Attempting to merge 6-5...success.
Attempting to merge 6-6...success.
Attempting to merge 7-2...success.
Attempting to merge 7-3...success.
Attempting to merge 7-4...success.
Attempting to merge 7-5...success.
Attempting to merge 7-6...success.
Attempting to merge 8-2...success.
Attempting to merge 8-3...success.
Attempting to merge 8-4...success.
Attempting to merge 8-5...success.
Attempting to merge 8-6...success.
Attempting to merge 9-2...success.
Attempting to merge 9-3...success.
Attempting to merge 9-4...success.
Attempting to merge 9-5...success.
Attempting to merge 9-6...success.
Merge is complete!
+ git-imerge diagram --commits --frontier --html=imerge4.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       **........
       *.........
       *.........
   5 - *.........
   6 - *.........
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *........|
       **.......|
       *........|
       *........|
   5 - *........|
   6 - *--------+
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge finish --branch=c-d-full
+ check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
+ local refname=c-d-full
+ local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
++ git rev-parse 'c-d-full^{tree}'
+ test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
+ test_conflict 9-5
+ local conflict=9-5
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-9-5
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-5
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-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-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-9-5
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[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
[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
[c 9732e77] 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
+ modify conflict.txt 'c version'
+ filename=conflict.txt
+ text='c version'
+ echo 'c version'
+ git add conflict.txt
+ commit -m c⇒9
+ TIME=1112912003
+ GIT_AUTHOR_DATE='@1112912003 +0000'
+ GIT_COMMITTER_DATE='@1112912003 +0000'
+ git commit -m c⇒9
[c 73a5eed] c⇒9
 2 files changed, 2 insertions(+), 2 deletions(-)
+ git checkout -b d master --
Switched to a new branch 'd'
++ seq 6
+ 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
+ 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

+ git-imerge autofill
+ tee autofill.out
Attempting automerge of 9-6...failure.
Attempting automerge of 1-1...success.
Attempting automerge of 1-4...success.
Attempting automerge of 1-6...success.
Attempting automerge of 9-6...failure.
Attempting automerge of 5-6...success.
Attempting automerge of 7-6...success.
Attempting automerge of 8-6...success.
Attempting automerge of 9-1...success.
Attempting automerge of 9-4...success.
Attempting automerge of 9-5...failure.
Autofilling 1-6...success.
Autofilling 2-6...success.
Autofilling 3-6...success.
Autofilling 4-6...success.
Autofilling 5-6...success.
Autofilling 6-6...success.
Autofilling 7-6...success.
Autofilling 8-1...success.
Autofilling 8-2...success.
Autofilling 8-3...success.
Autofilling 8-4...success.
Autofilling 8-5...success.
Autofilling 8-6 (first way)...success.
Autofilling 8-6 (second way)...success.
The two ways of autofilling 8-6 agree.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:9,0:7].
Autofilling 9-1...success.
Autofilling 9-2...success.
Autofilling 9-3...success.
Autofilling 9-4...success.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,0:5].
Attempting automerge of 9-6...failure.
Attempting automerge of 9-5...failure.
HEAD is now at 73a5eed c⇒9
Conflict; suggest manual merge of 9-5
+ grep -q Traceback autofill.out
+ grep -q 'suggest manual merge of 9-5' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge1.html
       0    5   9
       |    |   |
   0 - ********** - c
       *???????..
       *???????..
       *???????..
       *???????..
   5 - *???????.#
   6 - *........?
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *???????.|
       *???????.|
       *???????.|
       *???????.+
   5 - *???????|#
   6 - *-------+?
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge continue --edit
Switched to branch 'imerge/c-d'
Auto-merging conflict.txt
CONFLICT (content): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 73a5eedb087a0f656d730831b8def7943b40f3cf
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:23 2005 +0000

    c⇒9

Original second commit:
commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f
Author: Loú User <luser@example.com>
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 c024841] 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 28 20:59:04 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge c039047] Merge d into c (using imerge)
 Date: Tue Oct 28 20:59:04 2025 +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 <luser@example.com>
Date:   Thu Apr 7 22:13:23 2005 +0000

    c⇒9

Original second commit:
commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f
Author: Loú User <luser@example.com>
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 53de4b5] 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-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-5-1
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-5-1
+ git init /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-5-1
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: 	git config --global init.defaultBranch <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git/
+ echo 'git-imerge test repository with conflict at 5-1'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-5-1
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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(-)
+ 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
+ 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(-)
+ 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 df3c57a] 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 ea32d81] 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 44473d6] 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 d8d80cf] 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
+ modify conflict.txt 'd version'
+ filename=conflict.txt
+ text='d version'
+ echo 'd version'
+ git add conflict.txt
+ commit -m d⇒1
+ TIME=1112912004
+ GIT_AUTHOR_DATE='@1112912004 +0000'
+ GIT_COMMITTER_DATE='@1112912004 +0000'
+ git commit -m d⇒1
[d ac0427a] d⇒1
 2 files changed, 2 insertions(+), 2 deletions(-)
+ 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(-)
+ 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

+ git-imerge autofill
+ tee autofill.out
Attempting automerge of 9-6...failure.
Attempting automerge of 1-1...success.
Attempting automerge of 1-4...success.
Attempting automerge of 1-6...success.
Attempting automerge of 9-6...failure.
Attempting automerge of 5-6...failure.
Attempting automerge of 3-6...success.
Attempting automerge of 4-6...success.
Attempting automerge of 5-1...failure.
Autofilling 1-6...success.
Autofilling 2-6...success.
Autofilling 3-6...success.
Autofilling 4-1...success.
Autofilling 4-2...success.
Autofilling 4-3...success.
Autofilling 4-4...success.
Autofilling 4-5...success.
Autofilling 4-6 (first way)...success.
Autofilling 4-6 (second way)...success.
The two ways of autofilling 4-6 agree.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[0:5,0:7].
Attempting automerge of 9-6...failure.
Attempting automerge of 5-1...failure.
HEAD is now at d8d80cf c⇒9
Conflict; suggest manual merge of 5-1
+ grep -q Traceback autofill.out
+ grep -q 'suggest manual merge of 5-1' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge1.html
       0    5   9
       |    |   |
   0 - ********** - c
       *???.#????
       *???.?????
       *???.?????
       *???.?????
   5 - *???.?????
   6 - *....?????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *???|#????
       *???|?????
       *???|?????
       *???|?????
   5 - *???|?????
   6 - *---+?????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ git-imerge continue --edit
Switched to branch 'imerge/c-d'
Auto-merging conflict.txt
CONFLICT (content): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 7e31f254c318decc434628f023dac0703f3d2b9e
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:19 2005 +0000

    c⇒5

Original second commit:
commit ac0427a285b64f2815ebd6eb83880f309600d0c7
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:24 2005 +0000

    d⇒1

There was a conflict merging commit 5-1, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ echo 'merged version'
+ git add conflict.txt
+ git-imerge continue --no-edit
[imerge/c-d 0a74520] 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 28 20:59:08 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge bbe7de7] Merge d into c (using imerge)
 Date: Tue Oct 28 20:59:08 2025 +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 <luser@example.com>
Date:   Thu Apr 7 22:13:19 2005 +0000

    c⇒5

Original second commit:
commit ac0427a285b64f2815ebd6eb83880f309600d0c7
Author: Loú User <luser@example.com>
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 212574f] 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-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/conflicted-6-6
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-6-6
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git/
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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
+ 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-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/conflicted-6-6
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[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
+ 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
+ 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 7459ac3] 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 70408c8] 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
+ 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:
commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:20 2005 +0000

    c⇒6

Original second commit:
commit f7e451a6c9656dda15641a9fbc591a602f158692
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:29 2005 +0000

    d⇒6

There was a conflict merging commit 6-6, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ echo 'merged version'
+ git add conflict.txt
+ git-imerge continue --no-edit
[imerge/c-d b9c9794] 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 28 20:59:12 2025 +0000
#
# On branch c-d-merge
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[c-d-merge ada59db] Merge d into c (using imerge)
 Date: Tue Oct 28 20:59:12 2025 +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 bc05307 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 <luser@example.com>
Date:   Thu Apr 7 22:13:20 2005 +0000

    c⇒6

Original second commit:
commit f7e451a6c9656dda15641a9fbc591a602f158692
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:29 2005 +0000

    d⇒6

There was a conflict merging commit 6-6, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ grep -q Traceback start.out
+ grep -q 'suggest manual merge of 6-6' autofill.out
+ git-imerge diagram --commits --frontier --html=imerge3.html
       0    5   9
       |    |   |
   0 - ********** - c
       *.........
       *.........
       *.........
       *.........
   5 - *.........
   6 - *.....#???
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *........|
       *........|
       *........|
       *........|
   5 - *.....---+
   6 - *----+#???
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ echo 'merged version'
+ git add conflict.txt
+ GIT_EDITOR=cat
+ git commit
imerge 'c-d': manual merge 6-6

# Conflicts:
#	conflict.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#	git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch imerge/c-d
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   conflict.txt
#	modified:   d.txt
#
[imerge/c-d 115c32d] 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-build/git-imerge-1.2.0/t
+ BASE=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0
+ . /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/test-lib.sh
+ GIT_IMERGE=git-imerge
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/really-conflicted
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/really-conflicted
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/really-conflicted/.git/
+ 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-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-build/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.email luser@example.com
+ TIME=1112911993
+ ln -s /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/really-conflicted
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[master (root-commit) 8e21fbd] m⇒0
 10 files changed, 10 insertions(+)
 create mode 100644 c.txt
 create mode 100644 conflict0.txt
 create mode 100644 conflict1.txt
 create mode 100644 conflict2.txt
 create mode 100644 conflict3.txt
 create mode 100644 conflict4.txt
 create mode 100644 conflict5.txt
 create mode 100644 conflict6.txt
 create mode 100644 conflict7.txt
 create mode 100644 d.txt
+ git checkout -b c master --
Switched to a new branch 'c'
+ modify c.txt 1
+ filename=c.txt
+ text=1
+ echo 1
+ git add c.txt
+ modify conflict0.txt 'c version'
+ filename=conflict0.txt
+ text='c version'
+ echo 'c version'
+ git add conflict0.txt
+ modify conflict4.txt 'c version'
+ filename=conflict4.txt
+ text='c version'
+ echo 'c version'
+ git add conflict4.txt
+ commit -m c⇒1
+ TIME=1112911995
+ GIT_AUTHOR_DATE='@1112911995 +0000'
+ GIT_COMMITTER_DATE='@1112911995 +0000'
+ git commit -m c⇒1
[c 4e6007a] c⇒1
 3 files changed, 3 insertions(+), 3 deletions(-)
+ modify c.txt 2
+ filename=c.txt
+ text=2
+ echo 2
+ git add c.txt
+ commit -m c⇒2
+ TIME=1112911996
+ GIT_AUTHOR_DATE='@1112911996 +0000'
+ GIT_COMMITTER_DATE='@1112911996 +0000'
+ git commit -m c⇒2
[c c2b7c49] c⇒2
 1 file changed, 1 insertion(+), 1 deletion(-)
+ modify c.txt 3
+ filename=c.txt
+ text=3
+ echo 3
+ git add c.txt
+ commit -m c⇒3
+ TIME=1112911997
+ GIT_AUTHOR_DATE='@1112911997 +0000'
+ GIT_COMMITTER_DATE='@1112911997 +0000'
+ git commit -m c⇒3
[c 42ad55a] c⇒3
 1 file changed, 1 insertion(+), 1 deletion(-)
+ modify c.txt 4
+ filename=c.txt
+ text=4
+ echo 4
+ git add c.txt
+ modify conflict1.txt 'c version'
+ filename=conflict1.txt
+ text='c version'
+ echo 'c version'
+ git add conflict1.txt
+ commit -m c⇒4
+ TIME=1112911998
+ GIT_AUTHOR_DATE='@1112911998 +0000'
+ GIT_COMMITTER_DATE='@1112911998 +0000'
+ git commit -m c⇒4
[c a891793] c⇒4
 2 files changed, 2 insertions(+), 2 deletions(-)
+ modify c.txt 5
+ filename=c.txt
+ text=5
+ echo 5
+ git add c.txt
+ modify conflict3.txt 'c version'
+ filename=conflict3.txt
+ text='c version'
+ echo 'c version'
+ git add conflict3.txt
+ modify conflict6.txt 'c version'
+ filename=conflict6.txt
+ text='c version'
+ echo 'c version'
+ git add conflict6.txt
+ commit -m c⇒5
+ TIME=1112911999
+ GIT_AUTHOR_DATE='@1112911999 +0000'
+ GIT_COMMITTER_DATE='@1112911999 +0000'
+ git commit -m c⇒5
[c c21441d] c⇒5
 3 files changed, 3 insertions(+), 3 deletions(-)
+ modify c.txt 6
+ filename=c.txt
+ text=6
+ echo 6
+ git add c.txt
+ modify conflict5.txt 'c version'
+ filename=conflict5.txt
+ text='c version'
+ echo 'c version'
+ git add conflict5.txt
+ commit -m c⇒6
+ TIME=1112912000
+ GIT_AUTHOR_DATE='@1112912000 +0000'
+ GIT_COMMITTER_DATE='@1112912000 +0000'
+ git commit -m c⇒6
[c a797a66] c⇒6
 2 files changed, 2 insertions(+), 2 deletions(-)
+ modify c.txt 7
+ filename=c.txt
+ text=7
+ echo 7
+ git add c.txt
+ modify conflict2.txt 'c version'
+ filename=conflict2.txt
+ text='c version'
+ echo 'c version'
+ git add conflict2.txt
+ commit -m c⇒7
+ TIME=1112912001
+ GIT_AUTHOR_DATE='@1112912001 +0000'
+ GIT_COMMITTER_DATE='@1112912001 +0000'
+ git commit -m c⇒7
[c c0e1537] c⇒7
 2 files changed, 2 insertions(+), 2 deletions(-)
+ modify c.txt 8
+ filename=c.txt
+ text=8
+ echo 8
+ git add c.txt
+ commit -m c⇒8
+ TIME=1112912002
+ GIT_AUTHOR_DATE='@1112912002 +0000'
+ GIT_COMMITTER_DATE='@1112912002 +0000'
+ git commit -m c⇒8
[c 9f3e7c8] c⇒8
 1 file changed, 1 insertion(+), 1 deletion(-)
+ modify c.txt 9
+ filename=c.txt
+ text=9
+ echo 9
+ git add c.txt
+ modify conflict7.txt 'c version'
+ filename=conflict7.txt
+ text='c version'
+ echo 'c version'
+ git add conflict7.txt
+ commit -m c⇒9
+ TIME=1112912003
+ GIT_AUTHOR_DATE='@1112912003 +0000'
+ GIT_COMMITTER_DATE='@1112912003 +0000'
+ git commit -m c⇒9
[c ccbfccb] c⇒9
 2 files changed, 2 insertions(+), 2 deletions(-)
+ git checkout -b d master --
Switched to a new branch 'd'
+ modify d.txt 1
+ filename=d.txt
+ text=1
+ echo 1
+ git add d.txt
+ modify conflict0.txt 'd version'
+ filename=conflict0.txt
+ text='d version'
+ echo 'd version'
+ git add conflict0.txt
+ modify conflict6.txt 'd version'
+ filename=conflict6.txt
+ text='d version'
+ echo 'd version'
+ git add conflict6.txt
+ commit -m d⇒1
+ TIME=1112912004
+ GIT_AUTHOR_DATE='@1112912004 +0000'
+ GIT_COMMITTER_DATE='@1112912004 +0000'
+ git commit -m d⇒1
[d 8c3c065] d⇒1
 3 files changed, 3 insertions(+), 3 deletions(-)
+ modify d.txt 2
+ filename=d.txt
+ text=2
+ echo 2
+ git add d.txt
+ modify conflict1.txt 'd version'
+ filename=conflict1.txt
+ text='d version'
+ echo 'd version'
+ git add conflict1.txt
+ modify conflict2.txt 'd version'
+ filename=conflict2.txt
+ text='d version'
+ echo 'd version'
+ git add conflict2.txt
+ commit -m d⇒2
+ TIME=1112912005
+ GIT_AUTHOR_DATE='@1112912005 +0000'
+ GIT_COMMITTER_DATE='@1112912005 +0000'
+ git commit -m d⇒2
[d 820b787] d⇒2
 3 files changed, 3 insertions(+), 3 deletions(-)
+ modify d.txt 3
+ filename=d.txt
+ text=3
+ echo 3
+ git add d.txt
+ commit -m d⇒3
+ TIME=1112912006
+ GIT_AUTHOR_DATE='@1112912006 +0000'
+ GIT_COMMITTER_DATE='@1112912006 +0000'
+ git commit -m d⇒3
[d 821c792] d⇒3
 1 file changed, 1 insertion(+), 1 deletion(-)
+ modify d.txt 4
+ filename=d.txt
+ text=4
+ echo 4
+ git add d.txt
+ commit -m d⇒4
+ TIME=1112912007
+ GIT_AUTHOR_DATE='@1112912007 +0000'
+ GIT_COMMITTER_DATE='@1112912007 +0000'
+ git commit -m d⇒4
[d c2a1456] d⇒4
 1 file changed, 1 insertion(+), 1 deletion(-)
+ modify d.txt 5
+ filename=d.txt
+ text=5
+ echo 5
+ git add d.txt
+ modify conflict3.txt 'd version'
+ filename=conflict3.txt
+ text='d version'
+ echo 'd version'
+ git add conflict3.txt
+ commit -m d⇒5
+ TIME=1112912008
+ GIT_AUTHOR_DATE='@1112912008 +0000'
+ GIT_COMMITTER_DATE='@1112912008 +0000'
+ git commit -m d⇒5
[d c3e3890] d⇒5
 2 files changed, 2 insertions(+), 2 deletions(-)
+ modify d.txt 6
+ filename=d.txt
+ text=6
+ echo 6
+ git add d.txt
+ modify conflict4.txt 'd version'
+ filename=conflict4.txt
+ text='d version'
+ echo 'd version'
+ git add conflict4.txt
+ commit -m d⇒6
+ TIME=1112912009
+ GIT_AUTHOR_DATE='@1112912009 +0000'
+ GIT_COMMITTER_DATE='@1112912009 +0000'
+ git commit -m d⇒6
[d b2f5c5e] d⇒6
 2 files changed, 2 insertions(+), 2 deletions(-)
+ modify d.txt 7
+ filename=d.txt
+ text=7
+ echo 7
+ git add d.txt
+ modify conflict5.txt 'd version'
+ filename=conflict5.txt
+ text='d version'
+ echo 'd version'
+ git add conflict5.txt
+ commit -m d⇒7
+ TIME=1112912010
+ GIT_AUTHOR_DATE='@1112912010 +0000'
+ GIT_COMMITTER_DATE='@1112912010 +0000'
+ git commit -m d⇒7
[d 892af56] d⇒7
 2 files changed, 2 insertions(+), 2 deletions(-)
+ modify d.txt 8
+ filename=d.txt
+ text=8
+ echo 8
+ git add d.txt
+ modify conflict7.txt 'd version'
+ filename=conflict7.txt
+ text='d version'
+ echo 'd version'
+ git add conflict7.txt
+ commit -m d⇒8
+ TIME=1112912011
+ GIT_AUTHOR_DATE='@1112912011 +0000'
+ GIT_COMMITTER_DATE='@1112912011 +0000'
+ git commit -m d⇒8
[d 67099d0] d⇒8
 2 files changed, 2 insertions(+), 2 deletions(-)
+ git checkout c
Switched to branch 'c'
+ git-imerge init --name=c-d d
+ git-imerge diagram --commits --frontier
       0    5   9
       |    |   |
   0 - ********** - c
       *?????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
       *?????????
       *?????????
   8 - *?????????
       |
     d

       0    5   9
       |    |   |
   0 - ********** - c
       *?????????
       *?????????
       *?????????
       *?????????
   5 - *?????????
       *?????????
       *?????????
   8 - *?????????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ conflict_count=0
+ true
+ git-imerge continue --no-edit
+ tee autofill.out
Attempting automerge of 9-8...failure.
Attempting automerge of 1-1...failure.
Switched to branch 'imerge/c-d'
Auto-merging conflict0.txt
CONFLICT (content): Merge conflict in conflict0.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 4e6007a9261b8d70c6c9cb31fdf801cada885a79
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc
Author: Loú User <luser@example.com>
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 c6a566b] 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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    c⇒1

Original second commit:
commit b2f5c5e78cd79a99aa1f8f4a9d8054b2d5a484ff
Author: Loú User <luser@example.com>
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 4c591bb] 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:

  797864c 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 <new-branch-name> 797864c

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 <luser@example.com>
Date:   Thu Apr 7 22:13:18 2005 +0000

    c⇒4

Original second commit:
commit 820b787e86e22612af7a061db842dc95e9f1d49f
Author: Loú User <luser@example.com>
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 cd3e609] 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 c24cd43 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 <luser@example.com>
Date:   Thu Apr 7 22:13:19 2005 +0000

    c⇒5

Original second commit:
commit 8c3c06526942b1b7ef891dac2d98b871c0269ebc
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:24 2005 +0000

    d⇒1

There was a conflict merging commit 5-1, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ grep -q Traceback autofill.out
+ git-imerge diagram --frontier
       0    5   9
       |    |   |
   0 - ********** - c
       **?.|#????
       *.?.*?????
       *.?.|?????
       *.?.|?????
   5 - *...|?????
       **?.|?????
       *.?.|?????
   8 - *---+?????
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ grep -q 'There was a conflict merging' autofill.out
++ seq 0 7
+ 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 e5a46e7] 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 e8d90f1 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 <luser@example.com>
Date:   Thu Apr 7 22:13:19 2005 +0000

    c⇒5

Original second commit:
commit c3e3890b9e3c756c1d8f7e345184d576739be079
Author: Loú User <luser@example.com>
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 b086375] 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 <luser@example.com>
Date:   Thu Apr 7 22:13:20 2005 +0000

    c⇒6

Original second commit:
commit 892af56ace54c97776e84dff9e6fba7312efe5d0
Author: Loú User <luser@example.com>
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
+ git-imerge continue --no-edit
+ tee autofill.out
[imerge/c-d 67d1cf1] 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 5ee979f 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 <luser@example.com>
Date:   Thu Apr 7 22:13:21 2005 +0000

    c⇒7

Original second commit:
commit 820b787e86e22612af7a061db842dc95e9f1d49f
Author: Loú User <luser@example.com>
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 9a63380] imerge 'c-d': manual merge 7-2
Merge has been recorded for merge 7-2.
Attempting automerge of 7-8...success.
Autofilling 7-3...success.
Autofilling 7-4...success.
Autofilling 7-5...success.
Autofilling 7-6...success.
Autofilling 7-7...success.
Autofilling 7-8...success.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:8,2:9].
Attempting automerge of 9-8...failure.
Attempting automerge of 8-2...success.
Attempting automerge of 8-6...success.
Attempting automerge of 8-8...success.
Attempting automerge of 9-8...failure.
Attempting automerge of 9-2...success.
Attempting automerge of 9-5...success.
Attempting automerge of 9-7...success.
Autofilling 8-2...success.
Autofilling 8-3...success.
Autofilling 8-4...success.
Autofilling 8-5...success.
Autofilling 8-6...success.
Autofilling 8-7...success.
Autofilling 8-8...success.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[7:9,1:9].
Autofilling 9-2...success.
Autofilling 9-3...success.
Autofilling 9-4...success.
Autofilling 9-5...success.
Autofilling 9-6...success.
Autofilling 9-7...success.
Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[8:10,1:8].
Attempting automerge of 9-8...failure.
Attempting automerge of 9-8...failure.
Switched to branch 'imerge/c-d'
Auto-merging conflict7.txt
CONFLICT (content): Merge conflict in conflict7.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit ccbfccb3f61dac677c0a80382aaf6055a11a8a87
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:23 2005 +0000

    c⇒9

Original second commit:
commit 67099d078100141fbe4063d46a6408200f4ff311
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:31 2005 +0000

    d⇒8

There was a conflict merging commit 9-8, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ grep -q Traceback autofill.out
+ git-imerge diagram --frontier
       0    5   9
       |    |   |
   0 - ********** - c
       **?..*...|
       *.?.*..*.|
       *.?......|
       *.?......|
   5 - *....*...|
       **?......|
       *.?...*..+
   8 - *-------+#
       |
     d

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ grep -q 'There was a conflict merging' autofill.out
++ seq 0 7
+ 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 b447f77] 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
+ cat
+ diff -u - diagram.out
+ 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 28 20:59:18 2025 +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 6cc9968] Merge d into c (using imerge)
 Date: Tue Oct 28 20:59:18 2025 +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-build/git-imerge-1.2.0/t
+ BASE=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0
+ . /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/test-lib.sh
+ GIT_IMERGE=git-imerge
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/duplicated
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/duplicated
+ git init /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/duplicated
hint: Using 'master' as the name for the initial branch. This default branch name
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/duplicated/.git/
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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
+ 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-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/duplicated
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[master (root-commit) a733afa] m⇒0
 1 file changed, 1 insertion(+)
 create mode 100644 a.txt
+ git checkout -b a --
Switched to a new branch 'a'
++ seq 3
+ 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'
[a 2f1f75a] a⇒1 on branch a
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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 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 --
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'
[b 62a5c56] a⇒1 on branch b
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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
+ commit -m 'a⇒3 on branch b'
+ TIME=1112912000
+ GIT_AUTHOR_DATE='@1112912000 +0000'
+ GIT_COMMITTER_DATE='@1112912000 +0000'
+ git commit -m 'a⇒3 on branch b'
[b a4b2c2b] a⇒3 on branch b
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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'
[b 5b24553] a⇒4 on branch b
 1 file changed, 1 insertion(+), 1 deletion(-)
+ EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2
+ git checkout a
Switched to branch 'a'
+ git-imerge start --first-parent --name=a-b --branch=a-b-merge b
Attempting automerge of 3-4...failure.
Attempting automerge of 1-1...success.
Attempting automerge of 1-3...failure.
Attempting automerge of 1-2...failure.
Attempting automerge of 3-1...failure.
Attempting automerge of 2-1...failure.
Autofilling 1-1...success.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,0:2].
Attempting automerge of 1-4...success.
Autofilling 1-2...success.
Autofilling 1-3...success.
Autofilling 1-4...success.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[0:2,1:5].
Attempting automerge of 3-4...failure.
Attempting automerge of 2-1...success.
Attempting automerge of 2-3...failure.
Attempting automerge of 2-2...success.
Attempting automerge of 3-2...failure.
Attempting automerge of 3-1...success.
Autofilling 2-1...success.
Autofilling 2-2...success.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,0:3].
Autofilling 3-1...success.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,0:2].
Attempting automerge of 2-4...success.
Autofilling 2-3...success.
Autofilling 2-4...success.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[1:3,2:5].
Attempting automerge of 3-4...failure.
Attempting automerge of 3-2...success.
Attempting automerge of 3-4...failure.
Attempting automerge of 3-3...success.
Autofilling 3-2...success.
Autofilling 3-3...success.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,1:4].
Attempting automerge of 3-4...success.
Autofilling 3-4...success.
Recording autofilled block MergeState('a-b', tip1='a', tip2='b', goal='merge')[2:4,3:5].
Merge is complete!
+ git-imerge diagram --commits --frontier --html=imerge5.html
       0  3
       |  |
   0 - **** - a
       *...
       *...
       *...
   4 - *...
       |
     b

       0  3
       |  |
   0 - **** - a
       *..|
       *..|
       *..|
   4 - *--+
       |
     b

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ GIT_EDITOR=cat
+ git-imerge simplify --goal=merge --branch=a-b-merge
Merge b into a (using imerge)

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Tue Oct 28 20:59:20 2025 +0000
#
# On branch a-b-merge
# Changes to be committed:
#	modified:   a.txt
#
[a-b-merge 723c90d] Merge b into a (using imerge)
 Date: Tue Oct 28 20:59:20 2025 +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
++ dirname /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t
+ BASE=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0
+ . /builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/flip-flop-1
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-1
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-1/.git/
+ echo 'git-imerge test repository with a commit and its revert at n=1'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-1
+ cd /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-1
+ modify a.txt 0
+ filename=a.txt
+ text=0
+ echo 0
+ git add a.txt
+ commit -m m⇒0
+ TIME=1112911994
+ GIT_AUTHOR_DATE='@1112911994 +0000'
+ GIT_COMMITTER_DATE='@1112911994 +0000'
+ git commit -m m⇒0
[master (root-commit) a733afa] m⇒0
 1 file changed, 1 insertion(+)
 create mode 100644 a.txt
+ git checkout -b a --
Switched to a new branch 'a'
+ 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(-)
+ 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'
[b 2dc5eb7] b⇒4 on branch b
 1 file changed, 1 insertion(+), 1 deletion(-)
+ test_merge b-into-a-1 a b 1-1 1-2
+ local name=b-into-a-1
+ local dst=a
+ local src=b
+ local conflict1=1-1
+ local conflict2=1-2
+ git checkout a
Switched to branch 'a'
+ 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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    a⇒1 on branch a

Original second commit:
commit 044a3fac3fa19a3a6428eaeeb356b18764b9b1f2
Author: Loú User <luser@example.com>
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 e85f52d] 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 5683091 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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    a⇒1 on branch a

Original second commit:
commit 7851975ee7d12ef0a256db7ebd029aab51f895ab
Author: Loú User <luser@example.com>
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 e392a4d] 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 28 20:59:23 2025 +0000
#
# On branch b-into-a-1
# Changes to be committed:
#	new file:   b.txt
#
[b-into-a-1 8a22ec1] Merge b into a (using imerge)
 Date: Tue Oct 28 20:59:23 2025 +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 <luser@example.com>
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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    a⇒1 on branch a

There was a conflict merging commit 1-1, shown above.
Please resolve the conflict, commit the result, then type

    git-imerge continue
+ git-imerge diagram --commits --frontier
       0   4
       |   |
   0 - ***** - b
       *#???
       *????
   3 - *????
       |
     a

       0   4
       |   |
   0 - ***** - b
       *#???
       *????
   3 - *????
       |
     a

Key:
  |,-,+ = rectangles forming current merge frontier
  * = merge done manually
  . = merge done automatically
  # = conflict that is currently blocking progress
  @ = merge was blocked but has been resolved
  ? = no merge recorded

+ grep -q 'There was a conflict merging commit 1-1' imerge-a-into-b-1-1.out
+ echo 1
+ git add a.txt
+ git-imerge continue --no-edit
+ tee imerge-a-into-b-1-2.out
[imerge/a 8b552e5] 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 <luser@example.com>
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 <luser@example.com>
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 a88fd95] 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 28 20:59:24 2025 +0000
#
# On branch a-into-b-1
# Changes to be committed:
#	modified:   a.txt
#
[a-into-b-1 edd3aa2] Merge a into b (using imerge)
 Date: Tue Oct 28 20:59:24 2025 +0000
+ for n in 1 2 3
+ flip_flop_test 2
+ local n=2
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/flip-flop-2
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-2
+ git init /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-2
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: 	git config --global init.defaultBranch <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-2/.git/
+ echo 'git-imerge test repository with a commit and its revert at n=2'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-2
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[master (root-commit) a733afa] m⇒0
 1 file changed, 1 insertion(+)
 create mode 100644 a.txt
+ git checkout -b a --
Switched to a new branch 'a'
+ 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 = 2
+ test 1 = 3
+ commit -m 'b⇒1 on branch b'
+ TIME=1112911998
+ GIT_AUTHOR_DATE='@1112911998 +0000'
+ GIT_COMMITTER_DATE='@1112911998 +0000'
+ git commit -m 'b⇒1 on branch b'
[b 1f7d097] b⇒1 on branch b
 1 file changed, 1 insertion(+)
 create mode 100644 b.txt
+ 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'
[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'
[b f3ef019] b⇒3 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 = 2
+ test 4 = 3
+ commit -m 'b⇒4 on branch b'
+ TIME=1112912001
+ GIT_AUTHOR_DATE='@1112912001 +0000'
+ GIT_COMMITTER_DATE='@1112912001 +0000'
+ git commit -m 'b⇒4 on branch b'
[b 69d0c21] b⇒4 on branch b
 1 file changed, 1 insertion(+), 1 deletion(-)
+ test_merge b-into-a-2 a b 1-2 1-3
+ local name=b-into-a-2
+ local dst=a
+ local src=b
+ local conflict1=1-2
+ local conflict2=1-3
+ git checkout a
Switched to branch 'a'
+ git-imerge merge --branch=b-into-a-2 b
+ tee imerge-b-into-a-2-1.out
Attempting automerge of 3-4...success.
Autofilling 1-4...success.
Autofilling 2-4...success.
Autofilling 3-1...success.
Autofilling 3-2...unexpected conflict.  Backtracking...
Autofilling 1-4...success.
Autofilling 2-1...success.
Autofilling 2-2...unexpected conflict.  Backtracking...
Autofilling 1-1...success.
Autofilling 1-2...unexpected conflict.  Backtracking...
Autofilling 1-1...success.
Autofilling 2-1...success.
Autofilling 3-1...success.
Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:2].
Attempting automerge of 3-4...success.
Autofilling 1-4...success.
Autofilling 2-4...success.
Autofilling 3-2...unexpected conflict.  Backtracking...
Autofilling 1-4...success.
Autofilling 2-2...unexpected conflict.  Backtracking...
Autofilling 1-2...unexpected conflict.  Backtracking...
Switched to branch 'imerge/b'
Auto-merging a.txt
CONFLICT (content): Merge conflict in a.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    a⇒1 on branch a

Original second commit:
commit 48df77d20a6d16fe330e32ba17d5472d3868a622
Author: Loú User <luser@example.com>
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 74445a2] 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 ec0b082 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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    a⇒1 on branch a

Original second commit:
commit f3ef01986be02ef5e40589b283c0385471ecca7d
Author: Loú User <luser@example.com>
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 51d84ea] 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 28 20:59:25 2025 +0000
#
# On branch b-into-a-2
# Changes to be committed:
#	new file:   b.txt
#
[b-into-a-2 57f1a50] Merge b into a (using imerge)
 Date: Tue Oct 28 20:59:25 2025 +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 <luser@example.com>
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 <luser@example.com>
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 60c759e] 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 <luser@example.com>
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 <luser@example.com>
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 436da36] 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 28 20:59:26 2025 +0000
#
# On branch a-into-b-2
# Changes to be committed:
#	modified:   a.txt
#
[a-into-b-2 737ede8] Merge a into b (using imerge)
 Date: Tue Oct 28 20:59:26 2025 +0000
+ for n in 1 2 3
+ flip_flop_test 3
+ local n=3
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-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-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-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-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-build/git-imerge-1.2.0/t/tmp/flip-flop-3
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-3
+ git init /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-3
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: 	git config --global init.defaultBranch <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-3/.git/
+ echo 'git-imerge test repository with a commit and its revert at n=3'
+ printf '%s\n' '/*.out' '/*.css' '/*.html'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name 'Loú User'
+ git --git-dir=/builddir/build/BUILD/git-imerge-1.2.0-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/flip-flop-3
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[master (root-commit) a733afa] m⇒0
 1 file changed, 1 insertion(+)
 create mode 100644 a.txt
+ git checkout -b a --
Switched to a new branch 'a'
+ 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 = 3
+ test 1 = 4
+ commit -m 'b⇒1 on branch b'
+ TIME=1112911998
+ GIT_AUTHOR_DATE='@1112911998 +0000'
+ GIT_COMMITTER_DATE='@1112911998 +0000'
+ git commit -m 'b⇒1 on branch b'
[b 1f7d097] b⇒1 on branch b
 1 file changed, 1 insertion(+)
 create mode 100644 b.txt
+ 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'
[b ce671e9] b⇒2 on branch b
 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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(-)
+ 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'
[b eb736f2] b⇒4 and a⇒0 on branch b
 2 files changed, 2 insertions(+), 2 deletions(-)
+ test_merge b-into-a-3 a b 1-3 1-4
+ local name=b-into-a-3
+ local dst=a
+ local src=b
+ local conflict1=1-3
+ local conflict2=1-4
+ git checkout a
Switched to branch 'a'
+ git-imerge merge --branch=b-into-a-3 b
+ tee imerge-b-into-a-3-1.out
Attempting automerge of 3-4...success.
Autofilling 1-4...success.
Autofilling 2-4...success.
Autofilling 3-1...success.
Autofilling 3-2...success.
Autofilling 3-3...unexpected conflict.  Backtracking...
Autofilling 1-4...success.
Autofilling 2-1...success.
Autofilling 2-2...success.
Autofilling 2-3...unexpected conflict.  Backtracking...
Autofilling 1-1...success.
Autofilling 1-2...success.
Autofilling 1-3...unexpected conflict.  Backtracking...
Autofilling 1-2...success.
Autofilling 2-2...success.
Autofilling 3-1...success.
Autofilling 3-2 (first way)...success.
Autofilling 3-2 (second way)...success.
The two ways of autofilling 3-2 agree.
Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[0:4,0:3].
Attempting automerge of 3-4...success.
Autofilling 1-4...success.
Autofilling 2-4...success.
Autofilling 3-3...unexpected conflict.  Backtracking...
Autofilling 1-4...success.
Autofilling 2-3...unexpected conflict.  Backtracking...
Autofilling 1-3...unexpected conflict.  Backtracking...
Switched to branch 'imerge/b'
Auto-merging a.txt
CONFLICT (content): Merge conflict in a.txt
Automatic merge failed; fix conflicts and then commit the result.

Original first commit:
commit 2f1f75a7b49864d699f9e222c1d78078cfe01587
Author: Loú User <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    a⇒1 on branch a

Original second commit:
commit d40495ed379f376841e517047f90b663e8c7c7e1
Author: Loú User <luser@example.com>
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
+ git-imerge continue --no-edit
+ tee imerge-b-into-a-3-2.out
[imerge/b 0eb042f] 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 7169714 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 <luser@example.com>
Date:   Thu Apr 7 22:13:15 2005 +0000

    a⇒1 on branch a

Original second commit:
commit eb736f2ae81944f79f443fd39a89adf74dbc907a
Author: Loú User <luser@example.com>
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 3baeb9c] 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 28 20:59:27 2025 +0000
#
# On branch b-into-a-3
# Changes to be committed:
#	new file:   b.txt
#
[b-into-a-3 b23a870] Merge b into a (using imerge)
 Date: Tue Oct 28 20:59:27 2025 +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 <luser@example.com>
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 <luser@example.com>
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
+ git-imerge continue --no-edit
+ tee imerge-a-into-b-3-2.out
[imerge/a 1b0e22d] 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 <luser@example.com>
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 <luser@example.com>
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 0fcf293] 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 28 20:59:28 2025 +0000
#
# On branch a-into-b-3
# Changes to be committed:
#	modified:   a.txt
#
[a-into-b-3 39e180e] Merge a into b (using imerge)
 Date: Tue Oct 28 20:59:28 2025 +0000
++++ dirname t/test-drop
+++ cd t
+++ pwd
++ dirname /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t
+ BASE=/builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0
+ . /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/test-lib.sh
+ GIT_IMERGE=git-imerge
+ TMP=/builddir/build/BUILD/git-imerge-1.2.0-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-build/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository'
+ local path=/builddir/build/BUILD/git-imerge-1.2.0-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-build/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository'
+ local path=/builddir/build/BUILD/git-imerge-1.2.0-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-build/git-imerge-1.2.0/t/tmp/drop
+ mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/drop
+ git init /builddir/build/BUILD/git-imerge-1.2.0-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 <name>
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 <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in /builddir/build/BUILD/git-imerge-1.2.0-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-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-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-build/git-imerge-1.2.0/imerge.css /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/t/tmp/drop
+ cd /builddir/build/BUILD/git-imerge-1.2.0-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
[master (root-commit) a733afa] m⇒0
 1 file changed, 1 insertion(+)
 create mode 100644 a.txt
++ 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
[master 389a4ba] a1⇒1
 1 file changed, 1 insertion(+)
 create mode 100644 a1.txt
+ for i in $(seq 6)
+ modify a2.txt 2
+ filename=a2.txt
+ text=2
+ echo 2
+ git add a2.txt
+ commit -m a2⇒2
+ TIME=1112911996
+ GIT_AUTHOR_DATE='@1112911996 +0000'
+ GIT_COMMITTER_DATE='@1112911996 +0000'
+ git commit -m a2⇒2
[master 4785218] a2⇒2
 1 file changed, 1 insertion(+)
 create mode 100644 a2.txt
+ 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
[master 34bdde3] a3⇒3
 1 file changed, 1 insertion(+)
 create mode 100644 a3.txt
+ 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 <new-branch-name>

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 6d1cc8a] Revert "a3⇒3"
 Date: Tue Oct 28 20:59:28 2025 +0000
 1 file changed, 1 deletion(-)
 delete mode 100644 a3.txt
[detached HEAD fe80ca3] Revert "a2⇒2"
 Date: Tue Oct 28 20:59:28 2025 +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='fe80ca3e7b4a8ed657553928048f93009c3e583f', goal='drop')[0:4,0:3].
Merge is complete!
+ git-imerge diagram --commits --frontier --html=imerge-drop.html
       0  3
       |  |
   0 - **** - dropped
       *??.
   2 - *...
       |
     fe80ca3e7b4a8ed657553928048f93009c3e583f

       0  3
       |  |
   0 - **** - dropped
       *??|
   2 - *--+
       |
     fe80ca3e7b4a8ed657553928048f93009c3e583f

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 <new-branch-name>

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 6419eb4] Revert "a3⇒3"
 Date: Tue Oct 28 20:59:29 2025 +0000
 1 file changed, 1 deletion(-)
 delete mode 100644 a3.txt
[detached HEAD 9de1085] Revert "a2⇒2"
 Date: Tue Oct 28 20:59:29 2025 +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='9de108542ab089a2e71fda52ace617557395f0ca', goal='revert')[0:4,0:3].
Merge is complete!
+ git-imerge diagram --commits --frontier --html=imerge-revert.html
       0  3
       |  |
   0 - **** - reverted
       *??.
   2 - *...
       |
     9de108542ab089a2e71fda52ace617557395f0ca

       0  3
       |  |
   0 - **** - reverted
       *??|
   2 - *--+
       |
     9de108542ab089a2e71fda52ace617557395f0ca

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
  py314: OK (53.06 seconds)
  congratulations :) (53.10 seconds)
+ RPM_EC=0
++ jobs -p
+ exit 0
Processing files: git-imerge-1.2.0-1.fc44.noarch
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.M5Ngs1
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-build
+ cd git-imerge-1.2.0
+ DOCDIR=/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/share/doc/git-imerge
+ export LC_ALL=C.UTF-8
+ LC_ALL=C.UTF-8
+ export DOCDIR
+ /usr/bin/mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/share/doc/git-imerge
+ cp -pr /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/README.md /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/share/doc/git-imerge
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.hCul80
+ umask 022
+ cd /builddir/build/BUILD/git-imerge-1.2.0-build
+ cd git-imerge-1.2.0
+ LICENSEDIR=/builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/share/licenses/git-imerge
+ export LC_ALL=C.UTF-8
+ LC_ALL=C.UTF-8
+ export LICENSEDIR
+ /usr/bin/mkdir -p /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/share/licenses/git-imerge
+ cp -pr /builddir/build/BUILD/git-imerge-1.2.0-build/git-imerge-1.2.0/COPYING /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT/usr/share/licenses/git-imerge
+ RPM_EC=0
++ jobs -p
+ exit 0
Provides: git-imerge = 1.2.0-1.fc44 python3.14dist(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.14
Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILD/git-imerge-1.2.0-build/BUILDROOT
Wrote: /builddir/build/SRPMS/git-imerge-1.2.0-1.fc44.src.rpm
Wrote: /builddir/build/RPMS/git-imerge-1.2.0-1.fc44.noarch.rpm
Finish: rpmbuild git-imerge-1.2.0-1.fc44.src.rpm
Finish: build phase for git-imerge-1.2.0-1.fc44.src.rpm
INFO: chroot_scan: 1 files copied to /var/lib/copr-rpmbuild/results/chroot_scan
INFO: /var/lib/mock/fedora-rawhide-x86_64-1761685037.017021/root/var/log/dnf5.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.fc44.src.rpm) Config(child) 1 minutes 13 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.fc44",
            "arch": "src"
        },
        {
            "name": "git-imerge",
            "epoch": null,
            "version": "1.2.0",
            "release": "1.fc44",
            "arch": "noarch"
        }
    ]
}
RPMResults finished