Diff of the two buildlogs: -- --- b1/build.log 2025-01-20 14:52:04.699882434 +0000 +++ b2/build.log 2025-01-20 14:56:22.896319037 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Mon Jan 20 02:47:05 -12 2025 -I: pbuilder-time-stamp: 1737384425 +I: Current time: Tue Jan 21 04:52:13 +14 2025 +I: pbuilder-time-stamp: 1737384733 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz] I: copying local configuration @@ -24,52 +24,84 @@ dpkg-source: info: applying tox-4-pr-204.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/4655/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/1877/tmp/hooks/D01_modify_environment starting +debug: Running on virt32c. +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 Jan 20 14:52 /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/1877/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/1877/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='armhf' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 ' - DISTRIBUTION='trixie' - HOME='/root' - HOST_ARCH='armhf' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf") + BASH_VERSION='5.2.37(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=armhf + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 ' + DIRSTACK=() + DISTRIBUTION=trixie + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='f130f76f616844ec8dd6d46196926efa' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='4655' - PS1='# ' - PS2='> ' + INVOCATION_ID=2c95b3b343ec48f1917dcccd534d8e85 + LANG=C + LANGUAGE=it_CH:it + LC_ALL=C + MACHTYPE=arm-unknown-linux-gnueabihf + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnueabihf + 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=1877 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.Tz2kiNfN/pbuilderrc_F5yQ --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.Tz2kiNfN/b1 --logfile b1/build.log git-imerge_1.2.0-5.dsc' - SUDO_GID='113' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://10.0.0.15:3142/' + 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.Tz2kiNfN/pbuilderrc_jBOT --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.Tz2kiNfN/b2 --logfile b2/build.log git-imerge_1.2.0-5.dsc' + SUDO_GID=113 + SUDO_UID=107 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:3142/ I: uname -a - Linux virt64c 6.1.0-30-arm64 #1 SMP Debian 6.1.124-1 (2025-01-12) aarch64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-30-armmp-lpae #1 SMP Debian 6.1.124-1 (2025-01-12) armv7l GNU/Linux I: ls -l /bin lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/4655/tmp/hooks/D02_print_environment finished +I: user script /srv/workspace/pbuilder/1877/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -230,7 +262,7 @@ Get: 107 http://deb.debian.org/debian trixie/main armhf python3-virtualenv all 20.28.0+ds-1 [71.3 kB] Get: 108 http://deb.debian.org/debian trixie/main armhf python3-wheel all 0.45.1-1 [56.7 kB] Get: 109 http://deb.debian.org/debian trixie/main armhf tox all 4.23.0-1 [393 kB] -Fetched 45.7 MB in 1s (59.9 MB/s) +Fetched 45.7 MB in 1s (39.6 MB/s) Preconfiguring packages ... Selecting previously unselected package libpython3.12-minimal:armhf. (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 ... 19569 files and directories currently installed.) @@ -595,8 +627,8 @@ Setting up tzdata (2024b-6) ... Current default time zone: 'Etc/UTC' -Local time is now: Mon Jan 20 14:48:08 UTC 2025. -Universal Time is now: Mon Jan 20 14:48:08 UTC 2025. +Local time is now: Mon Jan 20 14:53:11 UTC 2025. +Universal Time is now: Mon Jan 20 14:53:11 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -702,7 +734,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/1877/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for trixie +I: user script /srv/workspace/pbuilder/1877/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 @@ -788,21 +824,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 @@ -817,9 +853,9 @@ hint: hint: git branch -m 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 ++ 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 @@ -834,147 +870,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 -+ commit -m a⇒7 ++ commit -m $'a\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'a\342\207\2227' [a 6797186] a⇒7 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 8) + modify a.txt 8 + filename=a.txt + text=8 + echo 8 + git add a.txt -+ commit -m a⇒8 ++ commit -m $'a\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'a\342\207\2228' [a 49643dd] a⇒8 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' -+ seq 5 +++ seq 5 ++ for i in $(seq 5) + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt -+ commit -m b⇒1 ++ commit -m $'b\342\207\2221' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'b\342\207\2221' [b d43305b] b⇒1 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 5) + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt -+ commit -m b⇒2 ++ commit -m $'b\342\207\2222' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'b\342\207\2222' [b 853ee68] b⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 5) + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt -+ commit -m b⇒3 ++ commit -m $'b\342\207\2223' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'b\342\207\2223' [b 03a2455] b⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 5) + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt -+ commit -m b⇒4 ++ commit -m $'b\342\207\2224' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'b\342\207\2224' [b 484ea85] b⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 5) + modify b.txt 5 + filename=b.txt + text=5 + echo 5 + git add b.txt -+ commit -m b⇒5 ++ commit -m $'b\342\207\2225' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'b\342\207\2225' [b e22cd97] b⇒5 1 file changed, 1 insertion(+), 1 deletion(-) + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42 @@ -1031,54 +1108,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: Mon Jan 20 14:48:58 2025 +0000 +# Date: Mon Jan 20 14:53:58 2025 +0000 # # On branch a-b-merge # Changes to be committed: # modified: b.txt # -[a-b-merge c9cb6a9] Merge b into a (using imerge) - Date: Mon Jan 20 14:48:58 2025 +0000 +[a-b-merge abee578] Merge b into a (using imerge) + Date: Mon Jan 20 14:53:58 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 @@ -1162,13 +1240,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 @@ -1176,17 +1254,16 @@ + test_conflict 4-3 + local conflict=4-3 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ DESCRIPTION=git-imerge test repository with conflict at 4-3 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 ++ DESCRIPTION='git-imerge test repository with conflict at 4-3' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ local description=git-imerge test repository with conflict at 4-3 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3 ++ local 'description=git-imerge test repository with conflict at 4-3' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ local description=git-imerge test repository with conflict at 4-3 ++ local 'description=git-imerge test repository with conflict at 4-3' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -1197,9 +1274,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 4-3 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/ ++ echo 'git-imerge test repository with conflict at 4-3' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 @@ -1214,14 +1292,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 @@ -1229,168 +1309,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 @@ -1472,7 +1612,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 | | | @@ -1530,10 +1670,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 869faea] imerge 'c-d': manual merge 4-3 +[imerge/c-d af2f062] 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. @@ -1586,55 +1726,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: Mon Jan 20 14:49:07 2025 +0000 +# Date: Mon Jan 20 14:54:07 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge ae15d28] Merge d into c (using imerge) - Date: Mon Jan 20 14:49:07 2025 +0000 +[c-d-merge 5140f8c] Merge d into c (using imerge) + Date: Mon Jan 20 14:54:07 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 @@ -1672,7 +1813,7 @@ Attempting to merge 8-2...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. -Previous HEAD position was 6700431 imerge 'c-d': automatic merge 9-2 +Previous HEAD position was 62c8315 imerge 'c-d': automatic merge 9-2 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -1697,7 +1838,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 | | | @@ -1731,9 +1872,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: @@ -1755,8 +1897,8 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d d009641] imerge 'c-d': manual merge 4-3 + git-imerge continue --edit +[imerge/c-d f6af166] 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. @@ -1819,18 +1961,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 @@ -1845,9 +1987,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 @@ -1862,14 +2004,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 @@ -1877,168 +2021,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 @@ -2086,7 +2290,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 | | | @@ -2144,10 +2348,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 310ee97] imerge 'c-d': manual merge 1-1 +[imerge/c-d cb14c4a] 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. @@ -2207,55 +2411,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: Mon Jan 20 14:49:16 2025 +0000 +# Date: Mon Jan 20 14:54:16 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge e45e788] Merge d into c (using imerge) - Date: Mon Jan 20 14:49:16 2025 +0000 +[c-d-merge 138aa0b] Merge d into c (using imerge) + Date: Mon Jan 20 14:54: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 @@ -2287,7 +2492,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 | | | @@ -2321,9 +2526,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: @@ -2345,8 +2551,8 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 7d1dab5] imerge 'c-d': manual merge 1-1 + git-imerge continue --edit +[imerge/c-d a339fe3] imerge 'c-d': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -2439,18 +2645,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 @@ -2464,10 +2670,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 9-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 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' + 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 @@ -2482,14 +2688,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 @@ -2497,168 +2705,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [c 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒9 ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒1 ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [d ac0427a] d⇒1 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [d 43c38c0] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [d 0260058] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt -+ 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 @@ -2731,7 +2999,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 | | | @@ -2769,9 +3037,9 @@ Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt +Automatic merge failed; fix conflicts and then commit the result. Original first commit: -Automatic merge failed; fix conflicts and then commit the result. commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 @@ -2779,20 +3047,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 65c2440] imerge 'c-d': manual merge 9-1 +[imerge/c-d 03ae6e1] 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. @@ -2835,61 +3103,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: Mon Jan 20 14:49:27 2025 +0000 +# Date: Mon Jan 20 14:54:25 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge ab5fe17] Merge d into c (using imerge) - Date: Mon Jan 20 14:49:27 2025 +0000 +[c-d-merge e62e8cf] Merge d into c (using imerge) + Date: Mon Jan 20 14:54: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...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -2963,7 +3232,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 | | | @@ -2997,9 +3266,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: @@ -3021,7 +3291,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d da635a0] imerge 'c-d': manual merge 9-1 +[imerge/c-d a8df96e] 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. @@ -3067,18 +3337,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-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 @@ -3093,9 +3363,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/ -+ echo git-imerge test repository with conflict at 1-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.name Loú User ++ 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 @@ -3110,14 +3380,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 @@ -3125,168 +3397,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 -+ 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 -[d 93e27e6] d⇒2 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' +[d 9522207] d⇒5 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt -[d 9522207] d⇒5 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒6 ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c @@ -3327,8 +3659,8 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ tee autofill.out + git-imerge autofill ++ tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. @@ -3356,7 +3688,7 @@ HEAD is now at 243e8ed c⇒9 Conflict; suggest manual merge of 1-6 + grep -q Traceback autofill.out -+ grep -q suggest manual merge of 1-6 autofill.out ++ grep -q 'suggest manual merge of 1-6' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -3414,10 +3746,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 35ef3ee] imerge 'c-d': manual merge 1-6 +[imerge/c-d 808cf6c] 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. @@ -3463,61 +3795,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: Mon Jan 20 14:49:40 2025 +0000 +# Date: Mon Jan 20 14:54:34 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge f4a5cb6] Merge d into c (using imerge) - Date: Mon Jan 20 14:49:40 2025 +0000 +[c-d-merge bb6aec1] Merge d into c (using imerge) + Date: Mon Jan 20 14:54:34 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ git rev-parse 'c-d-merge^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-rebase^{tree} +++ git rev-parse 'c-d-rebase^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-rebase-with-history^{tree} +++ git rev-parse 'c-d-rebase-with-history^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border^{tree} +++ git rev-parse 'c-d-border^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border-with-history^{tree} +++ git rev-parse 'c-d-border-with-history^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border-with-history2^{tree} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ tee start.out + git-imerge start --goal=full --first-parent --name=c-d d ++ tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -3564,7 +3897,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was b905ec4 imerge 'c-d': automatic merge 9-5 +Previous HEAD position was a5c7eb0 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -3589,7 +3922,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 | | | @@ -3623,9 +3956,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: @@ -3647,8 +3981,8 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 7b42856] imerge 'c-d': manual merge 1-6 + git-imerge continue --edit +[imerge/c-d a2017c5] 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. @@ -3696,22 +4030,21 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-6 + local conflict=9-6 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ DESCRIPTION=git-imerge test repository with conflict at 9-6 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 ++ DESCRIPTION='git-imerge test repository with conflict at 9-6' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ local description=git-imerge test repository with conflict at 9-6 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6 ++ local 'description=git-imerge test repository with conflict at 9-6' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ local description=git-imerge test repository with conflict at 9-6 ++ local 'description=git-imerge test repository with conflict at 9-6' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -3722,9 +4055,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 9-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git/ ++ echo 'git-imerge test repository with conflict at 9-6' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 @@ -3739,14 +4073,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 @@ -3754,168 +4090,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' +[c 9732e77] c⇒8 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt -[c 9732e77] c⇒8 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒9 ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [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 ++ 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 @@ -3996,7 +4392,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 | | | @@ -4034,16 +4430,16 @@ Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt +Automatic merge failed; fix conflicts and then commit the result. Original first commit: - -Original second commit: -Automatic merge failed; fix conflicts and then commit the result. commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 + +Original second commit: commit f7e451a6c9656dda15641a9fbc591a602f158692 Author: Loú User Date: Thu Apr 7 22:13:29 2005 +0000 @@ -4054,10 +4450,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 69fc177] imerge 'c-d': manual merge 9-6 +[imerge/c-d 58d4ee4] 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 @@ -4093,55 +4489,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: Mon Jan 20 14:49:55 2025 +0000 +# Date: Mon Jan 20 14:54:44 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 1c69240] Merge d into c (using imerge) - Date: Mon Jan 20 14:49:55 2025 +0000 +[c-d-merge 1280c38] Merge d into c (using imerge) + Date: Mon Jan 20 14:54:44 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ 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 @@ -4226,7 +4623,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 | | | @@ -4260,9 +4657,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: @@ -4284,7 +4682,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 457cfe6] imerge 'c-d': manual merge 9-6 +[imerge/c-d 8c30598] imerge 'c-d': manual merge 9-6 + git-imerge continue --edit Merge has been recorded for merge 9-6. Merge is complete! @@ -4325,18 +4723,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 @@ -4351,9 +4749,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 @@ -4368,183 +4766,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 -+ 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 -[c 2046ed2] 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 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 -[c 30dd2ae] c⇒6 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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 -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒2 ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [d 69efde8] d⇒2 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [d 3169557] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [d 86c8052] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [d 1700773] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d df2e493] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -4608,7 +5068,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 | | | @@ -4649,27 +5109,27 @@ Automatic merge failed; fix conflicts and then commit the result. Original first commit: - -Original second commit: commit 2120f40dc39d28052a5279b645124e8ed7e5de73 Author: Loú User Date: Thu Apr 7 22:13:15 2005 +0000 c⇒1 -There was a conflict merging commit 1-2, shown above. -Please resolve the conflict, commit the result, then type - - git-imerge continue -+ echo merged version -+ git add conflict.txt +Original second commit: commit 69efde8f66d581a765a3909ffacb9f895f95c345 Author: Loú User Date: Thu Apr 7 22:13:25 2005 +0000 d⇒2 + +There was a conflict merging commit 1-2, shown above. +Please resolve the conflict, commit the result, then type + + git-imerge continue ++ echo 'merged version' ++ git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d e7b4d10] imerge 'c-d': manual merge 1-2 +[imerge/c-d 7d9dff6] 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. @@ -4727,61 +5187,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: Mon Jan 20 14:50:08 2025 +0000 +# Date: Mon Jan 20 14:54:53 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 925ae30] Merge d into c (using imerge) - Date: Mon Jan 20 14:50:08 2025 +0000 +[c-d-merge 5c49049] Merge d into c (using imerge) + Date: Mon Jan 20 14:54:53 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ git rev-parse 'c-d-merge^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-rebase^{tree} +++ git rev-parse 'c-d-rebase^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-rebase-with-history^{tree} +++ git rev-parse 'c-d-rebase-with-history^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border^{tree} +++ git rev-parse 'c-d-border^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border-with-history^{tree} +++ git rev-parse 'c-d-border-with-history^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border-with-history2^{tree} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ + tee start.out -git-imerge start --goal=full --first-parent --name=c-d d ++ git-imerge start --goal=full --first-parent --name=c-d d ++ tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...conflict. Attempting to merge 2-1...success. @@ -4792,7 +5253,7 @@ Attempting to merge 7-1...success. Attempting to merge 8-1...success. Attempting to merge 9-1...success. -Previous HEAD position was 24adc8f imerge 'c-d': automatic merge 9-1 +Previous HEAD position was 643849b imerge 'c-d': automatic merge 9-1 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -4817,7 +5278,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 | | | @@ -4851,9 +5312,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: @@ -4875,8 +5337,8 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d d5b1723] imerge 'c-d': manual merge 1-2 + git-imerge continue --edit +[imerge/c-d 59ae8a8] imerge 'c-d': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting to merge 1-3...success. Attempting to merge 1-4...success. @@ -4960,22 +5422,21 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-5 + local conflict=9-5 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ DESCRIPTION=git-imerge test repository with conflict at 9-5 -+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 ++ DESCRIPTION='git-imerge test repository with conflict at 9-5' ++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ local description=git-imerge test repository with conflict at 9-5 -+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5 ++ local 'description=git-imerge test repository with conflict at 9-5' ++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ local description=git-imerge test repository with conflict at 9-5 ++ local 'description=git-imerge test repository with conflict at 9-5' + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -4986,9 +5447,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 9-5 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git/ ++ echo 'git-imerge test repository with conflict at 9-5' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 @@ -5003,14 +5465,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 @@ -5018,168 +5482,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt -+ commit -m c⇒5 ++ case $conflict in ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [c 1d3bf09] c⇒5 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [c f999ecd] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [c 7050a8a] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [c 9732e77] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒9 ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 73a5eed] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒5 ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [d 0a6f956] d⇒5 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt -+ commit -m d⇒6 ++ case $conflict in ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d bfb30f0] d⇒6 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout c @@ -5259,7 +5783,7 @@ HEAD is now at 73a5eed c⇒9 Conflict; suggest manual merge of 9-5 + grep -q Traceback autofill.out -+ grep -q suggest manual merge of 9-5 autofill.out ++ grep -q 'suggest manual merge of 9-5' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -5300,27 +5824,27 @@ Automatic merge failed; fix conflicts and then commit the result. Original first commit: - -Original second commit: commit 73a5eedb087a0f656d730831b8def7943b40f3cf Author: Loú User Date: Thu Apr 7 22:13:23 2005 +0000 c⇒9 -There was a conflict merging commit 9-5, shown above. -Please resolve the conflict, commit the result, then type - - git-imerge continue +Original second commit: commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f Author: Loú User Date: Thu Apr 7 22:13:28 2005 +0000 d⇒5 -+ echo merged version + +There was a conflict merging commit 9-5, shown above. +Please resolve the conflict, commit the result, then type + + git-imerge continue ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d fe4518b] imerge 'c-d': manual merge 9-5 +[imerge/c-d fa3b097] 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. @@ -5359,61 +5883,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: Mon Jan 20 14:50:21 2025 +0000 +# Date: Mon Jan 20 14:55:02 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge d04f8b9] Merge d into c (using imerge) - Date: Mon Jan 20 14:50:21 2025 +0000 +[c-d-merge d009f87] Merge d into c (using imerge) + Date: Mon Jan 20 14:55:02 2025 +0000 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-merge + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-merge^{tree} +++ git rev-parse 'c-d-merge^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase --branch=c-d-rebase + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-rebase^{tree} +++ git rev-parse 'c-d-rebase^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-rebase-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-rebase-with-history^{tree} +++ git rev-parse 'c-d-rebase-with-history^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border --branch=c-d-border + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border^{tree} +++ git rev-parse 'c-d-border^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border-with-history^{tree} +++ git rev-parse 'c-d-border-with-history^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-border-with-history2 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-border-with-history2^{tree} +++ git rev-parse 'c-d-border-with-history2^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + git-imerge remove + git checkout c Switched to branch 'c' -+ tee start.out + git-imerge start --goal=full --first-parent --name=c-d d ++ tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -5491,7 +6016,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 | | | @@ -5525,9 +6050,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: @@ -5549,7 +6075,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 322fd2f] imerge 'c-d': manual merge 9-5 +[imerge/c-d c89ed1d] 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. @@ -5591,18 +6117,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 @@ -5617,9 +6143,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 @@ -5634,14 +6160,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 @@ -5649,168 +6177,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 -[c 89e2141] c⇒1 - 1 file changed, 1 insertion(+), 1 deletion(-) + 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 -[c f02ab24] c⇒3 - 1 file changed, 1 insertion(+), 1 deletion(-) + 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 -[c 7e31f25] c⇒5 - 2 files changed, 2 insertions(+), 2 deletions(-) -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [c df3c57a] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' +[c ea32d81] c⇒7 + 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -[c ea32d81] 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 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 -[d 43c38c0] d⇒2 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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 @@ -5851,8 +6439,8 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ tee autofill.out + git-imerge autofill ++ tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. @@ -5879,7 +6467,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 | | | @@ -5917,9 +6505,9 @@ Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt +Automatic merge failed; fix conflicts and then commit the result. Original first commit: -Automatic merge failed; fix conflicts and then commit the result. commit 7e31f254c318decc434628f023dac0703f3d2b9e Author: Loú User Date: Thu Apr 7 22:13:19 2005 +0000 @@ -5927,20 +6515,20 @@ c⇒5 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 commit ac0427a285b64f2815ebd6eb83880f309600d0c7 Author: Loú User Date: Thu Apr 7 22:13:24 2005 +0000 d⇒1 + +There was a conflict merging commit 5-1, shown above. +Please resolve the conflict, commit the result, then type + + git-imerge continue ++ echo 'merged version' + git add conflict.txt + git-imerge continue --no-edit -[imerge/c-d 9a77bad] imerge 'c-d': manual merge 5-1 +[imerge/c-d 6e9815e] 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. @@ -5996,61 +6584,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: Mon Jan 20 14:50:35 2025 +0000 +# Date: Mon Jan 20 14:55:11 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 1bae9d6] Merge d into c (using imerge) - Date: Mon Jan 20 14:50:35 2025 +0000 +[c-d-merge f633580] Merge d into c (using imerge) + Date: Mon Jan 20 14:55:11 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-imergetee start start.out --goal=full - --first-parent --name=c-d d ++ git-imerge start --goal=full --first-parent --name=c-d d ++ tee start.out Attempting to merge 1-1...success. Attempting to merge 1-2...success. Attempting to merge 1-3...success. @@ -6100,7 +6689,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 | | | @@ -6134,9 +6723,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: @@ -6159,7 +6749,7 @@ # modified: d.txt # + git-imerge continue --edit -[imerge/c-d 49fa06d] imerge 'c-d': manual merge 5-1 +[imerge/c-d 3837385] imerge 'c-d': manual merge 5-1 Merge has been recorded for merge 5-1. Attempting to merge 5-2...success. Attempting to merge 5-3...success. @@ -6228,18 +6818,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 @@ -6253,10 +6843,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with conflict at 6-6 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git/ -+ 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 @@ -6271,14 +6861,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 @@ -6286,168 +6878,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 -[c ed9122f] c⇒4 - 1 file changed, 1 insertion(+), 1 deletion(-) -+ 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 -+ modify d.txt 4 -+ filename=d.txt ++ 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 -[d 9522207] d⇒5 - 1 file changed, 1 insertion(+), 1 deletion(-) + 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 @@ -6488,8 +7140,8 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ tee autofill.out + git-imerge autofill ++ tee autofill.out Attempting automerge of 9-6...failure. Attempting automerge of 1-1...success. Attempting automerge of 1-4...success. @@ -6531,7 +7183,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 | | | @@ -6589,10 +7241,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 71e919a] imerge 'c-d': manual merge 6-6 +[imerge/c-d 5a5338f] 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. @@ -6633,55 +7285,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: Mon Jan 20 14:50:49 2025 +0000 +# Date: Mon Jan 20 14:55:26 2025 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 43065ab] Merge d into c (using imerge) - Date: Mon Jan 20 14:50:49 2025 +0000 +[c-d-merge a5795ac] Merge d into c (using imerge) + Date: Mon Jan 20 14:55:26 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 @@ -6739,7 +7392,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was 7877ffa imerge 'c-d': automatic merge 9-5 +Previous HEAD position was 2691d85 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -6764,7 +7417,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 | | | @@ -6798,9 +7451,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: @@ -6822,8 +7476,8 @@ # modified: conflict.txt # modified: d.txt # +[imerge/c-d 310402c] imerge 'c-d': manual merge 6-6 + git-imerge continue --edit -[imerge/c-d 57fe1a7] 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. @@ -6866,24 +7520,24 @@ + 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 @@ -6898,9 +7552,9 @@ 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 @@ -6915,50 +7569,60 @@ + text=0 + echo 0 + git add d.txt -+ seq 0 7 -+ modify conflict0.txt original version +++ seq 0 7 ++ for i in $(seq 0 7) ++ modify conflict0.txt 'original version' + filename=conflict0.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict0.txt -+ modify conflict1.txt original version ++ for i in $(seq 0 7) ++ modify conflict1.txt 'original version' + filename=conflict1.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict1.txt -+ modify conflict2.txt original version ++ for i in $(seq 0 7) ++ modify conflict2.txt 'original version' + filename=conflict2.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict2.txt -+ modify conflict3.txt original version ++ for i in $(seq 0 7) ++ modify conflict3.txt 'original version' + filename=conflict3.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict3.txt -+ modify conflict4.txt original version ++ for i in $(seq 0 7) ++ modify conflict4.txt 'original version' + filename=conflict4.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict4.txt -+ modify conflict5.txt original version ++ for i in $(seq 0 7) ++ modify conflict5.txt 'original version' + filename=conflict5.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict5.txt -+ modify conflict6.txt original version ++ for i in $(seq 0 7) ++ modify conflict6.txt 'original version' + filename=conflict6.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict6.txt -+ modify conflict7.txt original version ++ for i in $(seq 0 7) ++ modify conflict7.txt 'original version' + filename=conflict7.txt -+ text=original version -+ echo original version ++ text='original version' ++ echo 'original version' + git add conflict7.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) 8e21fbd] m⇒0 10 files changed, 10 insertions(+) create mode 100644 c.txt @@ -6978,19 +7642,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 @@ -6998,9 +7664,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 @@ -7008,9 +7676,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 @@ -7018,14 +7688,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 @@ -7033,19 +7705,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 @@ -7053,14 +7727,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 @@ -7068,14 +7744,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 @@ -7083,9 +7761,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 @@ -7093,14 +7773,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 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c ccbfccb] c⇒9 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout -b d master -- @@ -7110,19 +7792,21 @@ + text=1 + echo 1 + git add d.txt -+ modify conflict0.txt d version ++ modify conflict0.txt 'd version' + filename=conflict0.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict0.txt -+ modify conflict6.txt d version ++ modify conflict6.txt 'd version' + filename=conflict6.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict6.txt -+ commit -m d⇒1 ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [d 8c3c065] d⇒1 3 files changed, 3 insertions(+), 3 deletions(-) + modify d.txt 2 @@ -7130,19 +7814,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 @@ -7150,9 +7836,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 @@ -7160,9 +7848,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 @@ -7170,14 +7860,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 @@ -7185,14 +7877,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 @@ -7200,14 +7894,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 @@ -7215,14 +7911,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 @@ -7318,26 +8016,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ grep -q 'There was a conflict merging' autofill.out +++ seq 0 7 ++ for i in $(seq 0 7) + grep -q ==== conflict0.txt -+ modify conflict0.txt merged version ++ modify conflict0.txt 'merged version' + filename=conflict0.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict0.txt + conflict_count=1 ++ for i in $(seq 0 7) + grep -q ==== conflict1.txt ++ for i in $(seq 0 7) + grep -q ==== conflict2.txt ++ for i in $(seq 0 7) + grep -q ==== conflict3.txt ++ for i in $(seq 0 7) + grep -q ==== conflict4.txt ++ for i in $(seq 0 7) + grep -q ==== conflict5.txt ++ for i in $(seq 0 7) + grep -q ==== conflict6.txt ++ for i in $(seq 0 7) + grep -q ==== conflict7.txt + true -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d b1a66c6] imerge 'c-d': manual merge 1-1 ++ tee autofill.out +[imerge/c-d 1a93854] 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. @@ -7429,26 +8135,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 -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 4cca452] imerge 'c-d': manual merge 1-6 ++ tee autofill.out +[imerge/c-d 273cad0] 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. @@ -7465,12 +8179,12 @@ Warning: you are leaving 1 commit behind, not connected to any of your branches: - d14dbbd imerge 'c-d': automatic merge 3-8 + c9df199 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 d14dbbd + git branch c9df199 Switched to branch 'imerge/c-d' Auto-merging conflict1.txt @@ -7519,26 +8233,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ grep -q 'There was a conflict merging' autofill.out +++ seq 0 7 ++ for i in $(seq 0 7) + grep -q ==== conflict0.txt ++ for i in $(seq 0 7) + grep -q ==== conflict1.txt -+ modify conflict1.txt merged version ++ modify conflict1.txt 'merged version' + filename=conflict1.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict1.txt + conflict_count=3 ++ for i in $(seq 0 7) + grep -q ==== conflict2.txt ++ for i in $(seq 0 7) + grep -q ==== conflict3.txt ++ for i in $(seq 0 7) + grep -q ==== conflict4.txt ++ for i in $(seq 0 7) + grep -q ==== conflict5.txt ++ for i in $(seq 0 7) + grep -q ==== conflict6.txt ++ for i in $(seq 0 7) + grep -q ==== conflict7.txt + true -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d c15def0] imerge 'c-d': manual merge 4-2 ++ tee autofill.out +[imerge/c-d 80a9754] 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. @@ -7548,7 +8270,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 9678291 imerge 'c-d': automatic merge 4-8 +Previous HEAD position was 94d6f4c imerge 'c-d': automatic merge 4-8 Switched to branch 'imerge/c-d' Auto-merging conflict6.txt CONFLICT (content): Merge conflict in conflict6.txt @@ -7596,26 +8318,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 7ddf6f7] imerge 'c-d': manual merge 5-1 +[imerge/c-d a74c19c] 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. @@ -7650,7 +8380,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 e2bd879 imerge 'c-d': automatic merge 7-1 +Previous HEAD position was 76d9216 imerge 'c-d': automatic merge 7-1 Switched to branch 'imerge/c-d' Auto-merging conflict3.txt CONFLICT (content): Merge conflict in conflict3.txt @@ -7698,26 +8428,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 d069cf3] imerge 'c-d': manual merge 5-5 +[imerge/c-d abfae97] 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. @@ -7780,31 +8518,39 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ grep -q 'There was a conflict merging' autofill.out +++ seq 0 7 ++ for i in $(seq 0 7) + grep -q ==== conflict0.txt ++ for i in $(seq 0 7) + grep -q ==== conflict1.txt ++ for i in $(seq 0 7) + grep -q ==== conflict2.txt ++ for i in $(seq 0 7) + grep -q ==== conflict3.txt ++ for i in $(seq 0 7) + grep -q ==== conflict4.txt ++ for i in $(seq 0 7) + grep -q ==== conflict5.txt -+ modify conflict5.txt merged version ++ modify conflict5.txt 'merged version' + filename=conflict5.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict5.txt + conflict_count=6 ++ for i in $(seq 0 7) + grep -q ==== conflict6.txt ++ for i in $(seq 0 7) + grep -q ==== conflict7.txt + true -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 85a9c1e] imerge 'c-d': manual merge 6-7 ++ tee autofill.out +[imerge/c-d e51fcd1] 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 52086eb imerge 'c-d': automatic merge 6-8 +Previous HEAD position was ace5951 imerge 'c-d': automatic merge 6-8 Switched to branch 'imerge/c-d' Auto-merging conflict2.txt CONFLICT (content): Merge conflict in conflict2.txt @@ -7852,26 +8598,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 4b50fa5] imerge 'c-d': manual merge 7-2 +[imerge/c-d 4b619bb] 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. @@ -7953,26 +8707,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ grep -q 'There was a conflict merging' autofill.out +++ seq 0 7 ++ for i in $(seq 0 7) + grep -q ==== conflict0.txt ++ for i in $(seq 0 7) + grep -q ==== conflict1.txt ++ for i in $(seq 0 7) + grep -q ==== conflict2.txt ++ for i in $(seq 0 7) + grep -q ==== conflict3.txt ++ for i in $(seq 0 7) + grep -q ==== conflict4.txt ++ for i in $(seq 0 7) + grep -q ==== conflict5.txt ++ for i in $(seq 0 7) + grep -q ==== conflict6.txt ++ for i in $(seq 0 7) + grep -q ==== conflict7.txt -+ modify conflict7.txt merged version ++ modify conflict7.txt 'merged version' + filename=conflict7.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict7.txt + conflict_count=8 + true -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d b523685] imerge 'c-d': manual merge 9-8 ++ tee autofill.out +[imerge/c-d 2ddcba4] imerge 'c-d': manual merge 9-8 Merge has been recorded for merge 9-8. Merge is complete! + grep -q Traceback autofill.out @@ -7999,20 +8761,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 -+ diff -u - diagram.out + 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: Mon Jan 20 14:51:13 2025 +0000 +# Date: Mon Jan 20 14:55:42 2025 +0000 # # On branch c-d-merge # Changes to be committed: @@ -8026,64 +8789,63 @@ # modified: conflict7.txt # modified: d.txt # -[c-d-merge 98cbb53] Merge d into c (using imerge) - Date: Mon Jan 20 14:51:13 2025 +0000 +[c-d-merge cdc78b4] Merge d into c (using imerge) + Date: Mon Jan 20 14:55:42 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 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -8094,9 +8856,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge test repository with duplicate commits -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git/ ++ echo 'git-imerge test repository with duplicate commits' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated @@ -8106,86 +8869,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 checkout -b a -- ++ 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 @@ -8260,54 +9046,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: Mon Jan 20 14:51:19 2025 +0000 +# Date: Mon Jan 20 14:55:46 2025 +0000 # # On branch a-b-merge # Changes to be committed: # modified: a.txt # -[a-b-merge be20fbb] Merge b into a (using imerge) - Date: Mon Jan 20 14:51:19 2025 +0000 +[a-b-merge 533c9c8] Merge b into a (using imerge) + Date: Mon Jan 20 14:55:46 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' @@ -8360,26 +9147,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 @@ -8394,9 +9182,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 @@ -8406,72 +9194,87 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' ++ for i in 1 2 3 + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt -+ commit -m a⇒1 on branch a ++ commit -m 'a⇒1 on branch a' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m 'a⇒1 on branch a' [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in 1 2 3 + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt -+ 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 @@ -8479,36 +9282,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 @@ -8580,12 +9391,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 79c21fe] imerge 'b': manual merge 1-1 +[imerge/b 17000a6] 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. @@ -8593,7 +9404,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 1122c4a imerge 'b': automatic merge 3-1 +Previous HEAD position was 27ffc17 imerge 'b': automatic merge 3-1 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -8646,12 +9457,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 9adb2b8] imerge 'b': manual merge 1-2 ++ tee imerge-b-into-a-1-3.out +[imerge/b 61b702a] imerge 'b': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting automerge of 1-4...success. Autofilling 1-3...success. @@ -8666,7 +9477,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 | | @@ -8696,20 +9507,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: Mon Jan 20 14:51:26 2025 +0000 +# Date: Mon Jan 20 14:55:52 2025 +0000 # # On branch b-into-a-1 # Changes to be committed: # new file: b.txt # -[b-into-a-1 4336103] Merge b into a (using imerge) - Date: Mon Jan 20 14:51:26 2025 +0000 +[b-into-a-1 52bc573] Merge b into a (using imerge) + Date: Mon Jan 20 14:55:52 2025 +0000 + test_merge a-into-b-1 b a 1-1 2-1 + local name=a-into-b-1 + local dst=b @@ -8774,12 +9586,12 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out ++ grep -q 'There was a conflict merging commit 1-1' imerge-a-into-b-1-1.out + echo 1 + git add a.txt -+ tee imerge-a-into-b-1-2.out + git-imerge continue --no-edit -[imerge/a f62b0bf] imerge 'a': manual merge 1-1 ++ tee imerge-a-into-b-1-2.out +[imerge/a 498a0b2] imerge 'a': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-3...success. Autofilling 1-2...success. @@ -8837,12 +9649,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.out + git-imerge continue --no-edit -[imerge/a 779b790] imerge 'a': manual merge 2-1 ++ tee imerge-a-into-b-1-3.out +[imerge/a b05940f] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -8857,7 +9669,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 | | @@ -8885,30 +9697,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: Mon Jan 20 14:51:30 2025 +0000 +# Date: Mon Jan 20 14:55:54 2025 +0000 # # On branch a-into-b-1 # Changes to be committed: # modified: a.txt # -[a-into-b-1 250c229] Merge a into b (using imerge) - Date: Mon Jan 20 14:51:30 2025 +0000 +[a-into-b-1 095a22d] Merge a into b (using imerge) + Date: Mon Jan 20 14:55:54 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 @@ -8923,9 +9737,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 @@ -8935,85 +9749,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 -[a 2f1f75a] a⇒1 on branch a - 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒2 on branch a ++ commit -m 'a⇒2 on branch a' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m 'a⇒2 on branch a' [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in 1 2 3 + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt -+ commit -m a⇒3 on branch a ++ commit -m 'a⇒3 on branch a' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m 'a⇒3 on branch a' [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' ++ for i in 1 2 3 4 + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt -+ msg=b⇒1 ++ msg=$'b\342\207\2221' + test 1 = 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 @@ -9021,23 +9853,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 @@ -9048,8 +9885,8 @@ + local conflict2=1-3 + git checkout a Switched to branch 'a' -+ tee imerge-b-into-a-2-1.out + git-imerge merge --branch=b-into-a-2 b ++ tee imerge-b-into-a-2-1.out Attempting automerge of 3-4...success. Autofilling 1-4...success. Autofilling 2-4...success. @@ -9123,12 +9960,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 9d307f3] imerge 'b': manual merge 1-2 +[imerge/b 8738503] 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. @@ -9136,7 +9973,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 4d64de1 imerge 'b': automatic merge 3-2 +Previous HEAD position was 8586588 imerge 'b': automatic merge 3-2 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9189,12 +10026,12 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out ++ grep -q 'There was a conflict merging commit 1-3' imerge-b-into-a-2-2.out + echo 1 + git add a.txt -+ tee imerge-b-into-a-2-3.out + git-imerge continue --no-edit -[imerge/b 9b08262] imerge 'b': manual merge 1-3 ++ tee imerge-b-into-a-2-3.out +[imerge/b f28174e] imerge 'b': manual merge 1-3 Merge has been recorded for merge 1-3. Attempting automerge of 1-4...success. Autofilling 1-4...success. @@ -9207,7 +10044,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 | | @@ -9237,20 +10074,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: Mon Jan 20 14:51:35 2025 +0000 +# Date: Mon Jan 20 14:55:57 2025 +0000 # # On branch b-into-a-2 # Changes to be committed: # new file: b.txt # -[b-into-a-2 2cc235c] Merge b into a (using imerge) - Date: Mon Jan 20 14:51:35 2025 +0000 +[b-into-a-2 50af3cf] Merge b into a (using imerge) + Date: Mon Jan 20 14:55:57 2025 +0000 + test_merge a-into-b-2 b a 2-1 3-1 + local name=a-into-b-2 + local dst=b @@ -9259,8 +10097,8 @@ + local conflict2=3-1 + git checkout b Switched to branch 'b' -+ tee imerge-a-into-b-2-1.out + git-imerge merge --branch=a-into-b-2 a ++ tee imerge-a-into-b-2-1.out Attempting automerge of 4-3...success. Autofilling 1-3...success. Autofilling 2-3...unexpected conflict. Backtracking... @@ -9320,12 +10158,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 151c060] imerge 'a': manual merge 2-1 +[imerge/a a54a968] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -9383,12 +10221,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 477740f] imerge 'a': manual merge 3-1 ++ git-imerge continue --no-edit ++ tee imerge-a-into-b-2-3.out +[imerge/a bb50160] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9400,7 +10238,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 | | @@ -9428,34 +10266,35 @@ @ = 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: Mon Jan 20 14:51:38 2025 +0000 +# Date: Mon Jan 20 14:55:59 2025 +0000 # # On branch a-into-b-2 # Changes to be committed: # modified: a.txt # -[a-into-b-2 09fb2a5] Merge a into b (using imerge) - Date: Mon Jan 20 14:51:38 2025 +0000 +[a-into-b-2 7e85806] Merge a into b (using imerge) + Date: Mon Jan 20 14:55:59 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 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -9466,9 +10305,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 @@ -9478,98 +10318,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' ++ TIME=1112911997 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m 'a⇒3 on branch a' [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) -+ commit -m a⇒3 on branch a -+ TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a + git checkout -b b master -- Switched to a new branch 'b' ++ for i in 1 2 3 4 + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt -+ msg=b⇒1 ++ msg=$'b\342\207\2221' + test 1 = 3 + test 1 = 4 -+ commit -m b⇒1 on branch b ++ commit -m 'b⇒1 on branch b' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m 'b⇒1 on branch b' [b 1f7d097] b⇒1 on branch b 1 file changed, 1 insertion(+) create mode 100644 b.txt ++ for i in 1 2 3 4 + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt -+ msg=b⇒2 ++ msg=$'b\342\207\2222' + test 2 = 3 + test 2 = 4 -+ commit -m b⇒2 on branch b ++ commit -m 'b⇒2 on branch b' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m 'b⇒2 on branch b' [b ce671e9] b⇒2 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in 1 2 3 4 + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt -+ msg=b⇒3 ++ msg=$'b\342\207\2223' + test 3 = 3 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt -+ msg=b⇒3 and a⇒X ++ msg='b⇒3 and a⇒X' + test 3 = 4 -+ commit -m b⇒3 and a⇒X on branch b ++ commit -m 'b⇒3 and a⇒X on branch b' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m 'b⇒3 and a⇒X on branch b' +[b d40495e] b⇒3 and a⇒X on branch b + 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in 1 2 3 4 + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt -[b d40495e] b⇒3 and a⇒X on branch b - 2 files changed, 2 insertions(+), 2 deletions(-) -+ msg=b⇒4 ++ msg=$'b\342\207\2224' + test 4 = 3 + test 4 = 4 + modify a.txt 0 @@ -9577,10 +10438,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 @@ -9672,12 +10535,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 + git-imerge continue --no-edit + tee imerge-b-into-a-3-2.out -[imerge/b dae4c00] imerge 'b': manual merge 1-3 +[imerge/b e6d8981] 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. @@ -9685,7 +10548,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 7a54128 imerge 'b': automatic merge 3-3 +Previous HEAD position was 4d4fc36 imerge 'b': automatic merge 3-3 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9738,19 +10601,19 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out ++ grep -q 'There was a conflict merging commit 1-4' imerge-b-into-a-3-2.out + echo 1 + git add a.txt -+ tee imerge-b-into-a-3-3.out + git-imerge continue --no-edit -[imerge/b 47e4259] imerge 'b': manual merge 1-4 ++ tee imerge-b-into-a-3-3.out +[imerge/b b803bc2] 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 | | @@ -9780,20 +10643,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: Mon Jan 20 14:51:42 2025 +0000 +# Date: Mon Jan 20 14:56:02 2025 +0000 # # On branch b-into-a-3 # Changes to be committed: # new file: b.txt # -[b-into-a-3 a52edae] Merge b into a (using imerge) - Date: Mon Jan 20 14:51:42 2025 +0000 +[b-into-a-3 6c84f9d] Merge b into a (using imerge) + Date: Mon Jan 20 14:56:02 2025 +0000 + test_merge a-into-b-3 b a 3-1 4-1 + local name=a-into-b-3 + local dst=b @@ -9802,8 +10666,8 @@ + local conflict2=4-1 + git checkout b Switched to branch 'b' -+ tee imerge-a-into-b-3-1.out + git-imerge merge --branch=a-into-b-3 a ++ tee imerge-a-into-b-3-1.out Attempting automerge of 4-3...success. Autofilling 1-3...success. Autofilling 2-3...success. @@ -9867,12 +10731,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 + git-imerge continue --no-edit + tee imerge-a-into-b-3-2.out -[imerge/a 7f1a6be] imerge 'a': manual merge 3-1 +[imerge/a ea92511] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9930,19 +10794,19 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out ++ grep -q 'There was a conflict merging commit 4-1' imerge-a-into-b-3-2.out + echo 1 + git add a.txt -+ tee imerge-a-into-b-3-3.out + git-imerge continue --no-edit -[imerge/a cb8621d] imerge 'a': manual merge 4-1 ++ tee imerge-a-into-b-3-3.out +[imerge/a 5b3e0d5] 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 | | @@ -9970,40 +10834,40 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ GIT_EDITOR=cat ++ git-imerge finish Merge a into b (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# Date: Mon Jan 20 14:51:45 2025 +0000 +# Date: Mon Jan 20 14:56:04 2025 +0000 # # On branch a-into-b-3 # Changes to be committed: # modified: a.txt # -[a-into-b-3 0da0e2b] Merge a into b (using imerge) - Date: Mon Jan 20 14:51:45 2025 +0000 +[a-into-b-3 53b8b26] Merge a into b (using imerge) + Date: Mon Jan 20 14:56:04 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 -Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git/ hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all hint: of your new repositories, which will suppress this warning, call: @@ -10014,9 +10878,10 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -+ echo git-imerge drop test repository -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.name Loú User +Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git/ ++ echo 'git-imerge drop test repository' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.name 'Loú User' + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop @@ -10026,76 +10891,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 @@ -10120,12 +11005,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD 6768db9] Revert "a3⇒3" - Date: Mon Jan 20 14:51:45 2025 +0000 +[detached HEAD 1961e93] Revert "a3⇒3" + Date: Mon Jan 20 14:56:04 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD 7ca707a] Revert "a2⇒2" - Date: Mon Jan 20 14:51:46 2025 +0000 +[detached HEAD cf17383] Revert "a2⇒2" + Date: Mon Jan 20 14:56:04 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10135,7 +11020,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='7ca707ab1ded17b58bad8ce6d983148d3bebd6e3', goal='drop')[0:4,0:3]. +Recording autofilled block MergeState('dropped', tip1='dropped', tip2='cf17383163acfb0dbc8d66b2d34d772f69ecef50', goal='drop')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-drop.html 0 3 @@ -10144,7 +11029,7 @@ *??. 2 - *... | - 7ca707ab1ded17b58bad8ce6d983148d3bebd6e3 + cf17383163acfb0dbc8d66b2d34d772f69ecef50 0 3 | | @@ -10152,7 +11037,7 @@ *??| 2 - *--+ | - 7ca707ab1ded17b58bad8ce6d983148d3bebd6e3 + cf17383163acfb0dbc8d66b2d34d772f69ecef50 Key: |,-,+ = rectangles forming current merge frontier @@ -10166,7 +11051,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' @@ -10189,12 +11074,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD 5121d3e] Revert "a3⇒3" - Date: Mon Jan 20 14:51:47 2025 +0000 +[detached HEAD 00842c3] Revert "a3⇒3" + Date: Mon Jan 20 14:56:05 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD 06474cb] Revert "a2⇒2" - Date: Mon Jan 20 14:51:47 2025 +0000 +[detached HEAD b23074e] Revert "a2⇒2" + Date: Mon Jan 20 14:56:05 2025 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10204,7 +11089,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='06474cbffa3b9bd5e7351c4631058386e731b820', goal='revert')[0:4,0:3]. +Recording autofilled block MergeState('reverted', tip1='reverted', tip2='b23074e56cc49599692bc76c0672658b16daad5c', goal='revert')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-revert.html 0 3 @@ -10213,7 +11098,7 @@ *??. 2 - *... | - 06474cbffa3b9bd5e7351c4631058386e731b820 + b23074e56cc49599692bc76c0672658b16daad5c 0 3 | | @@ -10221,7 +11106,7 @@ *??| 2 - *--+ | - 06474cbffa3b9bd5e7351c4631058386e731b820 + b23074e56cc49599692bc76c0672658b16daad5c Key: |,-,+ = rectangles forming current merge frontier @@ -10235,10 +11120,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 (176.08=setup[5.31]+cmd[6.61,114.80,18.09,6.12,22.77,2.38] seconds) - congratulations :) (176.51 seconds) + py312: OK (134.04=setup[4.53]+cmd[6.26,88.32,13.18,4.66,14.99,2.10] seconds) + congratulations :) (134.41 seconds) create-stamp debian/debhelper-build-stamp dh_testroot -O--buildsystem=pybuild dh_prep -O--buildsystem=pybuild @@ -10303,12 +11188,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/1877/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/1877/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/4655 and its subdirectories -I: Current time: Mon Jan 20 02:51:58 -12 2025 -I: pbuilder-time-stamp: 1737384718 +I: removing directory /srv/workspace/pbuilder/1877 and its subdirectories +I: Current time: Tue Jan 21 04:56:17 +14 2025 +I: pbuilder-time-stamp: 1737384977