Diff of the two buildlogs: -- --- b1/build.log 2024-10-20 22:45:47.613310785 +0000 +++ b2/build.log 2024-10-20 22:52:59.985913721 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sun Oct 20 10:42:55 -12 2024 -I: pbuilder-time-stamp: 1729464175 +I: Current time: Sun Nov 23 19:08:47 +14 2025 +I: pbuilder-time-stamp: 1763874527 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz] I: copying local configuration @@ -28,54 +28,86 @@ 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/57592/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/124362/tmp/hooks/D01_modify_environment starting +debug: Running on ionos16-i386. +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 Nov 23 05:08 /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/124362/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/124362/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='i386' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=11 ' - DISTRIBUTION='trixie' - HOME='/root' - HOST_ARCH='i386' + 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]="32" [3]="1" [4]="release" [5]="i686-pc-linux-gnu") + BASH_VERSION='5.2.32(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=i386 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=21 ' + DIRSTACK=() + DISTRIBUTION=trixie + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=i686 + HOST_ARCH=i386 IFS=' ' - INVOCATION_ID='1ef8c3cd46474e0595d7a0de7a8e4c65' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - LD_LIBRARY_PATH='/usr/lib/libeatmydata' - LD_PRELOAD='libeatmydata.so' - 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='57592' - PS1='# ' - PS2='> ' + INVOCATION_ID=bb4cf7d4683b414c874a00a448b23af0 + LANG=C + LANGUAGE=de_CH:de + LC_ALL=C + LD_LIBRARY_PATH=/usr/lib/libeatmydata + LD_PRELOAD=libeatmydata.so + MACHTYPE=i686-pc-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=124362 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.D4So3XVH/pbuilderrc_6tCp --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.D4So3XVH/b1 --logfile b1/build.log git-imerge_1.2.0-5.dsc' - SUDO_GID='112' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://46.16.76.132: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.D4So3XVH/pbuilderrc_7e6v --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.D4So3XVH/b2 --logfile b2/build.log git-imerge_1.2.0-5.dsc' + SUDO_GID=112 + SUDO_UID=107 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://213.165.73.152:3128 I: uname -a - Linux ionos2-i386 6.1.0-26-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.112-1 (2024-09-30) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-26-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.112-1 (2024-09-30) x86_64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Aug 4 21:30 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/57592/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Aug 4 2024 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/124362/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -229,7 +261,7 @@ Get: 100 http://deb.debian.org/debian trixie/main i386 python3-virtualenv all 20.26.6+ds-1 [71.1 kB] Get: 101 http://deb.debian.org/debian trixie/main i386 python3-wheel all 0.44.0-2 [53.4 kB] Get: 102 http://deb.debian.org/debian trixie/main i386 tox all 4.23.0-1 [393 kB] -Fetched 48.1 MB in 1s (43.7 MB/s) +Fetched 48.1 MB in 1s (86.1 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.12-minimal:i386. (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 ... 19786 files and directories currently installed.) @@ -574,8 +606,8 @@ Setting up tzdata (2024a-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Sun Oct 20 22:43:35 UTC 2024. -Universal Time is now: Sun Oct 20 22:43:35 UTC 2024. +Local time is now: Sun Nov 23 05:09:12 UTC 2025. +Universal Time is now: Sun Nov 23 05:09:12 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -673,7 +705,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/124362/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for trixie +I: user script /srv/workspace/pbuilder/124362/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 @@ -765,21 +801,21 @@ I: pybuild base:311: cd /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.12/build; tox -c /build/reproducible-path/git-imerge-1.2.0/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --installpkg /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.12/git_imerge-1.2.0-py3-none-any.whl py312: install_package .pybuild/cpython3_3.12/build> python -I -m pip install --force-reinstall --no-deps /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.12/git_imerge-1.2.0-py3-none-any.whl py312: commands[0] .pybuild/cpython3_3.12/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 @@ -793,11 +829,11 @@ 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 -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.email luser@example.com 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 + cd /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted @@ -811,147 +847,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 -+ 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 -[a f6520bf] a⇒6 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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 -[b 853ee68] b⇒2 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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 @@ -1008,54 +1085,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: Sun Oct 20 22:44:07 2024 +0000 +# Date: Sun Nov 23 05:11:04 2025 +0000 # # On branch a-b-merge # Changes to be committed: # modified: b.txt # -[a-b-merge 9fa321b] Merge b into a (using imerge) - Date: Sun Oct 20 22:44:07 2024 +0000 +[a-b-merge a15ffe8] Merge b into a (using imerge) + Date: Sun Nov 23 05:11:04 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 @@ -1139,13 +1217,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 py312: commands[1] .pybuild/cpython3_3.12/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 @@ -1153,13 +1231,13 @@ + 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 @@ -1174,9 +1252,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -1191,14 +1269,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 @@ -1206,168 +1286,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_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 @@ -1449,7 +1589,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 | | | @@ -1507,10 +1647,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 b82dfe0] imerge 'c-d': manual merge 4-3 +[imerge/c-d 47f1986] 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. @@ -1563,55 +1703,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: Sun Oct 20 22:44:13 2024 +0000 +# Date: Sun Nov 23 05:11:16 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge a7d4bd3] Merge d into c (using imerge) - Date: Sun Oct 20 22:44:13 2024 +0000 +[c-d-merge 97fcbae] Merge d into c (using imerge) + Date: Sun Nov 23 05:11:16 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 @@ -1649,7 +1790,7 @@ Attempting to merge 8-2...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. -Previous HEAD position was 5849636 imerge 'c-d': automatic merge 9-2 +Previous HEAD position was a58a787 imerge 'c-d': automatic merge 9-2 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -1674,7 +1815,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 | | | @@ -1708,9 +1849,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: @@ -1732,8 +1874,8 @@ # modified: conflict.txt # modified: d.txt # +[imerge/c-d c88315d] imerge 'c-d': manual merge 4-3 + git-imerge continue --edit -[imerge/c-d c261c1b] imerge 'c-d': manual merge 4-3 Merge has been recorded for merge 4-3. Attempting to merge 4-4...success. Attempting to merge 4-5...success. @@ -1796,18 +1938,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 @@ -1822,9 +1964,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 @@ -1839,14 +1981,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 @@ -1854,168 +1998,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 -+ 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 -+ 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 @@ -2063,7 +2267,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 | | | @@ -2121,10 +2325,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 2f47a03] imerge 'c-d': manual merge 1-1 +[imerge/c-d 3cb23a2] 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. @@ -2184,61 +2388,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: Sun Oct 20 22:44:20 2024 +0000 +# Date: Sun Nov 23 05:11:25 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 10ae0e4] Merge d into c (using imerge) - Date: Sun Oct 20 22:44:20 2024 +0000 +[c-d-merge a45eb83] Merge d into c (using imerge) + Date: Sun Nov 23 05:11:25 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...conflict. Switched to branch 'imerge/c-d' Auto-merging conflict.txt @@ -2264,7 +2469,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 | | | @@ -2298,9 +2503,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: @@ -2322,7 +2528,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 1571836] imerge 'c-d': manual merge 1-1 +[imerge/c-d d054aa9] imerge 'c-d': manual merge 1-1 + git-imerge continue --edit Merge has been recorded for merge 1-1. Attempting to merge 1-2...success. @@ -2416,18 +2622,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 @@ -2442,9 +2648,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 @@ -2459,183 +2665,245 @@ + 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 checkout -b c master -- ++ 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 create mode 100644 conflict.txt 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 -[c 7050a8a] 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 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 -+ 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 @@ -2708,7 +2976,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 | | | @@ -2744,11 +3012,11 @@ + git-imerge continue --edit Switched to branch 'imerge/c-d' - -Original first commit: Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. + +Original first commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 @@ -2756,20 +3024,20 @@ c⇒9 Original second commit: - -There was a conflict merging commit 9-1, shown above. -Please resolve the conflict, commit the result, then type - - git-imerge continue commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 -+ echo merged version + +There was a conflict merging commit 9-1, shown above. +Please resolve the conflict, commit the result, then type + + git-imerge continue ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d ff0cca1] imerge 'c-d': manual merge 9-1 +[imerge/c-d 461d466] 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. @@ -2812,55 +3080,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: Sun Oct 20 22:44:27 2024 +0000 +# Date: Sun Nov 23 05:11:37 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge e15f52f] Merge d into c (using imerge) - Date: Sun Oct 20 22:44:27 2024 +0000 +[c-d-merge e387bc7] Merge d into c (using imerge) + Date: Sun Nov 23 05:11:37 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 @@ -2940,7 +3209,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 | | | @@ -2974,9 +3243,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: @@ -2998,7 +3268,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 3391a44] imerge 'c-d': manual merge 9-1 +[imerge/c-d 43d8946] imerge 'c-d': manual merge 9-1 + git-imerge continue --edit Merge has been recorded for merge 9-1. Attempting to merge 9-2...success. @@ -3044,19 +3314,19 @@ + 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}' Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/ + 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 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 @@ -3070,9 +3340,9 @@ 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 ++ 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 @@ -3087,14 +3357,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 @@ -3102,168 +3374,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 -[c 2120f40] c⇒1 - 2 files changed, 2 insertions(+), 2 deletions(-) -+ 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 -[c 90cc7de] c⇒2 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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 -+ 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 -+ 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_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 @@ -3304,8 +3636,8 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ git-imerge autofill + tee autofill.out ++ git-imerge autofill Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. @@ -3331,10 +3663,10 @@ Attempting automerge of 9-6...failure. Attempting automerge of 1-6...failure. HEAD is now at 243e8ed c⇒9 -Conflict; suggest manual merge of 1-6 + grep -q Traceback autofill.out -+ grep -q suggest manual merge of 1-6 autofill.out ++ grep -q 'suggest manual merge of 1-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html +Conflict; suggest manual merge of 1-6 0 5 9 | | | 0 - ********** - c @@ -3381,20 +3713,20 @@ c⇒1 Original second commit: - -There was a conflict merging commit 1-6, shown above. -Please resolve the conflict, commit the result, then type - - git-imerge continue commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 d⇒6 -+ echo merged version + +There was a conflict merging commit 1-6, shown above. +Please resolve the conflict, commit the result, then type + + git-imerge continue ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d e869f7d] imerge 'c-d': manual merge 1-6 +[imerge/c-d 6bd7204] 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. @@ -3440,55 +3772,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: Sun Oct 20 22:44:36 2024 +0000 +# Date: Sun Nov 23 05:11:51 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge cf552a2] Merge d into c (using imerge) - Date: Sun Oct 20 22:44:36 2024 +0000 +[c-d-merge 95c5a6a] Merge d into c (using imerge) + Date: Sun Nov 23 05:11:51 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 @@ -3541,7 +3874,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was a8ea7a1 imerge 'c-d': automatic merge 9-5 +Previous HEAD position was 35cda22 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -3566,7 +3899,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 | | | @@ -3600,9 +3933,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: @@ -3625,7 +3959,7 @@ # modified: d.txt # + git-imerge continue --edit -[imerge/c-d e330d6f] imerge 'c-d': manual merge 1-6 +[imerge/c-d 538e5ad] 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. @@ -3673,18 +4007,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-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 @@ -3699,9 +4033,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -3716,14 +4050,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 @@ -3731,173 +4067,233 @@ 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 -+ 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 -[d f7e451a] d⇒6 - 2 files changed, 2 insertions(+), 2 deletions(-) ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d +[d f7e451a] d⇒6 + 2 files changed, 2 insertions(+), 2 deletions(-) + git-imerge list * c-d + git-imerge diagram --commits --frontier --html=imerge0.html @@ -3973,7 +4369,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 | | | @@ -4031,10 +4427,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 e04fc08] imerge 'c-d': manual merge 9-6 +[imerge/c-d ceae48d] 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 @@ -4070,61 +4466,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: Sun Oct 20 22:44:43 2024 +0000 +# Date: Sun Nov 23 05:12:10 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 64c5d2f] Merge d into c (using imerge) - Date: Sun Oct 20 22:44:43 2024 +0000 +[c-d-merge 210d4be] Merge d into c (using imerge) + Date: Sun Nov 23 05:12:10 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. @@ -4203,7 +4600,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 | | | @@ -4237,9 +4634,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: @@ -4261,7 +4659,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 5a9caed] imerge 'c-d': manual merge 9-6 +[imerge/c-d 84ba19b] imerge 'c-d': manual merge 9-6 + git-imerge continue --edit Merge has been recorded for merge 9-6. Merge is complete! @@ -4302,18 +4700,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-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 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 @@ -4328,9 +4726,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -4345,185 +4743,247 @@ + 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 -[master (root-commit) d70e04b] m⇒0 - 3 files changed, 3 insertions(+) - create mode 100644 c.txt - create mode 100644 conflict.txt - create mode 100644 d.txt ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' + 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 +[master (root-commit) d70e04b] m⇒0 + 3 files changed, 3 insertions(+) + create mode 100644 c.txt + create mode 100644 conflict.txt + create mode 100644 d.txt ++ 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 -+ 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 -+ TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) +[d 69efde8] d⇒2 + 2 files changed, 2 insertions(+), 2 deletions(-) +[d 3169557] d⇒3 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ 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\342\207\2221' ++ for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + 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⇒2 ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 -[d 69efde8] d⇒2 - 2 files changed, 2 insertions(+), 2 deletions(-) ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' ++ 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 3169557] d⇒3 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' ++ 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 -+ TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 [d 1700773] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) +[d df2e493] d⇒6 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ 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\342\207\2225' ++ 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 -[d df2e493] d⇒6 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' + git checkout c Switched to branch 'c' + git-imerge init --name=c-d d @@ -4562,8 +5022,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...failure. @@ -4585,7 +5045,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 | | | @@ -4624,29 +5084,29 @@ Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt Automatic merge failed; fix conflicts and then commit the result. - -Original first commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 - -Original second commit: commit 69efde8f66d581a765a3909ffacb9f895f95c345 Author: Loú User Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 +Original first commit: + +Original second commit: + There was a conflict merging commit 1-2, shown above. Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d c564c2f] imerge 'c-d': manual merge 1-2 +[imerge/c-d 7d069f3] 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. @@ -4704,61 +5164,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: Sun Oct 20 22:44:49 2024 +0000 +# Date: Sun Nov 23 05:12:30 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 60d5a81] Merge d into c (using imerge) - Date: Sun Oct 20 22:44:49 2024 +0000 +[c-d-merge 1b888d7] Merge d into c (using imerge) + Date: Sun Nov 23 05:12:30 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...conflict. Attempting to merge 2-1...success. @@ -4769,7 +5230,7 @@ Attempting to merge 7-1...success. Attempting to merge 8-1...success. Attempting to merge 9-1...success. -Previous HEAD position was a8d2eef imerge 'c-d': automatic merge 9-1 +Previous HEAD position was 228087c imerge 'c-d': automatic merge 9-1 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -4794,7 +5255,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 | | | @@ -4828,9 +5289,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: @@ -4852,7 +5314,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 77de5f1] imerge 'c-d': manual merge 1-2 +[imerge/c-d e1b7ce8] 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. @@ -4937,18 +5399,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-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 @@ -4963,9 +5425,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -4980,183 +5442,245 @@ + 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 create mode 100644 conflict.txt create mode 100644 d.txt + git checkout -b c master -- +[c 89e2141] c⇒1 + 1 file changed, 1 insertion(+), 1 deletion(-) 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 -[c 89e2141] c⇒1 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' ++ 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 @@ -5234,10 +5758,10 @@ Attempting automerge of 9-6...failure. Attempting automerge of 9-5...failure. HEAD is now at 73a5eed c⇒9 -Conflict; suggest manual merge of 9-5 + grep -q Traceback autofill.out -+ grep -q suggest manual merge of 9-5 autofill.out ++ grep -q 'suggest manual merge of 9-5' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html +Conflict; suggest manual merge of 9-5 0 5 9 | | | 0 - ********** - c @@ -5294,10 +5818,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 fa9d62a] imerge 'c-d': manual merge 9-5 +[imerge/c-d a2a6514] 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. @@ -5336,55 +5860,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: Sun Oct 20 22:44:55 2024 +0000 +# Date: Sun Nov 23 05:12:45 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 513ec3f] Merge d into c (using imerge) - Date: Sun Oct 20 22:44:55 2024 +0000 +[c-d-merge 33836da] Merge d into c (using imerge) + Date: Sun Nov 23 05:12:45 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 @@ -5468,7 +5993,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 | | | @@ -5502,9 +6027,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: @@ -5526,7 +6052,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 44edeb1] imerge 'c-d': manual merge 9-5 +[imerge/c-d 9da9010] 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. @@ -5568,18 +6094,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 @@ -5594,9 +6120,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -5611,14 +6137,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 @@ -5626,168 +6154,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 -+ 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 -[c ea32d81] c⇒7 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' ++ for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 +[c ea32d81] c⇒7 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ 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 -+ 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 d8d80cf] 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 -+ 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 -[d 40fef44] d⇒4 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' ++ 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 -[d b080a65] d⇒5 - 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' ++ for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt -+ commit -m d⇒6 +[d 40fef44] d⇒4 + 1 file changed, 1 insertion(+), 1 deletion(-) +[d b080a65] d⇒5 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ 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 @@ -5856,7 +6444,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 | | | @@ -5902,22 +6490,22 @@ Date: Thu Apr 7 22:13:19 2005 +0000 c⇒5 - -Original second commit: commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 +Original second commit: + There was a conflict merging commit 5-1, shown above. Please resolve the conflict, commit the result, then type git-imerge continue -+ echo merged version ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 606d6ad] imerge 'c-d': manual merge 5-1 +[imerge/c-d 75974b6] 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. @@ -5973,55 +6561,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: Sun Oct 20 22:45:01 2024 +0000 +# Date: Sun Nov 23 05:13:18 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 661121e] Merge d into c (using imerge) - Date: Sun Oct 20 22:45:01 2024 +0000 +[c-d-merge d32765a] Merge d into c (using imerge) + Date: Sun Nov 23 05:13:18 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 @@ -6077,7 +6666,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 | | | @@ -6111,9 +6700,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: @@ -6135,7 +6725,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 7cf6c35] imerge 'c-d': manual merge 5-1 +[imerge/c-d 07c6985] imerge 'c-d': manual merge 5-1 + git-imerge continue --edit Merge has been recorded for merge 5-1. Attempting to merge 5-2...success. @@ -6205,18 +6795,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 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 @@ -6231,9 +6821,9 @@ 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 @@ -6248,183 +6838,245 @@ + 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\342\207\2220' ++ TIME=1112911994 ++ 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 create mode 100644 conflict.txt create mode 100644 d.txt -+ commit -m m⇒0 -+ TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ 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 -[c 7c431f2] c⇒2 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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 -[c f02ab24] c⇒3 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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_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_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 @@ -6508,7 +7160,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 | | | @@ -6566,10 +7218,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 a6deb26] imerge 'c-d': manual merge 6-6 +[imerge/c-d 4c0f2b5] 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. @@ -6610,55 +7262,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: Sun Oct 20 22:45:08 2024 +0000 +# Date: Sun Nov 23 05:13:42 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge e4e0337] Merge d into c (using imerge) - Date: Sun Oct 20 22:45:08 2024 +0000 +[c-d-merge ebb858b] Merge d into c (using imerge) + Date: Sun Nov 23 05:13:42 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 @@ -6716,7 +7369,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was 8a8d960 imerge 'c-d': automatic merge 9-5 +Previous HEAD position was f5049fd imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -6741,7 +7394,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 | | | @@ -6775,9 +7428,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: @@ -6799,8 +7453,8 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d cdaf450] imerge 'c-d': manual merge 6-6 + git-imerge continue --edit +[imerge/c-d 13f0f7d] 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. @@ -6843,27 +7497,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 py312: commands[2] .pybuild/cpython3_3.12/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 + 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: @@ -6874,10 +7529,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/really-conflicted/.git/ -+ 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 @@ -6892,50 +7546,43 @@ + 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 -+ filename=conflict6.txt -+ text=original version -+ echo original version -+ git add conflict6.txt -+ modify conflict7.txt original version -+ filename=conflict7.txt -+ text=original version -+ echo original version -+ git add conflict7.txt -+ commit -m m⇒0 -+ TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 [master (root-commit) 8e21fbd] m⇒0 10 files changed, 10 insertions(+) create mode 100644 c.txt @@ -6948,6 +7595,23 @@ create mode 100644 conflict6.txt create mode 100644 conflict7.txt create mode 100644 d.txt ++ for i in $(seq 0 7) ++ modify conflict6.txt 'original version' ++ filename=conflict6.txt ++ text='original version' ++ echo 'original version' ++ git add conflict6.txt ++ for i in $(seq 0 7) ++ modify conflict7.txt 'original version' ++ filename=conflict7.txt ++ text='original version' ++ echo 'original version' ++ git add conflict7.txt ++ commit -m $'m\342\207\2220' ++ TIME=1112911994 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' + git checkout -b c master -- Switched to a new branch 'c' + modify c.txt 1 @@ -6955,19 +7619,21 @@ + 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 @@ -6975,9 +7641,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 @@ -6985,9 +7653,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 @@ -6995,14 +7665,16 @@ + 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 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [c a891793] c⇒4 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 5 @@ -7010,19 +7682,21 @@ + text=5 + echo 5 + git add c.txt -+ modify conflict3.txt c version ++ 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 @@ -7030,14 +7704,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 @@ -7045,14 +7721,16 @@ + 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 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [c c0e1537] c⇒7 2 files changed, 2 insertions(+), 2 deletions(-) + modify c.txt 8 @@ -7060,9 +7738,11 @@ + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 ++ 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 @@ -7070,16 +7750,16 @@ + 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 -[c ccbfccb] c⇒9 - 2 files changed, 2 insertions(+), 2 deletions(-) ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' + git checkout -b d master -- Switched to a new branch 'd' + modify d.txt 1 @@ -7087,19 +7767,23 @@ + text=1 + echo 1 + git add d.txt -+ modify conflict0.txt d version +[c ccbfccb] c⇒9 + 2 files changed, 2 insertions(+), 2 deletions(-) ++ 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 @@ -7107,19 +7791,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 @@ -7127,9 +7813,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 @@ -7137,9 +7825,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 @@ -7147,14 +7837,16 @@ + 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 @@ -7162,14 +7854,16 @@ + text=6 + echo 6 + git add d.txt -+ 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 @@ -7177,14 +7871,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 @@ -7192,14 +7888,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 @@ -7295,26 +7993,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 + git-imerge continue --no-edit + tee autofill.out -[imerge/c-d 8c7d7bf] imerge 'c-d': manual merge 1-1 +[imerge/c-d 64392d6] 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. @@ -7357,6 +8063,8 @@ Attempting automerge of 4-5...failure. Attempting automerge of 4-2...failure. Attempting automerge of 9-1...failure. ++ grep -q Traceback autofill.out ++ git-imerge diagram --frontier Attempting automerge of 5-1...failure. Previous HEAD position was c21441d c⇒5 Switched to branch 'imerge/c-d' @@ -7382,8 +8090,6 @@ Please resolve the conflict, commit the result, then type git-imerge continue -+ grep -q Traceback autofill.out -+ git-imerge diagram --frontier 0 5 9 | | | 0 - ********** - c @@ -7406,26 +8112,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 5358832] imerge 'c-d': manual merge 1-6 ++ git-imerge continue --no-edit +[imerge/c-d 2cefc71] 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. @@ -7442,12 +8156,12 @@ Warning: you are leaving 1 commit behind, not connected to any of your branches: - a34ec6d imerge 'c-d': automatic merge 3-8 + 98f19e6 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 a34ec6d + git branch 98f19e6 Switched to branch 'imerge/c-d' Auto-merging conflict1.txt @@ -7496,26 +8210,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 + git-imerge continue --no-edit + tee autofill.out -[imerge/c-d f544118] imerge 'c-d': manual merge 4-2 +[imerge/c-d 159bf16] 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. @@ -7525,7 +8247,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 b6a8604 imerge 'c-d': automatic merge 4-8 +Previous HEAD position was 699b3bf imerge 'c-d': automatic merge 4-8 Switched to branch 'imerge/c-d' Auto-merging conflict6.txt CONFLICT (content): Merge conflict in conflict6.txt @@ -7573,26 +8295,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 2728541] imerge 'c-d': manual merge 5-1 +[imerge/c-d 9a6c5ed] 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. @@ -7627,7 +8357,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 58bff91 imerge 'c-d': automatic merge 7-1 +Previous HEAD position was 72fbf1b imerge 'c-d': automatic merge 7-1 Switched to branch 'imerge/c-d' Auto-merging conflict3.txt CONFLICT (content): Merge conflict in conflict3.txt @@ -7675,26 +8405,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 + git-imerge continue --no-edit + tee autofill.out -[imerge/c-d 3da3a25] imerge 'c-d': manual merge 5-5 +[imerge/c-d d4d0c17] 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. @@ -7757,31 +8495,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 + git-imerge continue --no-edit + tee autofill.out -[imerge/c-d 0d98787] imerge 'c-d': manual merge 6-7 +[imerge/c-d 3f5467e] 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 1bada60 imerge 'c-d': automatic merge 6-8 +Previous HEAD position was 722fb79 imerge 'c-d': automatic merge 6-8 Switched to branch 'imerge/c-d' Auto-merging conflict2.txt CONFLICT (content): Merge conflict in conflict2.txt @@ -7829,26 +8575,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 + git-imerge continue --no-edit + tee autofill.out -[imerge/c-d 16d389a] imerge 'c-d': manual merge 7-2 +[imerge/c-d df51cc9] 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. @@ -7930,26 +8684,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 + git-imerge continue --no-edit + tee autofill.out -[imerge/c-d 2ae26e5] imerge 'c-d': manual merge 9-8 +[imerge/c-d 42f0660] imerge 'c-d': manual merge 9-8 Merge has been recorded for merge 9-8. Merge is complete! + grep -q Traceback autofill.out @@ -7976,20 +8738,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 + 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: Sun Oct 20 22:45:19 2024 +0000 +# Date: Sun Nov 23 05:14:23 2025 +0000 # # On branch c-d-merge # Changes to be committed: @@ -8003,60 +8766,60 @@ # modified: conflict7.txt # modified: d.txt # -[c-d-merge 2f96327] Merge d into c (using imerge) - Date: Sun Oct 20 22:45:19 2024 +0000 +[c-d-merge 58e8c86] Merge d into c (using imerge) + Date: Sun Nov 23 05:14:23 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 py312: commands[3] .pybuild/cpython3_3.12/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 @@ -8071,9 +8834,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -8083,86 +8846,109 @@ + 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 -+ 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' -+ 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' [b a4b2c2b] a⇒3 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 4) + modify a.txt 4 + filename=a.txt + text=4 + echo 4 + git add a.txt -+ commit -m a⇒4 on branch b ++ 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 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m 'a⇒4 on branch b' [b 5b24553] a⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 @@ -8237,54 +9023,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: Sun Oct 20 22:45:22 2024 +0000 +# Date: Sun Nov 23 05:14:41 2025 +0000 # # On branch a-b-merge # Changes to be committed: # modified: a.txt # -[a-b-merge 3239b3e] Merge b into a (using imerge) - Date: Sun Oct 20 22:45:22 2024 +0000 +[a-b-merge e7ef3a8] Merge b into a (using imerge) + Date: Sun Nov 23 05:14:41 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' @@ -8337,26 +9124,27 @@ + 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 py312: commands[4] .pybuild/cpython3_3.12/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 @@ -8371,9 +9159,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -8383,72 +9171,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 [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m 'a⇒1 on branch a' ++ for i in 1 2 3 + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt -+ commit -m a⇒2 on branch a ++ 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 = 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 @@ -8456,36 +9259,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 -+ 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 @@ -8557,12 +9368,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 0f1f459] imerge 'b': manual merge 1-1 +[imerge/b 0dc0530] 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. @@ -8570,7 +9381,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 e6178a6 imerge 'b': automatic merge 3-1 +Previous HEAD position was d8b0193 imerge 'b': automatic merge 3-1 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -8623,12 +9434,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 e46310c] imerge 'b': manual merge 1-2 ++ tee imerge-b-into-a-1-3.out +[imerge/b ebf6ecd] imerge 'b': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting automerge of 1-4...success. Autofilling 1-3...success. @@ -8643,7 +9454,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 | | @@ -8673,20 +9484,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: Sun Oct 20 22:45:26 2024 +0000 +# Date: Sun Nov 23 05:14:57 2025 +0000 # # On branch b-into-a-1 # Changes to be committed: # new file: b.txt # -[b-into-a-1 b584519] Merge b into a (using imerge) - Date: Sun Oct 20 22:45:26 2024 +0000 +[b-into-a-1 8d5f075] Merge b into a (using imerge) + Date: Sun Nov 23 05:14:57 2025 +0000 + test_merge a-into-b-1 b a 1-1 2-1 + local name=a-into-b-1 + local dst=b @@ -8751,12 +9563,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 + git-imerge continue --no-edit + tee imerge-a-into-b-1-2.out -[imerge/a 7416319] imerge 'a': manual merge 1-1 +[imerge/a 9752fd3] imerge 'a': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-3...success. Autofilling 1-2...success. @@ -8814,12 +9626,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 -+ + tee imerge-a-into-b-1-3.outgit-imerge - continue --no-edit -[imerge/a 9afedc4] imerge 'a': manual merge 2-1 ++ git-imerge continue --no-edit ++ tee imerge-a-into-b-1-3.out +[imerge/a 209d6dd] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -8834,7 +9646,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 | | @@ -8862,30 +9674,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: Sun Oct 20 22:45:31 2024 +0000 +# Date: Sun Nov 23 05:15:03 2025 +0000 # # On branch a-into-b-1 # Changes to be committed: # modified: a.txt # -[a-into-b-1 e0ec6bb] Merge a into b (using imerge) - Date: Sun Oct 20 22:45:31 2024 +0000 +[a-into-b-1 4c01a19] Merge a into b (using imerge) + Date: Sun Nov 23 05:15:03 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 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 @@ -8900,9 +9714,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git/ -+ echo git-imerge test repository with a commit and its revert at n=2 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/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 @@ -8912,85 +9726,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' [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 [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m 'a⇒2 on branch a' ++ 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' ++ git checkout -b b master -- [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 ++ 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 = 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 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m 'b⇒2 and a⇒X on branch b' [b 48df77d] b⇒2 and a⇒X on branch b 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in 1 2 3 4 + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt -+ msg=b⇒3 ++ msg=$'b\342\207\2223' + test 3 = 2 + test 3 = 3 + modify a.txt 0 @@ -8998,23 +9830,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 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m 'b⇒3 and a⇒0 on branch b' [b f3ef019] b⇒3 and a⇒0 on branch b 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in 1 2 3 4 + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt -+ msg=b⇒4 ++ 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 @@ -9100,12 +9937,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 5a65b51] imerge 'b': manual merge 1-2 +[imerge/b 99038b3] 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. @@ -9113,7 +9950,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 dcf8b41 imerge 'b': automatic merge 3-2 +Previous HEAD position was 7b48a79 imerge 'b': automatic merge 3-2 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9166,12 +10003,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 + git-imerge continue --no-edit + tee imerge-b-into-a-2-3.out -[imerge/b 381240e] imerge 'b': manual merge 1-3 +[imerge/b e85fb15] imerge 'b': manual merge 1-3 Merge has been recorded for merge 1-3. Attempting automerge of 1-4...success. Autofilling 1-4...success. @@ -9184,7 +10021,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 | | @@ -9214,20 +10051,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: Sun Oct 20 22:45:34 2024 +0000 +# Date: Sun Nov 23 05:15:08 2025 +0000 # # On branch b-into-a-2 # Changes to be committed: # new file: b.txt # -[b-into-a-2 6b8f481] Merge b into a (using imerge) - Date: Sun Oct 20 22:45:34 2024 +0000 +[b-into-a-2 2cb2ecf] Merge b into a (using imerge) + Date: Sun Nov 23 05:15:08 2025 +0000 + test_merge a-into-b-2 b a 2-1 3-1 + local name=a-into-b-2 + local dst=b @@ -9297,12 +10135,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 a983362] imerge 'a': manual merge 2-1 +[imerge/a e865a68] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -9360,12 +10198,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 + git-imerge continue --no-edit + tee imerge-a-into-b-2-3.out -[imerge/a 908d895] imerge 'a': manual merge 3-1 +[imerge/a 6831b5d] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9377,7 +10215,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 | | @@ -9405,30 +10243,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: Sun Oct 20 22:45:36 2024 +0000 +# Date: Sun Nov 23 05:15:14 2025 +0000 # # On branch a-into-b-2 # Changes to be committed: # modified: a.txt # -[a-into-b-2 41479f8] Merge a into b (using imerge) - Date: Sun Oct 20 22:45:36 2024 +0000 +[a-into-b-2 fe9d1e5] Merge a into b (using imerge) + Date: Sun Nov 23 05:15:14 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 @@ -9442,10 +10282,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 @@ -9455,98 +10295,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 -+ 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 -+ msg=b⇒4 ++ msg=$'b\342\207\2224' + test 4 = 3 + test 4 = 4 + modify a.txt 0 @@ -9554,10 +10415,12 @@ + 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 @@ -9649,12 +10512,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 03f24ad] imerge 'b': manual merge 1-3 ++ tee imerge-b-into-a-3-2.out +[imerge/b 5a2a0c8] 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. @@ -9662,7 +10525,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 a453efd imerge 'b': automatic merge 3-3 +Previous HEAD position was 6b51cd9 imerge 'b': automatic merge 3-3 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9715,19 +10578,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 + git-imerge continue --no-edit + tee imerge-b-into-a-3-3.out -[imerge/b 87f9754] imerge 'b': manual merge 1-4 +[imerge/b 4e8e932] 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 | | @@ -9757,20 +10620,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: Sun Oct 20 22:45:37 2024 +0000 +# Date: Sun Nov 23 05:15:18 2025 +0000 # # On branch b-into-a-3 # Changes to be committed: # new file: b.txt # -[b-into-a-3 9f9acce] Merge b into a (using imerge) - Date: Sun Oct 20 22:45:37 2024 +0000 +[b-into-a-3 188aced] Merge b into a (using imerge) + Date: Sun Nov 23 05:15:18 2025 +0000 + test_merge a-into-b-3 b a 3-1 4-1 + local name=a-into-b-3 + local dst=b @@ -9844,12 +10708,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 2f4fb7a] imerge 'a': manual merge 3-1 ++ tee imerge-a-into-b-3-2.out ++ git-imerge continue --no-edit +[imerge/a 4d1bb32] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9907,19 +10771,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 + git-imerge continue --no-edit + tee imerge-a-into-b-3-3.out -[imerge/a 046fce6] imerge 'a': manual merge 4-1 +[imerge/a b37d606] 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 | | @@ -9947,36 +10811,37 @@ @ = 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: Sun Oct 20 22:45:39 2024 +0000 +# Date: Sun Nov 23 05:15:35 2025 +0000 # # On branch a-into-b-3 # Changes to be committed: # modified: a.txt # -[a-into-b-3 8c8e9ee] Merge a into b (using imerge) - Date: Sun Oct 20 22:45:39 2024 +0000 +[a-into-b-3 ea29c0d] Merge a into b (using imerge) + Date: Sun Nov 23 05:15:35 2025 +0000 py312: commands[5] .pybuild/cpython3_3.12/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 @@ -9991,9 +10856,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -10003,76 +10868,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 @@ -10097,12 +10982,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD a7178e8] Revert "a3⇒3" - Date: Sun Oct 20 22:45:39 2024 +0000 +[detached HEAD 1d12072] Revert "a3⇒3" + Date: Sun Nov 23 05:15:36 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD ba77db5] Revert "a2⇒2" - Date: Sun Oct 20 22:45:39 2024 +0000 +[detached HEAD f196e34] Revert "a2⇒2" + Date: Sun Nov 23 05:15:36 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10112,7 +10997,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='ba77db59bdf49a3ed1c8d41417e8c0820187a48c', goal='drop')[0:4,0:3]. +Recording autofilled block MergeState('dropped', tip1='dropped', tip2='f196e345a5be3837a4b5ae2b2493ed101900a258', goal='drop')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-drop.html 0 3 @@ -10121,7 +11006,7 @@ *??. 2 - *... | - ba77db59bdf49a3ed1c8d41417e8c0820187a48c + f196e345a5be3837a4b5ae2b2493ed101900a258 0 3 | | @@ -10129,7 +11014,7 @@ *??| 2 - *--+ | - ba77db59bdf49a3ed1c8d41417e8c0820187a48c + f196e345a5be3837a4b5ae2b2493ed101900a258 Key: |,-,+ = rectangles forming current merge frontier @@ -10143,7 +11028,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' @@ -10166,12 +11051,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD 401c40e] Revert "a3⇒3" - Date: Sun Oct 20 22:45:40 2024 +0000 +[detached HEAD a91cc41] Revert "a3⇒3" + Date: Sun Nov 23 05:15:39 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD 8c3b897] Revert "a2⇒2" - Date: Sun Oct 20 22:45:40 2024 +0000 +[detached HEAD dff5f3a] Revert "a2⇒2" + Date: Sun Nov 23 05:15:39 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10181,7 +11066,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='8c3b897f3f1a6ec8ecaca18481a8d78f25f80a4d', goal='revert')[0:4,0:3]. +Recording autofilled block MergeState('reverted', tip1='reverted', tip2='dff5f3a0639395c7bbb72c6852ed9dbfdf02fedb', goal='revert')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-revert.html 0 3 @@ -10190,7 +11075,7 @@ *??. 2 - *... | - 8c3b897f3f1a6ec8ecaca18481a8d78f25f80a4d + dff5f3a0639395c7bbb72c6852ed9dbfdf02fedb 0 3 | | @@ -10198,7 +11083,7 @@ *??| 2 - *--+ | - 8c3b897f3f1a6ec8ecaca18481a8d78f25f80a4d + dff5f3a0639395c7bbb72c6852ed9dbfdf02fedb Key: |,-,+ = rectangles forming current merge frontier @@ -10212,10 +11097,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 - py312: OK (98.93=setup[3.67]+cmd[5.97,61.80,8.35,3.03,14.83,1.28] seconds) - congratulations :) (99.23 seconds) + py312: OK (282.42=setup[5.05]+cmd[12.57,162.50,34.81,18.56,44.78,4.15] seconds) + congratulations :) (282.85 seconds) create-stamp debian/debhelper-build-stamp dh_testroot -O--buildsystem=pybuild dh_prep -O--buildsystem=pybuild @@ -10285,12 +11170,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/124362/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/124362/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/57592 and its subdirectories -I: Current time: Sun Oct 20 10:45:46 -12 2024 -I: pbuilder-time-stamp: 1729464346 +I: removing directory /srv/workspace/pbuilder/124362 and its subdirectories +I: Current time: Sun Nov 23 19:15:55 +14 2025 +I: pbuilder-time-stamp: 1763874955