Diff of the two buildlogs: -- --- b1/build.log 2025-08-08 16:53:53.830465202 +0000 +++ b2/build.log 2025-08-08 16:57:00.718714413 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Thu Sep 10 11:11:01 -12 2026 -I: pbuilder-time-stamp: 1789081861 +I: Current time: Sat Aug 9 06:53:56 +14 2025 +I: pbuilder-time-stamp: 1754672036 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz] I: copying local configuration @@ -24,52 +24,84 @@ dpkg-source: info: applying tox-4-pr-204.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/2960561/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/D01_modify_environment starting +debug: Running on codethink04-arm64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Aug 8 16:54 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='arm64' - DEBIAN_FRONTEND='noninteractive' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu") + BASH_VERSION='5.2.37(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=arm64 + DEBIAN_FRONTEND=noninteractive DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 ' - DISTRIBUTION='trixie' - HOME='/root' - HOST_ARCH='arm64' + DIRSTACK=() + DISTRIBUTION=trixie + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=aarch64 + HOST_ARCH=arm64 IFS=' ' - INVOCATION_ID='90cf5b4dcfee4daa896c2855d7bd55df' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='2960561' - PS1='# ' - PS2='> ' + INVOCATION_ID=1a9da3904e0b4a978a052903e61b5929 + LANG=C + LANGUAGE=nl_BE:nl + LC_ALL=C + MACHTYPE=aarch64-unknown-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=1907971 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.8RXlquKs/pbuilderrc_pHuY --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.8RXlquKs/b1 --logfile b1/build.log git-imerge_1.2.0-5.dsc' - SUDO_GID='109' - SUDO_UID='104' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://192.168.101.4:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.8RXlquKs/pbuilderrc_56Ea --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.8RXlquKs/b2 --logfile b2/build.log git-imerge_1.2.0-5.dsc' + SUDO_GID=109 + SUDO_UID=104 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://192.168.101.4:3128 I: uname -a - Linux codethink03-arm64 6.1.0-37-cloud-arm64 #1 SMP Debian 6.1.140-1 (2025-05-22) aarch64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-37-cloud-arm64 #1 SMP Debian 6.1.140-1 (2025-05-22) aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 May 12 2025 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/2960561/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 May 12 19:25 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -225,7 +257,7 @@ Get: 102 http://deb.debian.org/debian trixie/main arm64 python3-virtualenv all 20.31.2+ds-1 [72.8 kB] Get: 103 http://deb.debian.org/debian trixie/main arm64 python3-wheel all 0.46.1-2 [21.7 kB] Get: 104 http://deb.debian.org/debian trixie/main arm64 tox all 4.25.0-1 [401 kB] -Fetched 39.9 MB in 0s (86.1 MB/s) +Fetched 39.9 MB in 0s (181 MB/s) Preconfiguring packages ... Selecting previously unselected package libexpat1:arm64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19965 files and directories currently installed.) @@ -571,8 +603,8 @@ Setting up tzdata (2025b-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Thu Sep 10 23:11:35 UTC 2026. -Universal Time is now: Thu Sep 10 23:11:35 UTC 2026. +Local time is now: Fri Aug 8 16:54:17 UTC 2025. +Universal Time is now: Fri Aug 8 16:54:17 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17030-1) ... @@ -675,7 +707,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/git-imerge-1.2.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../git-imerge_1.2.0-5_source.changes +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for trixie +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/git-imerge-1.2.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../git-imerge_1.2.0-5_source.changes dpkg-buildpackage: info: source package git-imerge dpkg-buildpackage: info: source version 1.2.0-5 dpkg-buildpackage: info: source distribution unstable @@ -813,25 +849,24 @@ I: pybuild base:311: cd /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.13/build; tox -c /build/reproducible-path/git-imerge-1.2.0/tox.ini --sitepackages -e py313 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --installpkg /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.13/git_imerge-1.2.0-py3-none-any.whl py313: install_package .pybuild/cpython3_3.13/build> python -I -m pip install --force-reinstall --no-deps /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.13/git_imerge-1.2.0-py3-none-any.whl py313: commands[0] .pybuild/cpython3_3.13/build> /bin/sh t/test-unconflicted -+ dirname t/test-unconflicted -+ cd t -+ pwd -+ dirname /build/reproducible-path/git-imerge-1.2.0/t +++++ dirname t/test-unconflicted ++++ cd t ++++ pwd +++ dirname /build/reproducible-path/git-imerge-1.2.0/t + BASE=/build/reproducible-path/git-imerge-1.2.0 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted -+ DESCRIPTION=git-imerge test repository without conflicts -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted git-imerge test repository without conflicts ++ DESCRIPTION='git-imerge test repository without conflicts' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted -+ local description=git-imerge test repository without conflicts -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted git-imerge test repository without conflicts ++ local 'description=git-imerge test repository without conflicts' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted -+ local description=git-imerge test repository without conflicts ++ local 'description=git-imerge test repository without conflicts' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -842,9 +877,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository without conflicts -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted @@ -859,147 +895,188 @@ + text=0 + echo 0 + git add b.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [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 +++ 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 ++ commit -m $'a\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'a\342\207\2221' [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 ++ commit -m $'a\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'a\342\207\2222' [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 ++ commit -m $'a\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'a\342\207\2223' +[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 -[a ecd8647] a⇒3 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒4 ++ commit -m $'a\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'a\342\207\2224' [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 ++ commit -m $'a\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'a\342\207\2225' [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 ++ commit -m $'a\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'a\342\207\2226' [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 ++ commit -m $'a\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'a\342\207\2227' [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 ++ commit -m $'a\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'a\342\207\2228' [a 49643dd] a⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' -+ seq 5 +++ 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 ++ commit -m $'b\342\207\2221' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'b\342\207\2221' [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 ++ commit -m $'b\342\207\2222' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'b\342\207\2222' [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 ++ commit -m $'b\342\207\2223' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'b\342\207\2223' [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 ++ commit -m $'b\342\207\2224' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'b\342\207\2224' [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 ++ commit -m $'b\342\207\2225' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'b\342\207\2225' [b e22cd97] b⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 @@ -1056,54 +1133,55 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge ++ 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: Thu Sep 10 23:12:16 2026 +0000 +# Date: Fri Aug 8 16:54:42 2025 +0000 # # On branch a-b-merge # Changes to be committed: # modified: b.txt # -[a-b-merge 06b430a] Merge b into a (using imerge) - Date: Thu Sep 10 23:12:16 2026 +0000 +[a-b-merge 89b5343] Merge b into a (using imerge) + Date: Fri Aug 8 16:54:42 2025 +0000 + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-merge + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 -+ git rev-parse a-b-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'a-b-border-with-history2^{tree}' + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 + git-imerge remove + git checkout a @@ -1187,13 +1265,13 @@ + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42 + local refname=a-b-full + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42 -+ git rev-parse a-b-full^{tree} +++ git rev-parse 'a-b-full^{tree}' + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42 py313: commands[1] .pybuild/cpython3_3.13/build> /bin/sh t/test-conflicted -+ dirname t/test-conflicted -+ cd t -+ pwd -+ dirname /build/reproducible-path/git-imerge-1.2.0/t +++++ dirname t/test-conflicted ++++ cd t ++++ pwd +++ dirname /build/reproducible-path/git-imerge-1.2.0/t + BASE=/build/reproducible-path/git-imerge-1.2.0 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge @@ -1201,17 +1279,16 @@ + test_conflict 4-3 + local conflict=4-3 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ DESCRIPTION=git-imerge test repository with conflict at 4-3 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 ++ DESCRIPTION='git-imerge test repository with conflict at 4-3' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ local description=git-imerge test repository with conflict at 4-3 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 ++ local 'description=git-imerge test repository with conflict at 4-3' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ local description=git-imerge test repository with conflict at 4-3 ++ local 'description=git-imerge test repository with conflict at 4-3' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -1222,9 +1299,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 4-3 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 @@ -1239,14 +1317,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -1254,168 +1334,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒4 ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [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 -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [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 -+ commit -m c⇒9 ++ case $conflict in ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 -+ git checkout -b d master -- ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 9cde605] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) ++ git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [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 -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒3 ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d 8085853] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -1497,7 +1637,7 @@ 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 ++ grep -q 'suggest manual merge of 4-3' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -1538,13 +1678,13 @@ Automatic merge failed; fix conflicts and then commit the result. Original first commit: - -Original second commit: commit 3c091ded129a5edf9061360bab867edade996c93 Author: Loú User Date: Thu Apr 7 22:13:18 2005 +0000 c⇒4 + +Original second commit: commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b Author: Loú User Date: Thu Apr 7 22:13:26 2005 +0000 @@ -1555,10 +1695,10 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 9e317fc] imerge 'c-d': manual merge 4-3 +[imerge/c-d 43df6ae] 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. @@ -1611,61 +1751,62 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:12:31 2026 +0000 +# Date: Fri Aug 8 16:54:49 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge d4c37a1] Merge d into c (using imerge) - Date: Thu Sep 10 23:12:31 2026 +0000 +[c-d-merge 5703572] Merge d into c (using imerge) + Date: Fri Aug 8 16:54:49 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ + tee start.out -git-imerge start --goal=full --first-parent --name=c-d d ++ 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. @@ -1697,7 +1838,7 @@ Attempting to merge 8-2...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. -Previous HEAD position was ee65928 imerge 'c-d': automatic merge 9-2 +Previous HEAD position was a792e99 imerge 'c-d': automatic merge 9-2 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -1722,7 +1863,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 4-3 autofill.out ++ grep -q 'suggest manual merge of 4-3' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -1756,9 +1897,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 4-3 # Conflicts: @@ -1780,7 +1922,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 98fad2c] imerge 'c-d': manual merge 4-3 +[imerge/c-d 55efba7] 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. @@ -1844,18 +1986,18 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 1-1 + local conflict=1-1 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 -+ DESCRIPTION=git-imerge test repository with conflict at 1-1 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 ++ DESCRIPTION='git-imerge test repository with conflict at 1-1' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 -+ local description=git-imerge test repository with conflict at 1-1 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1 ++ local 'description=git-imerge test repository with conflict at 1-1' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 -+ local description=git-imerge test repository with conflict at 1-1 ++ local 'description=git-imerge test repository with conflict at 1-1' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 @@ -1870,9 +2012,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.name Loú User ++ echo 'git-imerge test repository with conflict at 1-1' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 @@ -1887,14 +2029,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -1902,168 +2046,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒1 ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [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 -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [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\342\207\2229' ++ TIME=1112912003 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m c⇒9 -+ TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒1 ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [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 -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -2111,7 +2315,7 @@ 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 ++ grep -q 'suggest manual merge of 1-1' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -2169,10 +2373,10 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 747e927] imerge 'c-d': manual merge 1-1 +[imerge/c-d 178c2c7] 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. @@ -2232,55 +2436,56 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:12:47 2026 +0000 +# Date: Fri Aug 8 16:54:55 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 9aa67cc] Merge d into c (using imerge) - Date: Thu Sep 10 23:12:47 2026 +0000 +[c-d-merge b320424] Merge d into c (using imerge) + Date: Fri Aug 8 16:54:55 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c @@ -2312,7 +2517,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 1-1 autofill.out ++ grep -q 'suggest manual merge of 1-1' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -2346,9 +2551,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 1-1 # Conflicts: @@ -2370,8 +2576,8 @@ # modified: conflict.txt # modified: d.txt # +[imerge/c-d 65c5fc6] imerge 'c-d': manual merge 1-1 + git-imerge continue --edit -[imerge/c-d fec06b1] imerge 'c-d': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -2464,18 +2670,18 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-1 + local conflict=9-1 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 -+ DESCRIPTION=git-imerge test repository with conflict at 9-1 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 ++ DESCRIPTION='git-imerge test repository with conflict at 9-1' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 -+ local description=git-imerge test repository with conflict at 9-1 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1 ++ local 'description=git-imerge test repository with conflict at 9-1' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 -+ local description=git-imerge test repository with conflict at 9-1 ++ local 'description=git-imerge test repository with conflict at 9-1' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 @@ -2490,9 +2696,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.name Loú User ++ echo 'git-imerge test repository with conflict at 9-1' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 @@ -2507,14 +2713,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -2522,168 +2730,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [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 -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [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 -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒9 ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒1 ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [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 -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' +[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 -[d 0260058] d⇒3 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -2756,7 +3024,7 @@ 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 ++ grep -q 'suggest manual merge of 9-1' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -2814,10 +3082,10 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 670450d] imerge 'c-d': manual merge 9-1 +[imerge/c-d b4e2aa5] 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. @@ -2860,61 +3128,62 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:13:04 2026 +0000 +# Date: Fri Aug 8 16:55:02 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 84719d2] Merge d into c (using imerge) - Date: Thu Sep 10 23:13:04 2026 +0000 +[c-d-merge db10417] Merge d into c (using imerge) + Date: Fri Aug 8 16:55:02 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ + tee start.out -git-imerge start --goal=full --first-parent --name=c-d d ++ 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. @@ -2988,7 +3257,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 9-1 autofill.out ++ grep -q 'suggest manual merge of 9-1' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -3022,9 +3291,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 9-1 # Conflicts: @@ -3046,8 +3316,8 @@ # modified: conflict.txt # modified: d.txt # +[imerge/c-d c6bd4b9] imerge 'c-d': manual merge 9-1 + git-imerge continue --edit -[imerge/c-d f99a974] imerge 'c-d': manual merge 9-1 Merge has been recorded for merge 9-1. Attempting to merge 9-2...success. Attempting to merge 9-3...success. @@ -3092,21 +3362,20 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 1-6 + local conflict=1-6 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 -+ DESCRIPTION=git-imerge test repository with conflict at 1-6 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 ++ DESCRIPTION='git-imerge test repository with conflict at 1-6' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 -+ local description=git-imerge test repository with conflict at 1-6 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6 ++ local 'description=git-imerge test repository with conflict at 1-6' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 -+ local description=git-imerge test repository with conflict at 1-6 ++ local 'description=git-imerge test repository with conflict at 1-6' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/ + git init /build/reproducible-path/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 @@ -3118,9 +3387,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 1-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 @@ -3135,14 +3405,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -3150,171 +3422,231 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒1 ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' +[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 -[c 0883eb9] c⇒7 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [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 -+ commit -m c⇒9 ++ case $conflict in ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [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 -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' +[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 -[d 586472a] d⇒4 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒6 ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 -+ git checkout c ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [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 @@ -3352,8 +3684,8 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ tee autofill.out + git-imerge autofill ++ tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. @@ -3381,7 +3713,7 @@ 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 ++ grep -q 'suggest manual merge of 1-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -3439,10 +3771,10 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 3174d7e] imerge 'c-d': manual merge 1-6 +[imerge/c-d 48bed08] 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. @@ -3488,61 +3820,62 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:13:22 2026 +0000 +# Date: Fri Aug 8 16:55:09 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 8ec82e4] Merge d into c (using imerge) - Date: Thu Sep 10 23:13:22 2026 +0000 +[c-d-merge 37f025d] Merge d into c (using imerge) + Date: Fri Aug 8 16:55:09 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ + tee start.out -git-imerge start --goal=full --first-parent --name=c-d d ++ 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. @@ -3589,7 +3922,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was 9a24496 imerge 'c-d': automatic merge 9-5 +Previous HEAD position was 6ca1009 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -3614,7 +3947,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 1-6 autofill.out ++ grep -q 'suggest manual merge of 1-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -3648,9 +3981,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 1-6 # Conflicts: @@ -3672,8 +4006,8 @@ # modified: conflict.txt # modified: d.txt # +[imerge/c-d ff3be6b] imerge 'c-d': manual merge 1-6 + git-imerge continue --edit -[imerge/c-d 4e51e58] imerge 'c-d': manual merge 1-6 Merge has been recorded for merge 1-6. Attempting to merge 2-6...success. Attempting to merge 3-6...success. @@ -3721,22 +4055,21 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-6 + local conflict=9-6 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ DESCRIPTION=git-imerge test repository with conflict at 9-6 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 ++ DESCRIPTION='git-imerge test repository with conflict at 9-6' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ local description=git-imerge test repository with conflict at 9-6 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 ++ local 'description=git-imerge test repository with conflict at 9-6' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ local description=git-imerge test repository with conflict at 9-6 ++ local 'description=git-imerge test repository with conflict at 9-6' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -3747,9 +4080,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 9-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 @@ -3764,14 +4098,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -3779,168 +4115,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [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 -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' +[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 -[c 9732e77] c⇒8 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒9 ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' ++ git checkout -b d master -- [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) -+ git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' +[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 -[d bd5368a] d⇒1 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' +[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 -[d 9522207] d⇒5 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒6 ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c @@ -4021,7 +4417,7 @@ 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 ++ grep -q 'suggest manual merge of 9-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -4079,10 +4475,10 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 626f587] imerge 'c-d': manual merge 9-6 +[imerge/c-d ed9aa63] 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 @@ -4118,61 +4514,62 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:13:39 2026 +0000 +# Date: Fri Aug 8 16:55:15 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 3fec03e] Merge d into c (using imerge) - Date: Thu Sep 10 23:13:39 2026 +0000 +[c-d-merge 2846598] Merge d into c (using imerge) + Date: Fri Aug 8 16:55:15 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ tee start.out + git-imerge start --goal=full --first-parent --name=c-d d ++ tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -4251,7 +4648,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 9-6 autofill.out ++ grep -q 'suggest manual merge of 9-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -4285,9 +4682,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 9-6 # Conflicts: @@ -4309,7 +4707,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d d85019b] imerge 'c-d': manual merge 9-6 +[imerge/c-d 1fb53aa] imerge 'c-d': manual merge 9-6 + git-imerge continue --edit Merge has been recorded for merge 9-6. Merge is complete! @@ -4350,21 +4748,20 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 1-2 + local conflict=1-2 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 -+ DESCRIPTION=git-imerge test repository with conflict at 1-2 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 ++ DESCRIPTION='git-imerge test repository with conflict at 1-2' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 -+ local description=git-imerge test repository with conflict at 1-2 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2 ++ local 'description=git-imerge test repository with conflict at 1-2' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 -+ local description=git-imerge test repository with conflict at 1-2 ++ local 'description=git-imerge test repository with conflict at 1-2' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git/ + git init /build/reproducible-path/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 @@ -4376,9 +4773,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 1-2 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 @@ -4393,14 +4791,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -4408,168 +4808,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒1 ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' +[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 -[c 0883eb9] c⇒7 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [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 -+ commit -m c⇒9 ++ case $conflict in ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 243e8ed] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' +[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 -[d bd5368a] d⇒1 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒2 ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d df2e493] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -4633,7 +5093,7 @@ 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 ++ grep -q 'suggest manual merge of 1-2' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -4691,10 +5151,10 @@ Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 5fe3d83] imerge 'c-d': manual merge 1-2 +[imerge/c-d c0bba84] 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. @@ -4752,55 +5212,56 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:13:59 2026 +0000 +# Date: Fri Aug 8 16:55:22 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 791bb2f] Merge d into c (using imerge) - Date: Thu Sep 10 23:13:59 2026 +0000 +[c-d-merge 0f6b1c2] Merge d into c (using imerge) + Date: Fri Aug 8 16:55:22 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c @@ -4817,7 +5278,7 @@ Attempting to merge 7-1...success. Attempting to merge 8-1...success. Attempting to merge 9-1...success. -Previous HEAD position was d11d43f imerge 'c-d': automatic merge 9-1 +Previous HEAD position was aad73a6 imerge 'c-d': automatic merge 9-1 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -4842,7 +5303,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 1-2 autofill.out ++ grep -q 'suggest manual merge of 1-2' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -4876,9 +5337,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 1-2 # Conflicts: @@ -4900,7 +5362,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 496fa06] imerge 'c-d': manual merge 1-2 +[imerge/c-d 4aabfab] 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. @@ -4985,22 +5447,21 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-5 + local conflict=9-5 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ DESCRIPTION=git-imerge test repository with conflict at 9-5 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 ++ DESCRIPTION='git-imerge test repository with conflict at 9-5' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ local description=git-imerge test repository with conflict at 9-5 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 ++ local 'description=git-imerge test repository with conflict at 9-5' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ local description=git-imerge test repository with conflict at 9-5 ++ local 'description=git-imerge test repository with conflict at 9-5' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -5011,9 +5472,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 9-5 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 @@ -5028,14 +5490,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -5043,168 +5507,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [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 -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [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 -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒9 ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [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 -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒5 ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d bfb30f0] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -5284,7 +5808,7 @@ 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 ++ grep -q 'suggest manual merge of 9-5' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -5325,13 +5849,13 @@ Automatic merge failed; fix conflicts and then commit the result. Original first commit: - -Original second commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 + +Original second commit: commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f Author: Loú User Date: Thu Apr 7 22:13:28 2005 +0000 @@ -5342,10 +5866,10 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d d3a4059] imerge 'c-d': manual merge 9-5 +[imerge/c-d 6626b4b] 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. @@ -5384,61 +5908,62 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:14:23 2026 +0000 +# Date: Fri Aug 8 16:55:27 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge b04ea3b] Merge d into c (using imerge) - Date: Thu Sep 10 23:14:23 2026 +0000 +[c-d-merge e7f4721] Merge d into c (using imerge) + Date: Fri Aug 8 16:55:27 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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 ++ git-imerge start --goal=full --first-parent --name=c-d d Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -5516,7 +6041,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 9-5 autofill.out ++ grep -q 'suggest manual merge of 9-5' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -5550,9 +6075,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 9-5 # Conflicts: @@ -5574,7 +6100,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 93ff150] imerge 'c-d': manual merge 9-5 +[imerge/c-d c948825] 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. @@ -5616,18 +6142,18 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 5-1 + local conflict=5-1 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 -+ DESCRIPTION=git-imerge test repository with conflict at 5-1 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 ++ DESCRIPTION='git-imerge test repository with conflict at 5-1' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 -+ local description=git-imerge test repository with conflict at 5-1 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1 ++ local 'description=git-imerge test repository with conflict at 5-1' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 -+ local description=git-imerge test repository with conflict at 5-1 ++ local 'description=git-imerge test repository with conflict at 5-1' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 @@ -5641,10 +6167,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 5-1 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.name Loú User Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 @@ -5659,14 +6185,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -5674,168 +6202,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' +[c 89e2141] c⇒1 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt -[c 89e2141] c⇒1 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' +[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 -[c ed9122f] c⇒4 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒5 ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [c ea32d81] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) -[c 44473d6] c⇒8 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' +[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\342\207\2229' ++ TIME=1112912003 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c d8d80cf] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m c⇒9 -+ TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒1 ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [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 -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' +[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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 -[d 43c38c0] d⇒2 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d 200ce5c] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -5876,8 +6464,8 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ tee autofill.out + git-imerge autofill ++ tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. @@ -5904,7 +6492,7 @@ 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 ++ grep -q 'suggest manual merge of 5-1' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -5945,13 +6533,13 @@ Automatic merge failed; fix conflicts and then commit the result. Original first commit: + +Original second commit: commit 7e31f254c318decc434628f023dac0703f3d2b9e Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 c⇒5 - -Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 @@ -5962,10 +6550,10 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 61ff5e4] imerge 'c-d': manual merge 5-1 +[imerge/c-d 6b3f808] 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. @@ -6021,61 +6609,62 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:14:48 2026 +0000 +# Date: Fri Aug 8 16:55:34 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 2685736] Merge d into c (using imerge) - Date: Thu Sep 10 23:14:48 2026 +0000 +[c-d-merge f9a22f0] Merge d into c (using imerge) + Date: Fri Aug 8 16:55:34 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ tee start.out + git-imerge start --goal=full --first-parent --name=c-d d ++ tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -6125,7 +6714,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 5-1 autofill.out ++ grep -q 'suggest manual merge of 5-1' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -6159,9 +6748,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 5-1 # Conflicts: @@ -6183,8 +6773,8 @@ # modified: conflict.txt # modified: d.txt # +[imerge/c-d 912d4f0] imerge 'c-d': manual merge 5-1 + git-imerge continue --edit -[imerge/c-d e63e86f] imerge 'c-d': manual merge 5-1 Merge has been recorded for merge 5-1. Attempting to merge 5-2...success. Attempting to merge 5-3...success. @@ -6253,21 +6843,22 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 6-6 + local conflict=6-6 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 -+ DESCRIPTION=git-imerge test repository with conflict at 6-6 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 ++ DESCRIPTION='git-imerge test repository with conflict at 6-6' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 -+ local description=git-imerge test repository with conflict at 6-6 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6 ++ local 'description=git-imerge test repository with conflict at 6-6' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 -+ local description=git-imerge test repository with conflict at 6-6 ++ local 'description=git-imerge test repository with conflict at 6-6' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -6278,10 +6869,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git/ -+ echo git-imerge test repository with conflict at 6-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.name Loú User ++ echo 'git-imerge test repository with conflict at 6-6' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 @@ -6296,14 +6886,16 @@ + text=0 + echo 0 + git add d.txt -+ modify conflict.txt original version ++ modify conflict.txt 'original version' + filename=conflict.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) d70e04b] m⇒0 3 files changed, 3 insertions(+) create mode 100644 c.txt @@ -6311,171 +6903,231 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [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 -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [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 -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [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 -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [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 -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [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 -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒6 ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [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 -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [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 -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [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 -+ commit -m c⇒9 ++ case $conflict in ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 -+ git checkout -b d master -- ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 70408c8] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) ++ git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [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 -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [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 -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [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 -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [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 -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [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 -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒6 ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 -+ git checkout c ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [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 @@ -6556,7 +7208,7 @@ 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 ++ grep -q 'suggest manual merge of 6-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -6604,20 +7256,20 @@ c⇒6 Original second commit: -commit f7e451a6c9656dda15641a9fbc591a602f158692 -Author: Loú User -Date: Thu Apr 7 22:13:29 2005 +0000 - - d⇒6 There was a conflict merging commit 6-6, shown above. Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version +commit f7e451a6c9656dda15641a9fbc591a602f158692 +Author: Loú User +Date: Thu Apr 7 22:13:29 2005 +0000 + + d⇒6 ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 92ad593] imerge 'c-d': manual merge 6-6 +[imerge/c-d 3726964] 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. @@ -6658,55 +7310,56 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:15:11 2026 +0000 +# Date: Fri Aug 8 16:55:46 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 8128c81] Merge d into c (using imerge) - Date: Thu Sep 10 23:15:11 2026 +0000 +[c-d-merge 8def5ec] Merge d into c (using imerge) + Date: Fri Aug 8 16:55:46 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c @@ -6764,7 +7417,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was 92dab42 imerge 'c-d': automatic merge 9-5 +Previous HEAD position was 41cb6f5 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -6789,7 +7442,7 @@ git-imerge continue + grep -q Traceback start.out -+ grep -q suggest manual merge of 6-6 autofill.out ++ grep -q 'suggest manual merge of 6-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge3.html 0 5 9 | | | @@ -6823,9 +7476,10 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ echo merged version ++ echo 'merged version' + git add conflict.txt -+ GIT_EDITOR=cat git commit ++ GIT_EDITOR=cat ++ git commit imerge 'c-d': manual merge 6-6 # Conflicts: @@ -6847,8 +7501,8 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 481459b] imerge 'c-d': manual merge 6-6 + git-imerge continue --edit +[imerge/c-d ebdf73a] imerge 'c-d': manual merge 6-6 Merge has been recorded for merge 6-6. Attempting to merge 7-6...success. Attempting to merge 8-6...success. @@ -6891,28 +7545,28 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 py313: commands[2] .pybuild/cpython3_3.13/build> /bin/sh t/test-really-conflicted -+ dirname t/test-really-conflicted -+ cd t -+ pwd -+ dirname /build/reproducible-path/git-imerge-1.2.0/t +++++ dirname t/test-really-conflicted ++++ cd t ++++ pwd +++ dirname /build/reproducible-path/git-imerge-1.2.0/t + BASE=/build/reproducible-path/git-imerge-1.2.0 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git/ + GIT_IMERGE=git-imerge + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted -+ DESCRIPTION=git-imerge test repository with multiple conflicts -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted git-imerge test repository with multiple conflicts ++ DESCRIPTION='git-imerge test repository with multiple conflicts' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted -+ local description=git-imerge test repository with multiple conflicts -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted git-imerge test repository with multiple conflicts ++ local 'description=git-imerge test repository with multiple conflicts' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted -+ local description=git-imerge test repository with multiple conflicts ++ local 'description=git-imerge test repository with multiple conflicts' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -6923,9 +7577,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with multiple conflicts -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.name Loú User ++ echo 'git-imerge test repository with multiple conflicts' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted @@ -6940,51 +7594,60 @@ + text=0 + echo 0 + git add d.txt -+ seq 0 7 -+ modify conflict0.txt original version +++ seq 0 7 ++ for i in $(seq 0 7) ++ modify conflict0.txt 'original version' + filename=conflict0.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict0.txt -+ modify conflict1.txt original version ++ for i in $(seq 0 7) ++ modify conflict1.txt 'original version' + filename=conflict1.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict1.txt -+ modify conflict2.txt original version ++ for i in $(seq 0 7) ++ modify conflict2.txt 'original version' + filename=conflict2.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict2.txt -+ modify conflict3.txt original version ++ for i in $(seq 0 7) ++ modify conflict3.txt 'original version' + filename=conflict3.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict3.txt -+ modify conflict4.txt original version ++ for i in $(seq 0 7) ++ modify conflict4.txt 'original version' + filename=conflict4.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict4.txt -+ modify conflict5.txt original version ++ for i in $(seq 0 7) ++ modify conflict5.txt 'original version' + filename=conflict5.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict5.txt -+ modify conflict6.txt original version ++ for i in $(seq 0 7) ++ modify conflict6.txt 'original version' + filename=conflict6.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict6.txt -+ modify conflict7.txt original version ++ for i in $(seq 0 7) ++ modify conflict7.txt 'original version' + filename=conflict7.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict7.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 -+ git checkout -b c master -- ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) 8e21fbd] m⇒0 10 files changed, 10 insertions(+) create mode 100644 c.txt @@ -6997,25 +7660,28 @@ 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 ++ modify conflict0.txt 'c version' + filename=conflict0.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict0.txt -+ modify conflict4.txt c version ++ modify conflict4.txt 'c version' + filename=conflict4.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict4.txt -+ commit -m c⇒1 ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [c 4e6007a] c⇒1 3 files changed, 3 insertions(+), 3 deletions(-) + modify c.txt 2 @@ -7023,9 +7689,11 @@ + text=2 + echo 2 + git add c.txt -+ commit -m c⇒2 ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [c c2b7c49] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 3 @@ -7033,9 +7701,11 @@ + text=3 + echo 3 + git add c.txt -+ commit -m c⇒3 ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [c 42ad55a] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 4 @@ -7043,34 +7713,38 @@ + text=4 + echo 4 + git add c.txt -+ modify conflict1.txt c version ++ modify conflict1.txt 'c version' + filename=conflict1.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict1.txt -+ commit -m c⇒4 ++ commit -m $'c\342\207\2224' + 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(-) ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt -+ modify conflict3.txt c version +[c a891793] c⇒4 + 2 files changed, 2 insertions(+), 2 deletions(-) ++ modify conflict3.txt 'c version' + filename=conflict3.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict3.txt -+ modify conflict6.txt c version ++ modify conflict6.txt 'c version' + filename=conflict6.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict6.txt -+ commit -m c⇒5 ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [c c21441d] c⇒5 3 files changed, 3 insertions(+), 3 deletions(-) + modify c.txt 6 @@ -7078,14 +7752,16 @@ + text=6 + echo 6 + git add c.txt -+ modify conflict5.txt c version ++ modify conflict5.txt 'c version' + filename=conflict5.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict5.txt -+ commit -m c⇒6 ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [c a797a66] c⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 7 @@ -7093,24 +7769,28 @@ + text=7 + echo 7 + git add c.txt -+ modify conflict2.txt c version ++ modify conflict2.txt 'c version' + filename=conflict2.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict2.txt -+ commit -m c⇒7 ++ commit -m $'c\342\207\2227' + 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(-) ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 +[c c0e1537] c⇒7 + 2 files changed, 2 insertions(+), 2 deletions(-) ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [c 9f3e7c8] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + modify c.txt 9 @@ -7118,36 +7798,40 @@ + text=9 + echo 9 + git add c.txt -+ modify conflict7.txt c version ++ modify conflict7.txt 'c version' + filename=conflict7.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict7.txt -+ commit -m c⇒9 ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 -+ git checkout -b d master -- ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [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 ++ modify conflict0.txt 'd version' + filename=conflict0.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict0.txt -+ modify conflict6.txt d version ++ modify conflict6.txt 'd version' + filename=conflict6.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict6.txt -+ commit -m d⇒1 ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [d 8c3c065] d⇒1 3 files changed, 3 insertions(+), 3 deletions(-) + modify d.txt 2 @@ -7155,19 +7839,21 @@ + text=2 + echo 2 + git add d.txt -+ modify conflict1.txt d version ++ modify conflict1.txt 'd version' + filename=conflict1.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict1.txt -+ modify conflict2.txt d version ++ modify conflict2.txt 'd version' + filename=conflict2.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict2.txt -+ commit -m d⇒2 ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [d 820b787] d⇒2 3 files changed, 3 insertions(+), 3 deletions(-) + modify d.txt 3 @@ -7175,9 +7861,11 @@ + text=3 + echo 3 + git add d.txt -+ commit -m d⇒3 ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [d 821c792] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 4 @@ -7185,9 +7873,11 @@ + text=4 + echo 4 + git add d.txt -+ commit -m d⇒4 ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [d c2a1456] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) + modify d.txt 5 @@ -7195,29 +7885,33 @@ + text=5 + echo 5 + git add d.txt -+ modify conflict3.txt d version ++ modify conflict3.txt 'd version' + filename=conflict3.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict3.txt -+ commit -m d⇒5 ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' +[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 -[d c3e3890] d⇒5 - 2 files changed, 2 insertions(+), 2 deletions(-) -+ modify conflict4.txt d version ++ modify conflict4.txt 'd version' + filename=conflict4.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict4.txt -+ commit -m d⇒6 ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d b2f5c5e] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 7 @@ -7225,14 +7919,16 @@ + text=7 + echo 7 + git add d.txt -+ modify conflict5.txt d version ++ modify conflict5.txt 'd version' + filename=conflict5.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict5.txt -+ commit -m d⇒7 ++ commit -m $'d\342\207\2227' + TIME=1112912010 -+ GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7 ++ GIT_AUTHOR_DATE='@1112912010 +0000' ++ GIT_COMMITTER_DATE='@1112912010 +0000' ++ git commit -m $'d\342\207\2227' [d 892af56] d⇒7 2 files changed, 2 insertions(+), 2 deletions(-) + modify d.txt 8 @@ -7240,14 +7936,16 @@ + text=8 + echo 8 + git add d.txt -+ modify conflict7.txt d version ++ modify conflict7.txt 'd version' + filename=conflict7.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict7.txt -+ commit -m d⇒8 ++ commit -m $'d\342\207\2228' + TIME=1112912011 -+ GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8 ++ GIT_AUTHOR_DATE='@1112912011 +0000' ++ GIT_COMMITTER_DATE='@1112912011 +0000' ++ git commit -m $'d\342\207\2228' [d 67099d0] d⇒8 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c @@ -7292,8 +7990,8 @@ + conflict_count=0 + true -+ tee autofill.out + 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' @@ -7343,26 +8041,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict0.txt 'merged version' + filename=conflict0.txt -+ text=merged version -+ echo merged version ++ 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 -+ + tee autofill.out -git-imerge continue --no-edit -[imerge/c-d f91e19e] imerge 'c-d': manual merge 1-1 ++ git-imerge continue --no-edit ++ tee autofill.out +[imerge/c-d 3ee9ac2] 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. @@ -7454,26 +8160,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict4.txt 'merged version' + filename=conflict4.txt -+ text=merged version -+ echo merged version ++ 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 474e216] imerge 'c-d': manual merge 1-6 ++ git-imerge continue --no-edit +[imerge/c-d dde79b7] 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. @@ -7490,12 +8204,12 @@ Warning: you are leaving 1 commit behind, not connected to any of your branches: - f5e8259 imerge 'c-d': automatic merge 3-8 + 03c1029 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 f5e8259 + git branch 03c1029 Switched to branch 'imerge/c-d' Auto-merging conflict1.txt @@ -7544,26 +8258,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict1.txt 'merged version' + filename=conflict1.txt -+ text=merged version -+ echo merged version ++ 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 -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 2ea63d8] imerge 'c-d': manual merge 4-2 ++ tee autofill.out +[imerge/c-d 897897a] 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. @@ -7573,7 +8295,7 @@ 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 918dd66 imerge 'c-d': automatic merge 4-8 +Previous HEAD position was 984d4e8 imerge 'c-d': automatic merge 4-8 Switched to branch 'imerge/c-d' Auto-merging conflict6.txt CONFLICT (content): Merge conflict in conflict6.txt @@ -7621,26 +8343,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict6.txt 'merged version' + filename=conflict6.txt -+ text=merged version -+ echo merged version ++ 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 0b5e26a] imerge 'c-d': manual merge 5-1 ++ git-imerge continue --no-edit +[imerge/c-d c32124b] 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. @@ -7675,7 +8405,7 @@ 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 d3efdef imerge 'c-d': automatic merge 7-1 +Previous HEAD position was 625a187 imerge 'c-d': automatic merge 7-1 Switched to branch 'imerge/c-d' Auto-merging conflict3.txt CONFLICT (content): Merge conflict in conflict3.txt @@ -7723,26 +8453,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict3.txt 'merged version' + filename=conflict3.txt -+ text=merged version -+ echo merged version ++ 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 -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 3530cba] imerge 'c-d': manual merge 5-5 ++ tee autofill.out +[imerge/c-d b3e59ae] 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. @@ -7805,31 +8543,39 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict5.txt 'merged version' + filename=conflict5.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict5.txt + conflict_count=6 ++ for i in $(seq 0 7) + grep -q ==== conflict6.txt ++ for i in $(seq 0 7) + grep -q ==== conflict7.txt + true -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 67dd5b4] imerge 'c-d': manual merge 6-7 ++ tee autofill.out +[imerge/c-d 3bf56e7] 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 3f9c8c7 imerge 'c-d': automatic merge 6-8 +Previous HEAD position was c02df15 imerge 'c-d': automatic merge 6-8 Switched to branch 'imerge/c-d' Auto-merging conflict2.txt CONFLICT (content): Merge conflict in conflict2.txt @@ -7877,26 +8623,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict2.txt 'merged version' + filename=conflict2.txt -+ text=merged version -+ echo merged version ++ 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 -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 4c17774] imerge 'c-d': manual merge 7-2 ++ tee autofill.out +[imerge/c-d 45df809] 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. @@ -7978,26 +8732,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ 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 ++ modify conflict7.txt 'merged version' + filename=conflict7.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict7.txt + conflict_count=8 + true -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 50b7b8a] imerge 'c-d': manual merge 9-8 ++ tee autofill.out +[imerge/c-d e4750a6] imerge 'c-d': manual merge 9-8 Merge has been recorded for merge 9-8. Merge is complete! + grep -q Traceback autofill.out @@ -8024,20 +8786,21 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out ++ grep -q 'There was a conflict merging' autofill.out + break + test 8 -ne 8 + git-imerge diagram --commits -+ cat + diff -u - diagram.out ++ cat + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge ++ 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: Thu Sep 10 23:15:51 2026 +0000 +# Date: Fri Aug 8 16:56:21 2025 +0000 # # On branch c-d-merge # Changes to be committed: @@ -8051,64 +8814,63 @@ # modified: conflict7.txt # modified: d.txt # -[c-d-merge ba6dbc3] Merge d into c (using imerge) - Date: Thu Sep 10 23:15:51 2026 +0000 +[c-d-merge 1d91471] Merge d into c (using imerge) + Date: Fri Aug 8 16:56:21 2025 +0000 + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + local refname=c-d-merge + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f -+ git rev-parse c-d-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f + git-imerge remove py313: commands[3] .pybuild/cpython3_3.13/build> /bin/sh t/test-duplicated -+ dirname t/test-duplicated -+ cd t -+ pwd -+ dirname /build/reproducible-path/git-imerge-1.2.0/t +++++ dirname t/test-duplicated ++++ cd t ++++ pwd +++ dirname /build/reproducible-path/git-imerge-1.2.0/t + BASE=/build/reproducible-path/git-imerge-1.2.0 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated -+ DESCRIPTION=git-imerge test repository with duplicate commits -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated git-imerge test repository with duplicate commits ++ DESCRIPTION='git-imerge test repository with duplicate commits' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated -+ local description=git-imerge test repository with duplicate commits -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated git-imerge test repository with duplicate commits ++ local 'description=git-imerge test repository with duplicate commits' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated -+ local description=git-imerge test repository with duplicate commits ++ local 'description=git-imerge test repository with duplicate commits' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -8119,9 +8881,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with duplicate commits -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git/ ++ echo 'git-imerge test repository with duplicate commits' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated @@ -8131,76 +8894,97 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [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 +++ 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 ++ 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 ++ 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 ++ 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 ++ 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 -[a 4700669] a⇒2 on branch a - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒3 on branch a ++ commit -m 'a⇒3 on branch a' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m 'a⇒3 on branch a' + git checkout -b b master -- +Switched to a new branch 'b' [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) -Switched to a new branch 'b' -+ seq 4 +++ 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 ++ 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 ++ 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 ++ 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 ++ 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 ++ 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 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m 'a⇒3 on branch b' ++ for i in $(seq 4) + modify a.txt 4 + filename=a.txt + text=4 @@ -8208,13 +8992,15 @@ + git add a.txt [b a4b2c2b] a⇒3 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒4 on branch b ++ 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(-) ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m 'a⇒4 on branch b' + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 + git checkout a +[b 5b24553] a⇒4 on branch b + 1 file changed, 1 insertion(+), 1 deletion(-) Switched to branch 'a' + git-imerge start --first-parent --name=a-b --branch=a-b-merge b Attempting automerge of 3-4...failure. @@ -8285,54 +9071,55 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge ++ 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: Thu Sep 10 23:16:03 2026 +0000 +# Date: Fri Aug 8 16:56:30 2025 +0000 # # On branch a-b-merge # Changes to be committed: # modified: a.txt # -[a-b-merge 72b2619] Merge b into a (using imerge) - Date: Thu Sep 10 23:16:03 2026 +0000 +[a-b-merge cfae1f4] Merge b into a (using imerge) + Date: Fri Aug 8 16:56:30 2025 +0000 + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-merge + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 -+ git rev-parse a-b-merge^{tree} +++ 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} +++ 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} +++ 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} +++ 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} +++ 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} +++ git rev-parse 'a-b-border-with-history2^{tree}' + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 + git checkout a Switched to branch 'a' @@ -8385,29 +9172,31 @@ + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2 + local refname=a-b-full + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2 -+ git rev-parse a-b-full^{tree} +++ git rev-parse 'a-b-full^{tree}' + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2 py313: commands[4] .pybuild/cpython3_3.13/build> /bin/sh t/test-flip-flop -+ dirname t/test-flip-flop -+ cd t -+ pwd -+ dirname /build/reproducible-path/git-imerge-1.2.0/t +++++ dirname t/test-flip-flop ++++ cd t ++++ pwd +++ dirname /build/reproducible-path/git-imerge-1.2.0/t + BASE=/build/reproducible-path/git-imerge-1.2.0 + . /build/reproducible-path/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=/build/reproducible-path/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 /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 ++ DESCRIPTION='git-imerge test repository with a commit and its revert at n=1' ++ init_test_repo /build/reproducible-path/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=/build/reproducible-path/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 /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1 ++ local 'description=git-imerge test repository with a commit and its revert at n=1' ++ delete_test_repo /build/reproducible-path/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=/build/reproducible-path/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 ++ local 'description=git-imerge test repository with a commit and its revert at n=1' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -8418,10 +9207,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with a commit and its revert at n=1 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.name Loú User -Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 @@ -8431,72 +9219,87 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [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 ++ 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 ++ 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 -[a 2f1f75a] a⇒1 on branch a - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒2 on branch a ++ 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 ++ 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 ++ commit -m 'a⇒3 on branch a' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a -+ git checkout -b b master -- ++ 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 ++ msg=$'b\342\207\2221' + test 1 = 1 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt -+ msg=b⇒1 and a⇒X ++ msg='b⇒1 and a⇒X' + test 1 = 2 -+ commit -m b⇒1 and a⇒X on branch b ++ 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 ++ 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 ++ msg=$'b\342\207\2222' + test 2 = 1 + test 2 = 2 + modify a.txt 0 @@ -8504,36 +9307,44 @@ + text=0 + echo 0 + git add a.txt -+ msg=b⇒2 and a⇒0 -+ commit -m b⇒2 and a⇒0 on branch b ++ 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 ++ 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 ++ msg=$'b\342\207\2223' + test 3 = 1 + test 3 = 2 -+ commit -m b⇒3 on branch b ++ 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 ++ 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 -[b 6fe24f0] b⇒3 on branch b - 1 file changed, 1 insertion(+), 1 deletion(-) -+ msg=b⇒4 ++ msg=$'b\342\207\2224' + test 4 = 1 + test 4 = 2 -+ commit -m b⇒4 on branch b ++ 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 ++ 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 @@ -8544,8 +9355,8 @@ + 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 ++ git-imerge merge --branch=b-into-a-1 b Attempting automerge of 3-4...success. Autofilling 1-4...success. Autofilling 2-4...success. @@ -8571,12 +9382,12 @@ Date: Thu Apr 7 22:13:18 2005 +0000 b⇒1 and a⇒X on branch b -+ git-imerge diagram --commits --frontier 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 @@ -8605,12 +9416,12 @@ @ = 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 ++ 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 5063226] imerge 'b': manual merge 1-1 +[imerge/b 2cd749f] 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. @@ -8618,7 +9429,7 @@ 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 aa00d02 imerge 'b': automatic merge 3-1 +Previous HEAD position was 6546db9 imerge 'b': automatic merge 3-1 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -8671,12 +9482,12 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 1-2' imerge-b-into-a-1-2.out + echo 1 + git add a.txt -+ tee imerge-b-into-a-1-3.out + git-imerge continue --no-edit -[imerge/b 3c7071a] imerge 'b': manual merge 1-2 ++ tee imerge-b-into-a-1-3.out +[imerge/b c31ec1b] imerge 'b': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting automerge of 1-4...success. Autofilling 1-3...success. @@ -8691,7 +9502,7 @@ 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 ++ grep -q 'Merge is complete' imerge-b-into-a-1-3.out + git-imerge diagram --commits --frontier 0 3 | | @@ -8721,20 +9532,21 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ 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: Thu Sep 10 23:16:15 2026 +0000 +# Date: Fri Aug 8 16:56:41 2025 +0000 # # On branch b-into-a-1 # Changes to be committed: # new file: b.txt # -[b-into-a-1 1645770] Merge b into a (using imerge) - Date: Thu Sep 10 23:16:15 2026 +0000 +[b-into-a-1 414ad8a] Merge b into a (using imerge) + Date: Fri Aug 8 16:56:41 2025 +0000 + test_merge a-into-b-1 b a 1-1 2-1 + local name=a-into-b-1 + local dst=b @@ -8743,8 +9555,8 @@ + local conflict2=2-1 + git checkout b Switched to branch 'b' -+ + tee imerge-a-into-b-1-1.out -git-imerge merge --branch=a-into-b-1 a ++ 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... @@ -8762,7 +9574,6 @@ b⇒1 and a⇒X on branch b Original second commit: -+ git-imerge diagram --commits --frontier commit 2f1f75a7b49864d699f9e222c1d78078cfe01587 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 @@ -8773,6 +9584,7 @@ Please resolve the conflict, commit the result, then type git-imerge continue ++ git-imerge diagram --commits --frontier 0 4 | | 0 - ***** - b @@ -8799,12 +9611,12 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 1-1' imerge-a-into-b-1-1.out + echo 1 + git add a.txt -+ tee imerge-a-into-b-1-2.out + git-imerge continue --no-edit -[imerge/a 70eb960] imerge 'a': manual merge 1-1 ++ tee imerge-a-into-b-1-2.out +[imerge/a 125413b] imerge 'a': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-3...success. Autofilling 1-2...success. @@ -8862,12 +9674,12 @@ @ = 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 ++ 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 44f1269] imerge 'a': manual merge 2-1 +[imerge/a 9acda36] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -8882,7 +9694,7 @@ 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 ++ grep -q 'Merge is complete' imerge-a-into-b-1-3.out + git-imerge diagram --commits --frontier 0 4 | | @@ -8910,34 +9722,36 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ 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: Thu Sep 10 23:16:19 2026 +0000 +# Date: Fri Aug 8 16:56:45 2025 +0000 # # On branch a-into-b-1 # Changes to be committed: # modified: a.txt # -[a-into-b-1 953408a] Merge a into b (using imerge) - Date: Thu Sep 10 23:16:19 2026 +0000 +[a-into-b-1 4b4cd08] Merge a into b (using imerge) + Date: Fri Aug 8 16:56:45 2025 +0000 ++ for n in 1 2 3 + flip_flop_test 2 + local n=2 + TMP=/build/reproducible-path/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 /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 ++ DESCRIPTION='git-imerge test repository with a commit and its revert at n=2' ++ init_test_repo /build/reproducible-path/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=/build/reproducible-path/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 /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2 ++ local 'description=git-imerge test repository with a commit and its revert at n=2' ++ delete_test_repo /build/reproducible-path/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=/build/reproducible-path/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 ++ local 'description=git-imerge test repository with a commit and its revert at n=2' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git/ + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -8948,9 +9762,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with a commit and its revert at n=2 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.name Loú User ++ echo 'git-imerge test repository with a commit and its revert at n=2' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 @@ -8960,85 +9774,103 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' ++ git checkout -b a -- [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 ++ 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 ++ 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 ++ 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 ++ 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 -[a 4700669] a⇒2 on branch a - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒3 on branch a ++ commit -m 'a⇒3 on branch a' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a ++ GIT_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 ++ msg=$'b\342\207\2221' + test 1 = 2 + test 1 = 3 -+ commit -m b⇒1 on branch b ++ 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 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m 'b⇒1 on branch b' ++ for i in 1 2 3 4 + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt -+ msg=b⇒2 +[b 1f7d097] b⇒1 on branch b + 1 file changed, 1 insertion(+) + create mode 100644 b.txt ++ msg=$'b\342\207\2222' + test 2 = 2 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt -+ msg=b⇒2 and a⇒X ++ msg='b⇒2 and a⇒X' + test 2 = 3 -+ commit -m b⇒2 and a⇒X on branch b ++ 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(-) ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m 'b⇒2 and a⇒X on branch b' ++ for i in 1 2 3 4 + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt -+ msg=b⇒3 +[b 48df77d] b⇒2 and a⇒X on branch b + 2 files changed, 2 insertions(+), 2 deletions(-) ++ msg=$'b\342\207\2223' + test 3 = 2 + test 3 = 3 + modify a.txt 0 @@ -9046,23 +9878,28 @@ + text=0 + echo 0 + git add a.txt -+ msg=b⇒3 and a⇒0 -+ commit -m b⇒3 and a⇒0 on branch b ++ 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(-) ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m 'b⇒3 and a⇒0 on branch b' ++ for i in 1 2 3 4 + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt -+ msg=b⇒4 +[b f3ef019] b⇒3 and a⇒0 on branch b + 2 files changed, 2 insertions(+), 2 deletions(-) ++ msg=$'b\342\207\2224' + test 4 = 2 + test 4 = 3 -+ commit -m b⇒4 on branch b ++ 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 ++ 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 @@ -9073,8 +9910,8 @@ + local conflict2=1-3 + git checkout a Switched to branch 'a' -+ tee imerge-b-into-a-2-1.out + 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. @@ -9148,12 +9985,12 @@ @ = 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 ++ 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 470c356] imerge 'b': manual merge 1-2 ++ git-imerge continue --no-edit +[imerge/b f71d35f] 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. @@ -9161,7 +9998,7 @@ 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 133aeb9 imerge 'b': automatic merge 3-2 +Previous HEAD position was db9d22d imerge 'b': automatic merge 3-2 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9214,12 +10051,12 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 1-3' imerge-b-into-a-2-2.out + echo 1 + git add a.txt -+ tee imerge-b-into-a-2-3.out + git-imerge continue --no-edit -[imerge/b 64615be] imerge 'b': manual merge 1-3 ++ tee imerge-b-into-a-2-3.out +[imerge/b 9fa9cab] imerge 'b': manual merge 1-3 Merge has been recorded for merge 1-3. Attempting automerge of 1-4...success. Autofilling 1-4...success. @@ -9232,7 +10069,7 @@ 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 ++ grep -q 'Merge is complete' imerge-b-into-a-2-3.out + git-imerge diagram --commits --frontier 0 3 | | @@ -9262,20 +10099,21 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ 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: Thu Sep 10 23:16:24 2026 +0000 +# Date: Fri Aug 8 16:56:48 2025 +0000 # # On branch b-into-a-2 # Changes to be committed: # new file: b.txt # -[b-into-a-2 adfbd91] Merge b into a (using imerge) - Date: Thu Sep 10 23:16:24 2026 +0000 +[b-into-a-2 bed8752] Merge b into a (using imerge) + Date: Fri Aug 8 16:56:48 2025 +0000 + test_merge a-into-b-2 b a 2-1 3-1 + local name=a-into-b-2 + local dst=b @@ -9345,12 +10183,12 @@ @ = 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 ++ 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 d0595b8] imerge 'a': manual merge 2-1 ++ git-imerge continue --no-edit +[imerge/a 0616b07] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -9408,12 +10246,12 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 3-1' imerge-a-into-b-2-2.out + echo 1 + git add a.txt -+ + tee imerge-a-into-b-2-3.out -git-imerge continue --no-edit -[imerge/a dfea4b8] imerge 'a': manual merge 3-1 ++ git-imerge continue --no-edit ++ tee imerge-a-into-b-2-3.out +[imerge/a 24d8031] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9425,7 +10263,7 @@ 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 ++ grep -q 'Merge is complete' imerge-a-into-b-2-3.out + git-imerge diagram --commits --frontier 0 4 | | @@ -9453,30 +10291,32 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ 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: Thu Sep 10 23:16:28 2026 +0000 +# Date: Fri Aug 8 16:56:49 2025 +0000 # # On branch a-into-b-2 # Changes to be committed: # modified: a.txt # -[a-into-b-2 72e8c64] Merge a into b (using imerge) - Date: Thu Sep 10 23:16:28 2026 +0000 +[a-into-b-2 eb48b30] Merge a into b (using imerge) + Date: Fri Aug 8 16:56:49 2025 +0000 ++ for n in 1 2 3 + flip_flop_test 3 + local n=3 + TMP=/build/reproducible-path/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 /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 ++ DESCRIPTION='git-imerge test repository with a commit and its revert at n=3' ++ init_test_repo /build/reproducible-path/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=/build/reproducible-path/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 /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3 ++ local 'description=git-imerge test repository with a commit and its revert at n=3' ++ delete_test_repo /build/reproducible-path/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=/build/reproducible-path/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 ++ local 'description=git-imerge test repository with a commit and its revert at n=3' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 @@ -9490,10 +10330,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with a commit and its revert at n=3 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name Loú User Initialized empty Git repository in /build/reproducible-path/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=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 @@ -9503,98 +10343,119 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [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 ++ 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 ++ 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 -[a 2f1f75a] a⇒1 on branch a - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒2 on branch a ++ 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 ++ 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 ++ commit -m 'a⇒3 on branch a' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a ++ GIT_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 ++ msg=$'b\342\207\2221' + test 1 = 3 + test 1 = 4 -+ commit -m b⇒1 on branch b ++ 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 ++ 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 ++ msg=$'b\342\207\2222' + test 2 = 3 + test 2 = 4 -+ commit -m b⇒2 on branch b ++ 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 ++ 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 ++ msg=$'b\342\207\2223' + test 3 = 3 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt -+ msg=b⇒3 and a⇒X ++ msg='b⇒3 and a⇒X' + test 3 = 4 -+ commit -m b⇒3 and a⇒X on branch b ++ 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 ++ 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 -[b d40495e] b⇒3 and a⇒X on branch b - 2 files changed, 2 insertions(+), 2 deletions(-) -+ msg=b⇒4 ++ msg=$'b\342\207\2224' + test 4 = 3 + test 4 = 4 + modify a.txt 0 @@ -9602,10 +10463,14 @@ + text=0 + echo 0 + git add a.txt -+ msg=b⇒4 and a⇒0 -+ commit -m b⇒4 and a⇒0 on branch b ++ 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 ++ 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 @@ -9613,11 +10478,9 @@ + local conflict1=1-3 + local conflict2=1-4 + git checkout a -[b eb736f2] b⇒4 and a⇒0 on branch b - 2 files changed, 2 insertions(+), 2 deletions(-) Switched to branch 'a' -+ tee imerge-b-into-a-3-1.out + 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. @@ -9697,12 +10560,12 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 1-3' imerge-b-into-a-3-1.out + echo 1 + git add a.txt -+ + tee imerge-b-into-a-3-2.out -git-imerge continue --no-edit -[imerge/b f173482] imerge 'b': manual merge 1-3 ++ git-imerge continue --no-edit ++ tee imerge-b-into-a-3-2.out +[imerge/b f89c8fb] 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. @@ -9710,7 +10573,7 @@ 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 4e1c3c7 imerge 'b': automatic merge 3-3 +Previous HEAD position was 566d3b8 imerge 'b': automatic merge 3-3 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9763,19 +10626,19 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 1-4' imerge-b-into-a-3-2.out + echo 1 + git add a.txt -+ tee imerge-b-into-a-3-3.out + git-imerge continue --no-edit -[imerge/b e9c7cd8] imerge 'b': manual merge 1-4 ++ tee imerge-b-into-a-3-3.out +[imerge/b 6ff652e] 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 ++ grep -q 'Merge is complete' imerge-b-into-a-3-3.out + git-imerge diagram --commits --frontier 0 3 | | @@ -9805,20 +10668,21 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ 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: Thu Sep 10 23:16:33 2026 +0000 +# Date: Fri Aug 8 16:56:51 2025 +0000 # # On branch b-into-a-3 # Changes to be committed: # new file: b.txt # -[b-into-a-3 5c98bf1] Merge b into a (using imerge) - Date: Thu Sep 10 23:16:33 2026 +0000 +[b-into-a-3 4589f04] Merge b into a (using imerge) + Date: Fri Aug 8 16:56:51 2025 +0000 + test_merge a-into-b-3 b a 3-1 4-1 + local name=a-into-b-3 + local dst=b @@ -9892,12 +10756,12 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 3-1' imerge-a-into-b-3-1.out + echo 1 + git add a.txt -+ tee imerge-a-into-b-3-2.out + git-imerge continue --no-edit -[imerge/a b388009] imerge 'a': manual merge 3-1 ++ tee imerge-a-into-b-3-2.out +[imerge/a 0d217a8] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9955,19 +10819,19 @@ @ = 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 ++ grep -q 'There was a conflict merging commit 4-1' imerge-a-into-b-3-2.out + echo 1 + git add a.txt -+ tee imerge-a-into-b-3-3.out + git-imerge continue --no-edit -[imerge/a de1b69c] imerge 'a': manual merge 4-1 ++ tee imerge-a-into-b-3-3.out +[imerge/a 72bd81a] 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 ++ grep -q 'Merge is complete' imerge-a-into-b-3-3.out + git-imerge diagram --commits --frontier 0 4 | | @@ -9995,40 +10859,40 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ 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: Thu Sep 10 23:16:37 2026 +0000 +# Date: Fri Aug 8 16:56:53 2025 +0000 # # On branch a-into-b-3 # Changes to be committed: # modified: a.txt # -[a-into-b-3 98ff933] Merge a into b (using imerge) - Date: Thu Sep 10 23:16:37 2026 +0000 +[a-into-b-3 9370e91] Merge a into b (using imerge) + Date: Fri Aug 8 16:56:53 2025 +0000 py313: commands[5] .pybuild/cpython3_3.13/build> /bin/sh t/test-drop -+ dirname t/test-drop -+ cd t -+ pwd -+ dirname /build/reproducible-path/git-imerge-1.2.0/t +++++ dirname t/test-drop ++++ cd t ++++ pwd +++ dirname /build/reproducible-path/git-imerge-1.2.0/t + BASE=/build/reproducible-path/git-imerge-1.2.0 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop -+ DESCRIPTION=git-imerge drop test repository -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop git-imerge drop test repository ++ DESCRIPTION='git-imerge drop test repository' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop -+ local description=git-imerge drop test repository -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop git-imerge drop test repository ++ local 'description=git-imerge drop test repository' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop -+ local description=git-imerge drop test repository ++ local 'description=git-imerge drop test repository' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -10039,9 +10903,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge drop test repository -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git/ ++ echo 'git-imerge drop test repository' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop @@ -10051,76 +10916,96 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt -+ seq 6 +++ 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 ++ commit -m $'a1\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'a1\342\207\2221' [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 ++ commit -m $'a2\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'a2\342\207\2222' [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 ++ commit -m $'a3\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'a3\342\207\2223' [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 ++ commit -m $'a4\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'a4\342\207\2224' [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 ++ commit -m $'a5\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'a5\342\207\2225' [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 ++ commit -m $'a6\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'a6\342\207\2226' [master 9d6aec5] a6⇒6 1 file changed, 1 insertion(+) create mode 100644 a6.txt @@ -10145,12 +11030,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD f047ff2] Revert "a3⇒3" - Date: Thu Sep 10 23:16:38 2026 +0000 +[detached HEAD b9ae85e] Revert "a3⇒3" + Date: Fri Aug 8 16:56:53 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD 28eb2f6] Revert "a2⇒2" - Date: Thu Sep 10 23:16:38 2026 +0000 +[detached HEAD d818a70] Revert "a2⇒2" + Date: Fri Aug 8 16:56:53 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10160,7 +11045,7 @@ 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='28eb2f64fc2966e443b55e05e731e9df755cafd0', goal='drop')[0:4,0:3]. +Recording autofilled block MergeState('dropped', tip1='dropped', tip2='d818a70b32d3d1fc928a2ce7d13574ef4aaa5d1d', goal='drop')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-drop.html 0 3 @@ -10169,7 +11054,7 @@ *??. 2 - *... | - 28eb2f64fc2966e443b55e05e731e9df755cafd0 + d818a70b32d3d1fc928a2ce7d13574ef4aaa5d1d 0 3 | | @@ -10177,7 +11062,7 @@ *??| 2 - *--+ | - 28eb2f64fc2966e443b55e05e731e9df755cafd0 + d818a70b32d3d1fc928a2ce7d13574ef4aaa5d1d Key: |,-,+ = rectangles forming current merge frontier @@ -10191,7 +11076,7 @@ + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b + local refname=dropped + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b -+ git rev-parse dropped^{tree} +++ git rev-parse 'dropped^{tree}' + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b + git checkout -b reverted master Switched to a new branch 'reverted' @@ -10214,12 +11099,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD 25e4d07] Revert "a3⇒3" - Date: Thu Sep 10 23:16:39 2026 +0000 +[detached HEAD b101b40] Revert "a3⇒3" + Date: Fri Aug 8 16:56:54 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD 332c303] Revert "a2⇒2" - Date: Thu Sep 10 23:16:39 2026 +0000 +[detached HEAD ba29f41] Revert "a2⇒2" + Date: Fri Aug 8 16:56:54 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10229,7 +11114,7 @@ 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='332c30396378ca01a91004829f85d3b4a0e9b517', goal='revert')[0:4,0:3]. +Recording autofilled block MergeState('reverted', tip1='reverted', tip2='ba29f4107304aa9caee1112d0ec23586862a6fdf', goal='revert')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-revert.html 0 3 @@ -10238,7 +11123,7 @@ *??. 2 - *... | - 332c30396378ca01a91004829f85d3b4a0e9b517 + ba29f4107304aa9caee1112d0ec23586862a6fdf 0 3 | | @@ -10246,7 +11131,7 @@ *??| 2 - *--+ | - 332c30396378ca01a91004829f85d3b4a0e9b517 + ba29f4107304aa9caee1112d0ec23586862a6fdf Key: |,-,+ = rectangles forming current merge frontier @@ -10260,10 +11145,10 @@ + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b + local refname=reverted + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b -+ git rev-parse reverted^{tree} +++ git rev-parse 'reverted^{tree}' + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b - py313: OK (268.89=setup[1.39]+cmd[12.54,179.92,32.08,12.15,26.84,3.96] seconds) - congratulations :) (269.01 seconds) + py313: OK (134.51=setup[1.39]+cmd[4.59,73.59,27.00,9.94,16.49,1.50] seconds) + congratulations :) (134.60 seconds) create-stamp debian/debhelper-build-stamp dh_testroot -O--buildsystem=pybuild dh_prep -O--buildsystem=pybuild @@ -10342,12 +11227,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: not including original source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/1907971/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/2960561 and its subdirectories -I: Current time: Thu Sep 10 11:16:52 -12 2026 -I: pbuilder-time-stamp: 1789082212 +I: removing directory /srv/workspace/pbuilder/1907971 and its subdirectories +I: Current time: Sat Aug 9 06:56:59 +14 2025 +I: pbuilder-time-stamp: 1754672219