Diff of the two buildlogs: -- --- b1/build.log 2023-05-06 15:52:45.348733785 +0000 +++ b2/build.log 2023-05-06 15:57:40.415791295 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sat May 6 03:43:13 -12 2023 -I: pbuilder-time-stamp: 1683387793 +I: Current time: Sun May 7 05:52:53 +14 2023 +I: pbuilder-time-stamp: 1683388373 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz] I: copying local configuration @@ -16,7 +16,7 @@ I: copying [./git-imerge_1.2.0.orig.tar.gz] I: copying [./git-imerge_1.2.0-3.debian.tar.xz] I: Extracting source -gpgv: Signature made Sun Oct 25 11:52:36 2020 -12 +gpgv: Signature made Mon Oct 26 13:52:36 2020 +14 gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 gpgv: Can't check signature: No public key dpkg-source: warning: cannot verify inline signature for ./git-imerge_1.2.0-3.dsc: no acceptable signature found @@ -25,135 +25,167 @@ dpkg-source: info: unpacking git-imerge_1.2.0-3.debian.tar.xz I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/10116/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/21076/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 May 7 05:53 /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/21076/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/21076/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build' - 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='bookworm' - 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]="15" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf") + BASH_VERSION='5.2.15(1)-release' + BUILDDIR=/build + 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=bookworm + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='bb1ea9c477704fdca2989cb7508c9a33' - 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='10116' - PS1='# ' - PS2='> ' + INVOCATION_ID=99d53ded03c54abfa153c9dd2ec352a0 + 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=21076 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.sWNrbRcu/pbuilderrc_qYT7 --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.sWNrbRcu/b1 --logfile b1/build.log git-imerge_1.2.0-3.dsc' - SUDO_GID='114' - SUDO_UID='108' - 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.sWNrbRcu/pbuilderrc_ij3d --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.sWNrbRcu/b2 --logfile b2/build.log --extrapackages usrmerge git-imerge_1.2.0-3.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 jtx1c 5.10.0-22-arm64 #1 SMP Debian 5.10.178-3 (2023-04-22) aarch64 GNU/Linux + Linux i-capture-the-hostname 5.10.0-22-armmp-lpae #1 SMP Debian 5.10.178-3 (2023-04-22) armv7l GNU/Linux I: ls -l /bin total 5072 - -rwxr-xr-x 1 root root 838488 Apr 23 09:24 bash - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bunzip2 - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bzcat - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzcmp -> bzdiff - -rwxr-xr-x 1 root root 2225 Sep 18 2022 bzdiff - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzegrep -> bzgrep - -rwxr-xr-x 1 root root 4893 Nov 27 2021 bzexe - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzfgrep -> bzgrep - -rwxr-xr-x 1 root root 3775 Sep 18 2022 bzgrep - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bzip2 - -rwxr-xr-x 1 root root 67112 Sep 18 2022 bzip2recover - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzless -> bzmore - -rwxr-xr-x 1 root root 1297 Sep 18 2022 bzmore - -rwxr-xr-x 1 root root 67632 Sep 20 2022 cat - -rwxr-xr-x 1 root root 67676 Sep 20 2022 chgrp - -rwxr-xr-x 1 root root 67644 Sep 20 2022 chmod - -rwxr-xr-x 1 root root 67684 Sep 20 2022 chown - -rwxr-xr-x 1 root root 133532 Sep 20 2022 cp - -rwxr-xr-x 1 root root 132868 Jan 5 01:20 dash - -rwxr-xr-x 1 root root 133220 Sep 20 2022 date - -rwxr-xr-x 1 root root 67732 Sep 20 2022 dd - -rwxr-xr-x 1 root root 68104 Sep 20 2022 df - -rwxr-xr-x 1 root root 133632 Sep 20 2022 dir - -rwxr-xr-x 1 root root 59128 Mar 22 21:02 dmesg - lrwxrwxrwx 1 root root 8 Dec 19 01:33 dnsdomainname -> hostname - lrwxrwxrwx 1 root root 8 Dec 19 01:33 domainname -> hostname - -rwxr-xr-x 1 root root 67560 Sep 20 2022 echo - -rwxr-xr-x 1 root root 41 Jan 24 02:43 egrep - -rwxr-xr-x 1 root root 67548 Sep 20 2022 false - -rwxr-xr-x 1 root root 41 Jan 24 02:43 fgrep - -rwxr-xr-x 1 root root 55748 Mar 22 21:02 findmnt - -rwsr-xr-x 1 root root 26208 Mar 22 20:15 fusermount - -rwxr-xr-x 1 root root 128608 Jan 24 02:43 grep - -rwxr-xr-x 2 root root 2346 Apr 9 2022 gunzip - -rwxr-xr-x 1 root root 6447 Apr 9 2022 gzexe - -rwxr-xr-x 1 root root 64220 Apr 9 2022 gzip - -rwxr-xr-x 1 root root 67032 Dec 19 01:33 hostname - -rwxr-xr-x 1 root root 67720 Sep 20 2022 ln - -rwxr-xr-x 1 root root 35132 Mar 22 21:51 login - -rwxr-xr-x 1 root root 133632 Sep 20 2022 ls - -rwxr-xr-x 1 root root 136808 Mar 22 21:02 lsblk - -rwxr-xr-x 1 root root 67800 Sep 20 2022 mkdir - -rwxr-xr-x 1 root root 67764 Sep 20 2022 mknod - -rwxr-xr-x 1 root root 67596 Sep 20 2022 mktemp - -rwxr-xr-x 1 root root 38504 Mar 22 21:02 more - -rwsr-xr-x 1 root root 38496 Mar 22 21:02 mount - -rwxr-xr-x 1 root root 9824 Mar 22 21:02 mountpoint - -rwxr-xr-x 1 root root 133532 Sep 20 2022 mv - lrwxrwxrwx 1 root root 8 Dec 19 01:33 nisdomainname -> hostname - lrwxrwxrwx 1 root root 14 Apr 2 18:25 pidof -> /sbin/killall5 - -rwxr-xr-x 1 root root 67608 Sep 20 2022 pwd - lrwxrwxrwx 1 root root 4 Apr 23 09:24 rbash -> bash - -rwxr-xr-x 1 root root 67600 Sep 20 2022 readlink - -rwxr-xr-x 1 root root 67672 Sep 20 2022 rm - -rwxr-xr-x 1 root root 67600 Sep 20 2022 rmdir - -rwxr-xr-x 1 root root 67400 Nov 2 2022 run-parts - -rwxr-xr-x 1 root root 133372 Jan 5 07:55 sed - lrwxrwxrwx 1 root root 4 Jan 5 01:20 sh -> dash - -rwxr-xr-x 1 root root 67584 Sep 20 2022 sleep - -rwxr-xr-x 1 root root 67644 Sep 20 2022 stty - -rwsr-xr-x 1 root root 50800 Mar 22 21:02 su - -rwxr-xr-x 1 root root 67584 Sep 20 2022 sync - -rwxr-xr-x 1 root root 336764 Apr 6 02:25 tar - -rwxr-xr-x 1 root root 67144 Nov 2 2022 tempfile - -rwxr-xr-x 1 root root 133224 Sep 20 2022 touch - -rwxr-xr-x 1 root root 67548 Sep 20 2022 true - -rwxr-xr-x 1 root root 9768 Mar 22 20:15 ulockmgr_server - -rwsr-xr-x 1 root root 22108 Mar 22 21:02 umount - -rwxr-xr-x 1 root root 67572 Sep 20 2022 uname - -rwxr-xr-x 2 root root 2346 Apr 9 2022 uncompress - -rwxr-xr-x 1 root root 133632 Sep 20 2022 vdir - -rwxr-xr-x 1 root root 42608 Mar 22 21:02 wdctl - lrwxrwxrwx 1 root root 8 Dec 19 01:33 ypdomainname -> hostname - -rwxr-xr-x 1 root root 1984 Apr 9 2022 zcat - -rwxr-xr-x 1 root root 1678 Apr 9 2022 zcmp - -rwxr-xr-x 1 root root 6460 Apr 9 2022 zdiff - -rwxr-xr-x 1 root root 29 Apr 9 2022 zegrep - -rwxr-xr-x 1 root root 29 Apr 9 2022 zfgrep - -rwxr-xr-x 1 root root 2081 Apr 9 2022 zforce - -rwxr-xr-x 1 root root 8103 Apr 9 2022 zgrep - -rwxr-xr-x 1 root root 2206 Apr 9 2022 zless - -rwxr-xr-x 1 root root 1842 Apr 9 2022 zmore - -rwxr-xr-x 1 root root 4577 Apr 9 2022 znew -I: user script /srv/workspace/pbuilder/10116/tmp/hooks/D02_print_environment finished + -rwxr-xr-x 1 root root 838488 Apr 24 11:24 bash + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bunzip2 + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bzcat + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzcmp -> bzdiff + -rwxr-xr-x 1 root root 2225 Sep 19 2022 bzdiff + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzegrep -> bzgrep + -rwxr-xr-x 1 root root 4893 Nov 28 2021 bzexe + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzfgrep -> bzgrep + -rwxr-xr-x 1 root root 3775 Sep 19 2022 bzgrep + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bzip2 + -rwxr-xr-x 1 root root 67112 Sep 19 2022 bzip2recover + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzless -> bzmore + -rwxr-xr-x 1 root root 1297 Sep 19 2022 bzmore + -rwxr-xr-x 1 root root 67632 Sep 21 2022 cat + -rwxr-xr-x 1 root root 67676 Sep 21 2022 chgrp + -rwxr-xr-x 1 root root 67644 Sep 21 2022 chmod + -rwxr-xr-x 1 root root 67684 Sep 21 2022 chown + -rwxr-xr-x 1 root root 133532 Sep 21 2022 cp + -rwxr-xr-x 1 root root 132868 Jan 6 03:20 dash + -rwxr-xr-x 1 root root 133220 Sep 21 2022 date + -rwxr-xr-x 1 root root 67732 Sep 21 2022 dd + -rwxr-xr-x 1 root root 68104 Sep 21 2022 df + -rwxr-xr-x 1 root root 133632 Sep 21 2022 dir + -rwxr-xr-x 1 root root 59128 Mar 23 23:02 dmesg + lrwxrwxrwx 1 root root 8 Dec 20 03:33 dnsdomainname -> hostname + lrwxrwxrwx 1 root root 8 Dec 20 03:33 domainname -> hostname + -rwxr-xr-x 1 root root 67560 Sep 21 2022 echo + -rwxr-xr-x 1 root root 41 Jan 25 04:43 egrep + -rwxr-xr-x 1 root root 67548 Sep 21 2022 false + -rwxr-xr-x 1 root root 41 Jan 25 04:43 fgrep + -rwxr-xr-x 1 root root 55748 Mar 23 23:02 findmnt + -rwsr-xr-x 1 root root 26208 Mar 23 22:15 fusermount + -rwxr-xr-x 1 root root 128608 Jan 25 04:43 grep + -rwxr-xr-x 2 root root 2346 Apr 10 2022 gunzip + -rwxr-xr-x 1 root root 6447 Apr 10 2022 gzexe + -rwxr-xr-x 1 root root 64220 Apr 10 2022 gzip + -rwxr-xr-x 1 root root 67032 Dec 20 03:33 hostname + -rwxr-xr-x 1 root root 67720 Sep 21 2022 ln + -rwxr-xr-x 1 root root 35132 Mar 23 23:51 login + -rwxr-xr-x 1 root root 133632 Sep 21 2022 ls + -rwxr-xr-x 1 root root 136808 Mar 23 23:02 lsblk + -rwxr-xr-x 1 root root 67800 Sep 21 2022 mkdir + -rwxr-xr-x 1 root root 67764 Sep 21 2022 mknod + -rwxr-xr-x 1 root root 67596 Sep 21 2022 mktemp + -rwxr-xr-x 1 root root 38504 Mar 23 23:02 more + -rwsr-xr-x 1 root root 38496 Mar 23 23:02 mount + -rwxr-xr-x 1 root root 9824 Mar 23 23:02 mountpoint + -rwxr-xr-x 1 root root 133532 Sep 21 2022 mv + lrwxrwxrwx 1 root root 8 Dec 20 03:33 nisdomainname -> hostname + lrwxrwxrwx 1 root root 14 Apr 3 20:25 pidof -> /sbin/killall5 + -rwxr-xr-x 1 root root 67608 Sep 21 2022 pwd + lrwxrwxrwx 1 root root 4 Apr 24 11:24 rbash -> bash + -rwxr-xr-x 1 root root 67600 Sep 21 2022 readlink + -rwxr-xr-x 1 root root 67672 Sep 21 2022 rm + -rwxr-xr-x 1 root root 67600 Sep 21 2022 rmdir + -rwxr-xr-x 1 root root 67400 Nov 3 2022 run-parts + -rwxr-xr-x 1 root root 133372 Jan 6 09:55 sed + lrwxrwxrwx 1 root root 9 May 7 05:53 sh -> /bin/bash + -rwxr-xr-x 1 root root 67584 Sep 21 2022 sleep + -rwxr-xr-x 1 root root 67644 Sep 21 2022 stty + -rwsr-xr-x 1 root root 50800 Mar 23 23:02 su + -rwxr-xr-x 1 root root 67584 Sep 21 2022 sync + -rwxr-xr-x 1 root root 336764 Apr 7 04:25 tar + -rwxr-xr-x 1 root root 67144 Nov 3 2022 tempfile + -rwxr-xr-x 1 root root 133224 Sep 21 2022 touch + -rwxr-xr-x 1 root root 67548 Sep 21 2022 true + -rwxr-xr-x 1 root root 9768 Mar 23 22:15 ulockmgr_server + -rwsr-xr-x 1 root root 22108 Mar 23 23:02 umount + -rwxr-xr-x 1 root root 67572 Sep 21 2022 uname + -rwxr-xr-x 2 root root 2346 Apr 10 2022 uncompress + -rwxr-xr-x 1 root root 133632 Sep 21 2022 vdir + -rwxr-xr-x 1 root root 42608 Mar 23 23:02 wdctl + lrwxrwxrwx 1 root root 8 Dec 20 03:33 ypdomainname -> hostname + -rwxr-xr-x 1 root root 1984 Apr 10 2022 zcat + -rwxr-xr-x 1 root root 1678 Apr 10 2022 zcmp + -rwxr-xr-x 1 root root 6460 Apr 10 2022 zdiff + -rwxr-xr-x 1 root root 29 Apr 10 2022 zegrep + -rwxr-xr-x 1 root root 29 Apr 10 2022 zfgrep + -rwxr-xr-x 1 root root 2081 Apr 10 2022 zforce + -rwxr-xr-x 1 root root 8103 Apr 10 2022 zgrep + -rwxr-xr-x 1 root root 2206 Apr 10 2022 zless + -rwxr-xr-x 1 root root 1842 Apr 10 2022 zmore + -rwxr-xr-x 1 root root 4577 Apr 10 2022 znew +I: user script /srv/workspace/pbuilder/21076/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -283,7 +315,7 @@ Get: 78 http://deb.debian.org/debian bookworm/main armhf python3-wheel-whl all 0.38.4-2 [38.6 kB] Get: 79 http://deb.debian.org/debian bookworm/main armhf python3-virtualenv all 20.17.1+ds-1 [93.9 kB] Get: 80 http://deb.debian.org/debian bookworm/main armhf tox all 3.28.0-2 [385 kB] -Fetched 39.8 MB in 3s (11.4 MB/s) +Fetched 39.8 MB in 1s (39.7 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-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 ... 19329 files and directories currently installed.) @@ -626,8 +658,19 @@ Writing extended state information... Building tag database... -> Finished parsing the build-deps +Reading package lists... +Building dependency tree... +Reading state information... +usrmerge is already the newest version (35). +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/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-3_source.changes +I: user script /srv/workspace/pbuilder/21076/tmp/hooks/A99_set_merged_usr starting +Re-configuring usrmerge... +removed '/etc/unsupported-skip-usrmerge-conversion' +The system has been successfully converted. +I: user script /srv/workspace/pbuilder/21076/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/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-3_source.changes dpkg-buildpackage: info: source package git-imerge dpkg-buildpackage: info: source version 1.2.0-3 dpkg-buildpackage: info: source distribution unstable @@ -664,23 +707,23 @@ WARNING: Discarding $PYTHONPATH from environment, to override specify PYTHONPATH in 'passenv' in your configuration. WARNING: Discarding $PYTHONPATH from environment, to override specify PYTHONPATH in 'passenv' in your configuration. py311 installed: distlib==0.3.6,filelock==3.9.0,git-imerge @ file:///build/git-imerge-1.2.0/.tox/.tmp/package/1/git-imerge-1.2.0.zip,packaging==23.0,platformdirs==2.6.0,pluggy==1.0.0+repack,py==1.11.0,six==1.16.0,tox==3.28.0,virtualenv==20.17.1+ds -py311 run-test-pre: PYTHONHASHSEED='1169939161' +py311 run-test-pre: PYTHONHASHSEED='3689480709' py311 run-test: commands[0] | /bin/sh t/test-unconflicted -+ dirname t/test-unconflicted -+ cd t -+ pwd -+ dirname /build/git-imerge-1.2.0/t +++++ dirname t/test-unconflicted ++++ cd t ++++ pwd +++ dirname /build/git-imerge-1.2.0/t + BASE=/build/git-imerge-1.2.0 + . /build/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/build/git-imerge-1.2.0/t/tmp/unconflicted -+ DESCRIPTION=git-imerge test repository without conflicts -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts' + local path=/build/git-imerge-1.2.0/t/tmp/unconflicted -+ local description=git-imerge test repository without conflicts -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts' + local path=/build/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/git-imerge-1.2.0/t/tmp/unconflicted + mkdir -p /build/git-imerge-1.2.0/t/tmp/unconflicted + git init /build/git-imerge-1.2.0/t/tmp/unconflicted @@ -695,9 +738,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/unconflicted/.git/ -+ echo git-imerge test repository without conflicts -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/unconflicted @@ -712,147 +755,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 @@ -909,54 +993,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: Sat May 6 15:46:41 2023 +0000 +# Date: Sat May 6 15:55:24 2023 +0000 # # On branch a-b-merge # Changes to be committed: # modified: b.txt # -[a-b-merge c6ba1e9] Merge b into a (using imerge) - Date: Sat May 6 15:46:41 2023 +0000 +[a-b-merge 21f78c4] Merge b into a (using imerge) + Date: Sat May 6 15:55:24 2023 +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 @@ -1040,13 +1125,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 py311 run-test: commands[1] | /bin/sh t/test-conflicted -+ dirname t/test-conflicted -+ cd t -+ pwd -+ dirname /build/git-imerge-1.2.0/t +++++ dirname t/test-conflicted ++++ cd t ++++ pwd +++ dirname /build/git-imerge-1.2.0/t + BASE=/build/git-imerge-1.2.0 + . /build/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge @@ -1054,13 +1139,13 @@ + test_conflict 4-3 + local conflict=4-3 + TMP=/build/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ DESCRIPTION=git-imerge test repository with conflict at 4-3 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-4-3 -+ local description=git-imerge test repository with conflict at 4-3 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-4-3 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-4-3 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-4-3 @@ -1075,9 +1160,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/ -+ echo git-imerge test repository with conflict at 4-3 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name Loú User ++ echo 'git-imerge test repository with conflict at 4-3' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-4-3 @@ -1092,14 +1177,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 @@ -1107,168 +1194,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 @@ -1350,7 +1497,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 | | | @@ -1408,10 +1555,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 7527ff6] imerge 'c-d': manual merge 4-3 +[imerge/c-d b8ed5dc] 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. @@ -1464,55 +1611,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: Sat May 6 15:46:59 2023 +0000 +# Date: Sat May 6 15:55:32 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 77913a3] Merge d into c (using imerge) - Date: Sat May 6 15:46:59 2023 +0000 +[c-d-merge 35dcf28] Merge d into c (using imerge) + Date: Sat May 6 15:55:32 2023 +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 @@ -1550,7 +1698,7 @@ Attempting to merge 8-2...success. Attempting to merge 9-1...success. Attempting to merge 9-2...success. -Previous HEAD position was 2149057 imerge 'c-d': automatic merge 9-2 +Previous HEAD position was f6e99b1 imerge 'c-d': automatic merge 9-2 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -1575,7 +1723,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 | | | @@ -1609,9 +1757,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: @@ -1633,7 +1782,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 12c5d16] imerge 'c-d': manual merge 4-3 +[imerge/c-d 14f433e] imerge 'c-d': manual merge 4-3 + git-imerge continue --edit Merge has been recorded for merge 4-3. Attempting to merge 4-4...success. @@ -1697,18 +1846,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/git-imerge-1.2.0/t/tmp/conflicted-1-1 -+ DESCRIPTION=git-imerge test repository with conflict at 1-1 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-1-1 -+ local description=git-imerge test repository with conflict at 1-1 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-1-1 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-1-1 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-1-1 @@ -1723,9 +1872,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git/ -+ echo git-imerge test repository with conflict at 1-1 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-1-1 @@ -1740,14 +1889,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 @@ -1755,168 +1906,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 @@ -1957,14 +2168,14 @@ @ = 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...failure. HEAD is now at 243e8ed c⇒9 No progress was possible; suggest manual merge of 1-1 + grep -q Traceback autofill.out -+ grep -q suggest manual merge of 1-1 autofill.out ++ grep -q 'suggest manual merge of 1-1' autofill.out + git-imerge diagram --commits --frontier --html=imerge1.html 0 5 9 | | | @@ -2022,10 +2233,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 a1a0902] imerge 'c-d': manual merge 1-1 +[imerge/c-d aabc5e2] 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. @@ -2085,55 +2296,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: Sat May 6 15:47:19 2023 +0000 +# Date: Sat May 6 15:55:41 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 6e0bfb5] Merge d into c (using imerge) - Date: Sat May 6 15:47:19 2023 +0000 +[c-d-merge 57e2032] Merge d into c (using imerge) + Date: Sat May 6 15:55:41 2023 +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 @@ -2165,7 +2377,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 | | | @@ -2199,9 +2411,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: @@ -2223,7 +2436,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 7832213] imerge 'c-d': manual merge 1-1 +[imerge/c-d c252821] imerge 'c-d': manual merge 1-1 + git-imerge continue --edit Merge has been recorded for merge 1-1. Attempting to merge 1-2...success. @@ -2317,18 +2530,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/git-imerge-1.2.0/t/tmp/conflicted-9-1 -+ DESCRIPTION=git-imerge test repository with conflict at 9-1 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-9-1 -+ local description=git-imerge test repository with conflict at 9-1 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-9-1 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-9-1 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-9-1 @@ -2343,9 +2556,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git/ -+ echo git-imerge test repository with conflict at 9-1 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.name Loú User ++ echo 'git-imerge test repository with conflict at 9-1' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-9-1 @@ -2360,14 +2573,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 @@ -2375,168 +2590,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 @@ -2577,8 +2852,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. @@ -2609,7 +2884,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 | | | @@ -2667,10 +2942,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 b7e7720] imerge 'c-d': manual merge 9-1 +[imerge/c-d 1111902] 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. @@ -2713,61 +2988,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: Sat May 6 15:47:37 2023 +0000 +# Date: Sat May 6 15:55:50 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 5c317ba] Merge d into c (using imerge) - Date: Sat May 6 15:47:37 2023 +0000 +[c-d-merge f6fbb46] Merge d into c (using imerge) + Date: Sat May 6 15:55:50 2023 +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. @@ -2841,7 +3117,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 | | | @@ -2875,9 +3151,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: @@ -2899,7 +3176,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d f6c80b6] imerge 'c-d': manual merge 9-1 +[imerge/c-d 264c19e] 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. @@ -2945,18 +3222,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/git-imerge-1.2.0/t/tmp/conflicted-1-6 -+ DESCRIPTION=git-imerge test repository with conflict at 1-6 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-1-6 -+ local description=git-imerge test repository with conflict at 1-6 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-1-6 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-1-6 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-1-6 @@ -2971,9 +3248,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/ -+ echo git-imerge test repository with conflict at 1-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-1-6 @@ -2988,14 +3265,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 @@ -3003,168 +3282,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 -+ 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 @@ -3234,7 +3573,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 | | | @@ -3292,10 +3631,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 dcb7721] imerge 'c-d': manual merge 1-6 +[imerge/c-d cf95081] 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. @@ -3341,55 +3680,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: Sat May 6 15:47:59 2023 +0000 +# Date: Sat May 6 15:55:59 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 3de941a] Merge d into c (using imerge) - Date: Sat May 6 15:47:59 2023 +0000 +[c-d-merge bf29c0d] Merge d into c (using imerge) + Date: Sat May 6 15:55:59 2023 +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 @@ -3442,7 +3782,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was 7c35161 imerge 'c-d': automatic merge 9-5 +Previous HEAD position was 1582056 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -3467,7 +3807,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 | | | @@ -3501,9 +3841,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: @@ -3525,7 +3866,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d fa64d20] imerge 'c-d': manual merge 1-6 +[imerge/c-d 91088f0] imerge 'c-d': manual merge 1-6 + git-imerge continue --edit Merge has been recorded for merge 1-6. Attempting to merge 2-6...success. @@ -3574,18 +3915,18 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-6 + local conflict=9-6 + TMP=/build/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ DESCRIPTION=git-imerge test repository with conflict at 9-6 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-9-6 -+ local description=git-imerge test repository with conflict at 9-6 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-9-6 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-9-6 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-9-6 @@ -3600,9 +3941,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git/ -+ echo git-imerge test repository with conflict at 9-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name Loú User ++ echo 'git-imerge test repository with conflict at 9-6' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-9-6 @@ -3617,14 +3958,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 @@ -3632,168 +3975,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 -+ 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 @@ -3834,8 +4237,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. @@ -3874,7 +4277,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 | | | @@ -3932,10 +4335,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 1b96f7e] imerge 'c-d': manual merge 9-6 +[imerge/c-d 996c381] 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 @@ -3971,61 +4374,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: Sat May 6 15:48:22 2023 +0000 +# Date: Sat May 6 15:56:09 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 8417212] Merge d into c (using imerge) - Date: Sat May 6 15:48:22 2023 +0000 +[c-d-merge fe2efac] Merge d into c (using imerge) + Date: Sat May 6 15:56:09 2023 +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. @@ -4104,7 +4508,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 | | | @@ -4138,9 +4542,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: @@ -4162,7 +4567,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 56c04de] imerge 'c-d': manual merge 9-6 +[imerge/c-d f8f1de4] imerge 'c-d': manual merge 9-6 + git-imerge continue --edit Merge has been recorded for merge 9-6. Merge is complete! @@ -4203,18 +4608,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/git-imerge-1.2.0/t/tmp/conflicted-1-2 -+ DESCRIPTION=git-imerge test repository with conflict at 1-2 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-1-2 -+ local description=git-imerge test repository with conflict at 1-2 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-1-2 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-1-2 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-1-2 @@ -4229,9 +4634,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git/ -+ echo git-imerge test repository with conflict at 1-2 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-1-2 @@ -4246,14 +4651,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 @@ -4261,168 +4668,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 -+ 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 @@ -4486,7 +4953,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 | | | @@ -4544,10 +5011,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 55d205a] imerge 'c-d': manual merge 1-2 +[imerge/c-d 004233b] 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. @@ -4605,55 +5072,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: Sat May 6 15:48:49 2023 +0000 +# Date: Sat May 6 15:56:18 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 0e1f0ce] Merge d into c (using imerge) - Date: Sat May 6 15:48:49 2023 +0000 +[c-d-merge 27dc4a2] Merge d into c (using imerge) + Date: Sat May 6 15:56:18 2023 +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 @@ -4670,7 +5138,7 @@ Attempting to merge 7-1...success. Attempting to merge 8-1...success. Attempting to merge 9-1...success. -Previous HEAD position was 285dd27 imerge 'c-d': automatic merge 9-1 +Previous HEAD position was 5e294a4 imerge 'c-d': automatic merge 9-1 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -4695,7 +5163,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 | | | @@ -4729,9 +5197,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: @@ -4753,7 +5222,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d dd837bb] imerge 'c-d': manual merge 1-2 +[imerge/c-d 3f986fc] imerge 'c-d': manual merge 1-2 + git-imerge continue --edit Merge has been recorded for merge 1-2. Attempting to merge 1-3...success. @@ -4838,18 +5307,18 @@ + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5 + local refname=c-d-full + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5 -+ git rev-parse c-d-full^{tree} +++ git rev-parse 'c-d-full^{tree}' + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5 + test_conflict 9-5 + local conflict=9-5 + TMP=/build/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ DESCRIPTION=git-imerge test repository with conflict at 9-5 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-9-5 -+ local description=git-imerge test repository with conflict at 9-5 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-9-5 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-9-5 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-9-5 @@ -4864,9 +5333,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git/ -+ echo git-imerge test repository with conflict at 9-5 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name Loú User ++ echo 'git-imerge test repository with conflict at 9-5' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-9-5 @@ -4881,14 +5350,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 @@ -4896,168 +5367,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 @@ -5137,7 +5668,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 | | | @@ -5195,10 +5726,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 ab412ff] imerge 'c-d': manual merge 9-5 +[imerge/c-d d703552] 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. @@ -5237,55 +5768,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: Sat May 6 15:49:14 2023 +0000 +# Date: Sat May 6 15:56:27 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 333b9a6] Merge d into c (using imerge) - Date: Sat May 6 15:49:14 2023 +0000 +[c-d-merge d5bfd41] Merge d into c (using imerge) + Date: Sat May 6 15:56:27 2023 +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 @@ -5369,7 +5901,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 | | | @@ -5403,9 +5935,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: @@ -5427,7 +5960,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 5950db1] imerge 'c-d': manual merge 9-5 +[imerge/c-d efdcfcd] 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. @@ -5469,18 +6002,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/git-imerge-1.2.0/t/tmp/conflicted-5-1 -+ DESCRIPTION=git-imerge test repository with conflict at 5-1 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-5-1 -+ local description=git-imerge test repository with conflict at 5-1 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-5-1 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-5-1 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-5-1 @@ -5495,9 +6028,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git/ -+ echo git-imerge test repository with conflict at 5-1 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-5-1 @@ -5512,14 +6045,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 @@ -5527,168 +6062,228 @@ create mode 100644 d.txt + git checkout -b c master -- Switched to a new branch 'c' -+ seq 9 +++ seq 9 ++ for i in $(seq 9) + modify c.txt 1 + filename=c.txt + text=1 + echo 1 + git add c.txt -+ commit -m c⇒1 ++ case $conflict in ++ commit -m $'c\342\207\2221' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1 ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m $'c\342\207\2221' [c 89e2141] c⇒1 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 2 + filename=c.txt + text=2 + echo 2 + git add c.txt -+ commit -m c⇒2 ++ case $conflict in ++ commit -m $'c\342\207\2222' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2 ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m $'c\342\207\2222' [c 7c431f2] c⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 3 + filename=c.txt + text=3 + echo 3 + git add c.txt -+ commit -m c⇒3 ++ case $conflict in ++ commit -m $'c\342\207\2223' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3 ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m $'c\342\207\2223' [c f02ab24] c⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 4 + filename=c.txt + text=4 + echo 4 + git add c.txt -+ commit -m c⇒4 ++ case $conflict in ++ commit -m $'c\342\207\2224' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4 ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m $'c\342\207\2224' [c ed9122f] c⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 5 + filename=c.txt + text=5 + echo 5 + git add c.txt -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒5 ++ commit -m $'c\342\207\2225' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5 ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m $'c\342\207\2225' [c 7e31f25] c⇒5 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in $(seq 9) + modify c.txt 6 + filename=c.txt + text=6 + echo 6 + git add c.txt -+ commit -m c⇒6 ++ case $conflict in ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [c df3c57a] c⇒6 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ 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 -+ 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 -+ 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 @@ -5729,8 +6324,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. @@ -5757,7 +6352,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 | | | @@ -5815,10 +6410,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 f6c8d76] imerge 'c-d': manual merge 5-1 +[imerge/c-d a89bf08] 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. @@ -5874,55 +6469,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: Sat May 6 15:50:08 2023 +0000 +# Date: Sat May 6 15:56:36 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 0a98908] Merge d into c (using imerge) - Date: Sat May 6 15:50:08 2023 +0000 +[c-d-merge 78cd720] Merge d into c (using imerge) + Date: Sat May 6 15:56:36 2023 +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 @@ -5978,7 +6574,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 | | | @@ -6012,9 +6608,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: @@ -6036,7 +6633,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d c60c924] imerge 'c-d': manual merge 5-1 +[imerge/c-d 4fa657e] imerge 'c-d': manual merge 5-1 + git-imerge continue --edit Merge has been recorded for merge 5-1. Attempting to merge 5-2...success. @@ -6106,18 +6703,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/git-imerge-1.2.0/t/tmp/conflicted-6-6 -+ DESCRIPTION=git-imerge test repository with conflict at 6-6 -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6' + local path=/build/git-imerge-1.2.0/t/tmp/conflicted-6-6 -+ local description=git-imerge test repository with conflict at 6-6 -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6' + local path=/build/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/git-imerge-1.2.0/t/tmp/conflicted-6-6 + mkdir -p /build/git-imerge-1.2.0/t/tmp/conflicted-6-6 + git init /build/git-imerge-1.2.0/t/tmp/conflicted-6-6 @@ -6132,9 +6729,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git/ -+ echo git-imerge test repository with conflict at 6-6 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/conflicted-6-6 @@ -6149,14 +6746,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 @@ -6164,168 +6763,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 -+ modify conflict.txt c version ++ case $conflict in ++ modify conflict.txt 'c version' + filename=conflict.txt -+ text=c version -+ echo c version ++ text='c version' ++ echo 'c version' + git add conflict.txt -+ commit -m c⇒6 ++ commit -m $'c\342\207\2226' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6 ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m $'c\342\207\2226' [c fe4fed8] c⇒6 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in $(seq 9) + modify c.txt 7 + filename=c.txt + text=7 + echo 7 + git add c.txt -+ commit -m c⇒7 ++ case $conflict in ++ commit -m $'c\342\207\2227' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7 ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m $'c\342\207\2227' [c ec255ea] c⇒7 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 8 + filename=c.txt + text=8 + echo 8 + git add c.txt -+ commit -m c⇒8 ++ case $conflict in ++ commit -m $'c\342\207\2228' + TIME=1112912002 -+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8 ++ GIT_AUTHOR_DATE='@1112912002 +0000' ++ GIT_COMMITTER_DATE='@1112912002 +0000' ++ git commit -m $'c\342\207\2228' [c 7459ac3] c⇒8 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 9) + modify c.txt 9 + filename=c.txt + text=9 + echo 9 + git add c.txt -+ commit -m c⇒9 ++ case $conflict in ++ commit -m $'c\342\207\2229' + TIME=1112912003 -+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9 ++ GIT_AUTHOR_DATE='@1112912003 +0000' ++ GIT_COMMITTER_DATE='@1112912003 +0000' ++ git commit -m $'c\342\207\2229' [c 70408c8] c⇒9 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b d master -- Switched to a new branch 'd' -+ seq 6 +++ seq 6 ++ for i in $(seq 6) + modify d.txt 1 + filename=d.txt + text=1 + echo 1 + git add d.txt -+ commit -m d⇒1 ++ case $conflict in ++ commit -m $'d\342\207\2221' + TIME=1112912004 -+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1 ++ GIT_AUTHOR_DATE='@1112912004 +0000' ++ GIT_COMMITTER_DATE='@1112912004 +0000' ++ git commit -m $'d\342\207\2221' [d bd5368a] d⇒1 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 2 + filename=d.txt + text=2 + echo 2 + git add d.txt -+ commit -m d⇒2 ++ case $conflict in ++ commit -m $'d\342\207\2222' + TIME=1112912005 -+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2 ++ GIT_AUTHOR_DATE='@1112912005 +0000' ++ GIT_COMMITTER_DATE='@1112912005 +0000' ++ git commit -m $'d\342\207\2222' [d 93e27e6] d⇒2 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 3 + filename=d.txt + text=3 + echo 3 + git add d.txt -+ commit -m d⇒3 ++ case $conflict in ++ commit -m $'d\342\207\2223' + TIME=1112912006 -+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3 ++ GIT_AUTHOR_DATE='@1112912006 +0000' ++ GIT_COMMITTER_DATE='@1112912006 +0000' ++ git commit -m $'d\342\207\2223' [d 133f385] d⇒3 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 4 + filename=d.txt + text=4 + echo 4 + git add d.txt -+ commit -m d⇒4 ++ case $conflict in ++ commit -m $'d\342\207\2224' + TIME=1112912007 -+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4 ++ GIT_AUTHOR_DATE='@1112912007 +0000' ++ GIT_COMMITTER_DATE='@1112912007 +0000' ++ git commit -m $'d\342\207\2224' [d 586472a] d⇒4 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 5 + filename=d.txt + text=5 + echo 5 + git add d.txt -+ commit -m d⇒5 ++ case $conflict in ++ commit -m $'d\342\207\2225' + TIME=1112912008 -+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5 ++ GIT_AUTHOR_DATE='@1112912008 +0000' ++ GIT_COMMITTER_DATE='@1112912008 +0000' ++ git commit -m $'d\342\207\2225' [d 9522207] d⇒5 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 6) + modify d.txt 6 + filename=d.txt + text=6 + echo 6 + git add d.txt -+ modify conflict.txt d version ++ case $conflict in ++ modify conflict.txt 'd version' + filename=conflict.txt -+ text=d version -+ echo d version ++ text='d version' ++ echo 'd version' + git add conflict.txt -+ commit -m d⇒6 ++ commit -m $'d\342\207\2226' + TIME=1112912009 -+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6 ++ GIT_AUTHOR_DATE='@1112912009 +0000' ++ GIT_COMMITTER_DATE='@1112912009 +0000' ++ git commit -m $'d\342\207\2226' [d f7e451a] d⇒6 2 files changed, 2 insertions(+), 2 deletions(-) + git checkout c @@ -6409,7 +7068,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 | | | @@ -6467,10 +7126,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 7106a06] imerge 'c-d': manual merge 6-6 +[imerge/c-d 63dd21a] 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. @@ -6511,55 +7170,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: Sat May 6 15:50:36 2023 +0000 +# Date: Sat May 6 15:56:45 2023 +0000 # # On branch c-d-merge # Changes to be committed: # modified: conflict.txt # modified: d.txt # -[c-d-merge 68d0847] Merge d into c (using imerge) - Date: Sat May 6 15:50:36 2023 +0000 +[c-d-merge 46dc75f] Merge d into c (using imerge) + Date: Sat May 6 15:56:45 2023 +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 @@ -6617,7 +7277,7 @@ Attempting to merge 9-3...success. Attempting to merge 9-4...success. Attempting to merge 9-5...success. -Previous HEAD position was 7bba5ed imerge 'c-d': automatic merge 9-5 +Previous HEAD position was d1aa9b8 imerge 'c-d': automatic merge 9-5 Switched to branch 'imerge/c-d' Auto-merging conflict.txt CONFLICT (content): Merge conflict in conflict.txt @@ -6642,7 +7302,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 | | | @@ -6676,9 +7336,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: @@ -6700,7 +7361,7 @@ # modified: conflict.txt # modified: d.txt # -[imerge/c-d 7bce643] imerge 'c-d': manual merge 6-6 +[imerge/c-d b960acb] imerge 'c-d': manual merge 6-6 + git-imerge continue --edit Merge has been recorded for merge 6-6. Attempting to merge 7-6...success. @@ -6744,24 +7405,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 py311 run-test: commands[2] | /bin/sh t/test-really-conflicted -+ dirname t/test-really-conflicted -+ cd t -+ pwd -+ dirname /build/git-imerge-1.2.0/t +++++ dirname t/test-really-conflicted ++++ cd t ++++ pwd +++ dirname /build/git-imerge-1.2.0/t + BASE=/build/git-imerge-1.2.0 + . /build/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/build/git-imerge-1.2.0/t/tmp/really-conflicted -+ DESCRIPTION=git-imerge test repository with multiple conflicts -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts' + local path=/build/git-imerge-1.2.0/t/tmp/really-conflicted -+ local description=git-imerge test repository with multiple conflicts -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts' + local path=/build/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/git-imerge-1.2.0/t/tmp/really-conflicted + mkdir -p /build/git-imerge-1.2.0/t/tmp/really-conflicted + git init /build/git-imerge-1.2.0/t/tmp/really-conflicted @@ -6776,9 +7437,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/really-conflicted/.git/ -+ echo git-imerge test repository with multiple conflicts -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/really-conflicted @@ -6793,50 +7454,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 @@ -6856,19 +7527,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 @@ -6876,9 +7549,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 @@ -6886,9 +7561,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 @@ -6896,14 +7573,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 @@ -6911,19 +7590,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 @@ -6931,14 +7612,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 @@ -6946,14 +7629,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 @@ -6961,9 +7646,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 @@ -6971,14 +7658,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 -- @@ -6988,19 +7677,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 @@ -7008,19 +7699,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 @@ -7028,9 +7721,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 @@ -7038,9 +7733,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 @@ -7048,14 +7745,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 @@ -7063,14 +7762,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 @@ -7078,14 +7779,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 @@ -7093,14 +7796,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 @@ -7145,8 +7850,8 @@ + conflict_count=0 + true -+ tee autofill.out + git-imerge continue --no-edit ++ tee autofill.out Attempting automerge of 9-8...failure. Attempting automerge of 1-1...failure. Switched to branch 'imerge/c-d' @@ -7196,26 +7901,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 e500933] imerge 'c-d': manual merge 1-1 ++ tee autofill.out +[imerge/c-d 76cd21a] 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. @@ -7307,26 +8020,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 4d26065] imerge 'c-d': manual merge 1-6 ++ tee autofill.out +[imerge/c-d 22bc2f8] 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. @@ -7343,12 +8064,12 @@ Warning: you are leaving 1 commit behind, not connected to any of your branches: - 00e5a60 imerge 'c-d': automatic merge 3-8 + b73bb9d 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 00e5a60 + git branch b73bb9d Switched to branch 'imerge/c-d' Auto-merging conflict1.txt @@ -7397,26 +8118,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 eef502e] imerge 'c-d': manual merge 4-2 ++ tee autofill.out +[imerge/c-d f73ddda] 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. @@ -7426,7 +8155,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 4caf6ed imerge 'c-d': automatic merge 4-8 +Previous HEAD position was a658400 imerge 'c-d': automatic merge 4-8 Switched to branch 'imerge/c-d' Auto-merging conflict6.txt CONFLICT (content): Merge conflict in conflict6.txt @@ -7474,26 +8203,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 -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d 144f9ea] imerge 'c-d': manual merge 5-1 ++ tee autofill.out +[imerge/c-d 0ac6c0b] 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. @@ -7528,7 +8265,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 4c5bbd7 imerge 'c-d': automatic merge 7-1 +Previous HEAD position was 7036b13 imerge 'c-d': automatic merge 7-1 Switched to branch 'imerge/c-d' Auto-merging conflict3.txt CONFLICT (content): Merge conflict in conflict3.txt @@ -7576,26 +8313,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 b950c66] imerge 'c-d': manual merge 5-5 ++ git-imerge continue --no-edit ++ tee autofill.out +[imerge/c-d 7e41b15] 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. @@ -7658,31 +8403,39 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ grep -q 'There was a conflict merging' autofill.out +++ seq 0 7 ++ for i in $(seq 0 7) + grep -q ==== conflict0.txt ++ for i in $(seq 0 7) + grep -q ==== conflict1.txt ++ for i in $(seq 0 7) + grep -q ==== conflict2.txt ++ for i in $(seq 0 7) + grep -q ==== conflict3.txt ++ for i in $(seq 0 7) + grep -q ==== conflict4.txt ++ for i in $(seq 0 7) + grep -q ==== conflict5.txt -+ modify conflict5.txt merged version ++ modify conflict5.txt 'merged version' + filename=conflict5.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict5.txt + conflict_count=6 ++ for i in $(seq 0 7) + grep -q ==== conflict6.txt ++ for i in $(seq 0 7) + grep -q ==== conflict7.txt + true -+ + git-imerge continue --no-edit -tee autofill.out -[imerge/c-d c2e8400] imerge 'c-d': manual merge 6-7 ++ git-imerge continue --no-edit ++ tee autofill.out +[imerge/c-d a5c6062] 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 b833747 imerge 'c-d': automatic merge 6-8 +Previous HEAD position was e39224d imerge 'c-d': automatic merge 6-8 Switched to branch 'imerge/c-d' Auto-merging conflict2.txt CONFLICT (content): Merge conflict in conflict2.txt @@ -7730,26 +8483,34 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging autofill.out -+ seq 0 7 ++ grep -q 'There was a conflict merging' autofill.out +++ seq 0 7 ++ for i in $(seq 0 7) + grep -q ==== conflict0.txt ++ for i in $(seq 0 7) + grep -q ==== conflict1.txt ++ for i in $(seq 0 7) + grep -q ==== conflict2.txt -+ modify conflict2.txt merged version ++ modify conflict2.txt 'merged version' + filename=conflict2.txt -+ text=merged version -+ echo merged version ++ text='merged version' ++ echo 'merged version' + git add conflict2.txt + conflict_count=7 ++ for i in $(seq 0 7) + grep -q ==== conflict3.txt ++ for i in $(seq 0 7) + grep -q ==== conflict4.txt ++ for i in $(seq 0 7) + grep -q ==== conflict5.txt ++ for i in $(seq 0 7) + grep -q ==== conflict6.txt ++ for i in $(seq 0 7) + grep -q ==== conflict7.txt + true -+ tee autofill.out + git-imerge continue --no-edit -[imerge/c-d f76058c] imerge 'c-d': manual merge 7-2 ++ tee autofill.out +[imerge/c-d 907b099] 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. @@ -7831,26 +8592,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 c1555a8] imerge 'c-d': manual merge 9-8 ++ tee autofill.out +[imerge/c-d f72b4b8] imerge 'c-d': manual merge 9-8 Merge has been recorded for merge 9-8. Merge is complete! + grep -q Traceback autofill.out @@ -7877,20 +8646,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 -ucat - - 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: Sat May 6 15:51:17 2023 +0000 +# Date: Sat May 6 15:57:01 2023 +0000 # # On branch c-d-merge # Changes to be committed: @@ -7904,60 +8674,60 @@ # modified: conflict7.txt # modified: d.txt # -[c-d-merge de540aa] Merge d into c (using imerge) - Date: Sat May 6 15:51:17 2023 +0000 +[c-d-merge ee8b84a] Merge d into c (using imerge) + Date: Sat May 6 15:57:01 2023 +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 py311 run-test: commands[3] | /bin/sh t/test-duplicated -+ dirname t/test-duplicated -+ cd t -+ pwd -+ dirname /build/git-imerge-1.2.0/t +++++ dirname t/test-duplicated ++++ cd t ++++ pwd +++ dirname /build/git-imerge-1.2.0/t + BASE=/build/git-imerge-1.2.0 + . /build/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/build/git-imerge-1.2.0/t/tmp/duplicated -+ DESCRIPTION=git-imerge test repository with duplicate commits -+ init_test_repo /build/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/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits' + local path=/build/git-imerge-1.2.0/t/tmp/duplicated -+ local description=git-imerge test repository with duplicate commits -+ delete_test_repo /build/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/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits' + local path=/build/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/git-imerge-1.2.0/t/tmp/duplicated + mkdir -p /build/git-imerge-1.2.0/t/tmp/duplicated + git init /build/git-imerge-1.2.0/t/tmp/duplicated @@ -7972,9 +8742,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/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/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name Loú User ++ echo 'git-imerge test repository with duplicate commits' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/duplicated/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/duplicated @@ -7984,86 +8754,109 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' -+ seq 3 +++ seq 3 ++ for i in $(seq 3) + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt -+ commit -m a⇒1 on branch a ++ commit -m 'a⇒1 on branch a' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m 'a⇒1 on branch a' [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 3) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt -+ commit -m a⇒2 on branch a ++ commit -m 'a⇒2 on branch a' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m 'a⇒2 on branch a' [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 3) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt -+ commit -m a⇒3 on branch a ++ commit -m 'a⇒3 on branch a' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m 'a⇒3 on branch a' [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' -+ seq 4 +++ seq 4 ++ for i in $(seq 4) + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt -+ commit -m a⇒1 on branch b ++ commit -m 'a⇒1 on branch b' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m 'a⇒1 on branch b' [b 62a5c56] a⇒1 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 4) + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt -+ commit -m a⇒2 on branch b ++ commit -m 'a⇒2 on branch b' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m 'a⇒2 on branch b' [b f846281] a⇒2 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 4) + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt -+ commit -m a⇒3 on branch b ++ commit -m 'a⇒3 on branch b' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m 'a⇒3 on branch b' [b a4b2c2b] a⇒3 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in $(seq 4) + modify a.txt 4 + filename=a.txt + text=4 + echo 4 + git add a.txt -+ commit -m a⇒4 on branch b ++ commit -m 'a⇒4 on branch b' + TIME=1112912001 -+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b ++ GIT_AUTHOR_DATE='@1112912001 +0000' ++ GIT_COMMITTER_DATE='@1112912001 +0000' ++ git commit -m 'a⇒4 on branch b' [b 5b24553] a⇒4 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2 @@ -8138,54 +8931,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: Sat May 6 15:51:31 2023 +0000 +# Date: Sat May 6 15:57:05 2023 +0000 # # On branch a-b-merge # Changes to be committed: # modified: a.txt # -[a-b-merge 7f09df7] Merge b into a (using imerge) - Date: Sat May 6 15:51:31 2023 +0000 +[a-b-merge c355c5d] Merge b into a (using imerge) + Date: Sat May 6 15:57:05 2023 +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' @@ -8238,26 +9032,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 py311 run-test: commands[4] | /bin/sh t/test-flip-flop -+ dirname t/test-flip-flop -+ cd t -+ pwd -+ dirname /build/git-imerge-1.2.0/t +++++ dirname t/test-flip-flop ++++ cd t ++++ pwd +++ dirname /build/git-imerge-1.2.0/t + BASE=/build/git-imerge-1.2.0 + . /build/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge ++ for n in 1 2 3 + flip_flop_test 1 + local n=1 + TMP=/build/git-imerge-1.2.0/t/tmp/flip-flop-1 -+ DESCRIPTION=git-imerge test repository with a commit and its revert at n=1 -+ init_test_repo /build/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/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/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/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/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/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/git-imerge-1.2.0/t/tmp/flip-flop-1 + mkdir -p /build/git-imerge-1.2.0/t/tmp/flip-flop-1 + git init /build/git-imerge-1.2.0/t/tmp/flip-flop-1 @@ -8272,9 +9067,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/flip-flop-1/.git/ -+ echo git-imerge test repository with a commit and its revert at n=1 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/flip-flop-1 @@ -8284,72 +9079,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 @@ -8357,36 +9167,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 @@ -8458,12 +9276,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 -+ + teegit-imerge imerge-b-into-a-1-2.out continue - --no-edit -[imerge/b 7713792] imerge 'b': manual merge 1-1 ++ git-imerge continue --no-edit ++ tee imerge-b-into-a-1-2.out +[imerge/b afdd722] 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. @@ -8471,7 +9289,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 dae2636 imerge 'b': automatic merge 3-1 +Previous HEAD position was 282a0ea imerge 'b': automatic merge 3-1 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -8524,12 +9342,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 cb08780] imerge 'b': manual merge 1-2 ++ tee imerge-b-into-a-1-3.out +[imerge/b e919f2a] imerge 'b': manual merge 1-2 Merge has been recorded for merge 1-2. Attempting automerge of 1-4...success. Autofilling 1-3...success. @@ -8544,7 +9362,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 | | @@ -8574,20 +9392,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: Sat May 6 15:51:44 2023 +0000 +# Date: Sat May 6 15:57:11 2023 +0000 # # On branch b-into-a-1 # Changes to be committed: # new file: b.txt # -[b-into-a-1 57a6d92] Merge b into a (using imerge) - Date: Sat May 6 15:51:44 2023 +0000 +[b-into-a-1 e8749a5] Merge b into a (using imerge) + Date: Sat May 6 15:57:11 2023 +0000 + test_merge a-into-b-1 b a 1-1 2-1 + local name=a-into-b-1 + local dst=b @@ -8596,8 +9415,8 @@ + local conflict2=2-1 + git checkout b Switched to branch 'b' -+ tee imerge-a-into-b-1-1.out + git-imerge merge --branch=a-into-b-1 a ++ tee imerge-a-into-b-1-1.out Attempting automerge of 4-3...success. Autofilling 1-3...unexpected conflict. Backtracking... Autofilling 1-2...unexpected conflict. Backtracking... @@ -8652,12 +9471,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 63ea950] imerge 'a': manual merge 1-1 ++ tee imerge-a-into-b-1-2.out +[imerge/a 5be7ba3] imerge 'a': manual merge 1-1 Merge has been recorded for merge 1-1. Attempting automerge of 1-3...success. Autofilling 1-2...success. @@ -8715,12 +9534,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 -+ + teegit-imerge continue --no-edit - imerge-a-into-b-1-3.out -[imerge/a affa99e] imerge 'a': manual merge 2-1 ++ git-imerge continue --no-edit ++ tee imerge-a-into-b-1-3.out +[imerge/a ec2da47] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -8735,7 +9554,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 | | @@ -8763,30 +9582,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: Sat May 6 15:51:49 2023 +0000 +# Date: Sat May 6 15:57:13 2023 +0000 # # On branch a-into-b-1 # Changes to be committed: # modified: a.txt # -[a-into-b-1 5028e44] Merge a into b (using imerge) - Date: Sat May 6 15:51:49 2023 +0000 +[a-into-b-1 bca780a] Merge a into b (using imerge) + Date: Sat May 6 15:57:13 2023 +0000 ++ for n in 1 2 3 + flip_flop_test 2 + local n=2 + TMP=/build/git-imerge-1.2.0/t/tmp/flip-flop-2 -+ DESCRIPTION=git-imerge test repository with a commit and its revert at n=2 -+ init_test_repo /build/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/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/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/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/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/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/git-imerge-1.2.0/t/tmp/flip-flop-2 + mkdir -p /build/git-imerge-1.2.0/t/tmp/flip-flop-2 + git init /build/git-imerge-1.2.0/t/tmp/flip-flop-2 @@ -8801,9 +9622,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/flip-flop-2/.git/ -+ echo git-imerge test repository with a commit and its revert at n=2 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/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/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/flip-flop-2 @@ -8813,85 +9634,103 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' ++ for i in 1 2 3 + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt -+ commit -m a⇒1 on branch a ++ commit -m 'a⇒1 on branch a' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m 'a⇒1 on branch a' [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in 1 2 3 + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt -+ commit -m a⇒2 on branch a ++ commit -m 'a⇒2 on branch a' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a ++ 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 @@ -8899,23 +9738,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 @@ -8926,8 +9770,8 @@ + local conflict2=1-3 + git checkout a Switched to branch 'a' -+ + git-imergetee merge imerge-b-into-a-2-1.out --branch=b-into-a-2 - b ++ 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. @@ -9001,12 +9845,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 557e308] imerge 'b': manual merge 1-2 +[imerge/b 8733cd2] 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. @@ -9014,7 +9858,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 e0efb81 imerge 'b': automatic merge 3-2 +Previous HEAD position was ba56493 imerge 'b': automatic merge 3-2 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9067,12 +9911,12 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out ++ grep -q 'There was a conflict merging commit 1-3' imerge-b-into-a-2-2.out + echo 1 + git add a.txt + git-imerge continue --no-edit + tee imerge-b-into-a-2-3.out -[imerge/b c793c4e] imerge 'b': manual merge 1-3 +[imerge/b 61540cc] imerge 'b': manual merge 1-3 Merge has been recorded for merge 1-3. Attempting automerge of 1-4...success. Autofilling 1-4...success. @@ -9085,7 +9929,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 | | @@ -9115,20 +9959,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: Sat May 6 15:51:56 2023 +0000 +# Date: Sat May 6 15:57:16 2023 +0000 # # On branch b-into-a-2 # Changes to be committed: # new file: b.txt # -[b-into-a-2 98148c3] Merge b into a (using imerge) - Date: Sat May 6 15:51:56 2023 +0000 +[b-into-a-2 90ff5dd] Merge b into a (using imerge) + Date: Sat May 6 15:57:16 2023 +0000 + test_merge a-into-b-2 b a 2-1 3-1 + local name=a-into-b-2 + local dst=b @@ -9198,12 +10043,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 -+ tee imerge-a-into-b-2-2.out + git-imerge continue --no-edit -[imerge/a e8fd971] imerge 'a': manual merge 2-1 ++ tee imerge-a-into-b-2-2.out +[imerge/a 93e1516] imerge 'a': manual merge 2-1 Merge has been recorded for merge 2-1. Attempting automerge of 2-3...success. Autofilling 2-2...success. @@ -9261,12 +10106,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-imergetee continue imerge-a-into-b-2-3.out --no-edit - -[imerge/a 5062415] imerge 'a': manual merge 3-1 ++ git-imerge continue --no-edit ++ tee imerge-a-into-b-2-3.out +[imerge/a 27e3f2c] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9278,7 +10123,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 | | @@ -9306,30 +10151,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: Sat May 6 15:52:01 2023 +0000 +# Date: Sat May 6 15:57:18 2023 +0000 # # On branch a-into-b-2 # Changes to be committed: # modified: a.txt # -[a-into-b-2 9ed8a03] Merge a into b (using imerge) - Date: Sat May 6 15:52:01 2023 +0000 +[a-into-b-2 ec9cd70] Merge a into b (using imerge) + Date: Sat May 6 15:57:18 2023 +0000 ++ for n in 1 2 3 + flip_flop_test 3 + local n=3 + TMP=/build/git-imerge-1.2.0/t/tmp/flip-flop-3 -+ DESCRIPTION=git-imerge test repository with a commit and its revert at n=3 -+ init_test_repo /build/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/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/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/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/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/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/git-imerge-1.2.0/t/tmp/flip-flop-3 + mkdir -p /build/git-imerge-1.2.0/t/tmp/flip-flop-3 + git init /build/git-imerge-1.2.0/t/tmp/flip-flop-3 @@ -9344,9 +10191,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/flip-flop-3/.git/ -+ echo git-imerge test repository with a commit and its revert at n=3 -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name Loú User ++ echo 'git-imerge test repository with a commit and its revert at n=3' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/flip-flop-3 @@ -9356,98 +10203,119 @@ + text=0 + echo 0 + git add a.txt -+ commit -m m⇒0 ++ commit -m $'m\342\207\2220' + TIME=1112911994 -+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0 ++ GIT_AUTHOR_DATE='@1112911994 +0000' ++ GIT_COMMITTER_DATE='@1112911994 +0000' ++ git commit -m $'m\342\207\2220' [master (root-commit) a733afa] m⇒0 1 file changed, 1 insertion(+) create mode 100644 a.txt + git checkout -b a -- Switched to a new branch 'a' ++ for i in 1 2 3 + modify a.txt 1 + filename=a.txt + text=1 + echo 1 + git add a.txt -+ commit -m a⇒1 on branch a ++ commit -m 'a⇒1 on branch a' + TIME=1112911995 -+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a ++ GIT_AUTHOR_DATE='@1112911995 +0000' ++ GIT_COMMITTER_DATE='@1112911995 +0000' ++ git commit -m 'a⇒1 on branch a' [a 2f1f75a] a⇒1 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in 1 2 3 + modify a.txt 2 + filename=a.txt + text=2 + echo 2 + git add a.txt -+ commit -m a⇒2 on branch a ++ commit -m 'a⇒2 on branch a' + TIME=1112911996 -+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a ++ GIT_AUTHOR_DATE='@1112911996 +0000' ++ GIT_COMMITTER_DATE='@1112911996 +0000' ++ git commit -m 'a⇒2 on branch a' [a 4700669] a⇒2 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in 1 2 3 + modify a.txt 3 + filename=a.txt + text=3 + echo 3 + git add a.txt -+ commit -m a⇒3 on branch a ++ commit -m 'a⇒3 on branch a' + TIME=1112911997 -+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a ++ GIT_AUTHOR_DATE='@1112911997 +0000' ++ GIT_COMMITTER_DATE='@1112911997 +0000' ++ git commit -m 'a⇒3 on branch a' [a 621c381] a⇒3 on branch a 1 file changed, 1 insertion(+), 1 deletion(-) + git checkout -b b master -- Switched to a new branch 'b' ++ for i in 1 2 3 4 + modify b.txt 1 + filename=b.txt + text=1 + echo 1 + git add b.txt -+ msg=b⇒1 ++ msg=$'b\342\207\2221' + test 1 = 3 + test 1 = 4 -+ commit -m b⇒1 on branch b ++ commit -m 'b⇒1 on branch b' + TIME=1112911998 -+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b ++ GIT_AUTHOR_DATE='@1112911998 +0000' ++ GIT_COMMITTER_DATE='@1112911998 +0000' ++ git commit -m 'b⇒1 on branch b' [b 1f7d097] b⇒1 on branch b 1 file changed, 1 insertion(+) create mode 100644 b.txt ++ for i in 1 2 3 4 + modify b.txt 2 + filename=b.txt + text=2 + echo 2 + git add b.txt -+ msg=b⇒2 ++ msg=$'b\342\207\2222' + test 2 = 3 + test 2 = 4 -+ commit -m b⇒2 on branch b ++ commit -m 'b⇒2 on branch b' + TIME=1112911999 -+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b ++ GIT_AUTHOR_DATE='@1112911999 +0000' ++ GIT_COMMITTER_DATE='@1112911999 +0000' ++ git commit -m 'b⇒2 on branch b' [b ce671e9] b⇒2 on branch b 1 file changed, 1 insertion(+), 1 deletion(-) ++ for i in 1 2 3 4 + modify b.txt 3 + filename=b.txt + text=3 + echo 3 + git add b.txt -+ msg=b⇒3 ++ msg=$'b\342\207\2223' + test 3 = 3 + modify a.txt X + filename=a.txt + text=X + echo X + git add a.txt -+ msg=b⇒3 and a⇒X ++ msg='b⇒3 and a⇒X' + test 3 = 4 -+ commit -m b⇒3 and a⇒X on branch b ++ commit -m 'b⇒3 and a⇒X on branch b' + TIME=1112912000 -+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b ++ GIT_AUTHOR_DATE='@1112912000 +0000' ++ GIT_COMMITTER_DATE='@1112912000 +0000' ++ git commit -m 'b⇒3 and a⇒X on branch b' [b d40495e] b⇒3 and a⇒X on branch b 2 files changed, 2 insertions(+), 2 deletions(-) ++ for i in 1 2 3 4 + modify b.txt 4 + filename=b.txt + text=4 + echo 4 + git add b.txt -+ msg=b⇒4 ++ msg=$'b\342\207\2224' + test 4 = 3 + test 4 = 4 + modify a.txt 0 @@ -9455,10 +10323,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 @@ -9550,12 +10420,12 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out ++ grep -q 'There was a conflict merging commit 1-3' imerge-b-into-a-3-1.out + echo 1 + git add a.txt -+ tee imerge-b-into-a-3-2.out + git-imerge continue --no-edit -[imerge/b c24dc53] imerge 'b': manual merge 1-3 ++ tee imerge-b-into-a-3-2.out +[imerge/b fc332e8] 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. @@ -9563,7 +10433,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 f3e0d4e imerge 'b': automatic merge 3-3 +Previous HEAD position was b3abb80 imerge 'b': automatic merge 3-3 Switched to branch 'imerge/b' Auto-merging a.txt CONFLICT (content): Merge conflict in a.txt @@ -9616,19 +10486,19 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out ++ grep -q 'There was a conflict merging commit 1-4' imerge-b-into-a-3-2.out + echo 1 + git add a.txt -+ + git-imergetee continue --no-edit imerge-b-into-a-3-3.out - -[imerge/b 0777a67] imerge 'b': manual merge 1-4 ++ git-imerge continue --no-edit ++ tee imerge-b-into-a-3-3.out +[imerge/b 72723bd] 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 | | @@ -9658,20 +10528,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: Sat May 6 15:52:06 2023 +0000 +# Date: Sat May 6 15:57:21 2023 +0000 # # On branch b-into-a-3 # Changes to be committed: # new file: b.txt # -[b-into-a-3 40b8aba] Merge b into a (using imerge) - Date: Sat May 6 15:52:06 2023 +0000 +[b-into-a-3 7d6e25c] Merge b into a (using imerge) + Date: Sat May 6 15:57:21 2023 +0000 + test_merge a-into-b-3 b a 3-1 4-1 + local name=a-into-b-3 + local dst=b @@ -9745,12 +10616,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 056aa8a] imerge 'a': manual merge 3-1 +[imerge/a 2dcb433] imerge 'a': manual merge 3-1 Merge has been recorded for merge 3-1. Attempting automerge of 3-3...success. Autofilling 3-2...success. @@ -9808,19 +10679,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 4f9be30] imerge 'a': manual merge 4-1 ++ tee imerge-a-into-b-3-3.out +[imerge/a 4d2f742] 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 | | @@ -9848,36 +10719,37 @@ @ = merge was blocked but has been resolved ? = no merge recorded -+ GIT_EDITOR=cat git-imerge finish ++ GIT_EDITOR=cat ++ git-imerge finish Merge a into b (using imerge) # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# Date: Sat May 6 15:52:10 2023 +0000 +# Date: Sat May 6 15:57:23 2023 +0000 # # On branch a-into-b-3 # Changes to be committed: # modified: a.txt # -[a-into-b-3 42895d6] Merge a into b (using imerge) - Date: Sat May 6 15:52:10 2023 +0000 +[a-into-b-3 3378934] Merge a into b (using imerge) + Date: Sat May 6 15:57:23 2023 +0000 py311 run-test: commands[5] | /bin/sh t/test-drop -+ dirname t/test-drop -+ cd t -+ pwd -+ dirname /build/git-imerge-1.2.0/t +++++ dirname t/test-drop ++++ cd t ++++ pwd +++ dirname /build/git-imerge-1.2.0/t + BASE=/build/git-imerge-1.2.0 + . /build/git-imerge-1.2.0/t/test-lib.sh + GIT_IMERGE=git-imerge + TMP=/build/git-imerge-1.2.0/t/tmp/drop -+ DESCRIPTION=git-imerge drop test repository -+ init_test_repo /build/git-imerge-1.2.0/t/tmp/drop git-imerge drop test repository ++ DESCRIPTION='git-imerge drop test repository' ++ init_test_repo /build/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository' + local path=/build/git-imerge-1.2.0/t/tmp/drop -+ local description=git-imerge drop test repository -+ delete_test_repo /build/git-imerge-1.2.0/t/tmp/drop git-imerge drop test repository ++ local 'description=git-imerge drop test repository' ++ delete_test_repo /build/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository' + local path=/build/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/git-imerge-1.2.0/t/tmp/drop + mkdir -p /build/git-imerge-1.2.0/t/tmp/drop + git init /build/git-imerge-1.2.0/t/tmp/drop @@ -9892,9 +10764,9 @@ hint: hint: git branch -m Initialized empty Git repository in /build/git-imerge-1.2.0/t/tmp/drop/.git/ -+ echo git-imerge drop test repository -+ printf %s\n /*.out /*.css /*.html -+ git --git-dir=/build/git-imerge-1.2.0/t/tmp/drop/.git config user.name Loú User ++ echo 'git-imerge drop test repository' ++ printf '%s\n' '/*.out' '/*.css' '/*.html' ++ git --git-dir=/build/git-imerge-1.2.0/t/tmp/drop/.git config user.name 'Loú User' + git --git-dir=/build/git-imerge-1.2.0/t/tmp/drop/.git config user.email luser@example.com + TIME=1112911993 + ln -s /build/git-imerge-1.2.0/imerge.css /build/git-imerge-1.2.0/t/tmp/drop @@ -9904,76 +10776,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 @@ -9998,12 +10890,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD bb48540] Revert "a3⇒3" - Date: Sat May 6 15:52:11 2023 +0000 +[detached HEAD 16dacd2] Revert "a3⇒3" + Date: Sat May 6 15:57:23 2023 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD a607741] Revert "a2⇒2" - Date: Sat May 6 15:52:11 2023 +0000 +[detached HEAD ec9b83e] Revert "a2⇒2" + Date: Sat May 6 15:57:23 2023 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10013,7 +10905,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='a60774181baad7e0a063927076edb4b811282b49', goal='drop')[0:4,0:3]. +Recording autofilled block MergeState('dropped', tip1='dropped', tip2='ec9b83e71e826b3fbbc5e1d3c94a15207032eee9', goal='drop')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-drop.html 0 3 @@ -10022,7 +10914,7 @@ *??. 2 - *... | - a60774181baad7e0a063927076edb4b811282b49 + ec9b83e71e826b3fbbc5e1d3c94a15207032eee9 0 3 | | @@ -10030,7 +10922,7 @@ *??| 2 - *--+ | - a60774181baad7e0a063927076edb4b811282b49 + ec9b83e71e826b3fbbc5e1d3c94a15207032eee9 Key: |,-,+ = rectangles forming current merge frontier @@ -10044,7 +10936,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' @@ -10067,12 +10959,12 @@ Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 34bdde3 a3⇒3 -[detached HEAD 6c4087c] Revert "a3⇒3" - Date: Sat May 6 15:52:13 2023 +0000 +[detached HEAD 731be0b] Revert "a3⇒3" + Date: Sat May 6 15:57:24 2023 +0000 1 file changed, 1 deletion(-) delete mode 100644 a3.txt -[detached HEAD 61c6e63] Revert "a2⇒2" - Date: Sat May 6 15:52:13 2023 +0000 +[detached HEAD 3e3ffd2] Revert "a2⇒2" + Date: Sat May 6 15:57:24 2023 +0000 1 file changed, 1 deletion(-) delete mode 100644 a2.txt Attempting automerge of 3-2...success. @@ -10082,7 +10974,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='61c6e63a46cb73bbcc46719f3f42d6fafdbf8c20', goal='revert')[0:4,0:3]. +Recording autofilled block MergeState('reverted', tip1='reverted', tip2='3e3ffd2ba83892c01038ca1220a5ba8f1d1ceb06', goal='revert')[0:4,0:3]. Merge is complete! + git-imerge diagram --commits --frontier --html=imerge-revert.html 0 3 @@ -10091,7 +10983,7 @@ *??. 2 - *... | - 61c6e63a46cb73bbcc46719f3f42d6fafdbf8c20 + 3e3ffd2ba83892c01038ca1220a5ba8f1d1ceb06 0 3 | | @@ -10099,7 +10991,7 @@ *??| 2 - *--+ | - 61c6e63a46cb73bbcc46719f3f42d6fafdbf8c20 + 3e3ffd2ba83892c01038ca1220a5ba8f1d1ceb06 Key: |,-,+ = rectangles forming current merge frontier @@ -10113,7 +11005,7 @@ + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b + local refname=reverted + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b -+ git rev-parse reverted^{tree} +++ git rev-parse 'reverted^{tree}' + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b ___________________________________ summary ____________________________________ py311: commands succeeded @@ -10176,12 +11068,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/21076/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/21076/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/10116 and its subdirectories -I: Current time: Sat May 6 03:52:40 -12 2023 -I: pbuilder-time-stamp: 1683388360 +I: removing directory /srv/workspace/pbuilder/21076 and its subdirectories +I: Current time: Sun May 7 05:57:36 +14 2023 +I: pbuilder-time-stamp: 1683388656